Kill test dependency

3 files changed, 42 insertions, 54 deletions

diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml
index fdfbbfc9049..c7616b2187a 100644
--- a/config-provisioning/pom.xml
+++ b/config-provisioning/pom.xml
@@ -8,14 +8,12 @@
     <version>7-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
-  <groupId>com.yahoo.vespa</groupId>
+
+  <name>config-provisioning</name>
+  <description>Provisioning APIs.</description>
   <artifactId>config-provisioning</artifactId>
   <packaging>container-plugin</packaging>
-  <version>7-SNAPSHOT</version>
-  <name>config-provisioning</name>
-  <description>
-Provisioning APIs.
-  </description>
+
   <dependencies>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
@@ -69,11 +67,6 @@ Provisioning APIs.
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
index 01904b5eece..2016490d292 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
@@ -1,12 +1,16 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-import static org.junit.Assert.assertEquals;
-
 import com.yahoo.cloud.config.ApplicationIdConfig;
 import com.yahoo.test.TotalOrderTester;
 import org.junit.Test;
-import com.google.common.testing.EqualsTester;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static com.yahoo.config.provision.ApplicationId.from;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Ulf Lilleengen
@@ -15,19 +19,11 @@ import com.google.common.testing.EqualsTester;
  */
 public class ApplicationIdTest {
 
-    ApplicationId idFrom(String tenant, String name, String instance) {
-        ApplicationId.Builder b = new ApplicationId.Builder();
-        b.tenant(tenant);
-        b.applicationName(name);
-        b.instanceName(instance);
-        return b.build();
-    }
-
     @Test
     public void require_that_application_id_is_set() {
         ApplicationId app = applicationId("application");
         assertEquals("application", app.application().value());
-        app = idFrom("tenant", "application", "instance");
+        app = from("tenant", "application", "instance");
         assertEquals("tenant", app.tenant().value());
         assertEquals("application", app.application().value());
         assertEquals("instance", app.instance().value());
@@ -35,22 +31,25 @@ public class ApplicationIdTest {
 
     @Test
     public void require_that_equals_and_hashcode_behaves_correctly() {
-        new EqualsTester()
-                .addEqualityGroup(idFrom("tenant1", "name1", "instance1"),
-                                  idFrom("tenant1", "name1", "instance1"))
-                .addEqualityGroup(idFrom("tenant2", "name1", "instance1"))
-                .addEqualityGroup(idFrom("tenant1", "name2", "instance1"))
-                .addEqualityGroup(idFrom("tenant1", "name1", "instance2"))
-                .addEqualityGroup(applicationId("onlyName1"))
-                .addEqualityGroup(applicationId("onlyName2"))
-                .testEquals();
+        assertEquals(Set.of(from("tenant1", "name1", "instance1"),
+                            from("tenant2", "name1", "instance1"),
+                            from("tenant1", "name2", "instance1"),
+                            from("tenant1", "name1", "instance2"),
+                            applicationId("name1"),
+                            applicationId("name2")),
+                     new HashSet<>(List.of(from("tenant1", "name1", "instance1"),
+                                           from("tenant2", "name1", "instance1"),
+                                           from("tenant1", "name2", "instance1"),
+                                           from("tenant1", "name1", "instance2"),
+                                           applicationId("name1"),
+                                           applicationId("name2"))));
     }
 
     @Test
     public void require_that_value_format_is_correct() {
         ApplicationId id1 = applicationId("foo");
         ApplicationId id2 = applicationId("bar");
-        ApplicationId id3 = idFrom("tenant", "baz", "bim");
+        ApplicationId id3 = from("tenant", "baz", "bim");
         assertEquals("default:foo:default", id1.serializedForm());
         assertEquals("default:bar:default", id2.serializedForm());
         assertEquals("tenant:baz:bim", id3.serializedForm());
@@ -59,8 +58,8 @@ public class ApplicationIdTest {
     @Test
     public void require_string_formats_are_correct() {
         ApplicationId id1 = applicationId("foo");
-        ApplicationId id2 = idFrom("bar", "baz", "default");
-        ApplicationId id3 = idFrom("tenant", "baz", "bim");
+        ApplicationId id2 = from("bar", "baz", "default");
+        ApplicationId id3 = from("tenant", "baz", "bim");
         assertEquals("default.foo", id1.toShortString());
         assertEquals("default.foo.default", id1.toFullString());
         assertEquals("bar.baz", id2.toShortString());
@@ -92,11 +91,11 @@ public class ApplicationIdTest {
     @Test
     public void require_that_compare_to_is_correct() {
         new TotalOrderTester<ApplicationId>()
-                .theseObjects(idFrom("tenant1", "name1", "instance1"),
-                              idFrom("tenant1", "name1", "instance1"))
-                 .areLessThan(idFrom("tenant2", "name1", "instance1"))
-                 .areLessThan(idFrom("tenant2", "name2", "instance1"))
-                 .areLessThan(idFrom("tenant2", "name2", "instance2"))
+                .theseObjects(from("tenant1", "name1", "instance1"),
+                              from("tenant1", "name1", "instance1"))
+                 .areLessThan(from("tenant2", "name1", "instance1"))
+                 .areLessThan(from("tenant2", "name2", "instance1"))
+                 .areLessThan(from("tenant2", "name2", "instance2"))
                 .testOrdering();
     }
 
@@ -106,15 +105,14 @@ public class ApplicationIdTest {
         builder.tenant("a");
         builder.application("b");
         builder.instance("c");
-        ApplicationId applicationId = ApplicationId.from(new ApplicationIdConfig(builder));
+        ApplicationId applicationId = from(new ApplicationIdConfig(builder));
         assertEquals("a", applicationId.tenant().value());
         assertEquals("b", applicationId.application().value());
         assertEquals("c", applicationId.instance().value());
     }
 
     private ApplicationId applicationId(String applicationName) {
-        return ApplicationId.from(TenantName.defaultName(),
-                                  ApplicationName.from(applicationName), InstanceName.defaultName());
+        return from(TenantName.defaultName(), ApplicationName.from(applicationName), InstanceName.defaultName());
     }
 
 }
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterSpecTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterSpecTest.java
index 0fe123a774a..dc228ee7fd2 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterSpecTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterSpecTest.java
@@ -1,13 +1,16 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-import com.google.common.testing.EqualsTester;
 import com.yahoo.component.Version;
+import com.yahoo.config.provision.ClusterSpec.Group;
+import com.yahoo.config.provision.ClusterSpec.Id;
 import org.junit.Test;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
 
@@ -18,20 +21,14 @@ public class ClusterSpecTest {
 
     @Test
     public void testIdEquals() {
-        new EqualsTester()
-                .addEqualityGroup(ClusterSpec.Id.from("id1"), ClusterSpec.Id.from("id1"))
-                .addEqualityGroup(ClusterSpec.Id.from("id2"))
-                .addEqualityGroup(ClusterSpec.Id.from("id3"))
-                .testEquals();
+        assertEquals(Set.of(Id.from("id1"), Id.from("id2"), Id.from("id3")),
+                     new HashSet<>(List.of(Id.from("id1"), Id.from("id1"), Id.from("id2"), Id.from("id3"))));
     }
 
     @Test
     public void testGroupEquals() {
-        new EqualsTester()
-                .addEqualityGroup(ClusterSpec.Group.from(1), ClusterSpec.Group.from(1))
-                .addEqualityGroup(ClusterSpec.Group.from(2))
-                .addEqualityGroup(ClusterSpec.Group.from(3))
-                .testEquals();
+        assertEquals(Set.of(Group.from(1), Group.from(2), Group.from(3)),
+                     new HashSet<>(List.of(Group.from(1), Group.from(1), Group.from(2), Group.from(3))));
     }
 
     @Test