1 files changed, 16 insertions, 54 deletions

diff --git a/guava-tests/test/com/google/common/base/EquivalenceTest.java b/guava-tests/test/com/google/common/base/EquivalenceTest.java
index cced838..877aa67 100644
--- a/guava-tests/test/com/google/common/base/EquivalenceTest.java
+++ b/guava-tests/test/com/google/common/base/EquivalenceTest.java
@@ -18,11 +18,9 @@ package com.google.common.base;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
-import com.google.common.base.Equivalence.Wrapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EquivalenceTester;
-import com.google.common.testing.NullPointerTester;
 import com.google.common.testing.SerializableTester;
 
 import junit.framework.TestCase;
@@ -37,7 +35,7 @@ public class EquivalenceTest extends TestCase {
 
   @SuppressWarnings("unchecked") // Iterable<String>...
   public void testPairwiseEquivalent() {
-    EquivalenceTester.of(Equivalence.equals().<String>pairwise())
+    EquivalenceTester.of(Equivalences.equals().<String>pairwise())
         .addEquivalenceGroup(ImmutableList.<String>of())
         .addEquivalenceGroup(ImmutableList.of("a"))
         .addEquivalenceGroup(ImmutableList.of("b"))
@@ -47,8 +45,8 @@ public class EquivalenceTest extends TestCase {
 
   public void testPairwiseEquivalent_equals() {
     new EqualsTester()
-        .addEqualityGroup(Equivalence.equals().pairwise(), Equivalence.equals().pairwise())
-        .addEqualityGroup(Equivalence.identity().pairwise())
+        .addEqualityGroup(Equivalences.equals().pairwise(), Equivalences.equals().pairwise())
+        .addEqualityGroup(Equivalences.identity().pairwise())
         .testEquals();
   }
 
@@ -60,7 +58,7 @@ public class EquivalenceTest extends TestCase {
     }
   }
 
-  private static final Equivalence<String> LENGTH_EQUIVALENCE = Equivalence.equals()
+  private static final Equivalence<String> LENGTH_EQUIVALENCE = Equivalences.equals()
       .onResultOf(LengthFunction.INSTANCE);
 
   public void testWrap() {
@@ -75,22 +73,14 @@ public class EquivalenceTest extends TestCase {
         .addEqualityGroup(
             LENGTH_EQUIVALENCE.wrap(null),
             LENGTH_EQUIVALENCE.wrap(null))
-        .addEqualityGroup(Equivalence.equals().wrap("hello"))
-        .addEqualityGroup(Equivalence.equals().wrap(null))
+        .addEqualityGroup(Equivalences.equals().wrap("hello"))
+        .addEqualityGroup(Equivalences.equals().wrap(null))
         .testEquals();
   }
 
-  public void testWrap_get() {
-    String test = "test";
-    Wrapper<String> wrapper = LENGTH_EQUIVALENCE.wrap(test);
-    assertSame(test, wrapper.get());
-  }
-
   @GwtIncompatible("SerializableTester")
-  public void testSerialization() {
+  public void testWrapSerialization() {
     SerializableTester.reserializeAndAssert(LENGTH_EQUIVALENCE.wrap("hello"));
-    SerializableTester.reserializeAndAssert(Equivalence.equals());
-    SerializableTester.reserializeAndAssert(Equivalence.identity());
   }
 
   private static class IntValue {
@@ -106,7 +96,7 @@ public class EquivalenceTest extends TestCase {
   }
   
   public void testOnResultOf() {
-    EquivalenceTester.of(Equivalence.equals().onResultOf(Functions.toStringFunction()))
+    EquivalenceTester.of(Equivalences.equals().onResultOf(Functions.toStringFunction()))
         .addEquivalenceGroup(new IntValue(1), new IntValue(1))
         .addEquivalenceGroup(new IntValue(2))
         .test();
@@ -115,55 +105,27 @@ public class EquivalenceTest extends TestCase {
   public void testOnResultOf_equals() {
     new EqualsTester()
         .addEqualityGroup(
-            Equivalence.identity().onResultOf(Functions.toStringFunction()),
-            Equivalence.identity().onResultOf(Functions.toStringFunction()))
-        .addEqualityGroup(Equivalence.equals().onResultOf(Functions.toStringFunction()))
-        .addEqualityGroup(Equivalence.identity().onResultOf(Functions.identity()))
+            Equivalences.identity().onResultOf(Functions.toStringFunction()),
+            Equivalences.identity().onResultOf(Functions.toStringFunction()))
+        .addEqualityGroup(Equivalences.equals().onResultOf(Functions.toStringFunction()))
+        .addEqualityGroup(Equivalences.identity().onResultOf(Functions.identity()))
         .testEquals();
   }
   
   public void testEquivalentTo() {
-    Predicate<Object> equalTo1 = Equivalence.equals().equivalentTo("1");
+    Predicate<Object> equalTo1 = Equivalences.equals().equivalentTo("1");
     assertTrue(equalTo1.apply("1"));
     assertFalse(equalTo1.apply("2"));
     assertFalse(equalTo1.apply(null));
-    Predicate<Object> isNull = Equivalence.equals().equivalentTo(null);
+    Predicate<Object> isNull = Equivalences.equals().equivalentTo(null);
     assertFalse(isNull.apply("1"));
     assertFalse(isNull.apply("2"));
     assertTrue(isNull.apply(null));
     
     new EqualsTester()
-        .addEqualityGroup(equalTo1, Equivalence.equals().equivalentTo("1"))
+        .addEqualityGroup(equalTo1, Equivalences.equals().equivalentTo("1"))
         .addEqualityGroup(isNull)
-        .addEqualityGroup(Equivalence.identity().equivalentTo("1"))
+        .addEqualityGroup(Equivalences.identity().equivalentTo("1"))
         .testEquals();
   }
-  public void testEqualsEquivalent() {
-    EquivalenceTester.of(Equivalence.equals())
-        .addEquivalenceGroup(new Integer(42), 42)
-        .addEquivalenceGroup("a")
-        .test();
-  }
-
-  public void testIdentityEquivalent() {
-    EquivalenceTester.of(Equivalence.identity())
-        .addEquivalenceGroup(new Integer(42))
-        .addEquivalenceGroup(new Integer(42))
-        .addEquivalenceGroup("a")
-        .test();
-  }
-  
-  public void testEquals() {
-    new EqualsTester()
-        .addEqualityGroup(Equivalence.equals(), Equivalence.equals())
-        .addEqualityGroup(Equivalence.identity(), Equivalence.identity())
-        .testEquals();
-  }
-
-  @GwtIncompatible("NullPointerTester")
-  public void testNulls() {
-    new NullPointerTester().testAllPublicStaticMethods(Equivalence.class);
-    new NullPointerTester().testAllPublicInstanceMethods(Equivalence.equals());
-    new NullPointerTester().testAllPublicInstanceMethods(Equivalence.identity());
-  }
 }