diff options
author | Paul Duffin <paulduffin@google.com> | 2015-01-19 12:46:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 12:46:40 +0000 |
commit | aab56800fcb95e9b1a2d653588b14158080cc6b4 (patch) | |
tree | 7365392c3ea77742021cf187acfd465f9bb774ab /guava-tests/test/com/google/common/collect/EmptyImmutableTableTest.java | |
parent | 6fa98dbaae182b511fbeb331e08f5fb827715ea8 (diff) | |
parent | 84fb43aa6a1e752487f2624055ff26b1b6b7c043 (diff) | |
download | android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.gz android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.bz2 android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.zip |
am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""
* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
Revert "Upgraded Guava to unmodified v14.0.1"
Diffstat (limited to 'guava-tests/test/com/google/common/collect/EmptyImmutableTableTest.java')
-rw-r--r-- | guava-tests/test/com/google/common/collect/EmptyImmutableTableTest.java | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/guava-tests/test/com/google/common/collect/EmptyImmutableTableTest.java b/guava-tests/test/com/google/common/collect/EmptyImmutableTableTest.java index d1bd97a..38f4f32 100644 --- a/guava-tests/test/com/google/common/collect/EmptyImmutableTableTest.java +++ b/guava-tests/test/com/google/common/collect/EmptyImmutableTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Guava Authors + * Copyright (C) 2009 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,19 @@ package com.google.common.collect; -import com.google.common.annotations.GwtCompatible; -import com.google.common.annotations.GwtIncompatible; import com.google.common.testing.EqualsTester; /** * Tests {@link EmptyImmutableTable} * - * @author Gregory Kick + * @author gak@google.com (Gregory Kick) */ -@GwtCompatible(emulated = true) public class EmptyImmutableTableTest extends AbstractImmutableTableTest { - private static final ImmutableTable<Character, Integer, String> INSTANCE = ImmutableTable.of(); + private static final ImmutableTable<Character, Integer, String> INSTANCE = + ImmutableTable.of(); - @Override Iterable<ImmutableTable<Character, Integer, String>> getTestInstances() { + @Override Iterable<ImmutableTable<Character, Integer, String>> + getTestInstances() { return ImmutableSet.of(INSTANCE); } @@ -38,20 +37,11 @@ public class EmptyImmutableTableTest extends AbstractImmutableTableTest { } public void testEqualsObject() { - Table<Character, Integer, String> nonEmptyTable = HashBasedTable.create(); - nonEmptyTable.put('A', 1, "blah"); - - new EqualsTester() - .addEqualityGroup(INSTANCE, HashBasedTable.create(), TreeBasedTable.create()) - .addEqualityGroup(nonEmptyTable) - .testEquals(); - } - - @GwtIncompatible("ArrayTable") - public void testEqualsObjectNullValues() { new EqualsTester() - .addEqualityGroup(INSTANCE) - .addEqualityGroup(ArrayTable.create(ImmutableSet.of('A'), ImmutableSet.of(1))) + .addEqualityGroup(INSTANCE, HashBasedTable.create(), + TreeBasedTable.create()) + .addEqualityGroup(ArrayTable.create(ImmutableSet.of("A"), + ImmutableSet.of(1))) .testEquals(); } @@ -120,7 +110,8 @@ public class EmptyImmutableTableTest extends AbstractImmutableTableTest { } public void testReadResolve() { - assertSame(EmptyImmutableTable.INSTANCE, EmptyImmutableTable.INSTANCE.readResolve()); + assertSame(EmptyImmutableTable.INSTANCE, + EmptyImmutableTable.INSTANCE.readResolve()); } } |