Update tests that were manually asserting that objects were not equals() to an object of an unrelated class to use EqualsTester instead, which exhaustively checks equals() and hashCode().

nick-someone · garrettjonesgoogle · commit 3e6c79412d3c · 2017-06-30T15:00:24.000-07:00
This CL is in service of enabling a new compile-time error: go/bugpattern/EqualsIncompatibleType This change is part of an go/LSC process. See more about this change: https://docs.google.com/document/d/1iUC8Xpss0Y558wuipOVHvdQAMRMgR_oWHCeSdLV22xw/edit Tested: TAP --sample for global presubmit queue http://test/OCL:149062924:BASE:149043627:1488501672029:8ae9f150 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=149781297
diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
@@ -118,6 +118,11 @@
       <artifactId>guava-jdk5</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava-testlib-jdk5</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java
@@ -15,7 +15,7 @@
 package com.google.api.client.http;
 
 import com.google.common.base.Charsets;
-
+import com.google.common.testing.EqualsTester;
 import junit.framework.TestCase;
 
 /**
@@ -184,10 +184,10 @@ public void testEqualsIgnoreParameters_static() {
   }
 
   public void testEquals() {
-    assertEquals(true, new HttpMediaType("foo/bar").equals(new HttpMediaType("foo/bar")));
-    assertEquals(true, new HttpMediaType("foo/bar; a=c").equals(new HttpMediaType("foo/bar; a=c")));
-    assertEquals(false, new HttpMediaType("foo/bar; bar=bar").equals(new HttpMediaType("foo/bar")));
-    assertEquals(false, new HttpMediaType("foo/bar").equals(null));
-    assertEquals(false, new HttpMediaType("foo/bar").equals(new Integer(5)));
+    new EqualsTester()
+        .addEqualityGroup(new HttpMediaType("foo/bar"), new HttpMediaType("foo/bar"))
+        .addEqualityGroup(new HttpMediaType("foo/bar; a=c"), new HttpMediaType("foo/bar; a=c"))
+        .addEqualityGroup(new HttpMediaType("foo/bar; bar=bar"))
+        .testEquals();
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -168,6 +168,11 @@
         <artifactId>guava-jdk5</artifactId>
         <version>${project.guava.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-testlib-jdk5</artifactId>
+        <version>${project.guava.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
