Move test to PermanentFlagsTest

3 files changed, 28 insertions, 20 deletions

diff --git a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
index 52db6399a88..3edde140de8 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.flags;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.BooleanNode;
-import com.yahoo.vespa.flags.json.FlagData;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
diff --git a/flags/src/test/java/com/yahoo/vespa/flags/PermanentFlagsTest.java b/flags/src/test/java/com/yahoo/vespa/flags/PermanentFlagsTest.java
index 903b0d899e2..c4fa8ac7e1b 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/PermanentFlagsTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/PermanentFlagsTest.java
@@ -3,11 +3,15 @@ package com.yahoo.vespa.flags;
 
 import com.yahoo.vespa.flags.custom.HostResources;
 import com.yahoo.vespa.flags.custom.SharedHost;
+import com.yahoo.vespa.flags.json.FlagData;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static com.yahoo.vespa.flags.FlagsTest.testGeneric;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author bjorncs
@@ -21,4 +25,28 @@ class PermanentFlagsTest {
         testGeneric(PermanentFlags.SHARED_HOST, sharedHost);
     }
 
+    @Test
+    void wantedDockerTagValidation() {
+        IllegalArgumentException illegalArgumentException = assertThrows(
+                IllegalArgumentException.class,
+                () -> wantedDockerTagFlagData("do.not.work").validate(PermanentFlags.WANTED_DOCKER_TAG.serializer()));
+        assertThat(illegalArgumentException.getMessage(), equalTo("Invalid value: 'do.not.work'"));
+
+        wantedDockerTagFlagData("a").validate(PermanentFlags.WANTED_DOCKER_TAG.serializer());
+        wantedDockerTagFlagData("8.1.2").validate(PermanentFlags.WANTED_DOCKER_TAG.serializer());
+    }
+
+    private static FlagData wantedDockerTagFlagData(String value) {
+        return FlagData.deserialize("""
+                {
+                    "id": "wanted-docker-tag",
+                    "rules": [
+                       {
+                            "value": "%s"
+                        }
+                    ]
+                }
+                """.formatted(value));
+    }
+
 }
diff --git a/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java b/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java
index eccc546ebfc..2cc19917793 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.flags.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
-import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.flags.json.wire.WireCondition;
 import com.yahoo.vespa.flags.json.wire.WireFlagData;
 import org.junit.jupiter.api.Test;
@@ -15,7 +14,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -144,21 +142,4 @@ public class SerializationTest {
 
         assertThat(FlagData.deserialize(json).serializeToJson(), equalTo("{\"id\":\"id3\",\"rules\":[{\"conditions\":[{\"type\":\"whitelist\",\"dimension\":\"zone\"}]}]}"));
     }
-
-    @Test
-    void validation() {
-        FlagData data = FlagData.deserialize("""
-                                                    {
-                                                        "id": "wanted-docker-tag",
-                                                        "rules": [
-                                                           {
-                                                                "value": "do.not.work"
-                                                            }
-                                                        ]
-                                                    }
-                                                    """);
-        IllegalArgumentException illegalArgumentException =
-                assertThrows(IllegalArgumentException.class, () -> data.validate(PermanentFlags.WANTED_DOCKER_TAG.serializer()));
-        assertThat(illegalArgumentException.getMessage(), equalTo("Invalid value: 'do.not.work'"));
-    }
 }