Segment to phrase not and when inside an expicit phrase

2 files changed, 3 insertions, 3 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java
index c1db7d73561..80b2f845e84 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java
@@ -1679,8 +1679,8 @@ public class ParseTestCase {
         // "first" "second" and "third" are segments in the test language
         Item item = tester.parseQuery("name:\"firstsecondthird\"", null, Language.CHINESE_SIMPLIFIED, Query.Type.ANY, TestLinguistics.INSTANCE);
 
-        assertTrue(item instanceof AndSegmentItem);
-        AndSegmentItem segment = (AndSegmentItem) item;
+        assertTrue(item instanceof PhraseSegmentItem);
+        PhraseSegmentItem segment = (PhraseSegmentItem) item;
 
         assertEquals(3, segment.getItemCount());
         assertEquals("name:first", segment.getItem(0).toString());
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index c831ee29631..3a67245e912 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -1037,7 +1037,7 @@ public class QueryTestCase {
         IndexModel indexModel = new IndexModel(test);
         query.getModel().setExecution(new Execution(Execution.Context.createContextStub(new IndexFacts(indexModel))));
 
-        assertEquals("myfield:\"it s fine\"", query.getModel().getQueryTree().toString());
+        assertEquals("myfield:\"'it s' fine\"", query.getModel().getQueryTree().toString());
     }
 
     @Test