diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-02 17:49:06 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-03 16:32:28 +0200 |
commit | 01ed2064f931d598a35c2bf5083df5b8e071e5aa (patch) | |
tree | 40940752d633e80f7d32b236d9f9c8387edecf3a /config | |
parent | 66528789e10fae1f95ceecdfb4eddccad814d97f (diff) |
- Avoid single use of google's EqualsTester
- GC all references to unused packages.
Diffstat (limited to 'config')
-rwxr-xr-x | config/pom.xml | 5 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java | 28 |
2 files changed, 14 insertions, 19 deletions
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); } } |