unit test filename sanity check also

1 files changed, 9 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java
index 1f011883bfe..f96d59df150 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java
@@ -60,7 +60,7 @@ public class IntermediateCollection {
             throw new IllegalArgumentException("The file containing schema '"
                                                + parsed.name() + "' must be named '"
                                                + parsed.name() + ApplicationPackage.SD_NAME_SUFFIX
-                                               + "', not " + fileName);
+                                               + "', was '" + stripDirs(fileName) + "'");
         }
     }
 
@@ -76,6 +76,14 @@ public class IntermediateCollection {
         return filename;
     }
 
+    private String stripDirs(String filename) {
+        int pos = filename.lastIndexOf('/');
+        if (pos != -1) {
+            return filename.substring(pos + 1);
+        }
+        return filename;
+    }
+
     /**
      * parse a schema from the given reader and add result to collection
      **/