- Avoid single use of google's EqualsTester

- GC all references to unused packages.

3 files changed, 47 insertions, 21 deletions

diff --git a/config-model-api/src/test/java/com/yahoo/config/model/api/HostInfoTest.java b/config-model-api/src/test/java/com/yahoo/config/model/api/HostInfoTest.java
index 7f1fd20ec5a..1d1ea593870 100644
--- a/config-model-api/src/test/java/com/yahoo/config/model/api/HostInfoTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/model/api/HostInfoTest.java
@@ -2,10 +2,11 @@
 package com.yahoo.config.model.api;
 
 import org.junit.Test;
-import com.google.common.testing.EqualsTester;
-
 import java.util.Arrays;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 public class HostInfoTest {
     @Test
     public void testEquals() {
@@ -14,10 +15,12 @@ public class HostInfoTest {
         HostInfo c = new HostInfo("foo.yahoo.com", Arrays.asList(new ServiceInfo("foo", "baz", null, null, "config-id", "host-name")));
         HostInfo d = new HostInfo("foo.yahoo.com", Arrays.asList(new ServiceInfo("bar", "baz", null, null, "config-id", "host-name")));
         HostInfo e = new HostInfo("bar.yahoo.com", null);
-        new EqualsTester()
-                .addEqualityGroup(a, b)
-                .addEqualityGroup(c)
-                .addEqualityGroup(d)
-                .addEqualityGroup(e).testEquals();
+        assertEquals(a, b);
+        assertNotEquals(a, c);
+        assertNotEquals(a, d);
+        assertNotEquals(a, d);
+        assertNotEquals(c, d);
+        assertNotEquals(c, e);
+        assertNotEquals(d, e);
     }
 }
diff --git a/config-model-api/src/test/java/com/yahoo/config/model/api/PortInfoTest.java b/config-model-api/src/test/java/com/yahoo/config/model/api/PortInfoTest.java
index 21c5abf81f6..e7daf8a18f5 100644
--- a/config-model-api/src/test/java/com/yahoo/config/model/api/PortInfoTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/model/api/PortInfoTest.java
@@ -1,11 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
-import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 
 import java.util.Arrays;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 public class PortInfoTest {
     @Test
     public void testEquals() {
@@ -13,9 +15,9 @@ public class PortInfoTest {
         PortInfo b = new PortInfo(1234, Arrays.asList("foo"));
         PortInfo c = new PortInfo(1234, Arrays.asList("foo", "bar"));
         PortInfo d = new PortInfo(12345, Arrays.asList("foo"));
-        new EqualsTester()
-                .addEqualityGroup(a, b)
-                .addEqualityGroup(c)
-                .addEqualityGroup(d).testEquals();
+        assertEquals(a, b);
+        assertNotEquals(a, c);
+        assertNotEquals(a, d);
+        assertNotEquals(c, d);
     }
 }
diff --git a/config-model-api/src/test/java/com/yahoo/config/model/api/ServiceInfoTest.java b/config-model-api/src/test/java/com/yahoo/config/model/api/ServiceInfoTest.java
index 9a381bb8233..7638430486e 100644
--- a/config-model-api/src/test/java/com/yahoo/config/model/api/ServiceInfoTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/model/api/ServiceInfoTest.java
@@ -1,12 +1,14 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
-import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 
 public class ServiceInfoTest {
 
@@ -24,13 +26,32 @@ public class ServiceInfoTest {
         ServiceInfo g = new ServiceInfo("1", "0", Arrays.asList(new PortInfo(33, null)), Collections.singletonMap("foo", "bar"), "different-config-id", commonHostName);
         ServiceInfo h = new ServiceInfo("1", "0", Arrays.asList(new PortInfo(33, null)), Collections.singletonMap("foo", "bar"), commonConfigId, "different-host");
 
-        new EqualsTester()
-                .addEqualityGroup(a, b)
-                .addEqualityGroup(c)
-                .addEqualityGroup(d)
-                .addEqualityGroup(e)
-                .addEqualityGroup(f)
-                .addEqualityGroup(g)
-                .addEqualityGroup(h).testEquals();
+        assertEquals(a, b);
+        assertNotEquals(a, c);
+        assertNotEquals(a, d);
+        assertNotEquals(a, e);
+        assertNotEquals(a, f);
+        assertNotEquals(a, g);
+        assertNotEquals(a, h);
+
+        assertNotEquals(c, d);
+        assertNotEquals(c, e);
+        assertNotEquals(c, f);
+        assertNotEquals(c, g);
+        assertNotEquals(c, h);
+
+        assertNotEquals(d, e);
+        assertNotEquals(d, f);
+        assertNotEquals(d, g);
+        assertNotEquals(d, h);
+
+        assertNotEquals(e, f);
+        assertNotEquals(e, g);
+        assertNotEquals(e, h);
+
+        assertNotEquals(f, g);
+        assertNotEquals(f, h);
+
+        assertNotEquals(g, h);
     }
 }