Support equiv

3 files changed, 30 insertions, 5 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExpansionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExpansionTestCase.java
new file mode 100644
index 00000000000..b2d0d60c8fa
--- /dev/null
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExpansionTestCase.java
@@ -0,0 +1,22 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.prelude.semantics.test;
+
+import org.junit.Test;
+
+public class ExpansionTestCase extends RuleBaseAbstractTestCase {
+
+    public ExpansionTestCase() {
+        super("expansion.sr");
+    }
+
+    @Test
+    public void testOrExpansion() {
+        assertSemantics("OR or1 or2 or3", "or1");
+    }
+
+    @Test
+    public void testEquivExpansion() {
+        assertSemantics("EQUIV equiv1 equiv2 equiv3", "equiv1");
+    }
+
+}
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java
index b7754075724..5e5df9d2005 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java
@@ -151,7 +151,7 @@ public class SemanticSearcherTestCase extends RuleBaseAbstractTestCase {
 
     @Test
     public void testOrProduction() {
-        assertSemantics("OR something somethingelse","something");
+        assertSemantics("OR something somethingelse", "something");
     }
 
     // This test is order dependent. Fix it!!
@@ -159,15 +159,15 @@ public class SemanticSearcherTestCase extends RuleBaseAbstractTestCase {
     public void testWeightedSetItem() {
         Query q = new Query();
         WeightedSetItem weightedSet=new WeightedSetItem("fieldName");
-        weightedSet.addToken("a",1);
-        weightedSet.addToken("b",2);
+        weightedSet.addToken("a", 1);
+        weightedSet.addToken("b", 2);
         q.getModel().getQueryTree().setRoot(weightedSet);
-        assertSemantics("WEIGHTEDSET fieldName{[1]:\"a\",[2]:\"b\"}",q);
+        assertSemantics("WEIGHTEDSET fieldName{[1]:\"a\",[2]:\"b\"}", q);
     }
 
     @Test
     public void testNullQuery() {
-        Query query=new Query(""); // Causes a query containing a NullItem
+        Query query = new Query(""); // Causes a query containing a NullItem
         doSearch(searcher, query, 0, 10);
         assertEquals(NullItem.class, query.getModel().getQueryTree().getRoot().getClass()); // Still a NullItem
     }
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/expansion.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/expansion.sr
new file mode 100644
index 00000000000..c81b0e1819e
--- /dev/null
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/expansion.sr
@@ -0,0 +1,3 @@
+or1 +> ?or2 ?or3;
+
+equiv1 +> =equiv2 =equiv3;