diff options
3 files changed, 15 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 1892c8920a7..977946cbf71 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -83,6 +83,10 @@ public class DeployState implements ConfigDefinitionStore { return new Builder().build(); } + public static DeployState createTestState(DeployLogger testLogger) { + return new Builder().deployLogger(testLogger).build(); + } + public static DeployState createTestState(ApplicationPackage applicationPackage) { return new Builder().applicationPackage(applicationPackage).build(); } 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 8051796896e..7b382a45730 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 @@ -43,6 +43,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Level; import java.util.stream.Collectors; import static com.yahoo.config.model.test.TestUtil.joinLines; @@ -78,9 +79,14 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { "<jdisc version='1.0'>", nodesXml, "</jdisc>" ); - createModel(root, clusterElem); + TestLogger logger = new TestLogger(); + createModel(root, logger, clusterElem); AbstractService container = (AbstractService)root.getProducer("jdisc/container.0"); assertNotNull(container); + + assertFalse(logger.msgs.isEmpty()); + assertEquals(Level.WARNING, logger.msgs.get(0).getFirst()); + assertEquals("'jdisc' is deprecated as tag name. Use 'container' instead.", logger.msgs.get(0).getSecond()); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java index 1559e6b2d2c..4fec94d4ab4 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java @@ -60,6 +60,10 @@ public abstract class ContainerModelBuilderTestBase { createModel(root, DeployState.createTestState(), null, containerElems); } + public static void createModel(MockRoot root, DeployLogger testLogger, Element... containerElems) { + createModel(root, DeployState.createTestState(testLogger), null, containerElems); + } + private static void generateDefaultSearchChains(ContainerCluster cluster) { ContainerSearch search = cluster.getSearch(); if (search != null) |