diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-03 15:33:33 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-03 15:33:33 +0200 |
commit | 18a88e91f68e98f5742de14160c4ab0aca542a01 (patch) | |
tree | b0a99cd4c09c334c4d2d2c7f58d7e5a0e92d9d15 | |
parent | def6fe944d8717802b2ab67246b1cbb78b5afab9 (diff) |
Remove redundant tests
-rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java index 7fd124ca70f..308bce78179 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java @@ -493,28 +493,6 @@ public class DeploymentSpecWithoutInstanceTest { assertEquals(Set.of(RegionName.from("us-east")), spec.endpoints().get(0).regions()); } - @Test - public void invalidEndpoints() { - assertInvalid("<endpoint id='FOO' container-id='qrs'/>"); // Uppercase - assertInvalid("<endpoint id='123' container-id='qrs'/>"); // Starting with non-character - assertInvalid("<endpoint id='foo!' container-id='qrs'/>"); // Non-alphanumeric - assertInvalid("<endpoint id='foo.bar' container-id='qrs'/>"); - assertInvalid("<endpoint id='foo--bar' container-id='qrs'/>"); // Multiple consecutive dashes - assertInvalid("<endpoint id='foo-' container-id='qrs'/>"); // Trailing dash - assertInvalid("<endpoint id='foooooooooooo' container-id='qrs'/>"); // Too long - assertInvalid("<endpoint id='foo' container-id='qrs'/><endpoint id='foo' container-id='qrs'/>"); // Duplicate - } - - @Test - public void validEndpoints() { - assertEquals(List.of("default"), endpointIds("<endpoint container-id='qrs'/>")); - assertEquals(List.of("default"), endpointIds("<endpoint id='' container-id='qrs'/>")); - assertEquals(List.of("f"), endpointIds("<endpoint id='f' container-id='qrs'/>")); - assertEquals(List.of("foo"), endpointIds("<endpoint id='foo' container-id='qrs'/>")); - assertEquals(List.of("foo-bar"), endpointIds("<endpoint id='foo-bar' container-id='qrs'/>")); - assertEquals(List.of("foo", "bar"), endpointIds("<endpoint id='foo' container-id='qrs'/><endpoint id='bar' container-id='qrs'/>")); - assertEquals(List.of("fooooooooooo"), endpointIds("<endpoint id='fooooooooooo' container-id='qrs'/>")); - } @Test public void endpointDefaultRegions() { @@ -538,13 +516,6 @@ public class DeploymentSpecWithoutInstanceTest { assertEquals(Set.of("us-east", "us-west"), endpointRegions("default", spec)); } - private static void assertInvalid(String endpointTag) { - try { - endpointIds(endpointTag); - fail("Expected exception for input '" + endpointTag + "'"); - } catch (IllegalArgumentException ignored) {} - } - private static Set<String> endpointRegions(String endpointId, DeploymentSpec spec) { return spec.endpoints().stream() .filter(endpoint -> endpoint.endpointId().equals(endpointId)) @@ -553,19 +524,4 @@ public class DeploymentSpecWithoutInstanceTest { .collect(Collectors.toSet()); } - private static List<String> endpointIds(String endpointTag) { - var xml = "<deployment>" + - " <prod>" + - " <region active=\"true\">us-east</region>" + - " </prod>" + - " <endpoints>" + - endpointTag + - " </endpoints>" + - "</deployment>"; - - return DeploymentSpec.fromXml(xml).endpoints().stream() - .map(Endpoint::endpointId) - .collect(Collectors.toList()); - } - } |