Verify we can replace

2 files changed, 9 insertions, 2 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
index 7a287f8dcc9..22ba8754572 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
@@ -18,6 +18,8 @@ import com.yahoo.search.query.parser.ParserEnvironment;
 import com.yahoo.search.query.parser.ParserFactory;
 import com.yahoo.search.searchchain.Execution;
 
+import com.yahoo.search.test.QueryTestCase;
+import com.yahoo.search.yql.MinimalQueryInserter;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -53,6 +55,13 @@ public class CJKSearcherTestCase {
                 TestLinguistics.INSTANCE);
     }
 
+    @Test
+    public void testEquivAndChinese() {
+        Query query = new Query(QueryTestCase.httpEncode("search?yql=select * from music-only where default contains equiv('a', 'b c') or default contains '东'"));
+        new Execution(new Chain<>(new MinimalQueryInserter(), new CJKSearcher()), Execution.Context.createContextStub()).search(query);
+        assertEquals("OR (EQUIV default:a default:'b c') default:东", query.getModel().getQueryTree().toString());
+    }
+
     private void assertTransformed(String queryString, String expected, Query.Type mode, Language actualLanguage,
                                    Language queryLanguage, Linguistics linguistics) {
         Parser parser = ParserFactory.newInstance(mode, new ParserEnvironment()
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 75e9525f09b..29a651aabf4 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
@@ -1116,9 +1116,7 @@ public class YqlParserTestCase {
     void testBackslash() {
         {
             String queryString = "select * from testtype where title contains \"\\\\\""; // Java escaping * YQL escaping
-
             QueryTree query = parse(queryString);
-
             assertEquals("title:\\", query.toString());
         }