diff options
Diffstat (limited to 'config-application-package/src/test')
11 files changed, 60 insertions, 3 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java index bea7efb40f4..e3a27ecddf0 100644 --- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java @@ -10,7 +10,6 @@ import com.yahoo.io.IOUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; - import java.io.File; import java.io.FileReader; import java.io.IOException; @@ -158,8 +157,22 @@ public class FilesApplicationPackageTest { app.validateFileExtensions(true); fail("expected an exception"); } catch (IllegalArgumentException e) { - assertEquals("File in application package with unknown suffix: search/query-profiles/file-with-invalid.extension " + - "Please delete or move file to another directory.", + assertEquals("File in application package with unknown suffix: search/query-profiles/file-with-invalid.extension, " + + "please delete or move file to another directory.", + e.getMessage()); + } + } + + @Test + public void testInvalidFileExtensionInSubDirOfSubDir() { + File appDir = new File("src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/");; + FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir); + try { + app.validateFileExtensions(true); + fail("expected an exception"); + } catch (IllegalArgumentException e) { + assertEquals("File in application package with unknown suffix: schemas/foo/bar.junk, " + + "please delete or move file to another directory.", e.getMessage()); } } diff --git a/config-application-package/src/test/resources/app-with-deployment/models/a.onnx b/config-application-package/src/test/resources/app-with-deployment/models/a.onnx new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/config-application-package/src/test/resources/app-with-deployment/models/a.onnx diff --git a/config-application-package/src/test/resources/app-with-deployment/models/b.tf b/config-application-package/src/test/resources/app-with-deployment/models/b.tf new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/config-application-package/src/test/resources/app-with-deployment/models/b.tf diff --git a/config-application-package/src/test/resources/app-with-deployment/models/c.json b/config-application-package/src/test/resources/app-with-deployment/models/c.json new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/config-application-package/src/test/resources/app-with-deployment/models/c.json diff --git a/config-application-package/src/test/resources/app-with-deployment/models/d.json.lz4 b/config-application-package/src/test/resources/app-with-deployment/models/d.json.lz4 new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/config-application-package/src/test/resources/app-with-deployment/models/d.json.lz4 diff --git a/config-application-package/src/test/resources/app-with-deployment/schemas/music/default.profile b/config-application-package/src/test/resources/app-with-deployment/schemas/music/default.profile new file mode 100644 index 00000000000..a0ab4d8225e --- /dev/null +++ b/config-application-package/src/test/resources/app-with-deployment/schemas/music/default.profile @@ -0,0 +1,5 @@ +rank-profile default { + second-phase { + expression: fieldMatch(f) + } +} diff --git a/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/deployment.xml b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/deployment.xml new file mode 100644 index 00000000000..3aad0ca6a6a --- /dev/null +++ b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/deployment.xml @@ -0,0 +1,9 @@ +<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<deployment version='1.0'> + <test /> + <staging /> + <prod> + <region active="true">us-east</region> + <region active="false">us-west-1</region> + </prod> +</deployment> diff --git a/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/hosts.xml b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/hosts.xml new file mode 100644 index 00000000000..64a07644038 --- /dev/null +++ b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/hosts.xml @@ -0,0 +1,10 @@ +<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<hosts xmlns:deploy="vespa" xmlns:preprocess="properties"> + <preprocess:properties> + <node1.hostname>foo.yahoo.com</node1.hostname> + <node1.hostname deploy:environment="dev">bar.yahoo.com</node1.hostname> + </preprocess:properties> + <host name="${node1.hostname}"> + <alias>node1</alias> + </host> +</hosts> diff --git a/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/schemas/foo/bar.junk b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/schemas/foo/bar.junk new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/schemas/foo/bar.junk diff --git a/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/schemas/music.sd b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/schemas/music.sd new file mode 100644 index 00000000000..7da7c49c162 --- /dev/null +++ b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/schemas/music.sd @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +search music { + document music { + field f type string { + indexing: index | summary + } + } +} diff --git a/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/services.xml b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/services.xml new file mode 100644 index 00000000000..60d08cb615c --- /dev/null +++ b/config-application-package/src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/services.xml @@ -0,0 +1,12 @@ +<!-- Copyright Yahoo. 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> + <content version='1.0' id='foo'> + <redundancy>1</redundancy> + <documents> + <document type="music.sd" mode="index" /> + </documents> + </content> +</services> |