Always compare item content fully in Item.equals

5 files changed, 20 insertions, 24 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 173279318f6..ba225722fd0 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
@@ -232,27 +232,24 @@ public class ItemsCommonStuffTestCase {
         as.setFromUser(true);
         assertTrue(as.isFromUser());
         as.lock();
-        boolean caught = false;
         try {
             as.removeItem(firstItem);
-        } catch (IllegalArgumentException e) {
-            caught = true;
+            fail("Excpected exception");
+        } catch (IllegalStateException e) {
+            // success
         }
-        assertTrue(caught);
-        caught = false;
         try {
             as.addItem(new WordItem("puppy"));
-        } catch (IllegalArgumentException e) {
-            caught= true;
+            fail("Excpected exception");
+        } catch (IllegalStateException e) {
+            // success
         }
-        assertTrue(caught);
-        caught = false;
         try {
             as.addItem(1, new WordItem("kvalp"));
-        } catch (IllegalArgumentException e) {
-            caught = true;
+            fail("Excpected exception");
+        } catch (IllegalStateException e) {
+            // success
         }
-        assertTrue(caught);
     }
 
     @Test
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java
index 853132efad9..b447b4b0242 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java
@@ -19,7 +19,9 @@ public class IntItemTestCase {
         Query q2 = new Query("/?query=123%20456");
 
         AndItem andItem = (AndItem) q2.getModel().getQueryTree().getRoot();
-        andItem.addItem(new IntItem(789l, ""));
+        var item = new IntItem(789L, "");
+        item.setFromQuery(true);
+        andItem.addItem(item);
 
         assertEquals(q1, q2);
     }
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
index 571991d7696..6bb216e1d10 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
@@ -72,8 +72,8 @@ public class StemmingSearcherTestCase {
         r = (CompositeItem)q1.getModel().getQueryTree().getRoot();
         first = (WordItem)r.getItem(0);
         second = (PhraseSegmentItem)r.getItem(1);
-        assertEquals("Connectivity incorrect.",
-                     second, first.getConnectedItem());
+        var origSecond = first.getConnectedItem();
+        assertEquals("Connectivity incorrect.", second, first.getConnectedItem());
     }
 
     @Test
diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java
index 79756d2eec4..3ac8de93f2b 100644
--- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java
@@ -273,7 +273,7 @@ public class FieldCollapsingSearcherTestCase {
 
         // Caveat: Collapse is set to false, because that's what the collapser asks for
         Query q = new Query("?query=%22test%20collapse%22+b&collapsefield=amid");
-        System.out.println(q);
+
         // The searcher turns off collapsing further on in the chain
         q.properties().set("collapse", "0");
         Result r = new Result(q);
@@ -477,7 +477,10 @@ public class FieldCollapsingSearcherTestCase {
         public Result search(com.yahoo.search.Query query, Execution execution) {
             AndItem a = new AndItem();
             a.addItem(query.getModel().getQueryTree().getRoot());
-            a.addItem(new WordItem("b"));
+            WordItem item = new WordItem("b");
+            item.setFromQuery(true);
+            a.addItem(item);
+
             query.getModel().getQueryTree().setRoot(a);
 
             return execution.search(query);
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
index df7246ebffb..e645c560f9d 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
@@ -124,13 +124,7 @@ public class NameRewriterTestCase {
                                    "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
                                    "=true",
-                                   "query 'OR obama \"obama nobel peace prize\" " +
-                                   "\"obama wiki\" \"obama nobel prize\" " +
-                                   "\"obama wears mom jeans\" " +
-                                   "\"obama sucks\" \"obama news\" \"malia obama\" " +
-                                   "\"obama speech\" \"obama nobel\" \"obama wikipedia\" " +
-                                   "\"barack obama biography\" \"obama snl\" " +
-                                   "\"obama peace prize\" \"michelle obama\" \"barack obama\"'");
+                                   "query 'OR obama \"obama nobel peace prize\" \"obama wiki\" \"obama nobel prize\" \"obama nobel peace prize\" \"obama wears mom jeans\" \"obama sucks\" \"obama news\" \"malia obama\" \"obama speech\" \"obama nobel\" \"obama wikipedia\" \"barack obama biography\" \"obama snl\" \"obama peace prize\" \"michelle obama\" \"barack obama\"'");
     }
 
     /**