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());
   }
 
 }