Create test jars in unit test instead of using pre-made

Unpack checked-in test JARs and package to JARs in test case instead.
Don't use full path in produced warning/error messages.

20 files changed, 838 insertions, 22 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
index b6b9190fedf..04d4ac35e6a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
@@ -12,6 +12,7 @@ import com.yahoo.path.Path;
 import com.yahoo.vespa.model.VespaModel;
 
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,29 +41,29 @@ public class BundleValidator extends Validator {
     public void validate(VespaModel model, DeployState deployState) {
         ApplicationPackage app = deployState.getApplicationPackage();
         for (ComponentInfo info : app.getComponentsInfo(deployState.getVespaVersion())) {
+            Path path = Path.fromString(info.getPathRelativeToAppDir());
             try {
-                Path path = Path.fromString(info.getPathRelativeToAppDir());
                 DeployLogger deployLogger = deployState.getDeployLogger();
                 deployLogger.log(Level.FINE, String.format("Validating bundle at '%s'", path));
                 JarFile jarFile = new JarFile(app.getFileReference(path));
                 validateJarFile(deployLogger, jarFile);
             } catch (IOException e) {
                 throw new IllegalArgumentException(
-                        "Failed to validate JAR file '" + info.getPathRelativeToAppDir() + "'", e);
+                        "Failed to validate JAR file '" + path.last() + "'", e);
             }
         }
     }
 
     void validateJarFile(DeployLogger deployLogger, JarFile jarFile) throws IOException {
         Manifest manifest = jarFile.getManifest();
-        String jarPath = jarFile.getName();
+        String filename = Paths.get(jarFile.getName()).getFileName().toString();
         if (manifest == null) {
-            throw new IllegalArgumentException("Non-existing or invalid manifest in " + jarPath);
+            throw new IllegalArgumentException("Non-existing or invalid manifest in " + filename);
         }
-        validateManifest(deployLogger, jarPath, manifest);
+        validateManifest(deployLogger, filename, manifest);
     }
 
-    void validateManifest(DeployLogger deployLogger, String jarPath, Manifest mf) {
+    private void validateManifest(DeployLogger deployLogger, String filename, Manifest mf) {
         // Check for required OSGI headers
         Attributes attributes = mf.getMainAttributes();
         HashSet<String> mfAttributes = new HashSet<>();
@@ -74,21 +75,21 @@ public class BundleValidator extends Validator {
         for (String header : requiredOSGIHeaders) {
             if (!mfAttributes.contains(header)) {
                 throw new IllegalArgumentException("Required OSGI header '" + header +
-                        "' was not found in manifest in '" + jarPath + "'");
+                        "' was not found in manifest in '" + filename + "'");
             }
         }
 
         if (attributes.getValue("Bundle-Version").endsWith(".SNAPSHOT")) {
-            deployLogger.logApplicationPackage(Level.WARNING, "Deploying snapshot bundle " + jarPath +
+            deployLogger.logApplicationPackage(Level.WARNING, "Deploying snapshot bundle " + filename +
                     ".\nTo use this bundle, you must include the qualifier 'SNAPSHOT' in  the version specification in services.xml.");
         }
 
         if (attributes.getValue("Import-Package") != null) {
-            validateImportedPackages(deployLogger, jarPath, mf);
+            validateImportedPackages(deployLogger, filename, mf);
         }
     }
 
-    private static void validateImportedPackages(DeployLogger deployLogger, String jarPath, Manifest manifest) {
+    private static void validateImportedPackages(DeployLogger deployLogger, String filename, Manifest manifest) {
         Domain osgiHeaders = Domain.domain(manifest);
         Parameters importPackage = osgiHeaders.getImportPackage();
         Map<DeprecatedArtifact, List<String>> deprecatedPackagesInUse = new HashMap<>();
@@ -112,7 +113,7 @@ public class BundleValidator extends Validator {
                     String.format("For JAR file '%s': \n" +
                             "Manifest imports the following Java packages from '%s': %s. \n" +
                             "%s",
-                            jarPath, artifact.name, packagesInUse, artifact.description));
+                            filename, artifact.name, packagesInUse, artifact.description));
         });
     }
 
