1 files changed, 48 insertions, 8 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateCollectionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateCollectionTestCase.java
index cd78f1faeb2..e29e4833856 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateCollectionTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateCollectionTestCase.java
@@ -36,6 +36,20 @@ public class IntermediateCollectionTestCase {
     }
 
     @Test
+    public void names_may_differ() throws Exception {
+        String input = joinLines
+            ("schema foo_search {",
+             "  document foo {",
+             "  }",
+             "}");
+        var collection = new IntermediateCollection();
+        ParsedSchema schema = collection.addSchemaFromString(input);
+        assertEquals("foo_search", schema.name());
+        assertTrue(schema.hasDocument());
+        assertEquals("foo", schema.getDocument().name());
+    }
+
+    @Test
     public void can_add_schema_files() throws Exception {
         var collection = new IntermediateCollection();
         collection.addSchemaFromFile("src/test/derived/deriver/child.sd");
@@ -127,16 +141,16 @@ public class IntermediateCollectionTestCase {
     public void bad_parse_throws() throws Exception {
         var collection = new IntermediateCollection();
         var ex = assertThrows(ParseException.class, () ->
-                              collection.addSchemaFromFile("src/test/examples/structoutsideofdocument.sd"));
-        assertTrue(ex.getMessage().startsWith("Failed parsing schema from src/test/examples/structoutsideofdocument.sd: Encountered"));
+                              collection.addSchemaFromFile("src/test/examples/badparse.sd"));
+        assertTrue(ex.getMessage().startsWith("Failed parsing schema from src/test/examples/badparse.sd: Encountered"));
         ex = assertThrows(ParseException.class, () ->
-                          collection.addSchemaFromReader(readerOf("src/test/examples/structoutsideofdocument.sd")));
-        assertTrue(ex.getMessage().startsWith("Failed parsing schema from src/test/examples/structoutsideofdocument.sd: Encountered"));
+                          collection.addSchemaFromReader(readerOf("src/test/examples/badparse.sd")));
+        assertTrue(ex.getMessage().startsWith("Failed parsing schema from src/test/examples/badparse.sd: Encountered"));
         collection.addSchemaFromFile("src/test/derived/rankprofilemodularity/test.sd");
         collection.addRankProfileFile("test", "src/test/derived/rankprofilemodularity/test/outside_schema1.profile");
         ex = assertThrows(ParseException.class, () ->
-                          collection.addRankProfileFile("test", "src/test/examples/structoutsideofdocument.sd"));
-        assertTrue(ex.getMessage().startsWith("Failed parsing rank-profile from src/test/examples/structoutsideofdocument.sd: Encountered"));
+                          collection.addRankProfileFile("test", "src/test/examples/badparse.sd"));
+        assertTrue(ex.getMessage().startsWith("Failed parsing rank-profile from src/test/examples/badparse.sd: Encountered"));
     }
 
     @Test
@@ -167,7 +181,7 @@ public class IntermediateCollectionTestCase {
         assertEquals(collection.getParsedSchemas().size(), 3);
         var ex = assertThrows(IllegalArgumentException.class, () ->
                               collection.resolveInternalConnections());
-        assertTrue(ex.getMessage().startsWith("Inheritance cycle for schemas: "));
+        assertTrue(ex.getMessage().startsWith("Inheritance/reference cycle for schemas: "));
     }
 
     @Test
@@ -180,7 +194,7 @@ public class IntermediateCollectionTestCase {
         var ex = assertThrows(IllegalArgumentException.class, () ->
                               collection.resolveInternalConnections());
         System.err.println("ex: "+ex.getMessage());
-        assertTrue(ex.getMessage().startsWith("Inheritance cycle for documents: "));
+        assertTrue(ex.getMessage().startsWith("Inheritance/reference cycle for documents: "));
     }
 
     @Test
@@ -194,4 +208,30 @@ public class IntermediateCollectionTestCase {
         assertEquals("document foo inherits from unavailable document bar", ex.getMessage());
     }
 
+    @Test
+    public void can_detect_document_reference_cycle() throws Exception {
+        var collection = new IntermediateCollection();
+        collection.addSchemaFromString("schema foo { document foo { field oneref type reference<bar> {} } }");
+        collection.addSchemaFromString("schema bar { document bar { field tworef type reference<foo> {} } }");
+        assertEquals(collection.getParsedSchemas().size(), 2);
+        var ex = assertThrows(IllegalArgumentException.class, () ->
+                              collection.resolveInternalConnections());
+        System.err.println("ex: "+ex.getMessage());
+        assertTrue(ex.getMessage().startsWith("Inheritance/reference cycle for documents: "));
+    }
+
+    @Test
+    public void can_detect_cycles_with_reference() throws Exception {
+        var collection = new IntermediateCollection();
+        collection.addSchemaFromString("schema foo { document foodoc inherits bardoc {} }");
+        collection.addSchemaFromString("schema bar { document bardoc { field myref type reference<qux> { } } }");
+        collection.addSchemaFromString("schema qux inherits foo { document qux inherits foodoc {} }");
+        assertEquals(collection.getParsedSchemas().size(), 3);
+        var ex = assertThrows(IllegalArgumentException.class, () ->
+                              collection.resolveInternalConnections());
+        System.err.println("ex: "+ex.getMessage());
+        assertTrue(ex.getMessage().startsWith("Inheritance/reference cycle for documents: "));
+    }
+
+
 }