summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-07-11 11:21:58 +0200
committergjoranv <gv@verizonmedia.com>2019-07-11 11:21:58 +0200
commitda9425675c9b3e42947e17e2f2cb98aeb4fcab3c (patch)
treeab99f04591e736e9bb0548e28c3b56f60a4cbf59 /config-model
parentf4275608419676d227ac0997e4562fe6b71b8002 (diff)
Add test for deprecated 'jdisc' tag
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 426155e6ea7..8051796896e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -56,6 +56,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -72,6 +73,17 @@ import static org.junit.Assert.fail;
public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
@Test
+ public void deprecated_jdisc_tag_is_allowed() {
+ Element clusterElem = DomBuilderTest.parse(
+ "<jdisc version='1.0'>",
+ nodesXml,
+ "</jdisc>" );
+ createModel(root, clusterElem);
+ AbstractService container = (AbstractService)root.getProducer("jdisc/container.0");
+ assertNotNull(container);
+ }
+
+ @Test
public void default_port_is_4080() {
Element clusterElem = DomBuilderTest.parse(
"<container version='1.0'>",