From d5a2caa23b848a18352127b502f4817aa9bfc45d Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 28 Apr 2022 15:01:42 +0200 Subject: Validate file extension for app files, part 4 * Allow .gitignore files everywhere and .profile files in schemas/ directory * Move exception handling and logging to config server code --- .../provider/FilesApplicationPackageTest.java | 16 ++++++++-------- .../resources/app-with-deployment/schemas/.gitignore | 0 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 config-application-package/src/test/resources/app-with-deployment/schemas/.gitignore (limited to 'config-application-package/src/test') 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 e3a27ecddf0..29bc2b6fbd6 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 @@ -144,20 +144,20 @@ public class FilesApplicationPackageTest { @Test public void testValidFileExtensions() { - File appDir = new File("src/test/resources/app-with-deployment");; + File appDir = new File("src/test/resources/app-with-deployment"); FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir); - app.validateFileExtensions(true); + app.validateFileExtensions(); } @Test public void testInvalidFileExtensions() { - File appDir = new File("src/test/resources/app-with-invalid-files-in-subdir");; + File appDir = new File("src/test/resources/app-with-invalid-files-in-subdir"); FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir); try { - app.validateFileExtensions(true); + app.validateFileExtensions(); fail("expected an exception"); } catch (IllegalArgumentException e) { - assertEquals("File in application package with unknown suffix: search/query-profiles/file-with-invalid.extension, " + + assertEquals("File in application package with unknown extension: search/query-profiles/file-with-invalid.extension, " + "please delete or move file to another directory.", e.getMessage()); } @@ -165,13 +165,13 @@ public class FilesApplicationPackageTest { @Test public void testInvalidFileExtensionInSubDirOfSubDir() { - File appDir = new File("src/test/resources/app-with-files-with-invalid-extension-in-subdir-of-subdir/");; + 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); + app.validateFileExtensions(); fail("expected an exception"); } catch (IllegalArgumentException e) { - assertEquals("File in application package with unknown suffix: schemas/foo/bar.junk, " + + assertEquals("File in application package with unknown extension: 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/schemas/.gitignore b/config-application-package/src/test/resources/app-with-deployment/schemas/.gitignore new file mode 100644 index 00000000000..e69de29bb2d -- cgit v1.2.3