diff options
| author | sameb <sameb@google.com> | 2015-03-23 13:04:47 -0700 |
|---|---|---|
| committer | Sam Berlin <sameb@google.com> | 2015-03-23 18:29:08 -0400 |
| commit | 825f8c1df885b9d7643a9e18e336984f0138edaf (patch) | |
| tree | 381ed6243e7744b964081f2a182bd45a6e97792b /extensions | |
| parent | 02c489e4fbddf702c7932b55caab83e6d8cba9ce (diff) | |
| download | guice-825f8c1df885b9d7643a9e18e336984f0138edaf.tar.gz | |
Some work on issue 910 -- ensure that anonymous keys & typeliterals don't
retain references to their parent classes. Still some more work to do in
WeakKeySet to let it clean up more frequently, but this should help for now.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=89328452
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java | 3 | ||||
| -rw-r--r-- | extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java b/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java index 849993f5..4206521d 100644 --- a/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java +++ b/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java @@ -32,6 +32,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.inject.AbstractModule; +import com.google.inject.Asserts; import com.google.inject.Binding; import com.google.inject.BindingAnnotation; import com.google.inject.ConfigurationException; @@ -1025,7 +1026,7 @@ public class MapBinderTest extends TestCase { // Clear the ref, GC, and ensure that we are no longer blacklisting. childInjector = null; - WeakKeySetUtils.awaitClear(weakRef); + Asserts.awaitClear(weakRef); WeakKeySetUtils.assertNotBlacklisted(parentInjector, mapKey); } } diff --git a/extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java b/extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java index d0a239ac..f3c9f63f 100644 --- a/extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java +++ b/extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java @@ -30,6 +30,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.inject.AbstractModule; +import com.google.inject.Asserts; import com.google.inject.Binding; import com.google.inject.BindingAnnotation; import com.google.inject.CreationException; @@ -1203,7 +1204,7 @@ public class OptionalBinderTest extends TestCase { // Clear the ref, GC, and ensure that we are no longer blacklisting. childInjector = null; - WeakKeySetUtils.awaitClear(weakRef); + Asserts.awaitClear(weakRef); WeakKeySetUtils.assertNotBlacklisted(parentInjector, Key.get(Integer.class)); } |