diff options
Diffstat (limited to 'config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java')
-rw-r--r-- | config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java | 179 |
1 files changed, 90 insertions, 89 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java index debde6c1438..8602b2955aa 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java @@ -5,7 +5,6 @@ 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; @@ -19,107 +18,109 @@ import java.io.StringReader; */ public class MultiOverrideProcessorTest { - static { - XMLUnit.setIgnoreWhitespace(true); - } - private static final String input = - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<services version=\"1.0\" xmlns:deploy=\"vespa\">\n" + - " <container id='default' version='1.0'>\n" + - " <component id=\"comp-B\" class=\"com.yahoo.ls.MyComponent\" bundle=\"lsbe-hv\">\n" + - " <config name=\"ls.config.resource-pool\">\n" + - " <resource>\n" + - " <item>\n" + - " <id>comp-B-item-0</id>\n" + - " <type></type>\n" + - " </item>\n" + - " <item deploy:environment=\"dev perf test staging prod\" deploy:region=\"us-west-1 us-east-3\">\n" + - " <id>comp-B-item-1</id>\n" + - " <type></type>\n" + - " </item>\n" + - " <item>\n" + - " <id>comp-B-item-2</id>\n" + - " <type></type>\n" + - " </item>\n" + - " </resource>\n" + - " </config>\n" + - " </component>\n" + - " </container>\n" + - "</services>\n"; + """ + <?xml version="1.0" encoding="UTF-8"?> + <services version="1.0" xmlns:deploy="vespa"> + <container id='default' version='1.0'> + <component id="comp-B" class="com.yahoo.ls.MyComponent" bundle="lsbe-hv"> + <config name="ls.config.resource-pool"> + <resource> + <item> + <id>comp-B-item-0</id> + <type></type> + </item> + <item deploy:environment="dev perf test staging prod" deploy:region="us-west-1 us-east-3"> + <id>comp-B-item-1</id> + <type></type> + </item> + <item> + <id>comp-B-item-2</id> + <type></type> + </item> + </resource> + </config> + </component> + </container> + </services> + """; private static final String inputWithIds = - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<services version=\"1.0\" xmlns:deploy=\"vespa\">\n" + - " <container id='default' version='1.0'>\n" + - " <component id=\"comp-B\" class=\"com.yahoo.ls.MyComponent\" bundle=\"lsbe-hv\">\n" + - " <config name=\"ls.config.resource-pool\">\n" + - " <resource>\n" + - " <item id='1'>\n" + - " <id>comp-B-item-0</id>\n" + - " <type></type>\n" + - " </item>\n" + - " <item id='2' deploy:environment=\"dev perf test staging prod\" deploy:region=\"us-west-1 us-east-3\">\n" + - " <id>comp-B-item-1</id>\n" + - " <type></type>\n" + - " </item>\n" + - " <item id='3'>\n" + - " <id>comp-B-item-2</id>\n" + - " <type></type>\n" + - " </item>\n" + - " </resource>\n" + - " </config>\n" + - " </component>\n" + - " </container>\n" + - "</services>\n"; + """ + <?xml version="1.0" encoding="UTF-8"?> + <services version="1.0" xmlns:deploy="vespa"> + <container id='default' version='1.0'> + <component id="comp-B" class="com.yahoo.ls.MyComponent" bundle="lsbe-hv"> + <config name="ls.config.resource-pool"> + <resource> + <item id='1'> + <id>comp-B-item-0</id> + <type></type> + </item> + <item id='2' deploy:environment="dev perf test staging prod" deploy:region="us-west-1 us-east-3"> + <id>comp-B-item-1</id> + <type></type> + </item> + <item id='3'> + <id>comp-B-item-2</id> + <type></type> + </item> + </resource> + </config> + </component> + </container> + </services> + """; @Test public void testParsingDev() throws TransformerException { String expected = - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<services version=\"1.0\" xmlns:deploy=\"vespa\">\n" + - " <container id='default' version='1.0'>\n" + - " <component id=\"comp-B\" class=\"com.yahoo.ls.MyComponent\" bundle=\"lsbe-hv\">\n" + - " <config name=\"ls.config.resource-pool\">\n" + - " <resource>\n" + - " <item>\n" + - " <id>comp-B-item-1</id>\n" + - " <type></type>\n" + - " </item>\n" + - " </resource>\n" + - " </config>\n" + - " </component>\n" + - " </container>\n" + - "</services>"; + """ + <?xml version="1.0" encoding="UTF-8"?> + <services version="1.0" xmlns:deploy="vespa"> + <container id='default' version='1.0'> + <component id="comp-B" class="com.yahoo.ls.MyComponent" bundle="lsbe-hv"> + <config name="ls.config.resource-pool"> + <resource> + <item> + <id>comp-B-item-1</id> + <type></type> + </item> + </resource> + </config> + </component> + </container> + </services>"""; assertOverride(Environment.dev, RegionName.from("us-east-3"), expected); } @Test public void testParsingDevWithIds() throws TransformerException { String expected = - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<services version=\"1.0\" xmlns:deploy=\"vespa\">\n" + - " <container id='default' version='1.0'>\n" + - " <component id=\"comp-B\" class=\"com.yahoo.ls.MyComponent\" bundle=\"lsbe-hv\">\n" + - " <config name=\"ls.config.resource-pool\">\n" + - " <resource>\n" + - " <item id='1'>\n" + - " <id>comp-B-item-0</id>\n" + - " <type></type>\n" + - " </item>\n" + - " <item id='2'>\n" + - " <id>comp-B-item-1</id>\n" + - " <type></type>\n" + - " </item>\n" + - " <item id='3'>\n" + - " <id>comp-B-item-2</id>\n" + - " <type></type>\n" + - " </item>\n" + - " </resource>\n" + - " </config>\n" + - " </component>\n" + - " </container>\n" + - "</services>"; + """ + <?xml version="1.0" encoding="UTF-8"?> + <services version="1.0" xmlns:deploy="vespa"> + <container id='default' version='1.0'> + <component id="comp-B" class="com.yahoo.ls.MyComponent" bundle="lsbe-hv"> + <config name="ls.config.resource-pool"> + <resource> + <item id='1'> + <id>comp-B-item-0</id> + <type></type> + </item> + <item id='2'> + <id>comp-B-item-1</id> + <type></type> + </item> + <item id='3'> + <id>comp-B-item-2</id> + <type></type> + </item> + </resource> + </config> + </component> + </container> + </services>"""; assertOverrideWithIds(Environment.dev, RegionName.from("us-east-3"), expected); } |