Use schemsa-info

1 files changed, 16 insertions, 41 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
index 6921880d725..da9d849db90 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
@@ -1,8 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.fastsearch.test;
 
-import com.yahoo.config.subscription.ConfigGetter;
-import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.prelude.fastsearch.ByteField;
 import com.yahoo.prelude.fastsearch.DataField;
 import com.yahoo.prelude.fastsearch.DocsumDefinition;
@@ -12,6 +10,8 @@ import com.yahoo.prelude.fastsearch.IntegerField;
 import com.yahoo.prelude.fastsearch.StringField;
 import com.yahoo.document.DocumentId;
 import com.yahoo.document.GlobalId;
+import com.yahoo.search.schema.DocumentSummary;
+import com.yahoo.search.schema.Schema;
 import com.yahoo.slime.BinaryFormat;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Slime;
@@ -21,9 +21,8 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -34,37 +33,8 @@ import static org.junit.Assert.assertTrue;
 public class DocsumDefinitionTestCase {
 
     @Test
-    public void testReading() {
-        String summary_cf = "file:src/test/java/com/yahoo/prelude/fastsearch/test/documentdb-info.cfg";
-        DocsumDefinitionSet set = createDocsumDefinitionSet(summary_cf);
-
-        String[] defs = new String[] { "[default,default]", "[version1,version1]",
-                "[withranklog,withranklog]", "[version2,version2]", "[version3,version3]",
-                "[version4,version4]", "[version5,version5]" };
-        String setAsString = set.toString();
-        for (String d : defs) {
-            assertFalse(setAsString.indexOf(d) == -1);
-        }
-        assertEquals(7, set.size());
-
-        DocsumDefinition docsum0 = set.getDocsum("default");
-
-        assertNotNull(docsum0);
-        assertEquals("default", docsum0.getName());
-        assertEquals(19, docsum0.getFieldCount());
-        assertNull(docsum0.getField(19));
-        assertEquals("DSHOST", docsum0.getField(7).getName());
-
-        assertTrue(docsum0.getField(1) instanceof StringField);
-        assertTrue(docsum0.getField(6) instanceof ByteField);
-        assertTrue(docsum0.getField(7) instanceof IntegerField);
-        assertTrue(docsum0.getField(18) instanceof DataField);
-    }
-
-    @Test
     public void testDecoding() {
-        String summary_cf = "file:src/test/java/com/yahoo/prelude/fastsearch/test/documentdb-info.cfg";
-        DocsumDefinitionSet set = createDocsumDefinitionSet(summary_cf);
+        DocsumDefinitionSet set = createDocsumDefinitionSet();
         FastHit hit = new FastHit();
 
         set.lazyDecode(null, makeDocsum(), hit);
@@ -87,10 +57,6 @@ public class DocsumDefinitionTestCase {
         return sb.toString();
     }
 
-    public static GlobalId createGlobalId(int docId) {
-        return new GlobalId((new DocumentId("id:ns:type::" + docId)).getGlobalId());
-    }
-
     public static byte[] makeDocsum() {
         Slime slime = new Slime();
         Cursor docsum = slime.setObject();
@@ -110,9 +76,18 @@ public class DocsumDefinitionTestCase {
         return buf.array();
     }
 
-    public static DocsumDefinitionSet createDocsumDefinitionSet(String configID) {
-        DocumentdbInfoConfig config = new ConfigGetter<>(DocumentdbInfoConfig.class).getConfig(configID);
-        return new DocsumDefinitionSet(config.documentdb(0));
+    public static DocsumDefinitionSet createDocsumDefinitionSet() {
+        var schema = new Schema.Builder("test");
+        var summary = new DocumentSummary.Builder("default");
+        summary.add(new DocumentSummary.Field("TOPIC", "string"));
+        summary.add(new DocumentSummary.Field("TITLE", "string"));
+        summary.add(new DocumentSummary.Field("DYNTEASER", "string"));
+        summary.add(new DocumentSummary.Field("EXTINFOSOURCE", "integer"));
+        summary.add(new DocumentSummary.Field("LANG1", "integer"));
+        summary.add(new DocumentSummary.Field("WORDS", "integer"));
+        summary.add(new DocumentSummary.Field("BYTES", "byte"));
+        schema.add(summary.build());
+        return new DocsumDefinitionSet(schema.build());
     }
 
 }