1 files changed, 14 insertions, 20 deletions
diff --git a/guava-tests/test/com/google/common/collect/SingletonImmutableTableTest.java b/guava-tests/test/com/google/common/collect/SingletonImmutableTableTest.java
index 395be9c..36b8159 100644
--- a/guava-tests/test/com/google/common/collect/SingletonImmutableTableTest.java
+++ b/guava-tests/test/com/google/common/collect/SingletonImmutableTableTest.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,19 +16,16 @@
 
 package com.google.common.collect;
 
-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;
 import com.google.common.base.Objects;
 import com.google.common.testing.EqualsTester;
 
 /**
  * Tests {@link SingletonImmutableTable}.
  *
- * @author Gregory Kick
+ * @author gak@google.com (Gregory Kick)
  */
-@GwtCompatible(emulated = true)
 public class SingletonImmutableTableTest extends AbstractImmutableTableTest {
   private final ImmutableTable<Character, Integer, String> testTable =
       new SingletonImmutableTable<Character, Integer, String>('a', 1, "blah");
@@ -38,7 +35,8 @@ public class SingletonImmutableTableTest extends AbstractImmutableTableTest {
   }
 
   public void testCellSet() {
-    assertEquals(ImmutableSet.of(Tables.immutableCell('a', 1, "blah")), testTable.cellSet());
+    assertEquals(ImmutableSet.of(Tables.immutableCell('a', 1, "blah")),
+        testTable.cellSet());
   }
 
   public void testColumn() {
@@ -51,7 +49,8 @@ public class SingletonImmutableTableTest extends AbstractImmutableTableTest {
   }
 
   public void testColumnMap() {
-    assertEquals(ImmutableMap.of(1, ImmutableMap.of('a', "blah")), testTable.columnMap());
+    assertEquals(ImmutableMap.of(1, ImmutableMap.of('a', "blah")),
+        testTable.columnMap());
   }
 
   public void testRow() {
@@ -70,20 +69,14 @@ public class SingletonImmutableTableTest extends AbstractImmutableTableTest {
 
   public void testEqualsObject() {
     new EqualsTester()
-        .addEqualityGroup(testTable, HashBasedTable.create(testTable))
-        .addEqualityGroup(EmptyImmutableTable.INSTANCE, HashBasedTable.create())
+        .addEqualityGroup(testTable, ArrayTable.create(testTable),
+            HashBasedTable.create(testTable))
+        .addEqualityGroup(EmptyImmutableTable.INSTANCE,
+            HashBasedTable.create())
         .addEqualityGroup(HashBasedTable.create(ImmutableTable.of('A', 2, "")))
         .testEquals();
   }
 
-  @GwtIncompatible("ArrayTable")
-  public void testEqualsObjectNullValues() {
-    new EqualsTester()
-        .addEqualityGroup(testTable)
-        .addEqualityGroup(ArrayTable.create(ImmutableSet.of('A'), ImmutableSet.of(1)))
-        .testEquals();
-  }
-
   public void testToString() {
     assertEquals("{a={1=blah}}", testTable.toString());
   }
@@ -126,10 +119,11 @@ public class SingletonImmutableTableTest extends AbstractImmutableTableTest {
   }
 
   public void testValues() {
-    ASSERT.that(testTable.values()).has().item("blah");
+    ASSERT.that(testTable.values()).hasContentsInOrder("blah");
   }
 
-  @Override Iterable<ImmutableTable<Character, Integer, String>> getTestInstances() {
+  @Override Iterable<ImmutableTable<Character, Integer, String>>
+      getTestInstances() {
     return ImmutableSet.of(testTable);
   }
 }