diff options
Diffstat (limited to 'guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java')
-rw-r--r-- | guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java b/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java index 1c8de93db..4e9928060 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java @@ -16,11 +16,11 @@ package com.google.common.collect; -import java.util.ArrayDeque; +import junit.framework.TestCase; + import java.util.Collection; import java.util.Deque; import java.util.Iterator; -import junit.framework.TestCase; /** * Tests for {@link Synchronized#deque} and {@link Queues#synchronizedDeque}. @@ -30,9 +30,9 @@ import junit.framework.TestCase; public class SynchronizedDequeTest extends TestCase { protected Deque<String> create() { - TestDeque<String> inner = new TestDeque<>(); + TestDeque<String> inner = new TestDeque<String>(); Deque<String> outer = Synchronized.deque(inner, inner.mutex); - outer.add("foo"); // necessary because we try to remove elements later on + outer.add("foo"); // necessary because we try to remove elements later on return outer; } @@ -59,12 +59,6 @@ public class SynchronizedDequeTest extends TestCase { } @Override - public boolean remove(Object object) { - assertTrue(Thread.holdsLock(mutex)); - return delegate.remove(object); - } - - @Override public E peek() { assertTrue(Thread.holdsLock(mutex)); return delegate.peek(); @@ -114,6 +108,12 @@ public class SynchronizedDequeTest extends TestCase { } @Override + public boolean remove(Object object) { + assertTrue(Thread.holdsLock(mutex)); + return delegate.remove(object); + } + + @Override public boolean containsAll(Collection<?> collection) { assertTrue(Thread.holdsLock(mutex)); return delegate.containsAll(collection); @@ -265,7 +265,7 @@ public class SynchronizedDequeTest extends TestCase { create().clear(); create().contains("foo"); create().containsAll(ImmutableList.of("foo")); - create().equals(new ArrayDeque<>(ImmutableList.of("foo"))); + create().equals(ImmutableList.of("foo")); create().hashCode(); create().isEmpty(); create().iterator(); @@ -274,7 +274,7 @@ public class SynchronizedDequeTest extends TestCase { create().retainAll(ImmutableList.of("foo")); create().size(); create().toArray(); - create().toArray(new String[] {"foo"}); + create().toArray(new String[] { "foo" }); create().addFirst("e"); create().addLast("e"); create().offerFirst("e"); |