1 files changed, 8 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateParserTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateParserTestCase.java
index 4e212ccd574..8bd04af8c54 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateParserTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateParserTestCase.java
@@ -22,8 +22,12 @@ public class IntermediateParserTestCase {
         var deployLogger = new BaseDeployLogger();
         var modelProperties = new TestProperties();
         var stream = new SimpleCharStream(input);
-        var parser = new IntermediateParser(stream, deployLogger, modelProperties);
-        return parser.schema();
+        try {
+            var parser = new IntermediateParser(stream, deployLogger, modelProperties);
+            return parser.schema();
+        } catch (ParseException pe) {
+            throw new ParseException(stream.formatException(pe.getMessage()));
+        }
     }
 
     ParsedSchema parseFile(String fileName) throws Exception {
@@ -174,7 +178,7 @@ public class IntermediateParserTestCase {
         checkFileParses("src/test/derived/position_summary/position_summary.sd");
         checkFileParses("src/test/derived/predicate_attribute/predicate_attribute.sd");
         checkFileParses("src/test/derived/prefixexactattribute/prefixexactattribute.sd");
-        checkFileParses("src/test/derived/rankexpression/rankexpression.sd");
+        checkFileParses("src/test/derived/rankingexpression/rankexpression.sd");
         checkFileParses("src/test/derived/rankprofileinheritance/child.sd");
         checkFileParses("src/test/derived/rankprofileinheritance/parent1.sd");
         checkFileParses("src/test/derived/rankprofileinheritance/parent2.sd");
@@ -208,9 +212,9 @@ public class IntermediateParserTestCase {
         checkFileParses("src/test/derived/uri_wset/uri_wset.sd");
         checkFileParses("src/test/examples/arrays.sd");
         checkFileParses("src/test/examples/arraysweightedsets.sd");
+        checkFileParses("src/test/examples/attributeposition.sd");
         checkFileParses("src/test/examples/attributesettings.sd");
         checkFileParses("src/test/examples/attributesexactmatch.sd");
-        checkFileParses("src/test/examples/badstruct.sd");
         checkFileParses("src/test/examples/casing.sd");
         checkFileParses("src/test/examples/comment.sd");
         checkFileParses("src/test/examples/documentidinsummary.sd");
@@ -252,7 +256,6 @@ public class IntermediateParserTestCase {
         checkFileParses("src/test/examples/stemmingdefault.sd");
         checkFileParses("src/test/examples/stemmingsetting.sd");
         checkFileParses("src/test/examples/strange.sd");
-        checkFileParses("src/test/examples/structanddocumentwithsamenames.sd");
         checkFileParses("src/test/examples/struct.sd");
         checkFileParses("src/test/examples/summaryfieldcollision.sd");
         checkFileParses("src/test/examples/weightedset-summaryto.sd");