diff options
Diffstat (limited to 'config-provisioning/src/test/java/com')
15 files changed, 170 insertions, 167 deletions
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 622fc2527bf..0a60b868bde 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 @@ -3,7 +3,7 @@ package com.yahoo.config.provision; import com.yahoo.cloud.config.ApplicationIdConfig; import com.yahoo.test.TotalOrderTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; @@ -11,8 +11,9 @@ import java.util.Set; import static com.yahoo.config.provision.ApplicationId.from; import static com.yahoo.config.provision.ApplicationId.global; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author Ulf Lilleengen @@ -22,7 +23,7 @@ import static org.junit.Assert.assertNotEquals; public class ApplicationIdTest { @Test - public void require_that_application_id_is_set() { + void require_that_application_id_is_set() { ApplicationId app = applicationId("application"); assertEquals("application", app.application().value()); app = from("tenant", "application", "instance"); @@ -32,23 +33,23 @@ public class ApplicationIdTest { } @Test - public void require_that_equals_and_hashcode_behaves_correctly() { + void require_that_equals_and_hashcode_behaves_correctly() { 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")))); + 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() { + void require_that_value_format_is_correct() { ApplicationId id1 = applicationId("foo"); ApplicationId id2 = applicationId("bar"); ApplicationId id3 = from("tenant", "baz", "bim"); @@ -58,7 +59,7 @@ public class ApplicationIdTest { } @Test - public void require_string_formats_are_correct() { + void require_string_formats_are_correct() { ApplicationId id1 = applicationId("foo"); ApplicationId id2 = from("bar", "baz", "default"); ApplicationId id3 = from("tenant", "baz", "bim"); @@ -71,38 +72,40 @@ public class ApplicationIdTest { } @Test - public void require_that_idstring_can_be_parsed() { + void require_that_idstring_can_be_parsed() { ApplicationId id = ApplicationId.fromSerializedForm("ten:foo:bim"); assertEquals("ten", id.tenant().value()); assertEquals("foo", id.application().value()); assertEquals("bim", id.instance().value()); } - @Test(expected = IllegalArgumentException.class) - public void require_that_invalid_idstring_throws_exception() { - ApplicationId.fromSerializedForm("foo:baz"); + @Test + void require_that_invalid_idstring_throws_exception() { + assertThrows(IllegalArgumentException.class, () -> { + ApplicationId.fromSerializedForm("foo:baz"); + }); } @Test - public void require_that_defaults_are_given() { + void require_that_defaults_are_given() { ApplicationId id1 = applicationId("foo"); assertEquals("default", id1.tenant().value()); assertEquals("default", id1.instance().value()); } @Test - public void require_that_compare_to_is_correct() { + void require_that_compare_to_is_correct() { new TotalOrderTester<ApplicationId>() - .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(); + .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(); } @Test - public void require_that_instance_from_config_is_correct() { + void require_that_instance_from_config_is_correct() { ApplicationIdConfig.Builder builder = new ApplicationIdConfig.Builder(); builder.tenant("a"); builder.application("b"); @@ -114,7 +117,7 @@ public class ApplicationIdTest { } @Test - public void require_that_global_is_special() { + void require_that_global_is_special() { assertEquals(global(), global()); assertNotEquals(global(), from("hosted-vespa", "routing", "default")); assertEquals(global().serializedForm(), from("hosted-vespa", "routing", "default").serializedForm()); diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/CapacityTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/CapacityTest.java index 706addc4298..a6ddb401b2f 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/CapacityTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/CapacityTest.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author bratseth @@ -12,26 +12,26 @@ import static org.junit.Assert.fail; public class CapacityTest { @Test - public void testCapacityValidation() { + void testCapacityValidation() { // Equal min and max is allowed - Capacity.from(new ClusterResources(4, 2, new NodeResources(1,2,3,4)), - new ClusterResources(4, 2, new NodeResources(1,2,3,4)), - false, true); - assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1,2,3,4)), - new ClusterResources(2, 2, new NodeResources(1,2,3,4))); - assertValidationFailure(new ClusterResources(4, 4, new NodeResources(1,2,3,4)), - new ClusterResources(4, 2, new NodeResources(1,2,3,4))); - assertValidationFailure(new ClusterResources(4, 2, new NodeResources(2,2,3,4)), - new ClusterResources(4, 2, new NodeResources(1,2,3,4))); - assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1,3,3,4)), - new ClusterResources(4, 2, new NodeResources(1,2,3,4))); - assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1,2,4,4)), - new ClusterResources(4, 2, new NodeResources(1,2,3,4))); - assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1,2,3,5)), - new ClusterResources(4, 2, new NodeResources(1,2,3,4))); + Capacity.from(new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4)), + new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4)), + false, true); + assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4)), + new ClusterResources(2, 2, new NodeResources(1, 2, 3, 4))); + assertValidationFailure(new ClusterResources(4, 4, new NodeResources(1, 2, 3, 4)), + new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4))); + assertValidationFailure(new ClusterResources(4, 2, new NodeResources(2, 2, 3, 4)), + new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4))); + assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1, 3, 3, 4)), + new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4))); + assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1, 2, 4, 4)), + new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4))); + assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1, 2, 3, 5)), + new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4))); // It's enough than one dimension is smaller also when the others are larger - assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1,2,3,4)), - new ClusterResources(8, 4, new NodeResources(2,1,6,8))); + assertValidationFailure(new ClusterResources(4, 2, new NodeResources(1, 2, 3, 4)), + new ClusterResources(8, 4, new NodeResources(2, 1, 6, 8))); } private void assertValidationFailure(ClusterResources min, ClusterResources max) { diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java index 986609357aa..b1195b6a54b 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java @@ -2,13 +2,13 @@ package com.yahoo.config.provision; import com.yahoo.component.Vtag; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author bratseth @@ -16,13 +16,13 @@ import static org.junit.Assert.assertTrue; public class ClusterMembershipTest { @Test - public void testContainerServiceInstance() { + void testContainerServiceInstance() { ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1")).vespaVersion("6.42").build(); assertContainerService(ClusterMembership.from(cluster, 3)); } @Test - public void testSerializationWithOptionalParts() { + void testSerializationWithOptionalParts() { { ClusterMembership instance = ClusterMembership.from("container/id1/4/37/exclusive/retired", Vtag.currentVersion, Optional.empty()); ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, Optional.empty()); @@ -56,42 +56,42 @@ public class ClusterMembershipTest { } @Test - public void testServiceInstance() { + void testServiceInstance() { ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1")).vespaVersion("6.42").build(); assertContentService(ClusterMembership.from(cluster, 37)); } @Test - public void testServiceInstanceWithGroup() { + void testServiceInstanceWithGroup() { ClusterSpec cluster = ClusterSpec.specification(ClusterSpec.Type.content, ClusterSpec.Id.from("id1")) - .group(ClusterSpec.Group.from(4)) - .vespaVersion("6.42") - .build(); + .group(ClusterSpec.Group.from(4)) + .vespaVersion("6.42") + .build(); assertContentServiceWithGroup(ClusterMembership.from(cluster, 37)); } @Test - public void testServiceInstanceWithGroupFromString() { + void testServiceInstanceWithGroupFromString() { assertContentServiceWithGroup(ClusterMembership.from("content/id1/4/37/stateful", Vtag.currentVersion, Optional.empty())); } @Test - public void testServiceInstanceWithRetire() { + void testServiceInstanceWithRetire() { ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1")).vespaVersion("6.42").build(); assertContentServiceWithRetire(ClusterMembership.retiredFrom(cluster, 37)); } @Test - public void testServiceInstanceWithGroupAndRetire() { + void testServiceInstanceWithGroupAndRetire() { ClusterSpec cluster = ClusterSpec.specification(ClusterSpec.Type.content, ClusterSpec.Id.from("id1")) - .group(ClusterSpec.Group.from(4)) - .vespaVersion("6.42") - .build(); + .group(ClusterSpec.Group.from(4)) + .vespaVersion("6.42") + .build(); assertContentServiceWithGroupAndRetire(ClusterMembership.retiredFrom(cluster, 37)); } @Test - public void testServiceInstanceWithGroupAndRetireFromString() { + void testServiceInstanceWithGroupAndRetireFromString() { assertContentServiceWithGroupAndRetire(ClusterMembership.from("content/id1/4/37/retired/stateful", Vtag.currentVersion, Optional.empty())); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java index cbca931e4d0..06b5dd472d6 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterResourcesTest.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author bratseth @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; public class ClusterResourcesTest { @Test - public void testCost() { + void testCost() { ClusterResources r1 = new ClusterResources(3, 1, new NodeResources(2, 8, 50, 1)); ClusterResources r2 = new ClusterResources(3, 1, new NodeResources(2, 16, 50, 1)); assertEquals(2.232, r1.cost() + r2.cost(), 0.01); 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 dc228ee7fd2..21118266ce0 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 @@ -4,7 +4,7 @@ package com.yahoo.config.provision; import com.yahoo.component.Version; import com.yahoo.config.provision.ClusterSpec.Group; import com.yahoo.config.provision.ClusterSpec.Id; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Ulf Lilleengen @@ -20,32 +20,32 @@ import static org.junit.Assert.assertEquals; public class ClusterSpecTest { @Test - public void testIdEquals() { + void testIdEquals() { 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")))); + new HashSet<>(List.of(Id.from("id1"), Id.from("id1"), Id.from("id2"), Id.from("id3")))); } @Test - public void testGroupEquals() { + void testGroupEquals() { 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)))); + new HashSet<>(List.of(Group.from(1), Group.from(1), Group.from(2), Group.from(3)))); } @Test - public void testSatisfies() { + void testSatisfies() { var tests = Map.of( - List.of(spec(ClusterSpec.Type.content, "id1"), spec(ClusterSpec.Type.content, "id2")), false, - List.of(spec(ClusterSpec.Type.admin, "id1"), spec(ClusterSpec.Type.container, "id1")), false, - List.of(spec(ClusterSpec.Type.admin, "id1"), spec(ClusterSpec.Type.content, "id1")), false, - List.of(spec(ClusterSpec.Type.combined, "id1"), spec(ClusterSpec.Type.container, "id1")), false, - List.of(spec(ClusterSpec.Type.combined, "id1"), spec(ClusterSpec.Type.content, "id1")), true, - List.of(spec(ClusterSpec.Type.content, "id1"), spec(ClusterSpec.Type.content, "id1")), true + List.of(spec(ClusterSpec.Type.content, "id1"), spec(ClusterSpec.Type.content, "id2")), false, + List.of(spec(ClusterSpec.Type.admin, "id1"), spec(ClusterSpec.Type.container, "id1")), false, + List.of(spec(ClusterSpec.Type.admin, "id1"), spec(ClusterSpec.Type.content, "id1")), false, + List.of(spec(ClusterSpec.Type.combined, "id1"), spec(ClusterSpec.Type.container, "id1")), false, + List.of(spec(ClusterSpec.Type.combined, "id1"), spec(ClusterSpec.Type.content, "id1")), true, + List.of(spec(ClusterSpec.Type.content, "id1"), spec(ClusterSpec.Type.content, "id1")), true ); tests.forEach((specs, satisfies) -> { var s1 = specs.get(0); var s2 = specs.get(1); - assertEquals(s1 + (satisfies ? " satisfies " : " does not satisfy ") + s2, satisfies, s1.satisfies(s2)); - assertEquals(s2 + (satisfies ? " satisfies " : " does not satisfy ") + s1, satisfies, s2.satisfies(s1)); + assertEquals(satisfies, s1.satisfies(s2), s1 + (satisfies ? " satisfies " : " does not satisfy ") + s2); + assertEquals(satisfies, s2.satisfies(s1), s2 + (satisfies ? " satisfies " : " does not satisfy ") + s1); }); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/DockerImageTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/DockerImageTest.java index 2e0de192f03..36cc83f91b6 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/DockerImageTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/DockerImageTest.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; import java.util.Optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; /** * @author mpolden @@ -17,42 +17,42 @@ import static org.junit.Assert.fail; public class DockerImageTest { @Test - public void parse() { + void parse() { Map<String, DockerImage> tests = Map.of( - "", DockerImage.EMPTY, - "registry.example.com:9999/vespa/vespa:7.42", new DockerImage("registry.example.com:9999", "vespa/vespa", Optional.of("7.42")), - "registry.example.com/vespa/vespa:7.42", new DockerImage("registry.example.com", "vespa/vespa", Optional.of("7.42")), - "registry.example.com:9999/vespa/vespa", new DockerImage("registry.example.com:9999", "vespa/vespa", Optional.empty()), - "registry.example.com/vespa/vespa", new DockerImage("registry.example.com", "vespa/vespa", Optional.empty()), - "registry.example.com/project/repo/vespa/vespa", new DockerImage("registry.example.com/project/repo", "vespa/vespa", Optional.empty()) + "", DockerImage.EMPTY, + "registry.example.com:9999/vespa/vespa:7.42", new DockerImage("registry.example.com:9999", "vespa/vespa", Optional.of("7.42")), + "registry.example.com/vespa/vespa:7.42", new DockerImage("registry.example.com", "vespa/vespa", Optional.of("7.42")), + "registry.example.com:9999/vespa/vespa", new DockerImage("registry.example.com:9999", "vespa/vespa", Optional.empty()), + "registry.example.com/vespa/vespa", new DockerImage("registry.example.com", "vespa/vespa", Optional.empty()), + "registry.example.com/project/repo/vespa/vespa", new DockerImage("registry.example.com/project/repo", "vespa/vespa", Optional.empty()) ); tests.forEach((value, expected) -> { DockerImage parsed = DockerImage.fromString(value); assertEquals(value, parsed.asString()); String untagged = expected.equals(DockerImage.EMPTY) - ? "" - : expected.registry() + "/" + expected.repository(); + ? "" + : expected.registry() + "/" + expected.repository(); assertEquals(untagged, parsed.untagged()); }); } @Test - public void registry_cannot_contain_slash() { + void registry_cannot_contain_slash() { DockerImage image = DockerImage.fromString("registry.example.com/vespa/vespa"); assertThrows(IllegalArgumentException.class, () -> image.withRegistry("")); assertThrows(IllegalArgumentException.class, () -> image.withRegistry("my-registry/path/")); } @Test - public void parse_invalid() { + void parse_invalid() { List<String> tests = List.of( - "registry.example.com", - "registry.example.com/", - "registry.example.com/repository", - "registry.example.com/repository:", - "foo", - "foo:1.2.3" + "registry.example.com", + "registry.example.com/", + "registry.example.com/repository", + "registry.example.com/repository:", + "foo", + "foo:1.2.3" ); for (var value : tests) { try { diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java index b0ce1b3b8cb..e8ad99ff0d3 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java @@ -2,13 +2,13 @@ package com.yahoo.config.provision; import com.yahoo.component.Vtag; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.Optional; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author bratseth @@ -16,7 +16,7 @@ import static org.junit.Assert.assertTrue; public class HostFilterTest { @Test - public void testSingleConditionFilter() { + void testSingleConditionFilter() { HostFilter all = HostFilter.all(); HostFilter hostname = HostFilter.hostname("host1"); HostFilter type = HostFilter.clusterType(ClusterSpec.Type.content); @@ -33,22 +33,22 @@ public class HostFilterTest { assertFalse( id.matches("anyhost", "flavor", membership("content/anytype/0/0/stateful"))); assertTrue( all.matches("host1", "flavor", membership("content/anytype/0/0/stateful"))); - assertTrue( hostname.matches("host1", "flavor", membership("content/anytype/0/0/stateful"))); + assertTrue(hostname.matches("host1", "flavor", membership("content/anytype/0/0/stateful"))); assertTrue( type.matches("host1", "flavor", membership("content/anytype/0/0/stateful"))); assertFalse( id.matches("host1", "flavor", membership("content/anytype/0/0/stateful"))); assertTrue( all.matches("host1", "flavor", membership("content/type1/0/0/stateful"))); - assertTrue( hostname.matches("host1", "flavor", membership("content/type1/0/0/stateful"))); + assertTrue(hostname.matches("host1", "flavor", membership("content/type1/0/0/stateful"))); assertTrue( type.matches("host1", "flavor", membership("content/type1/0/0/stateful"))); assertTrue( id.matches("host1", "flavor", membership("content/type1/0/0/stateful"))); } @Test - public void testMultiConditionFilter() { + void testMultiConditionFilter() { HostFilter typeAndId = HostFilter.from(Collections.emptyList(), - Collections.emptyList(), - Collections.singletonList(ClusterSpec.Type.content), - Collections.singletonList(ClusterSpec.Id.from("type1"))); + Collections.emptyList(), + Collections.singletonList(ClusterSpec.Type.content), + Collections.singletonList(ClusterSpec.Id.from("type1"))); assertFalse(typeAndId.matches("anyhost", "flavor", membership("content/anyType/0/0/stateful"))); assertFalse(typeAndId.matches("anyhost", "flavor", membership("container/type1/0/0"))); @@ -56,7 +56,7 @@ public class HostFilterTest { } @Test - public void testMultiConditionFilterFromStrings() { + void testMultiConditionFilterFromStrings() { HostFilter typeAndId = HostFilter.from("host1 host2, host3,host4", " , ,flavor", null, "type1 "); assertFalse(typeAndId.matches("anotherhost", "flavor", membership("content/type1/0/0/stateful"))); diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/HostNameTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/HostNameTest.java index da01920cc57..fe42e71682b 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/HostNameTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/HostNameTest.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author jonmv @@ -11,7 +11,7 @@ import static org.junit.Assert.assertThrows; public class HostNameTest { @Test - public void testNames() { + void testNames() { HostName.of("name-123.0.321-eman"); HostName.of(("." + "a".repeat(32)).repeat(2).substring(1, 65)); HostName.of("123"); diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/IdentifierTestBase.java b/config-provisioning/src/test/java/com/yahoo/config/provision/IdentifierTestBase.java index fd1a9401b81..1fd4c2e06ce 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/IdentifierTestBase.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/IdentifierTestBase.java @@ -1,16 +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 org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Generic test for identifiers such as {@link Environment} and {@link RegionName}. @@ -23,7 +23,7 @@ public abstract class IdentifierTestBase<ID_TYPE> { protected abstract boolean isDefault(ID_TYPE instance); @Test - public void testDefault() { + void testDefault() { ID_TYPE def = createDefaultInstance(); ID_TYPE def2 = createInstance("default"); ID_TYPE notdef = createInstance("default2"); @@ -35,9 +35,9 @@ public abstract class IdentifierTestBase<ID_TYPE> { } @Test - public void testEquals() { + void testEquals() { assertEquals(Set.of(createInstance("foo"), createInstance("bar"), createInstance("baz")), - new HashSet<>(List.of(createInstance("foo"), createInstance("foo"), createInstance("bar"), createInstance("baz")))); + new HashSet<>(List.of(createInstance("foo"), createInstance("foo"), createInstance("bar"), createInstance("baz")))); } } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java index 8c2a6b70cf5..5ab6aa64516 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java @@ -2,19 +2,19 @@ package com.yahoo.config.provision; import com.yahoo.config.provisioning.FlavorsConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class NodeFlavorsTest { private static final double delta = 0.00001; @Test - public void testConfigParsing() { + void testConfigParsing() { FlavorsConfig.Builder builder = new FlavorsConfig.Builder(); List<FlavorsConfig.Flavor.Builder> flavorBuilderList = new ArrayList<>(); { @@ -35,7 +35,7 @@ public class NodeFlavorsTest { Flavor banana = nodeFlavors.getFlavor("banana").get(); assertEquals(3, banana.cost()); assertEquals(13, banana.resources().vcpu(), delta); - assertEquals("10 * 1.3", 13, banana.resources().vcpu(), delta); + assertEquals(13, banana.resources().vcpu(), delta, "10 * 1.3"); } } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java index 564c53eeff0..35c7bfd35ec 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.function.Supplier; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author bratseth @@ -14,17 +14,17 @@ import static org.junit.Assert.fail; public class NodeResourcesTest { @Test - public void testToString() { + void testToString() { assertEquals("[vcpu: 1.0, memory: 10.0 Gb, disk 100.0 Gb, architecture: x86_64]", - new NodeResources(1., 10., 100., 0).toString()); + new NodeResources(1., 10., 100., 0).toString()); assertEquals("[vcpu: 0.3, memory: 3.3 Gb, disk 33.3 Gb, bandwidth: 0.3 Gbps, architecture: x86_64]", - new NodeResources(1/3., 10/3., 100/3., 0.3).toString()); + new NodeResources(1 / 3., 10 / 3., 100 / 3., 0.3).toString()); assertEquals("[vcpu: 0.7, memory: 9.0 Gb, disk 66.7 Gb, bandwidth: 0.7 Gbps, architecture: x86_64]", - new NodeResources(2/3., 8.97, 200/3., 0.67).toString()); + new NodeResources(2 / 3., 8.97, 200 / 3., 0.67).toString()); } @Test - public void testInvalid() { + void testInvalid() { assertInvalid("vcpu", () -> new NodeResources(Double.NaN, 1.0, 1.0, 1.0)); assertInvalid("memory", () -> new NodeResources(1.0, Double.NaN, 1.0, 1.0)); assertInvalid("disk", () -> new NodeResources(1.0, 1.0, Double.NaN, 1.0)); @@ -32,17 +32,17 @@ public class NodeResourcesTest { } @Test - public void benchmark() { + void benchmark() { NodeResources [] resouces = new NodeResources[100]; for (int i = 0; i < resouces.length; i++) { - resouces[i] = new NodeResources(1/3., 10/3., 100/3., 0.3); + resouces[i] = new NodeResources(1 / 3., 10 / 3., 100 / 3., 0.3); } int NUM_ITER = 100; // Use at least 100000 for proper benchmarking long warmup = runTest(resouces, NUM_ITER); long start = System.nanoTime(); long benchmark = runTest(resouces, NUM_ITER); long duration = System.nanoTime() - start; - System.out.println("NodeResources.toString() took " + duration/1000000 + " ms"); + System.out.println("NodeResources.toString() took " + duration / 1000000 + " ms"); assertEquals(warmup, benchmark); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java index beb28241963..f0656f84a07 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java @@ -1,25 +1,25 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author hakonhall */ public class SystemNameTest { @Test - public void test() { + void test() { for (SystemName name : SystemName.values()) { assertEquals(name, SystemName.from(name.value())); } } @Test - public void allOf() { + void allOf() { assertEquals(Set.of(SystemName.cd, SystemName.PublicCd), SystemName.allOf(SystemName::isCd)); assertEquals(Set.of(SystemName.PublicCd, SystemName.Public), SystemName.allOf(SystemName::isPublic)); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/TenantTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/TenantTest.java index 2bfcd183c85..a68ea952475 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/TenantTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/TenantTest.java @@ -2,9 +2,9 @@ package com.yahoo.config.provision; import com.yahoo.test.TotalOrderTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Ulf Lilleengen @@ -27,12 +27,12 @@ public class TenantTest extends IdentifierTestBase<TenantName> { } @Test - public void testComparator() { + void testComparator() { assertEquals(0, TenantName.defaultName().compareTo(TenantName.defaultName())); new TotalOrderTester<TenantName>() - .theseObjects(TenantName.from("a"), TenantName.from("a")) - .areLessThan(TenantName.from("b")) - .testOrdering(); + .theseObjects(TenantName.from("a"), TenantName.from("a")) + .areLessThan(TenantName.from("b")) + .testOrdering(); } } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java index ae61be8f2e9..4fd1b1bbc26 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java @@ -2,10 +2,10 @@ package com.yahoo.config.provision; import com.yahoo.config.provision.zone.ZoneId; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author hmusum @@ -16,14 +16,14 @@ public class ZoneIdTest { private static final RegionName region = RegionName.from("moon-dark-side-1"); @Test - public void testCreatingZoneId() { + void testCreatingZoneId() { ZoneId zoneId = ZoneId.from(environment, region); assertEquals(region, zoneId.region()); assertEquals(environment, zoneId.environment()); } @Test - public void testSerializingAndDeserializing() { + void testSerializingAndDeserializing() { ZoneId zoneId = ZoneId.from(environment, region); assertEquals(environment.value() + "." + region.value(), zoneId.value()); assertEquals(ZoneId.from(zoneId.value()), zoneId); diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java index ed87ff9f555..fec8be59c50 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java @@ -8,7 +8,7 @@ import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NetworkPorts; import com.yahoo.config.provision.NodeResources; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.LinkedHashSet; @@ -18,7 +18,7 @@ import java.util.Set; import static com.yahoo.config.provision.serialization.AllocatedHostsSerializer.fromJson; import static com.yahoo.config.provision.serialization.AllocatedHostsSerializer.toJson; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author bratseth @@ -31,7 +31,7 @@ public class AllocatedHostsSerializerTest { private static final NodeResources arm64Node = new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any, NodeResources.StorageType.any, NodeResources.Architecture.arm64); @Test - public void testAllocatedHostsSerialization() throws IOException { + void testAllocatedHostsSerialization() throws IOException { Set<HostSpec> hosts = new LinkedHashSet<>(); hosts.add(new HostSpec("empty", List.of(), Optional.empty())); hosts.add(new HostSpec("with-aliases", List.of("alias1", "alias2"), Optional.empty())); @@ -69,7 +69,7 @@ public class AllocatedHostsSerializerTest { Optional.empty()), Optional.empty(), Optional.of(new NetworkPorts(List.of(new NetworkPorts.Allocation(1234, "service1", "configId1", "suffix1"), - new NetworkPorts.Allocation(4567, "service2", "configId2", "suffix2")))), + new NetworkPorts.Allocation(4567, "service2", "configId2", "suffix2")))), Optional.empty())); hosts.add(new HostSpec("arm64", arm64Node, @@ -79,7 +79,7 @@ public class AllocatedHostsSerializerTest { Optional.empty()), Optional.empty(), Optional.of(new NetworkPorts(List.of(new NetworkPorts.Allocation(1234, "service1", "configId1", "suffix1"), - new NetworkPorts.Allocation(4567, "service2", "configId2", "suffix2")))), + new NetworkPorts.Allocation(4567, "service2", "configId2", "suffix2")))), Optional.empty())); assertAllocatedHosts(AllocatedHosts.withHosts(hosts)); |