Test schema-info summaries

3 files changed, 28 insertions, 20 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
index f69602fe0b1..2082028e654 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
@@ -242,8 +242,8 @@ public class DocumentDatabaseTestCase {
                 assertEquals(2, db.summaryclass().size());
                 assertEquals("default", db.summaryclass(0).name());
                 assertEquals("attributeprefetch", db.summaryclass(1).name());
-                assertSummaryField(db, 0, 0, "f1", "longstring", true);
-                assertSummaryField(db, 0, 1, "f2", "integer", false);
+                tester.assertSummaryField(db, 0, 0, "f1", "longstring", true);
+                tester.assertSummaryField(db, 0, 1, "f2", "integer", false);
             }
             { // type2
                 DocumentdbInfoConfig.Documentdb db = dcfg.documentdb(1);
@@ -261,14 +261,6 @@ public class DocumentDatabaseTestCase {
         }
     }
 
-    private void assertSummaryField(DocumentdbInfoConfig.Documentdb db, int summaryClassIndex, int fieldIndex,
-                                    String name, String type, boolean dynamic) {
-        DocumentdbInfoConfig.Documentdb.Summaryclass.Fields field = db.summaryclass(summaryClassIndex).fields(fieldIndex);
-        assertEquals(name, field.name());
-        assertEquals(type, field.type());
-        assertEquals(dynamic, field.dynamic());
-    }
-
     private void assertDocumentDBConfigAvailableForStreaming(String mode) {
         List<String> sds = List.of("type");
         var tester = new SchemaTester();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java
index dbf933fee58..239bab63904 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java
@@ -22,12 +22,12 @@ public class SchemaInfoTestCase {
     }
 
     private void assertSchemaInfo(String configId, VespaModel model, SchemaTester tester) {
-        { // schema-info config
-            SchemaInfoConfig dcfg = model.getConfig(SchemaInfoConfig.class, configId);
-            assertEquals(2, dcfg.schema().size());
+        {
+            SchemaInfoConfig schemaInfoConfig = model.getConfig(SchemaInfoConfig.class, configId);
+            assertEquals(2, schemaInfoConfig.schema().size());
 
             { // type1
-                SchemaInfoConfig.Schema schema = dcfg.schema(0);
+                SchemaInfoConfig.Schema schema = schemaInfoConfig.schema(0);
                 assertEquals("type1", schema.name());
 
                 assertEquals(7, schema.rankprofile().size());
@@ -45,14 +45,14 @@ public class SchemaInfoTestCase {
                 assertEquals("query(bar)", inputs.input(1).name());
                 assertEquals("tensor(key{},x[1000])", inputs.input(1).type());
 
-                // assertEquals(2, schema.summaryclass().size());
-                // assertEquals("default", schema.summaryclass(0).name());
-                // assertEquals("attributeprefetch", schema.summaryclass(1).name());
-                // assertSummaryField(schema, 0, 0, "f1", "longstring", true);
-                // assertSummaryField(schema, 0, 1, "f2", "integer", false);
+                assertEquals(2, schema.summaryclass().size());
+                assertEquals("default", schema.summaryclass(0).name());
+                assertEquals("attributeprefetch", schema.summaryclass(1).name());
+                tester.assertSummaryField(schema, 0, 0, "f1", "longstring", true);
+                tester.assertSummaryField(schema, 0, 1, "f2", "integer", false);
             }
             { // type2
-                SchemaInfoConfig.Schema schema = dcfg.schema(1);
+                SchemaInfoConfig.Schema schema = schemaInfoConfig.schema(1);
                 assertEquals("type2", schema.name());
             }
         }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaTester.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaTester.java
index 37ce17b7592..cc0202f5dfd 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaTester.java
@@ -200,4 +200,20 @@ public class SchemaTester {
         return rankProfile;
     }
 
+    void assertSummaryField(DocumentdbInfoConfig.Documentdb db, int summaryClassIndex, int fieldIndex,
+                            String name, String type, boolean dynamic) {
+        DocumentdbInfoConfig.Documentdb.Summaryclass.Fields field = db.summaryclass(summaryClassIndex).fields(fieldIndex);
+        assertEquals(name, field.name());
+        assertEquals(type, field.type());
+        assertEquals(dynamic, field.dynamic());
+    }
+
+    void assertSummaryField(SchemaInfoConfig.Schema schema, int summaryClassIndex, int fieldIndex,
+                            String name, String type, boolean dynamic) {
+        SchemaInfoConfig.Schema.Summaryclass.Fields field = schema.summaryclass(summaryClassIndex).fields(fieldIndex);
+        assertEquals(name, field.name());
+        assertEquals(type, field.type());
+        assertEquals(dynamic, field.dynamic());
+    }
+
 }