diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2019-02-22 13:57:24 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2019-02-22 13:57:24 +0000 |
commit | d384da4f3f6de0d1ef3deb70f1d66a6f84cdaf9e (patch) | |
tree | 3db7ecad73136fb6cb302bdd9fe551b7ee6319f4 /config-model/src/test/java | |
parent | 8bd7b6534fab28d507629fca1c109fff65585c40 (diff) |
remove unused code and simplify
Diffstat (limited to 'config-model/src/test/java')
-rwxr-xr-x | config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java | 7 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java index d7861a6f284..f4fb3ac5247 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java @@ -6,6 +6,7 @@ import com.yahoo.config.model.ConfigModelContext; import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockRoot; import com.yahoo.text.XML; import com.yahoo.vespa.model.admin.*; @@ -115,9 +116,9 @@ public class DomAdminV2BuilderTest extends DomBuilderTest { @Test public void multitenant() { List<ConfigServerSpec> configServerSpecs = Arrays.asList( - new Configserver.Spec("test1", 19070, 19071, 2181), - new Configserver.Spec("test2", 19070, 19071, 2181), - new Configserver.Spec("test3", 19070, 19071, 2181)); + new TestProperties.Spec("test1", 19070, 19071, 2181), + new TestProperties.Spec("test2", 19070, 19071, 2181), + new TestProperties.Spec("test3", 19070, 19071, 2181)); Admin admin = buildAdmin(servicesMultitenantAdminOnly(), true, configServerSpecs); assertThat(admin.getConfigservers().size(), is(3)); assertThat(admin.getSlobroks().size(), is(1)); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java index 5d842c6651c..14659494780 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java @@ -280,7 +280,7 @@ public class VespaModelTestCase { .applicationPackage(applicationPackage) .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com")) .properties(new TestProperties() - .setConfigServerSpecs(Arrays.asList(new Configserver.Spec("cfghost", 1234, 1235, 1236))) + .setConfigServerSpecs(Arrays.asList(new TestProperties.Spec("cfghost", 1234, 1235, 1236))) .setMultitenant(true)) .build(); VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState); |