1 files changed, 70 insertions, 16 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 1a4dab01930..451c7a3c217 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
@@ -4,6 +4,7 @@ package com.yahoo.config.application;
 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;
@@ -14,6 +15,7 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.TransformerException;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.List;
 
 /**
  * @author bratseth
@@ -48,7 +50,11 @@ public class HostedOverrideProcessorTest {
                 "    <nodes count='1'/>" +
                 "  </container>" +
                 "</services>";
-        assertOverride(Environment.test, RegionName.defaultName(), expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.test,
+                       RegionName.defaultName(),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -60,7 +66,27 @@ public class HostedOverrideProcessorTest {
                 "    <nodes count='4' required='true'/>" +
                 "  </container>" +
                 "</services>";
-        assertOverride(Environment.from("prod"), RegionName.from("us-west"), expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.from("prod"),
+                       RegionName.from("us-west"),
+                       Tags.empty(),
+                       expected);
+    }
+
+    @Test
+    public void testParsingSpecificTag() 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>";
+        assertOverride(InstanceName.defaultName(),
+                       Environment.from("prod"),
+                       RegionName.from("us-west"),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -72,7 +98,11 @@ public class HostedOverrideProcessorTest {
                 "    <nodes count='1' required='true'/>" +
                 "  </container>" +
                 "</services>";
-        assertOverride(InstanceName.from("myinstance"), Environment.from("prod"), RegionName.from("us-west"), expected);
+        assertOverride(InstanceName.from("myinstance"),
+                       Environment.from("prod"),
+                       RegionName.from("us-west"),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -84,7 +114,11 @@ public class HostedOverrideProcessorTest {
                         "    <nodes count='5' flavor='v-8-8-100' required='true'/>" +
                         "  </container>" +
                         "</services>";
-        assertOverride(Environment.from("prod"), RegionName.from("us-east-3"), expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.from("prod"),
+                       RegionName.from("us-east-3"),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -96,7 +130,11 @@ public class HostedOverrideProcessorTest {
                         "    <nodes count='3' required='true'/>" +
                         "  </container>" +
                         "</services>";
-        assertOverride(Environment.from("perf"), RegionName.from("us-east-3"), expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.from("perf"),
+                       RegionName.from("us-east-3"),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -108,7 +146,11 @@ public class HostedOverrideProcessorTest {
                 "    <nodes count='3' flavor='v-4-8-100' required='true'/>" +
                 "  </container>" +
                 "</services>";
-        assertOverride(Environment.valueOf("prod"), RegionName.from("unknown"), expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.valueOf("prod"),
+                       RegionName.from("unknown"),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -120,7 +162,11 @@ public class HostedOverrideProcessorTest {
                 "    <nodes count='3' flavor='v-4-8-100' required='true'/>" +
                 "  </container>" +
                 "</services>";
-        assertOverride(Environment.from("prod"), RegionName.defaultName(), expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.from("prod"),
+                       RegionName.defaultName(),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -132,7 +178,11 @@ public class HostedOverrideProcessorTest {
                 "    <nodes count='1'/>" +
                 "  </container>" +
                 "</services>";
-        assertOverride(Environment.from("dev"), RegionName.defaultName(), expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.from("dev"),
+                       RegionName.defaultName(),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -144,7 +194,11 @@ public class HostedOverrideProcessorTest {
                 "    <nodes count='1'/>" +
                 "  </container>" +
                 "</services>";
-        assertOverride(Environment.from("test"), RegionName.from("us-west"), expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.from("test"),
+                       RegionName.from("us-west"),
+                       Tags.empty(),
+                       expected);
     }
 
     @Test
@@ -156,16 +210,16 @@ public class HostedOverrideProcessorTest {
                 "    <nodes count='2' required='true'/>" +
                 "  </container>" +
                 "</services>";
-        assertOverride(Environment.from("staging"), RegionName.from("us-west"), expected);
-    }
-
-    private void assertOverride(Environment environment, RegionName region, String expected) throws TransformerException {
-        assertOverride(InstanceName.from("default"), environment, region, expected);
+        assertOverride(InstanceName.defaultName(),
+                       Environment.from("staging"),
+                       RegionName.from("us-west"),
+                       Tags.empty(),
+                       expected);
     }
 
-    private void assertOverride(InstanceName instance, Environment environment, RegionName region, String expected) throws TransformerException {
+    private void assertOverride(InstanceName instance, Environment environment, RegionName region, Tags tags, String expected) throws TransformerException {
         Document inputDoc = Xml.getDocument(new StringReader(input));
-        Document newDoc = new OverrideProcessor(instance, environment, region).process(inputDoc);
+        Document newDoc = new OverrideProcessor(instance, environment, region, tags).process(inputDoc);
         TestBase.assertDocument(expected, newDoc);
     }