summaryrefslogtreecommitdiffstats
path: root/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java')
-rw-r--r--config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java52
1 files changed, 1 insertions, 51 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java
index d8e35ced227..05a5357a8ab 100644
--- a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java
@@ -347,58 +347,8 @@ public class OverrideProcessorTest {
new OverrideProcessor(InstanceName.from("default"), Environment.defaultEnvironment(), RegionName.from("us-west")).process(inputDoc);
}
- @Test
- public void testImpliedRequired() throws TransformerException {
- String input = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
- "<services xmlns:deploy=\"vespa\" xmlns:preprocess=\"?\" version=\"1.0\">" +
- " <content id=\"foo\" version=\"1.0\">" +
- " <nodes deploy:environment=\"dev\">" +
- " <!-- comment -->" +
- " <resources vcpu=\"2\" memory=\"8Gb\" disk=\"50Gb\" disk-speed=\"any\"/>" +
- " </nodes>" +
- " </content>" +
- "</services>";
- String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
- "<services xmlns:deploy=\"vespa\" xmlns:preprocess=\"?\" version=\"1.0\">" +
- " <content id=\"foo\" version=\"1.0\">" +
- " <nodes required=\"true\">" +
- " <!-- comment -->" +
- " <resources vcpu=\"2\" memory=\"8Gb\" disk=\"50Gb\" disk-speed=\"any\"/>" +
- " </nodes>" +
- " </content>" +
- "</services>";
-
- assertOverride(input, Environment.dev, RegionName.defaultName(), expected);
- }
-
- @Test
- public void testNodeElementCancelsImpliedRequired() throws TransformerException {
- String input = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
- "<services xmlns:deploy=\"vespa\" xmlns:preprocess=\"?\" version=\"1.0\">" +
- " <content id=\"foo\" version=\"1.0\">" +
- " <nodes deploy:environment=\"dev\">" +
- " <node distribution-key=\"0\" hostalias=\"node0\"/>" +
- " </nodes>" +
- " </content>" +
- "</services>";
- String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
- "<services xmlns:deploy=\"vespa\" xmlns:preprocess=\"?\" version=\"1.0\">" +
- " <content id=\"foo\" version=\"1.0\">" +
- " <nodes>" +
- " <node distribution-key=\"0\" hostalias=\"node0\"/>" +
- " </nodes>" +
- " </content>" +
- "</services>";
-
- assertOverride(input, Environment.dev, RegionName.defaultName(), expected);
- }
-
private void assertOverride(Environment environment, RegionName region, String expected) throws TransformerException {
- assertOverride(input, environment, region, expected);
- }
-
- private void assertOverride(String input, Environment environment, RegionName region, String expected) throws TransformerException {
- Document inputDoc = Xml.getDocument(new StringReader(input));
+ Document inputDoc = Xml.getDocument(new StringReader(OverrideProcessorTest.input));
Document newDoc = new OverrideProcessor(InstanceName.from("default"), environment, region).process(inputDoc);
TestBase.assertDocument(expected, newDoc);
}