- Use CompoundName where possible.

- Avoid * imports.
- Use common property definition.

1 files changed, 15 insertions, 6 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java
index 30d06510409..97e37c2f40c 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java
@@ -2,8 +2,14 @@
 package com.yahoo.search.querytransform;
 
 import com.yahoo.component.chain.Chain;
-import com.yahoo.prelude.query.*;
-import com.yahoo.processing.request.CompoundName;
+import com.yahoo.prelude.query.AndItem;
+import com.yahoo.prelude.query.CompositeItem;
+import com.yahoo.prelude.query.IntItem;
+import com.yahoo.prelude.query.Item;
+import com.yahoo.prelude.query.NotItem;
+import com.yahoo.prelude.query.OrItem;
+import com.yahoo.prelude.query.WeakAndItem;
+import com.yahoo.prelude.query.WordItem;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -12,11 +18,14 @@ import org.junit.jupiter.api.Test;
 
 import java.util.stream.IntStream;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static com.yahoo.search.querytransform.WeakAndReplacementSearcher.WEAKAND_REPLACE;
+import static com.yahoo.search.querytransform.WeakAndReplacementSearcher.WAND_HITS;
 
-public class WeakAndReplacementSearcherTestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-    private static final CompoundName WEAKAND_REPLACE = new CompoundName("weakAnd.replace");
+public class WeakAndReplacementSearcherTestCase {
     private static final int N = 99;
 
 
@@ -27,7 +36,7 @@ public class WeakAndReplacementSearcherTestCase {
 
     private Query buildDefaultQuery(boolean searcherEnabled) {
         Query query = new Query();
-        query.properties().set("wand.hits", N);
+        query.properties().set(WAND_HITS, N);
         query.properties().set(WEAKAND_REPLACE, searcherEnabled);
         OrItem root = new OrItem();
         root.addItem(new WordItem("text"));