From 4b67fbc8d76a9e4137bd080ea0ee0ee5ebd8e6b1 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@vespa.ai>
Date: Thu, 21 Dec 2023 10:15:22 +0100
Subject: Revert "Jonmv/keep config change actions in dev"

---
 .../CertificateRemovalChangeValidatorTest.java     |  8 +++----
 .../change/IndexingModeChangeValidatorTest.java    | 25 ++++++----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'config-model/src/test')

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidatorTest.java
index bc36b800bfb..6b7df8871aa 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidatorTest.java
@@ -23,11 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 public class CertificateRemovalChangeValidatorTest {
 
     private static final String validationOverrides =
-            """
-            <validation-overrides>
-                <allow until='2000-01-14' comment='test override'>certificate-removal</allow>
-            </validation-overrides>
-            """;
+            "<validation-overrides>\n" +
+            "    <allow until='2000-01-14' comment='test override'>certificate-removal</allow>\n" +
+            "</validation-overrides>\n";
 
     @Test
     void validate() {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
index 9e0eab9aba7..3fd3180b37e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
@@ -21,16 +21,6 @@ import static org.junit.jupiter.api.Assertions.fail;
  */
 public class IndexingModeChangeValidatorTest {
 
-    @Test
-    void testChangingIndexModeFromIndexedToStreamingWhenDisallowedButInDev() {
-        ValidationTester tester = new ValidationTester();
-
-        VespaModel oldModel =
-                tester.deploy(null, getServices("index"), Environment.dev, "<validation-overrides />").getFirst();
-        List<ConfigChangeAction> actions = tester.deploy(oldModel, getServices("streaming"), Environment.dev, "<calidation-overrides />").getSecond();
-        assertReindexingChange("Document type 'music' in cluster 'default-content' changed indexing mode from 'indexed' to 'streaming'", actions);
-    }
-
     @Test
     void testChangingIndexModeFromIndexedToStreamingWhenDisallowed() {
         ValidationTester tester = new ValidationTester();
@@ -38,12 +28,13 @@ public class IndexingModeChangeValidatorTest {
         VespaModel oldModel =
                 tester.deploy(null, getServices("index"), Environment.prod, "<validation-overrides />").getFirst();
         try {
-            tester.deploy(oldModel, getServices("streaming"), Environment.prod, "<calidation-overrides />").getSecond();
+            List<ConfigChangeAction> changeActions =
+                    tester.deploy(oldModel, getServices("streaming"), Environment.prod, "<calidation-overrides />").getSecond();
             fail("Should throw on disallowed config change action");
         }
         catch (ValidationException e) {
-            assertEquals("indexing-mode-change: " +
-                    "Document type 'music' in cluster 'default-content' changed indexing mode from 'indexed' to 'streaming'. " +
+            assertEquals("indexing-mode-change:\n" +
+                    "\tDocument type 'music' in cluster 'default-content' changed indexing mode from 'indexed' to 'streaming'\n" +
                     "To allow this add <allow until='yyyy-mm-dd'>indexing-mode-change</allow> to validation-overrides.xml, see https://docs.vespa.ai/en/reference/validation-overrides.html",
                     e.getMessage());
         }
@@ -103,10 +94,8 @@ public class IndexingModeChangeValidatorTest {
     }
 
     private static final String validationOverrides =
-            """
-            <validation-overrides>
-                <allow until='2000-01-14' comment='test override'>indexing-mode-change</allow>
-            </validation-overrides>
-            """;
+            "<validation-overrides>\n" +
+            "    <allow until='2000-01-14' comment='test override'>indexing-mode-change</allow>\n" +
+            "</validation-overrides>\n";
 
 }
-- 
cgit v1.2.3