1 files changed, 250 insertions, 62 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java
index c9371160ea5..329d27472c2 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java
@@ -1,78 +1,266 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition;
 
-import com.yahoo.io.IOUtils;
+import com.yahoo.searchdefinition.document.Stemming;
+import com.yahoo.searchdefinition.parser.ParseException;
+import com.yahoo.searchdefinition.processing.ImportedFieldsResolver;
+import com.yahoo.searchdefinition.processing.OnnxModelTypeResolver;
+import com.yahoo.vespa.model.test.utils.DeployLoggerStub;
+import org.junit.Test;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
+import static com.yahoo.config.model.test.TestUtil.joinLines;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import static helpers.CompareConfigTestHelper.assertSerializedConfigEquals;
-import static helpers.CompareConfigTestHelper.assertSerializedConfigFileEquals;
+/**
+ * Schema tests that don't depend on files.
+ *
+ * @author bratseth
+ */
+public class SchemaTestCase {
 
-public abstract class SchemaTestCase {
-
-    protected static void assertConfigFile(String filename, String cfg) throws IOException {
-        assertSerializedConfigFileEquals(filename, cfg);
+    @Test
+    public void testValidationOfInheritedSchema() throws ParseException {
+        try {
+            String schema = joinLines(
+                    "schema test inherits nonesuch {" +
+                    "  document test inherits nonesuch {" +
+                    "  }" +
+                    "}");
+            DeployLoggerStub logger = new DeployLoggerStub();
+            SearchBuilder.createFromStrings(logger, schema);
+            assertEquals("schema 'test' inherits 'nonesuch', but this schema does not exist",
+                         logger.entries.get(0).message);
+            fail("Expected failure");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("schema 'test' inherits 'nonesuch', but this schema does not exist", e.getMessage());
+        }
     }
 
-    protected static void assertConfigFiles(String expectedFile,
-                                            String cfgFile,
-                                            boolean orderMatters,
-                                            boolean updateOnAssert) throws IOException {
+    @Test
+    public void testValidationOfSchemaAndDocumentInheritanceConsistency() throws ParseException {
         try {
-            assertSerializedConfigEquals(readAndCensorIndexes(expectedFile), readAndCensorIndexes(cfgFile), orderMatters);
-        } catch (AssertionError e) {
-            if (updateOnAssert) {
-                BufferedWriter writer = IOUtils.createWriter(expectedFile, false);
-                writer.write(readAndCensorIndexes(cfgFile));
-                writer.newLine();
-                writer.flush();
-                writer.close();
-                System.err.println(e.getMessage() + " [not equal files: >>>"+expectedFile+"<<< and >>>"+cfgFile+"<<< in assertConfigFiles]");
-                return;
-            }
-            throw new AssertionError(e.getMessage() + " [not equal files: >>>"+expectedFile+"<<< and >>>"+cfgFile+"<<< in assertConfigFiles]", e);
+            String parent = joinLines(
+                    "schema parent {" +
+                    "  document parent {" +
+                    "    field pf1 type string {" +
+                    "      indexing: summary" +
+                    "    }" +
+                    "  }" +
+                    "}");
+            String child = joinLines(
+                    "schema child inherits parent {" +
+                    "  document child {" +
+                    "    field cf1 type string {" +
+                    "      indexing: summary" +
+                    "    }" +
+                    "  }" +
+                    "}");
+            SearchBuilder.createFromStrings(new DeployLoggerStub(), parent, child);
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("schema 'child' inherits 'parent', " +
+                         "but its document type does not inherit the parent's document type"
+                         , e.getMessage());
         }
     }
-    /**
-     * This is to avoid having to keep those pesky array index numbers in the config format up to date
-     * as new entries are added and removed.
-     */
-    private static String readAndCensorIndexes(String file) throws IOException {
-        StringBuilder b = new StringBuilder();
-        try (BufferedReader r = IOUtils.createReader(file)) {
-            int character;
-            boolean lastWasNewline = false;
-            boolean inBrackets = false;
-            while (-1 != (character = r.read())) {
-                // skip empty lines
-                if (character == '\n') {
-                    if (lastWasNewline) continue;
-                    lastWasNewline = true;
-                }
-                else {
-                    lastWasNewline = false;
-                }
 
-                // skip quoted strings
-                if (character == '"') {
-                    b.appendCodePoint(character);
-                    while (-1 != (character = r.read()) && character != '"') {
-                        b.appendCodePoint(character);
-                    }
-                }
+    @Test
+    public void testSchemaInheritance() throws ParseException {
+        String parentLines = joinLines(
+                "schema parent {" +
+                "  document parent {" +
+                "    field pf1 type string {" +
+                "      indexing: summary" +
+                "    }" +
+                "  }" +
+                "  fieldset parent_set {" +
+                "    fields: pf1" +
+                "  }" +
+                "  stemming: none" +
+                "  index parent_index {" +
+                "    stemming: best" +
+                "  }" +
+                "  field parent_field type string {" +
+                "      indexing: input pf1 | lowercase | index | attribute | summary" +
+                "  }" +
+                "  rank-profile parent_profile {" +
+                "  }" +
+                "  constant parent_constant {" +
+                "    file: constants/my_constant_tensor_file.json" +
+                "    type: tensor<float>(x{},y{})" +
+                "  }" +
+                "  onnx-model parent_model {" +
+                "    file: models/my_model.onnx" +
+                "  }" +
+                "  document-summary parent_summary {" +
+                "    summary pf1 type string {}" +
+                "  }" +
+                "  import field parentschema_ref.name as parent_imported {}" +
+                "  raw-as-base64-in-summary" +
+                "}");
+        String childLines = joinLines(
+                "schema child inherits parent {" +
+                "  document child inherits parent {" +
+                "    field cf1 type string {" +
+                "      indexing: summary" +
+                "    }" +
+                "  }" +
+                "  fieldset child_set {" +
+                "    fields: cf1, pf1" +
+                "  }" +
+                "  stemming: shortest" +
+                "  index child_index {" +
+                "    stemming: shortest" +
+                "  }" +
+                "  field child_field type string {" +
+                "      indexing: input pf1 | lowercase | index | attribute | summary" +
+                "  }" +
+                "  rank-profile child_profile inherits parent_profile {" +
+                "  }" +
+                "  constant child_constant {" +
+                "    file: constants/my_constant_tensor_file.json" +
+                "    type: tensor<float>(x{},y{})" +
+                "  }" +
+                "  onnx-model child_model {" +
+                "    file: models/my_model.onnx" +
+                "  }" +
+                "  document-summary child_summary inherits parent_summary {" +
+                "    summary cf1 type string {}" +
+                "  }" +
+                "  import field parentschema_ref.name as child_imported {}" +
+                "}");
 
-                // skip bracket content
-                if (character == ']')
-                    inBrackets = false;
-                if (! inBrackets)
-                    b.appendCodePoint(character);
-                if (character == '[')
-                    inBrackets = true;
-            }
-        }
-        return b.toString();
+        System.out.println(parentLines);
+        SearchBuilder builder = new SearchBuilder(new DeployLoggerStub());
+        builder.processorsToSkip().add(OnnxModelTypeResolver.class); // Avoid discovering the Onnx model referenced does not exist
+        builder.processorsToSkip().add(ImportedFieldsResolver.class); // Avoid discovering the document reference leads nowhere
+        builder.importString(parentLines);
+        builder.importString(childLines);
+        builder.build(true);
+        var application = builder.application();
+
+        var child = application.schemas().get("child");
+        assertEquals("pf1", child.fieldSets().userFieldSets().get("parent_set").getFieldNames().stream().findFirst().get());
+        assertEquals("[cf1, pf1]", child.fieldSets().userFieldSets().get("child_set").getFieldNames().toString());
+        assertEquals(Stemming.SHORTEST, child.getStemming());
+        assertEquals(Stemming.BEST, child.getIndex("parent_index").getStemming());
+        assertEquals(Stemming.SHORTEST, child.getIndex("child_index").getStemming());
+        assertNotNull(child.getField("parent_field"));
+        assertNotNull(child.getField("child_field"));
+        assertNotNull(child.getExtraField("parent_field"));
+        assertNotNull(child.getExtraField("child_field"));
+        assertNotNull(application.rankProfileRegistry().get(child, "parent_profile"));
+        assertNotNull(application.rankProfileRegistry().get(child, "child_profile"));
+        assertEquals("parent_profile", application.rankProfileRegistry().get(child, "child_profile").getInheritedName());
+        assertNotNull(child.rankingConstants().get("parent_constant"));
+        assertNotNull(child.rankingConstants().get("child_constant"));
+        assertTrue(child.rankingConstants().asMap().containsKey("parent_constant"));
+        assertTrue(child.rankingConstants().asMap().containsKey("child_constant"));
+        assertNotNull(child.onnxModels().get("parent_model"));
+        assertNotNull(child.onnxModels().get("child_model"));
+        assertTrue(child.onnxModels().asMap().containsKey("parent_model"));
+        assertTrue(child.onnxModels().asMap().containsKey("child_model"));
+        assertNotNull(child.getSummary("parent_summary"));
+        assertNotNull(child.getSummary("child_summary"));
+        assertEquals("parent_summary", child.getSummary("child_summary").getInherited().getName());
+        assertTrue(child.getSummaries().containsKey("parent_summary"));
+        assertTrue(child.getSummaries().containsKey("child_summary"));
+        assertNotNull(child.getSummaryField("pf1"));
+        assertNotNull(child.getSummaryField("cf1"));
+        assertNotNull(child.getExplicitSummaryField("pf1"));
+        assertNotNull(child.getExplicitSummaryField("cf1"));
+        assertNotNull(child.getUniqueNamedSummaryFields().get("pf1"));
+        assertNotNull(child.getUniqueNamedSummaryFields().get("cf1"));
+        assertNotNull(child.temporaryImportedFields().get().fields().get("parent_imported"));
+        assertNotNull(child.temporaryImportedFields().get().fields().get("child_imported"));
+    }
+
+    @Test
+    public void testSchemaInheritanceEmptyChildren() throws ParseException {
+        String parentLines = joinLines(
+                "schema parent {" +
+                "  document parent {" +
+                "    field pf1 type string {" +
+                "      indexing: summary" +
+                "    }" +
+                "  }" +
+                "  fieldset parent_set {" +
+                "    fields: pf1" +
+                "  }" +
+                "  stemming: none" +
+                "  index parent_index {" +
+                "    stemming: best" +
+                "  }" +
+                "  field parent_field type string {" +
+                "      indexing: input pf1 | lowercase | index | attribute | summary" +
+                "  }" +
+                "  rank-profile parent_profile {" +
+                "  }" +
+                "  constant parent_constant {" +
+                "    file: constants/my_constant_tensor_file.json" +
+                "    type: tensor<float>(x{},y{})" +
+                "  }" +
+                "  onnx-model parent_model {" +
+                "    file: models/my_model.onnx" +
+                "  }" +
+                "  document-summary parent_summary {" +
+                "    summary pf1 type string {}" +
+                "  }" +
+                "  import field parentschema_ref.name as parent_imported {}" +
+                "  raw-as-base64-in-summary" +
+                "}");
+        String childLines = joinLines(
+                "schema child inherits parent {" +
+                "  document child inherits parent {" +
+                "    field cf1 type string {" +
+                "      indexing: summary" +
+                "    }" +
+                "  }" +
+                "}");
+        String grandchildLines = joinLines(
+                "schema grandchild inherits child {" +
+                "  document grandchild inherits child {" +
+                "    field gf1 type string {" +
+                "      indexing: summary" +
+                "    }" +
+                "  }" +
+                "}");
+
+        SearchBuilder builder = new SearchBuilder(new DeployLoggerStub());
+        builder.processorsToSkip().add(OnnxModelTypeResolver.class); // Avoid discovering the Onnx model referenced does not exist
+        builder.processorsToSkip().add(ImportedFieldsResolver.class); // Avoid discovering the document reference leads nowhere
+        builder.importString(parentLines);
+        builder.importString(childLines);
+        builder.importString(grandchildLines);
+        builder.build(true);
+        var application = builder.application();
+
+        assertInheritedFromParent(application.schemas().get("child"), application);
+        assertInheritedFromParent(application.schemas().get("grandchild"), application);
+    }
+
+    private void assertInheritedFromParent(Schema schema, Application application) {
+        assertEquals("pf1", schema.fieldSets().userFieldSets().get("parent_set").getFieldNames().stream().findFirst().get());
+        assertEquals(Stemming.NONE, schema.getStemming());
+        assertEquals(Stemming.BEST, schema.getIndex("parent_index").getStemming());
+        assertNotNull(schema.getField("parent_field"));
+        assertNotNull(schema.getExtraField("parent_field"));
+        assertNotNull(application.rankProfileRegistry().get(schema, "parent_profile"));
+        assertNotNull(schema.rankingConstants().get("parent_constant"));
+        assertTrue(schema.rankingConstants().asMap().containsKey("parent_constant"));
+        assertNotNull(schema.onnxModels().get("parent_model"));
+        assertTrue(schema.onnxModels().asMap().containsKey("parent_model"));
+        assertNotNull(schema.getSummary("parent_summary"));
+        assertTrue(schema.getSummaries().containsKey("parent_summary"));
+        assertNotNull(schema.getSummaryField("pf1"));
+        assertNotNull(schema.getExplicitSummaryField("pf1"));
+        assertNotNull(schema.getUniqueNamedSummaryFields().get("pf1"));
+        assertNotNull(schema.temporaryImportedFields().get().fields().get("parent_imported"));
+        assertTrue(schema.isRawAsBase64());
     }
 
 }