diff --git a/config-model/src/test/cfg/application/validation/testjars/manifest-producing-import-warnings.MF b/config-model/src/test/cfg/application/validation/testjars/import-warnings/META-INF/MANIFEST.MF
index 760a9ecf00f..760a9ecf00f 100644
--- a/config-model/src/test/cfg/application/validation/testjars/manifest-producing-import-warnings.MF
+++ b/config-model/src/test/cfg/application/validation/testjars/import-warnings/META-INF/MANIFEST.MF
diff --git a/config-model/src/test/cfg/application/validation/testjars/missing_osgi_headers.jar b/config-model/src/test/cfg/application/validation/testjars/missing_osgi_headers.jar
deleted file mode 100644
index 84781c4802e..00000000000
--- a/config-model/src/test/cfg/application/validation/testjars/missing_osgi_headers.jar
+++ /dev/null
diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest.jar b/config-model/src/test/cfg/application/validation/testjars/nomanifest.jar
deleted file mode 100644
index f4f7dd4e127..00000000000
--- a/config-model/src/test/cfg/application/validation/testjars/nomanifest.jar
+++ /dev/null
diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/base.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/base.sd
new file mode 100644
index 00000000000..c52570face3
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/base.sd
@@ -0,0 +1,7 @@
+search base {
+    document base {
+        field base type string {
+            indexing: summary | index
+        }
+    }
+}
\ No newline at end of file
diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd
new file mode 100644
index 00000000000..73b540627d7
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd
@@ -0,0 +1,184 @@
+search book {
+        document book inherits base {
+                field title type string {
+                        bolding: on
+                        index-to: default, title
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field dispauthor type string {
+                        bolding: on
+                        index-to: default, dispauthor
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field author type string {
+                        bolding: on
+                        index-to: default, author
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field keys type string {
+                        index-to: default, keys
+                        indexing: index
+                        rank-type: about
+                }
+                field isbn type string {
+                        index-to: default, isbn
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field series type string {
+                        index-to: default, series
+                        indexing: index
+                        rank-type: about
+                }
+                field url type string {
+                        indexing: summary
+                }
+                field image type string {
+                        indexing: summary
+                }
+                field img85 type string {
+                        indexing: summary
+                }
+                field img110 type string {
+                        indexing: summary
+                }
+    field limg type string {
+      indexing: summary
+    }
+                field did type string {
+                        indexing: attribute|index|summary
+			attribute : no-update
+                }
+                field price type string {
+                        indexing: summary
+                }
+                field categories type string {
+                        indexing: attribute|index|summary
+			attribute : no-update
+                }
+                field mid type int {
+                        indexing: attribute|summary|collapse
+                }
+                field pfrom type long {
+                        indexing: attribute|summary
+                }
+                field pto type string {
+                        indexing: summary
+                }
+                field fmt type string {
+                        indexing: index|summary
+                }
+                field data type string {
+                        indexing: summary
+                }
+                field weight type float {
+                        indexing {
+                                field weight * 6 | summary;
+                        }
+                }
+                field year type int {
+                        indexing: attribute|summary
+                }
+                field newestedition type int {
+                        indexing: attribute|summary
+                }
+                field woty type int {
+                        indexing: attribute|summary
+                }
+                field formats type string {
+                        indexing: index|summary
+                }
+                field age type string {
+                        indexing: index|summary
+                }
+                field sales type int {
+                        indexing: attribute|summary
+                }
+                field more_url type string {
+                        indexing: summary
+                }
+                field more_price type string {
+                        indexing: summary
+                }
+                field more_format type string {
+                        indexing: summary
+                }
+                field pid type string {
+                        indexing: index|summary
+                }
+                field userrate type int {
+                        indexing: attribute|summary
+                }
+                field numreview type int {
+                        indexing: summary
+                }
+                field cbid type string {
+                        indexing: attribute|index|summary
+ 			attribute: no-update
+                        rank-type: about
+                }
+                field scid type string {
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field w1 type float {
+                        indexing {
+                                field weight * 6 + field w1 | staticrank weight1 | summary;
+                        }
+                }
+                field w2 type float {
+                        indexing {
+                                field w2 + field weight | staticrank weight2 | summary;
+                        }
+                }
+                field w3 type float {
+                        indexing {
+                                field w3 + field weight | staticrank weight3 | summary;
+                        }
+                }
+                field w4 type float {
+                        indexing {
+                                field w4 + field weight | staticrank weight4 | summary;
+                        }
+                }
+                field sw1 type float {
+                        indexing {
+                                field weight * 6 + field w1 + field w2 | staticrank | summary;
+                        }
+                }
+                field sw2 type float {
+                        indexing {
+                                field weight | staticrank sw2 | summary;
+                        }
+                }
+                field sw3 type float {
+                        indexing {
+                                field weight | staticrank sw3 | summary;
+                        }
+                }
+                field sw4 type float {
+                        indexing {
+                                field weight | staticrank sw4 | summary;
+                        }
+                }
+        }
+
+        field didinteger type int {
+                indexing {
+                        field did | split_foreach " " { attribute; } | summary;
+                }
+                attribute: multivalued
+        }
+
+        rank-profile rp1 inherits default {
+        }
+        rank-profile rp2 inherits default {
+        }
+        rank-profile rp3 inherits default {
+        }
+        rank-profile rp4 inherits default {
+        }
+}
diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd
new file mode 100644
index 00000000000..498bc79489f
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd
@@ -0,0 +1,12 @@
+search music      {
+        document music inherits base {
+                field f1 type string    {
+                        indexing: summary | index
+                        index-to: f1, all
+                }
+                field f2 type string    {
+                        indexing: summary | index
+                        index-to: f2, all
+                }
+        }
+}
diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd
new file mode 100644
index 00000000000..b010b6d9769
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd
@@ -0,0 +1,182 @@
+search video {
+	document video inherits base {
+		field title type string {
+			bolding: on
+			index-to: default, title
+			indexing: index|summary
+			rank-type: about
+		}
+		field keys type string {
+			index-to: default, keys
+			indexing: index
+                        rank-type: about
+		}
+		field director type string {
+			bolding: on
+			index-to: default, director
+			indexing: index|summary
+                        rank-type: about
+		}
+		field disp_actor type string {
+			bolding: on
+			index-to: default, disp_actor
+			indexing: index|summary
+                        rank-type: about
+		}
+		field actor type string {
+			bolding: on
+			index-to: default, actor
+			indexing: index|summary
+                        rank-type: about
+		}
+		field fmt type string {
+			index-to: default, fmt
+			indexing: index|summary
+                        rank-type: about
+		}
+		field isbn type string {
+			bolding: on
+			index-to: default, isbn
+			indexing: index|summary
+                        rank-type: about
+		}
+		field mid type int {
+			indexing: attribute|summary|collapse
+		}
+		field url type string {
+			indexing: summary
+		}
+		field image type string {
+			indexing: summary
+		}
+		field img85 type string {
+			indexing: summary
+		}
+		field img110 type string {
+			indexing: summary
+		}
+    field limg type string {
+      indexing: summary
+    }
+		field did type string {
+			indexing: attribute|index|summary
+			attribute : no-update
+		}
+		field categories type string {
+			indexing: attribute|index|summary
+			attribute : no-update
+		}
+		field pfrom type long {
+			indexing: attribute|summary
+		}
+		field pto type string {
+			indexing: summary
+		}
+		field data type string {
+			indexing: summary
+		}
+                field weight type float {
+                        indexing {
+                                field weight * 10 | summary;
+                        }
+                }
+		field year type int {
+			indexing: attribute|summary
+		}
+		field sales type int {
+			indexing: attribute|summary
+		}
+		field surl type string {
+			indexing: summary
+		}
+		field pid type string {
+			indexing: index|summary
+		}
+		field ew type string {
+			indexing: index|summary
+			rank-type: about
+		}
+		field ed type string {
+			indexing: summary
+		}
+		field userrate type int {
+			indexing: summary
+		}
+		field numreview type int {
+			indexing: summary
+		}
+		field cbid type string {
+			indexing: attribute|index|summary
+			attribute : no-update
+			rank-type: about
+		}
+		field newestedition type int {
+			indexing: attribute|summary
+		}
+		field woty type int {
+			indexing: attribute|summary
+		}
+		field scid type string {
+			indexing: index|summary
+			rank-type: about
+		}
+                field w1 type float {
+                        indexing {
+                                field weight * 10 + field w1 | staticrank weight1 | summary;
+                        }
+                }
+                field w2 type float {
+                        indexing {
+                                field w2 + field weight | staticrank weight2 | summary;
+                        }
+                }
+                field w3 type float {
+                        indexing {
+                                field w3 + field weight | staticrank weight3 | summary;
+                        }
+                }
+                field w4 type float {
+                        indexing {
+                                field w4 + field weight | staticrank weight4 | summary;
+                        }
+                }
+                field sw1 type float {
+                        indexing {
+                                field weight * 10 + field w1 + field w2 | staticrank | summary;
+                        }
+                }
+                field sw2 type float {
+                        indexing {
+                                field weight | staticrank sw2 | summary;
+                        }
+                }
+                field sw3 type float {
+                        indexing {
+                                field weight | staticrank sw3 | summary;
+                        }
+                }
+                field sw4 type float {
+                        indexing {
+                                field weight | staticrank sw4 | summary;
+                        }
+                }
+	}
+
+	field didinteger type int {
+		indexing {
+			field did | split_foreach " " {
+				attribute;
+			};
+		}
+		attribute: multivalued
+	}
+
+	rank-profile rp1 inherits default {
+	}
+	rank-profile rp2 inherits default {
+	}
+	rank-profile rp3 inherits default {
+	}
+	rank-profile rp4 inherits default {
+	}
+}
diff --git a/config-model/src/test/cfg/application/validation/testjars/ok.jar b/config-model/src/test/cfg/application/validation/testjars/ok.jar
deleted file mode 100644
index fce043c6ff7..00000000000
--- a/config-model/src/test/cfg/application/validation/testjars/ok.jar
+++ /dev/null
diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/META-INF/MANIFEST.MF b/config-model/src/test/cfg/application/validation/testjars/ok/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..53773b8b1cc
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/ok/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Created-By: 1.6.0_20 (Apple Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: ok
+Bundle-SymbolicName: ok
+Bundle-Version: 0
+
diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/base.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/base.sd
new file mode 100644
index 00000000000..c52570face3
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/base.sd
@@ -0,0 +1,7 @@
+search base {
+    document base {
+        field base type string {
+            indexing: summary | index
+        }
+    }
+}
\ No newline at end of file
diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd
new file mode 100644
index 00000000000..73b540627d7
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd
@@ -0,0 +1,184 @@
+search book {
+        document book inherits base {
+                field title type string {
+                        bolding: on
+                        index-to: default, title
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field dispauthor type string {
+                        bolding: on
+                        index-to: default, dispauthor
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field author type string {
+                        bolding: on
+                        index-to: default, author
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field keys type string {
+                        index-to: default, keys
+                        indexing: index
+                        rank-type: about
+                }
+                field isbn type string {
+                        index-to: default, isbn
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field series type string {
+                        index-to: default, series
+                        indexing: index
+                        rank-type: about
+                }
+                field url type string {
+                        indexing: summary
+                }
+                field image type string {
+                        indexing: summary
+                }
+                field img85 type string {
+                        indexing: summary
+                }
+                field img110 type string {
+                        indexing: summary
+                }
+    field limg type string {
+      indexing: summary
+    }
+                field did type string {
+                        indexing: attribute|index|summary
+			attribute : no-update
+                }
+                field price type string {
+                        indexing: summary
+                }
+                field categories type string {
+                        indexing: attribute|index|summary
+			attribute : no-update
+                }
+                field mid type int {
+                        indexing: attribute|summary|collapse
+                }
+                field pfrom type long {
+                        indexing: attribute|summary
+                }
+                field pto type string {
+                        indexing: summary
+                }
+                field fmt type string {
+                        indexing: index|summary
+                }
+                field data type string {
+                        indexing: summary
+                }
+                field weight type float {
+                        indexing {
+                                field weight * 6 | summary;
+                        }
+                }
+                field year type int {
+                        indexing: attribute|summary
+                }
+                field newestedition type int {
+                        indexing: attribute|summary
+                }
+                field woty type int {
+                        indexing: attribute|summary
+                }
+                field formats type string {
+                        indexing: index|summary
+                }
+                field age type string {
+                        indexing: index|summary
+                }
+                field sales type int {
+                        indexing: attribute|summary
+                }
+                field more_url type string {
+                        indexing: summary
+                }
+                field more_price type string {
+                        indexing: summary
+                }
+                field more_format type string {
+                        indexing: summary
+                }
+                field pid type string {
+                        indexing: index|summary
+                }
+                field userrate type int {
+                        indexing: attribute|summary
+                }
+                field numreview type int {
+                        indexing: summary
+                }
+                field cbid type string {
+                        indexing: attribute|index|summary
+ 			attribute: no-update
+                        rank-type: about
+                }
+                field scid type string {
+                        indexing: index|summary
+                        rank-type: about
+                }
+                field w1 type float {
+                        indexing {
+                                field weight * 6 + field w1 | staticrank weight1 | summary;
+                        }
+                }
+                field w2 type float {
+                        indexing {
+                                field w2 + field weight | staticrank weight2 | summary;
+                        }
+                }
+                field w3 type float {
+                        indexing {
+                                field w3 + field weight | staticrank weight3 | summary;
+                        }
+                }
+                field w4 type float {
+                        indexing {
+                                field w4 + field weight | staticrank weight4 | summary;
+                        }
+                }
+                field sw1 type float {
+                        indexing {
+                                field weight * 6 + field w1 + field w2 | staticrank | summary;
+                        }
+                }
+                field sw2 type float {
+                        indexing {
+                                field weight | staticrank sw2 | summary;
+                        }
+                }
+                field sw3 type float {
+                        indexing {
+                                field weight | staticrank sw3 | summary;
+                        }
+                }
+                field sw4 type float {
+                        indexing {
+                                field weight | staticrank sw4 | summary;
+                        }
+                }
+        }
+
+        field didinteger type int {
+                indexing {
+                        field did | split_foreach " " { attribute; } | summary;
+                }
+                attribute: multivalued
+        }
+
+        rank-profile rp1 inherits default {
+        }
+        rank-profile rp2 inherits default {
+        }
+        rank-profile rp3 inherits default {
+        }
+        rank-profile rp4 inherits default {
+        }
+}
diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd
new file mode 100644
index 00000000000..498bc79489f
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd
@@ -0,0 +1,12 @@
+search music      {
+        document music inherits base {
+                field f1 type string    {
+                        indexing: summary | index
+                        index-to: f1, all
+                }
+                field f2 type string    {
+                        indexing: summary | index
+                        index-to: f2, all
+                }
+        }
+}
diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd
new file mode 100644
index 00000000000..b010b6d9769
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd
@@ -0,0 +1,182 @@
+search video {
+	document video inherits base {
+		field title type string {
+			bolding: on
+			index-to: default, title
+			indexing: index|summary
+			rank-type: about
+		}
+		field keys type string {
+			index-to: default, keys
+			indexing: index
+                        rank-type: about
+		}
+		field director type string {
+			bolding: on
+			index-to: default, director
+			indexing: index|summary
+                        rank-type: about
+		}
+		field disp_actor type string {
+			bolding: on
+			index-to: default, disp_actor
+			indexing: index|summary
+                        rank-type: about
+		}
+		field actor type string {
+			bolding: on
+			index-to: default, actor
+			indexing: index|summary
+                        rank-type: about
+		}
+		field fmt type string {
+			index-to: default, fmt
+			indexing: index|summary
+                        rank-type: about
+		}
+		field isbn type string {
+			bolding: on
+			index-to: default, isbn
+			indexing: index|summary
+                        rank-type: about
+		}
+		field mid type int {
+			indexing: attribute|summary|collapse
+		}
+		field url type string {
+			indexing: summary
+		}
+		field image type string {
+			indexing: summary
+		}
+		field img85 type string {
+			indexing: summary
+		}
+		field img110 type string {
+			indexing: summary
+		}
+    field limg type string {
+      indexing: summary
+    }
+		field did type string {
+			indexing: attribute|index|summary
+			attribute : no-update
+		}
+		field categories type string {
+			indexing: attribute|index|summary
+			attribute : no-update
+		}
+		field pfrom type long {
+			indexing: attribute|summary
+		}
+		field pto type string {
+			indexing: summary
+		}
+		field data type string {
+			indexing: summary
+		}
+                field weight type float {
+                        indexing {
+                                field weight * 10 | summary;
+                        }
+                }
+		field year type int {
+			indexing: attribute|summary
+		}
+		field sales type int {
+			indexing: attribute|summary
+		}
+		field surl type string {
+			indexing: summary
+		}
+		field pid type string {
+			indexing: index|summary
+		}
+		field ew type string {
+			indexing: index|summary
+			rank-type: about
+		}
+		field ed type string {
+			indexing: summary
+		}
+		field userrate type int {
+			indexing: summary
+		}
+		field numreview type int {
+			indexing: summary
+		}
+		field cbid type string {
+			indexing: attribute|index|summary
+			attribute : no-update
+			rank-type: about
+		}
+		field newestedition type int {
+			indexing: attribute|summary
+		}
+		field woty type int {
+			indexing: attribute|summary
+		}
+		field scid type string {
+			indexing: index|summary
+			rank-type: about
+		}
+                field w1 type float {
+                        indexing {
+                                field weight * 10 + field w1 | staticrank weight1 | summary;
+                        }
+                }
+                field w2 type float {
+                        indexing {
+                                field w2 + field weight | staticrank weight2 | summary;
+                        }
+                }
+                field w3 type float {
+                        indexing {
+                                field w3 + field weight | staticrank weight3 | summary;
+                        }
+                }
+                field w4 type float {
+                        indexing {
+                                field w4 + field weight | staticrank weight4 | summary;
+                        }
+                }
+                field sw1 type float {
+                        indexing {
+                                field weight * 10 + field w1 + field w2 | staticrank | summary;
+                        }
+                }
+                field sw2 type float {
+                        indexing {
+                                field weight | staticrank sw2 | summary;
+                        }
+                }
+                field sw3 type float {
+                        indexing {
+                                field weight | staticrank sw3 | summary;
+                        }
+                }
+                field sw4 type float {
+                        indexing {
+                                field weight | staticrank sw4 | summary;
+                        }
+                }
+	}
+
+	field didinteger type int {
+		indexing {
+			field did | split_foreach " " {
+				attribute;
+			};
+		}
+		attribute: multivalued
+	}
+
+	rank-profile rp1 inherits default {
+	}
+	rank-profile rp2 inherits default {
+	}
+	rank-profile rp3 inherits default {
+	}
+	rank-profile rp4 inherits default {
+	}
+}
diff --git a/config-model/src/test/cfg/application/validation/testjars/snapshot_bundle.jar b/config-model/src/test/cfg/application/validation/testjars/snapshot_bundle.jar
deleted file mode 100644
index a395a52d17d..00000000000
--- a/config-model/src/test/cfg/application/validation/testjars/snapshot_bundle.jar
+++ /dev/null
diff --git a/config-model/src/test/cfg/application/validation/testjars/snapshot_bundle/META-INF/MANIFEST.MF b/config-model/src/test/cfg/application/validation/testjars/snapshot_bundle/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..21c58490c13
--- /dev/null
+++ b/config-model/src/test/cfg/application/validation/testjars/snapshot_bundle/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: vespa container maven plugin
+Built-By: tonyv
+Build-Jdk: 1.6.0_26
+Bundle-Vendor: Yahoo!
+Bundle-ClassPath: .,dependencies/jrt-5.1-SNAPSHOT.jar
+Bundle-Version: 5.1.0.SNAPSHOT
+Bundle-Name: container maven plugin test
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: TestBundle
+
diff --git a/config-model/src/test/cfg/application/validation/testjars/test.jar b/config-model/src/test/cfg/application/validation/testjars/test.jar
deleted file mode 100644
index 47fbd01f1ec..00000000000
--- a/config-model/src/test/cfg/application/validation/testjars/test.jar
+++ /dev/null
diff --git a/config-model/src/test/cfg/application/validation/testjars/wrong_classpath.jar b/config-model/src/test/cfg/application/validation/testjars/wrong_classpath.jar
deleted file mode 100644
index 31266f1e8f2..00000000000
--- a/config-model/src/test/cfg/application/validation/testjars/wrong_classpath.jar
+++ /dev/null
diff --git a/config-model/src/test/cfg/application/validation/testjars/wrong_export.jar b/config-model/src/test/cfg/application/validation/testjars/wrong_export.jar
deleted file mode 100644
index 47fbd01f1ec..00000000000
--- a/config-model/src/test/cfg/application/validation/testjars/wrong_export.jar
+++ /dev/null
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java
index e2eae30d78d..ae508c6a388 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java
@@ -3,36 +3,41 @@ package com.yahoo.vespa.model.application.validation;
 
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.jar.Manifest;
+import java.util.jar.JarOutputStream;
 
+import static com.yahoo.yolean.Exceptions.uncheck;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class BundleValidatorTest {
-    private static final String JARS_DIR = "src/test/cfg/application/validation/testjars/";
+    @Rule
+    public TemporaryFolder tempDir = new TemporaryFolder();
 
     @Test
     public void basicBundleValidation() throws Exception {
         // Valid jar file
-        JarFile ok = new JarFile(new File(JARS_DIR + "ok.jar"));
+        JarFile ok = createTemporaryJarFile("ok");
         BundleValidator bundleValidator = new BundleValidator();
         bundleValidator.validateJarFile(new BaseDeployLogger(), ok);
 
         // No manifest
-        validateWithException("nomanifest.jar", "Non-existing or invalid manifest in " + JARS_DIR + "nomanifest.jar");
+        validateWithException("nomanifest", "Non-existing or invalid manifest in nomanifest.jar");
     }
 
     private void validateWithException(String jarName, String exceptionMessage) throws IOException {
         try {
-            JarFile jarFile = new JarFile(JARS_DIR + jarName);
+            JarFile jarFile = createTemporaryJarFile(jarName);
             BundleValidator bundleValidator = new BundleValidator();
             bundleValidator.validateJarFile(new BaseDeployLogger(), jarFile);
             assert (false);
@@ -46,8 +51,8 @@ public class BundleValidatorTest {
         final StringBuffer buffer = new StringBuffer();
 
         DeployLogger logger = createDeployLogger(buffer);
-
-        new BundleValidator().validateJarFile(logger, new JarFile(JARS_DIR + "snapshot_bundle.jar"));
+        JarFile jarFile = createTemporaryJarFile("snapshot_bundle");
+        new BundleValidator().validateJarFile(logger, jarFile);
         assertTrue(buffer.toString().contains("Deploying snapshot bundle"));
     }
 
@@ -56,14 +61,35 @@ public class BundleValidatorTest {
         final StringBuffer buffer = new StringBuffer();
         DeployLogger logger = createDeployLogger(buffer);
         BundleValidator validator = new BundleValidator();
-        Manifest manifest = new Manifest(Files.newInputStream(Paths.get(JARS_DIR + "/manifest-producing-import-warnings.MF")));
-        validator.validateManifest(logger, "my-app-bundle.jar", manifest);
+        JarFile jarFile = createTemporaryJarFile("import-warnings");
+        validator.validateJarFile(logger, jarFile);
         assertThat(buffer.toString())
-                .contains("For JAR file 'my-app-bundle.jar': \n" +
+                .contains("For JAR file 'import-warnings.jar': \n" +
                         "Manifest imports the following Java packages from 'org.json:json': [org.json]. \n" +
                         "The org.json library will no longer provided by jdisc runtime on Vespa 8. See https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime.");
     }
 
+    private JarFile createTemporaryJarFile(String testArtifact) throws IOException {
+        Path jarFile = tempDir.newFile(testArtifact + ".jar").toPath();
+        Path artifactDirectory = Paths.get("src/test/cfg/application/validation/testjars/" + testArtifact);
+        try (JarOutputStream out = new JarOutputStream(Files.newOutputStream(jarFile))) {
+            Files.walk(artifactDirectory).forEach(path -> {
+                Path relativePath = artifactDirectory.relativize(path);
+                String zipName = relativePath.toString();
+                uncheck(() -> {
+                    if (Files.isDirectory(path)) {
+                        out.putNextEntry(new JarEntry(zipName + "/"));
+                    } else {
+                        out.putNextEntry(new JarEntry(zipName));
+                        out.write(Files.readAllBytes(path));
+                    }
+                    out.closeEntry();
+                });
+            });
+        }
+        return new JarFile(jarFile.toFile());
+    }
+
     private DeployLogger createDeployLogger(StringBuffer buffer) {
         return (__, message) -> buffer.append(message).append('\n');
     }