diff options
author | gjoranv <gv@verizonmedia.com> | 2019-07-10 16:22:16 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-07-10 16:41:52 +0200 |
commit | d61ecb2cb1340aa9e708678791c77226826066db (patch) | |
tree | fb17bc7cb0201fc434cc69dced37067edad20be7 /config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain | |
parent | 6a7d07037ce40a637441078afe6951c00d189e7b (diff) |
Deprecate 'jdisc', and update all tests to use 'container.
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java index 6ba75f1ff05..9dd6f834e62 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java @@ -44,13 +44,13 @@ public class SearchChainsTest2 { @Test public void fail_upon_two_user_declared_chains_with_same_name() { final Element clusterElem = DomBuilderTest.parse( - "<jdisc id='cluster1' version='1.0'>", + "<container id='cluster1' version='1.0'>", ContainerModelBuilderTest.nodesXml, " <search>", " <chain id='same' />", " <chain id='same' />", " </search>", - "</jdisc>"); + "</container>"); try { ContainerModelBuilderTest.createModel(root, clusterElem); fail("Expected exception when declaring chains with duplicate id."); @@ -63,12 +63,12 @@ public class SearchChainsTest2 { @Test public void fail_upon_user_declared_chain_with_same_id_as_builtin_chain() { final Element clusterElem = DomBuilderTest.parse( - "<jdisc id='cluster1' version='1.0'>", + "<container id='cluster1' version='1.0'>", ContainerModelBuilderTest.nodesXml, " <search>", " <chain id='vespa' />", " </search>", - "</jdisc>"); + "</container>"); try { ContainerModelBuilderTest.createModel(root, clusterElem); fail("Expected exception when taking the id from a builtin chain."); |