raw user input will be an forwarded as exact match.

3 files changed, 27 insertions, 3 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java
index f77341033fb..fc8e9daae35 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java
@@ -181,10 +181,10 @@ public class ItemsCommonStuffTestCase {
     public final void testIdStuff() {
         Item i;
         final String expected = "i";
-        i = new ExactstringItem(expected);
+        i = new ExactStringItem(expected);
         assertEquals(ItemType.EXACT, i.getItemType());
         assertEquals("EXACTSTRING", i.getName());
-        assertEquals(expected, ((ExactstringItem) i).stringValue());
+        assertEquals(expected, ((ExactStringItem) i).stringValue());
         i = new PrefixItem("p");
         assertEquals(ItemType.PREFIX, i.getItemType());
         assertEquals("PREFIX", i.getName());
diff --git a/container-search/src/test/java/com/yahoo/search/query/textserialize/item/test/ParseItemTestCase.java b/container-search/src/test/java/com/yahoo/search/query/textserialize/item/test/ParseItemTestCase.java
index d59fd23e567..afc0234540a 100644
--- a/container-search/src/test/java/com/yahoo/search/query/textserialize/item/test/ParseItemTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/textserialize/item/test/ParseItemTestCase.java
@@ -116,7 +116,7 @@ public class ParseItemTestCase {
 
     @Test
     public void parse_exactString() throws ParseException {
-        ExactstringItem subStringItem = (ExactstringItem) parse("(EXACT 'word')");
+        ExactStringItem subStringItem = (ExactStringItem) parse("(EXACT 'word')");
         assertThat(subStringItem.getWord(), is("word"));
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
index 8e5ebbad614..32facd7a754 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
@@ -8,6 +8,7 @@ import com.yahoo.prelude.IndexFacts;
 import com.yahoo.prelude.IndexModel;
 import com.yahoo.prelude.query.AndItem;
 import com.yahoo.prelude.query.IndexedItem;
+import com.yahoo.prelude.query.ExactStringItem;
 import com.yahoo.prelude.query.Item;
 import com.yahoo.prelude.query.PhraseItem;
 import com.yahoo.prelude.query.PrefixItem;
@@ -290,6 +291,29 @@ public class YqlParserTestCase {
     }
 
     @Test
+    public void testRaw() {
+        Item root = parse("select foo from bar where baz contains (\"yoni jo dima\");").getRoot();
+        assertTrue(root instanceof WordItem);
+        assertFalse(root instanceof ExactStringItem);
+        assertEquals("yoni jo dima", ((WordItem)root).getWord());
+
+        root = parse("select foo from bar where baz contains ([{\"grammar\":\"raw\"}]\"yoni jo dima\");").getRoot();
+        assertTrue(root instanceof WordItem);
+        assertFalse(root instanceof ExactStringItem);
+        assertEquals("yoni jo dima", ((WordItem)root).getWord());
+
+        root = parse("select foo from bar where userInput(\"yoni jo dima\");").getRoot();
+        assertTrue(root instanceof AndItem);
+        AndItem andItem = (AndItem) root;
+        assertEquals(3, andItem.getItemCount());
+
+        root = parse("select foo from bar where [{\"grammar\":\"raw\"}]userInput(\"yoni jo dima\");").getRoot();
+        assertTrue(root instanceof WordItem);
+        assertTrue(root instanceof ExactStringItem);
+        assertEquals("yoni jo dima", ((WordItem)root).getWord());
+    }
+
+    @Test
     public void testAccentDropping() {
         assertFalse(getRootWord("select foo from bar where baz contains " +
                                 "([ {\"accentDrop\": false} ]\"colors\");").isNormalizable());