diff options
Diffstat (limited to 'config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java')
| -rw-r--r-- | config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java | 101 |
1 files changed, 52 insertions, 49 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java index 3de624c78ac..697d8c208d3 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java @@ -2,7 +2,6 @@ package com.yahoo.config.application; import com.yahoo.config.application.api.ApplicationPackage; -import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -28,54 +27,58 @@ public class IncludeProcessorTest { DocumentBuilder docBuilder = Xml.getPreprocessDocumentBuilder(); String expected = - "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" + - "<services xmlns:deploy=\"vespa\" xmlns:preprocess=\"properties\" version=\"1.0\">\n" + - " <preprocess:properties>\n" + - " <qrs.port>4099</qrs.port>\n" + - " <qrs.port>5000</qrs.port>\n" + - " </preprocess:properties>\n" + - " <preprocess:properties deploy:environment='prod'>\n" + - " <qrs.port deploy:region='us-west'>5001</qrs.port>" + - " <qrs.port deploy:region='us-east us-central'>5002</qrs.port>" + - " </preprocess:properties>\n" + - " <admin version=\"2.0\">\n" + - " <adminserver hostalias=\"node0\"/>\n" + - " </admin>\n" + - " <admin deploy:environment=\"staging prod\" deploy:region=\"us-east us-central\" version=\"2.0\">\n" + - " <adminserver hostalias=\"node1\"/>\n" + - " </admin>\n" + - " <content id=\"foo\" version=\"1.0\">\n" + - " <redundancy>1</redundancy><documents>\n" + - " <document mode=\"index\" type=\"music.sd\"/>\n" + - " </documents><nodes>\n" + - " <node distribution-key=\"0\" hostalias=\"node0\"/>\n" + - " </nodes>" + - " <nodes deploy:environment=\"prod\">\n" + - " <node distribution-key=\"0\" hostalias=\"node0\"/>\n" + - " <node distribution-key=\"1\" hostalias=\"node1\"/>\n" + - " </nodes>" + - " <nodes deploy:environment=\"prod\" deploy:region=\"us-west\">\n" + - " <node distribution-key=\"0\" hostalias=\"node0\"/>\n" + - " <node distribution-key=\"1\" hostalias=\"node1\"/>\n" + - " <node distribution-key=\"2\" hostalias=\"node2\"/>\n" + - " </nodes>" + - "</content>\n" + - "<container id=\"stateless\" version=\"1.0\">\n" + - " <search deploy:environment=\"prod\">\n" + - " <chain id=\"common\">\n" + - " <searcher id=\"MySearcher1\" />\n" + - " <searcher deploy:environment=\"prod\" id=\"MySearcher2\" />\n" + - " </chain>\n" + - " </search>\n" + - " <search/>\n" + - " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />\n" + - " <component id=\"bar\" class=\"TestBar\" bundle=\"foobundle\" deploy:environment=\"dev\" />\n" + - " <component id=\"bar\" class=\"ProdBar\" bundle=\"foobundle\" deploy:environment=\"prod\" />\n" + - " <component id=\"baz\" class=\"ProdBaz\" bundle=\"foobundle\" deploy:environment=\"prod\" />\n" + - " <nodes>\n" + - " <node baseport=\"${qrs.port}\" hostalias=\"node0\"/>\n" + - " </nodes>\n" + - "</container></services>"; + """ + <?xml version="1.0" encoding="UTF-8" standalone="no"?> + <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --><services xmlns:deploy="vespa" xmlns:preprocess="properties" version="1.0"> + <preprocess:properties> + <qrs.port>4099</qrs.port> + <qrs.port>5000</qrs.port> + </preprocess:properties> + <preprocess:properties deploy:environment="prod"> + <qrs.port deploy:region="us-west">5001</qrs.port> + <qrs.port deploy:region="us-east us-central">5002</qrs.port> + </preprocess:properties> + <admin version="2.0"> + <adminserver hostalias="node0"/> + </admin> + <admin deploy:environment="staging prod" deploy:region="us-east us-central" version="2.0"> + <adminserver hostalias="node1"/> + </admin> + <content id="foo" version="1.0"> + <redundancy>1</redundancy> + <documents> + <document mode="index" type="music.sd"/> + </documents> + <nodes> + <node distribution-key="0" hostalias="node0"/> + </nodes> + <nodes deploy:environment="prod"> + <node distribution-key="0" hostalias="node0"/> + <node distribution-key="1" hostalias="node1"/> + </nodes> + <nodes deploy:environment="prod" deploy:region="us-west"> + <node distribution-key="0" hostalias="node0"/> + <node distribution-key="1" hostalias="node1"/> + <node distribution-key="2" hostalias="node2"/> + </nodes> + </content> + <container id="stateless" version="1.0"> + <search deploy:environment="prod"> + <chain id="common"> + <searcher id="MySearcher1"/> + <searcher deploy:environment="prod" id="MySearcher2"/> + </chain> + </search> + <search/> + <component bundle="foobundle" class="MyFoo" id="foo"/> + <component bundle="foobundle" class="TestBar" deploy:environment="dev" id="bar"/> + <component bundle="foobundle" class="ProdBar" deploy:environment="prod" id="bar"/> + <component bundle="foobundle" class="ProdBaz" deploy:environment="prod" id="baz"/> + <nodes> + <node baseport="${qrs.port}" hostalias="node0"/> + </nodes> + </container> + </services>"""; Document doc = new IncludeProcessor(app).process(docBuilder.parse(getServices(app))); // System.out.println(Xml.documentAsString(doc)); |