diff options
11 files changed, 75 insertions, 70 deletions
diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 5053e4b3472..aaa26a136b5 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -75,11 +75,6 @@ <version>${project.version}</version> <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-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); } } diff --git a/config/pom.xml b/config/pom.xml index 9f3ec28b54b..e9d19e8e9cb 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -80,11 +80,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava-testlib</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>testutil</artifactId> <version>${project.version}</version> diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java index af6aefb26e1..31d9ebd01e8 100644 --- a/config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.protocol; -import com.google.common.testing.EqualsTester; import com.yahoo.slime.Slime; import com.yahoo.text.Utf8Array; import com.yahoo.vespa.config.ConfigPayload; @@ -11,6 +10,7 @@ import org.junit.Test; import java.nio.charset.StandardCharsets; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; /** * @author Ulf Lilleengen @@ -38,36 +38,36 @@ public class PayloadTest { Payload a = Payload.from(foo1); Payload b = Payload.from(foo1); + assertEquals(a, b); Payload c = Payload.from(foo2); + assertNotEquals(a, c); Slime slime = new Slime(); slime.setString(foo1); Payload d = Payload.from(new ConfigPayload(slime)); + assertNotEquals(a, d); slime.setString(foo1); Payload e = Payload.from(new ConfigPayload(slime)); + assertEquals(d, e); slime.setString("foo 2"); Payload f = Payload.from(new ConfigPayload(slime)); + assertNotEquals(c, f); - Payload g, h, i, j; - g = Payload.from(new Utf8Array(foo1.getBytes(StandardCharsets.UTF_8)), CompressionInfo.uncompressed()); - h = Payload.from(new Utf8Array(foo1.getBytes(StandardCharsets.UTF_8)), CompressionInfo.uncompressed()); + Payload g = Payload.from(new Utf8Array(foo1.getBytes(StandardCharsets.UTF_8)), CompressionInfo.uncompressed()); + Payload h = Payload.from(new Utf8Array(foo1.getBytes(StandardCharsets.UTF_8)), CompressionInfo.uncompressed()); + assertEquals(a, g); + assertEquals(g, h); LZ4PayloadCompressor compressor = new LZ4PayloadCompressor(); CompressionInfo info = CompressionInfo.create(CompressionType.LZ4, foo2.length()); Utf8Array compressed = new Utf8Array(compressor.compress(foo2.getBytes())); - i = Payload.from(compressed, info); - j = Payload.from(compressed, info); - - new EqualsTester() - .addEqualityGroup(a, b, g, h) - .addEqualityGroup(c) - .addEqualityGroup(d, e) - .addEqualityGroup(f) - .addEqualityGroup(i, j). - testEquals(); + Payload i = Payload.from(compressed, info); + Payload j = Payload.from(compressed, info); + assertEquals(i, j); + assertNotEquals(c, j); } } diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 21d132bb574..d70ded8033c 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -77,7 +77,7 @@ --> <bouncycastle.vespa.version>1.76</bouncycastle.vespa.version> <byte-buddy.vespa.version>1.14.7</byte-buddy.vespa.version> - <checker-qual.vespa.version>3.37.0</checker-qual.vespa.version> + <checker-qual.vespa.version>3.38.0</checker-qual.vespa.version> <commons-codec.vespa.version>1.16.0</commons-codec.vespa.version> <commons-csv.vespa.version>1.10.0</commons-csv.vespa.version> <commons-exec.vespa.version>1.3</commons-exec.vespa.version> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index cf45e010d14..d24ff9a3655 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -86,11 +86,6 @@ <!-- Test --> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava-testlib</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddressTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddressTest.java index 32fbcf9f6a4..79664159b88 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddressTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddressTest.java @@ -1,12 +1,12 @@ package com.yahoo.vespa.hosted.node.admin.task.util.network; -import com.google.common.testing.EqualsTester; import org.junit.jupiter.api.Test; import java.util.List; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; /** * @author gjoranv @@ -51,12 +51,18 @@ public class VersionedIpAddressTest { @Test void equals_and_hashCode_are_implemented() { - new EqualsTester() - .addEqualityGroup(VersionedIpAddress.from("::1"), VersionedIpAddress.from("::1")) - .addEqualityGroup(VersionedIpAddress.from("::2")) - .addEqualityGroup(VersionedIpAddress.from("127.0.0.1"), VersionedIpAddress.from("127.0.0.1")) - .addEqualityGroup(VersionedIpAddress.from("10.0.0.1")) - .testEquals(); + var one = VersionedIpAddress.from("::1"); + var two = VersionedIpAddress.from("::2"); + var local = VersionedIpAddress.from("127.0.0.1"); + var ten = VersionedIpAddress.from("10.0.0.1"); + assertEquals(one, VersionedIpAddress.from("::1")); + assertNotEquals(one, two); + assertNotEquals(one, local); + assertNotEquals(one, ten); + + assertEquals(local, VersionedIpAddress.from("127.0.0.1")); + assertNotEquals(local, two); + assertNotEquals(local, 10); } } diff --git a/parent/pom.xml b/parent/pom.xml index 31b7eaa8025..2aa9c76d495 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -541,11 +541,6 @@ </exclusions> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava-testlib</artifactId> - <version>${guava.vespa.version}</version> - </dependency> - <dependency> <groupId>com.google.jimfs</groupId> <artifactId>jimfs</artifactId> <version>${jimfs.vespa.version}</version> @@ -1132,11 +1127,6 @@ <version>${error-prone-annotations.vespa.version}</version> </dependency> <dependency> - <groupId>org.checkerframework</groupId> - <artifactId>checker-qual</artifactId> - <version>${checker-qual.vespa.version}</version> - </dependency> - <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client-apache-v2</artifactId> <version>1.43.3</version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index ba6985ad690..394d4f7b4a5 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -218,14 +218,12 @@ xml-apis:xml-apis:1.4.01 #[test-only] # Contains dependencies that are used exclusively in 'test' scope -com.google.guava:guava-testlib:32.1.2-jre com.google.inject:guice:4.2.3 com.google.jimfs:jimfs:1.3.0 net.bytebuddy:byte-buddy:1.14.7 net.bytebuddy:byte-buddy-agent:1.14.6 org.apache.curator:curator-test:5.5.0 org.assertj:assertj-core:3.24.2 -org.checkerframework:checker-qual:3.37.0 org.junit.jupiter:junit-jupiter:5.8.1 org.junit.jupiter:junit-jupiter-params:5.8.1 org.junit.vintage:junit-vintage-engine:5.8.1 |