1 files changed, 13 insertions, 9 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java
index 82c03c02f61..127ed7a528b 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java
@@ -5,7 +5,11 @@ import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.document.DataType;
 import com.yahoo.document.Document;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
-import com.yahoo.searchdefinition.document.*;
+import com.yahoo.searchdefinition.document.Attribute;
+import com.yahoo.searchdefinition.document.RankType;
+import com.yahoo.searchdefinition.document.SDDocumentType;
+import com.yahoo.searchdefinition.document.SDField;
+import com.yahoo.searchdefinition.document.Stemming;
 import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.searchdefinition.processing.MakeAliases;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
@@ -27,7 +31,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
     @Test
     public void testSimpleImporting() throws IOException, ParseException {
         RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
-        SearchBuilder sb = new UnprocessingSearchBuilder(rankProfileRegistry, new QueryProfileRegistry());
+        SearchBuilder sb = new SearchBuilder(rankProfileRegistry, new QueryProfileRegistry());
         sb.importFile("src/test/examples/simple.sd");
         sb.build();
         Search search = sb.getSearch();
@@ -36,7 +40,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
 
         SDDocumentType document = search.getDocument();
         assertEquals("simple", document.getName());
-        assertEquals(12, document.getFieldCount());
+        assertEquals(25, document.getFieldCount());
 
         SDField field;
         Attribute attribute;
@@ -46,7 +50,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
         // First field
         field=(SDField) document.getField("title");
         assertEquals(DataType.STRING,field.getDataType());
-        assertEquals("{ summary | index; }", field.getIndexingScript().toString());
+        assertEquals("{ input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }", field.getIndexingScript().toString());
         assertTrue(!search.getIndex("default").isPrefix());
         assertTrue(search.getIndex("title").isPrefix());
         Iterator<String> titleAliases=search.getIndex("title").aliasIterator();
@@ -85,7 +89,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
 
         // Fifth field
         field=(SDField) document.getField("popularity");
-        assertEquals("{ attribute; }",
+        assertEquals("{ input popularity | attribute popularity; }",
                      field.getIndexingScript().toString());
 
         // Sixth field
@@ -96,19 +100,19 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
 
         // Seventh field
         field= search.getConcreteField("categories");
-        assertEquals("{ input categories_src | lowercase | normalize | index; }",
+        assertEquals("{ input categories_src | lowercase | normalize | tokenize normalize stem:\"SHORTEST\" | index categories; }",
                      field.getIndexingScript().toString());
         assertTrue(!field.isHeader());
 
         // Eight field
         field= search.getConcreteField("categoriesagain");
-        assertEquals("{ input categoriesagain_src | lowercase | normalize | index; }",
+        assertEquals("{ input categoriesagain_src | lowercase | normalize | tokenize normalize stem:\"SHORTEST\" | index categoriesagain; }",
                      field.getIndexingScript().toString());
         assertTrue(field.isHeader());
 
         // Ninth field
         field= search.getConcreteField("exactemento");
-        assertEquals("{ input exactemento_src | lowercase | index | summary; }",
+        assertEquals("{ input exactemento_src | lowercase | tokenize normalize stem:\"SHORTEST\" | index exactemento | summary exactemento; }",
                      field.getIndexingScript().toString());
 
         // Tenth field
@@ -153,7 +157,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase {
         assertEquals("exact",exact.getName());
         assertEquals(Stemming.NONE,exact.getStemming());
         assertTrue(!exact.getNormalizing().doRemoveAccents());
-        assertEquals("{ input title . \" \" . input category | summary | index; }",
+        assertEquals("{ input title . \" \" . input category | tokenize | summary exact | index exact; }",
                      exact.getIndexingScript().toString());
         assertEquals(RankType.IDENTITY, exact.getRankType());
     }