Refactor schema validation setup

* Try to avoid hardcoding and having to specify version several times
* Make sure to only copy schema files once

1 files changed, 3 insertions, 2 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index ee2e6ffcc74..92083545027 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -242,9 +242,10 @@ public class ApplicationDeployTest {
     public FilesApplicationPackage createAppPkg(String appPkg, boolean validateXml) throws IOException {
         final FilesApplicationPackage filesApplicationPackage = FilesApplicationPackage.fromFile(new File(appPkg));
         if (validateXml) {
-            ApplicationPackageXmlFilesValidator validator = ApplicationPackageXmlFilesValidator.createTestXmlValidator(new File(appPkg), new Version(6));
+            ApplicationPackageXmlFilesValidator validator =
+                    ApplicationPackageXmlFilesValidator.createTestXmlValidator(new File(appPkg), new Version(6));
             validator.checkApplication();
-            ApplicationPackageXmlFilesValidator.checkIncludedDirs(filesApplicationPackage, new Version(6));
+            validator.checkIncludedDirs(filesApplicationPackage);
         }
         return filesApplicationPackage;
     }