Prep for test of deriving with schema inheritance

3 files changed, 16 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index b3da8ca14b9..1ef5dcef411 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -96,7 +96,7 @@ public class MockApplicationPackage implements ApplicationPackage {
     protected File root() { return root; }
 
     @Override
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings("deprecation") // NOT redundant
     public String getApplicationName() {
         return "mock application";
     }
@@ -206,6 +206,15 @@ public class MockApplicationPackage implements ApplicationPackage {
                        .withSchemaDir(dir).build();
     }
 
+    // TODO: It might work to just merge this and the above
+    public static ApplicationPackage fromSearchDefinitionAndRootDirectory(String dir) {
+        return new MockApplicationPackage.Builder()
+                .withRoot(new File(dir))
+                .withEmptyHosts()
+                .withEmptyServices()
+                .withSchemaDir(dir).build();
+    }
+
     public static class Builder {
 
         private File root = new File("nonexisting");
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
index ff5d6d98c1c..dc5ab752f31 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
@@ -418,6 +418,7 @@ public class SearchBuilder {
         return builder;
     }
 
+
     public static SearchBuilder createFromDirectory(String dir, FileRegistry fileRegistry, DeployLogger logger, ModelContext.Properties properties) throws IOException, ParseException {
         return createFromDirectory(dir, fileRegistry, logger, properties, new RankProfileRegistry());
     }
@@ -434,7 +435,8 @@ public class SearchBuilder {
                                                      ModelContext.Properties properties,
                                                      RankProfileRegistry rankProfileRegistry,
                                                      QueryProfileRegistry queryProfileRegistry) throws IOException, ParseException {
-        return createFromDirectory(dir, MockApplicationPackage.fromSearchDefinitionDirectory(dir), fileRegistry, logger, properties, rankProfileRegistry, queryProfileRegistry);
+        return createFromDirectory(dir, MockApplicationPackage.fromSearchDefinitionAndRootDirectory(dir), fileRegistry, logger, properties,
+                                   rankProfileRegistry, queryProfileRegistry);
     }
 
     private static SearchBuilder createFromDirectory(String dir,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/OnnxModelInfo.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/OnnxModelInfo.java
index f0309cc630b..88139de7888 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ml/OnnxModelInfo.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/OnnxModelInfo.java
@@ -107,7 +107,7 @@ public class OnnxModelInfo {
                     unboundSizes.add(size);
                     if (unboundSizes.size() > 1) {
                         throw new IllegalArgumentException("Found conflicting sizes for unbound dimension " +
-                                "for type '" + onnxType + "'");
+                                                           "for type '" + onnxType + "'");
                     }
 
                 // Handle dimensions with symbolic names
@@ -115,7 +115,7 @@ public class OnnxModelInfo {
                     String symbolicName = onnxType.dimensions().get(i).getSymbolicName();
                     if (symbolicSizes.containsKey(symbolicName) && ! symbolicSizes.get(symbolicName).equals(size)) {
                         throw new IllegalArgumentException("Found conflicting sizes for symbolic dimension '" +
-                                symbolicName + "' for input '" + onnxName + "'");
+                                                           symbolicName + "' for input '" + onnxName + "'");
                     }
                     symbolicSizes.put(symbolicName, size);
                 }
@@ -131,7 +131,7 @@ public class OnnxModelInfo {
         if (app.getFile(generatedModelInfoPath(pathInApplicationPackage)).exists()) {
             return loadFromGeneratedInfo(pathInApplicationPackage, app);
         }
-        throw new IllegalArgumentException("Unable to find ONNX model file or generated ONNX info file");
+        throw new IllegalArgumentException("Unable to find ONNX model '" +  path + "'");
     }
 
     static public boolean modelExists(String path, ApplicationPackage app) {