1 files changed, 28 insertions, 36 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTest.java
index 451c7a3c217..eb65c01522e 100644
--- a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTest.java
@@ -5,51 +5,42 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.Tags;
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Test;
 import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.TransformerException;
-import java.io.IOException;
 import java.io.StringReader;
-import java.util.List;
 
 /**
  * @author bratseth
  */
 public class HostedOverrideProcessorTest {
 
-    static {
-        XMLUnit.setIgnoreWhitespace(true);
-    }
-
     private static final String input =
-            "<?xml version='1.0' encoding='UTF-8' standalone='no'?>" +
-                    "<services xmlns:deploy='vespa' xmlns:preprocess='?' version='1.0'>" +
-                    "  <container id='foo' version='1.0'>" +
-                    "    <nodes count='1'/>" +
-                    "    <nodes count='3' deploy:environment='perf'/>" +
-                    "    <nodes deploy:environment='staging' count='2' required='true'/>" +
-                    "    <nodes deploy:environment='prod' count='3' flavor='v-4-8-100'/>" +
-                    "    <nodes deploy:environment='prod' deploy:region='us-west' count='4'/>" +
-                    "    <nodes deploy:environment='prod' deploy:region='us-east-3' flavor='v-8-8-100' count='5'/>" +
-                    "    <nodes deploy:instance='myinstance' deploy:environment='prod' deploy:region='us-west' count='1'/>" +
-                    "  </container>" +
-                    "</services>";
+            """
+            <?xml version='1.0' encoding='UTF-8' standalone='no'?>
+            <services xmlns:deploy='vespa' xmlns:preprocess='?' version='1.0'>
+              <container id='foo' version='1.0'>
+                <nodes count='1'/>
+                <nodes count='3' deploy:environment='perf'/>
+                <nodes deploy:environment='staging' count='2' required='true'/>
+                <nodes deploy:environment='prod' count='3' flavor='v-4-8-100'/>
+                <nodes deploy:environment='prod' deploy:region='us-west' count='4'/>
+                <nodes deploy:environment='prod' deploy:region='us-east-3' flavor='v-8-8-100' count='5'/>
+                <nodes deploy:instance='myinstance' deploy:environment='prod' deploy:region='us-west' count='1'/>
+              </container></services>""";
 
 
     @Test
     public void testParsingDefault() throws TransformerException {
-        String expected = 
-                "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
-                "<services xmlns:deploy=\"vespa\" xmlns:preprocess=\"?\" version=\"1.0\">" +
-                "  <container id=\"foo\" version=\"1.0\">" +
-                "    <nodes count='1'/>" +
-                "  </container>" +
-                "</services>";
+        String expected =
+                """
+                <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                <services xmlns:deploy="vespa" xmlns:preprocess="?" version="1.0">
+                  <container id="foo" version="1.0">
+                    <nodes count='1'/>
+                  </container>
+                </services>""";
         assertOverride(InstanceName.defaultName(),
                        Environment.test,
                        RegionName.defaultName(),
@@ -59,13 +50,14 @@ public class HostedOverrideProcessorTest {
 
     @Test
     public void testParsingEnvironmentAndRegion() throws TransformerException {
-        String expected = 
-                "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
-                "<services xmlns:deploy=\"vespa\" xmlns:preprocess=\"?\" version=\"1.0\">" +
-                "  <container id=\"foo\" version=\"1.0\">" +
-                "    <nodes count='4' required='true'/>" +
-                "  </container>" +
-                "</services>";
+        String expected =
+                """
+                <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                <services xmlns:deploy="vespa" xmlns:preprocess="?" version="1.0">
+                  <container id="foo" version="1.0">
+                    <nodes count='4' required='true'/>
+                  </container>
+                </services>""";
         assertOverride(InstanceName.defaultName(),
                        Environment.from("prod"),
                        RegionName.from("us-west"),