From 18a88e91f68e98f5742de14160c4ab0aca542a01 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Thu, 3 Oct 2019 15:33:33 +0200
Subject: Remove redundant tests

---
 .../api/DeploymentSpecWithoutInstanceTest.java     | 44 ----------------------
 1 file changed, 44 deletions(-)

(limited to 'config-model-api')

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());
-    }
-
 }
-- 
cgit v1.2.3