diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-13 16:34:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 16:34:00 +0000 |
| commit | c490e4dc33f0fe2086ec8d9cd872b9a358801eab (patch) | |
| tree | d06005a82652efb5b5cd471b7107d46f8e74f3a7 /harmony-tests/src/test | |
| parent | d8467fa1c1773e074ebff73bd11a0bf5538ae1d2 (diff) | |
| parent | 85cd6a1913b894491efaad4bd50d7efe5021c69d (diff) | |
| download | libcore-c490e4dc33f0fe2086ec8d9cd872b9a358801eab.zip libcore-c490e4dc33f0fe2086ec8d9cd872b9a358801eab.tar.gz libcore-c490e4dc33f0fe2086ec8d9cd872b9a358801eab.tar.bz2 | |
am 85cd6a19: Merge "Fix tests that relied on ReferenceQueue ordering semantics."
* commit '85cd6a1913b894491efaad4bd50d7efe5021c69d':
Fix tests that relied on ReferenceQueue ordering semantics.
Diffstat (limited to 'harmony-tests/src/test')
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java index ba28541..75a5218 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java @@ -76,7 +76,8 @@ public class ReferenceQueueTest extends junit.framework.TestCase { pr.enqueue(); try { - assertNull("Remove failed.", rq.poll().get()); + assertTrue("Remove failed.", ((Boolean) rq.poll().get()) + .booleanValue()); } catch (Exception e) { fail("Exception during the test : " + e.getMessage()); } @@ -88,11 +89,11 @@ public class ReferenceQueueTest extends junit.framework.TestCase { } try { - assertTrue("Remove failed.", ((Boolean) rq.poll().get()) - .booleanValue()); + assertNull("Remove failed.", rq.poll().get()); } catch (Exception e) { fail("Exception during the test : " + e.getMessage()); } + assertNull(rq.poll()); sr.enqueue(); @@ -182,11 +183,11 @@ public class ReferenceQueueTest extends junit.framework.TestCase { try { Reference result = rq.remove(1L); - assertTrue((Boolean)result.get()); + assertNull(result.get()); result = rq.remove(1L); assertEquals(obj, result.get()); result = rq.remove(1L); - assertNull(result.get()); + assertTrue((Boolean)result.get()); } catch (IllegalArgumentException e1) { fail("IllegalArgumentException was thrown."); } catch (InterruptedException e1) { |