diff options
Diffstat (limited to 'guava-tests/test/com/google/common/collect/MapConstraintsTest.java')
-rw-r--r-- | guava-tests/test/com/google/common/collect/MapConstraintsTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/guava-tests/test/com/google/common/collect/MapConstraintsTest.java b/guava-tests/test/com/google/common/collect/MapConstraintsTest.java index d743032..6cf647b 100644 --- a/guava-tests/test/com/google/common/collect/MapConstraintsTest.java +++ b/guava-tests/test/com/google/common/collect/MapConstraintsTest.java @@ -17,7 +17,7 @@ package com.google.common.collect; import static com.google.common.collect.testing.Helpers.nefariousMapEntry; -import static org.truth0.Truth.ASSERT; +import static org.junit.contrib.truth.Truth.ASSERT; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; @@ -115,11 +115,11 @@ public class MapConstraintsTest extends TestCase { assertFalse(map.values() instanceof Serializable); assertEquals(map.toString(), constrained.toString()); assertEquals(map.hashCode(), constrained.hashCode()); - ASSERT.that(map.entrySet()).has().allOf( + ASSERT.that(map.entrySet()).hasContentsInOrder( Maps.immutableEntry(TEST_KEY, TEST_VALUE), Maps.immutableEntry("foo", 1), Maps.immutableEntry("bar", 2), - Maps.immutableEntry("baz", 3)).inOrder(); + Maps.immutableEntry("baz", 3)); } public void testConstrainedMapIllegal() { @@ -163,11 +163,11 @@ public class MapConstraintsTest extends TestCase { assertEquals(map.values(), constrained.values()); assertEquals(map.toString(), constrained.toString()); assertEquals(map.hashCode(), constrained.hashCode()); - ASSERT.that(map.entrySet()).has().allOf( + ASSERT.that(map.entrySet()).hasContentsInOrder( Maps.immutableEntry(TEST_KEY, TEST_VALUE), Maps.immutableEntry("foo", 1), Maps.immutableEntry("bar", 2), - Maps.immutableEntry("baz", 3)).inOrder(); + Maps.immutableEntry("baz", 3)); } public void testConstrainedBiMapIllegal() { @@ -232,7 +232,7 @@ public class MapConstraintsTest extends TestCase { assertTrue(constrained.equals(multimap)); ASSERT.that(ImmutableList.copyOf(multimap.entries())) .is(ImmutableList.copyOf(constrained.entries())); - ASSERT.that(constrained.asMap().get("foo")).has().item(1); + ASSERT.that(constrained.asMap().get("foo")).hasContentsInOrder(1); assertNull(constrained.asMap().get("missing")); assertEquals(multimap.asMap(), constrained.asMap()); assertEquals(multimap.values(), constrained.values()); @@ -240,7 +240,7 @@ public class MapConstraintsTest extends TestCase { assertEquals(multimap.keySet(), constrained.keySet()); assertEquals(multimap.toString(), constrained.toString()); assertEquals(multimap.hashCode(), constrained.hashCode()); - ASSERT.that(multimap.entries()).has().allOf( + ASSERT.that(multimap.entries()).hasContentsInOrder( Maps.immutableEntry(TEST_KEY, TEST_VALUE), Maps.immutableEntry("foo", 1), Maps.immutableEntry("bar", 2), @@ -252,7 +252,7 @@ public class MapConstraintsTest extends TestCase { Maps.immutableEntry("bim", 8), Maps.immutableEntry("bop", 9), Maps.immutableEntry("dig", 10), - Maps.immutableEntry("dag", 11)).inOrder(); + Maps.immutableEntry("dag", 11)); assertFalse(constrained.asMap().values() instanceof Serializable); Iterator<Collection<Integer>> iterator = constrained.asMap().values().iterator(); |