diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-06-03 08:47:59 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-06-03 08:47:59 +0200 |
commit | 67548f5422030fe563db0f42ded3d61fb3c35458 (patch) | |
tree | b0e5c46b5d33824d7cd7ac35694336092549d7c7 /config-model/src | |
parent | 2a9e6b4fc298d654f04f23dd0965fb4e221b9ac6 (diff) |
Create app package with deprecated features and use it in test
Diffstat (limited to 'config-model/src')
4 files changed, 46 insertions, 2 deletions
diff --git a/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml b/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml new file mode 100644 index 00000000000..f0c76482b2f --- /dev/null +++ b/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<hosts> + <host name="localhost"> + <alias>node0</alias> + </host> +</hosts> diff --git a/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd b/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd new file mode 100644 index 00000000000..c97c860a129 --- /dev/null +++ b/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd @@ -0,0 +1,9 @@ +# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +search message { + + document message { + field foo type string { + indexing: summary + } + } +} diff --git a/config-model/src/test/cfg/application/deprecated_features_app/services.xml b/config-model/src/test/cfg/application/deprecated_features_app/services.xml new file mode 100644 index 00000000000..daf03d0c4c3 --- /dev/null +++ b/config-model/src/test/cfg/application/deprecated_features_app/services.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> + +<services version="1.0"> + + <admin version="2.0"> + <adminserver hostalias="node0"/> + </admin> + + <container version="1.0"> + <nodes> + <node hostalias="node0"/> + </nodes> + <document-api/> + <search/> + </container> + + <content version="1.0" id="message"> + <redundancy>1</redundancy> + <documents> + <document type="message" mode="index"/> + </documents> + <nodes> + <node hostalias="node0" distribution-key="0" /> + </nodes> + </content> + +</services> 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 a3f7e973508..9eb7ca0ac02 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 @@ -306,9 +306,9 @@ public class VespaModelTestCase { } @Test - public void testThatDeployLogContainsWarninnWhenUsingSearchdefinitionsDir() throws IOException, SAXException { + public void testThatDeployLogContainsWarningWhenUsingSearchdefinitionsDir() throws IOException, SAXException { ApplicationPackage app = FilesApplicationPackage.fromFile( - new File("src/test/cfg/application/app_qrserverandgw/")); + new File("src/test/cfg/application/deprecated_features_app/")); MyLogger logger = new MyLogger(); DeployState deployState = new DeployState.Builder() .applicationPackage(app) |