Revert "Bratseth/weakand by default take 2"

1 files changed, 11 insertions, 12 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java
index 9ed84298838..6c500604a81 100644
--- a/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java
@@ -17,26 +17,25 @@ public class GetRawWordTestCase {
 
     @Test
     public void testGetRawWord() {
-        Query query = new Query("?query=%C4%B0%C5%9EBANKASI%20GAZ%C4%B0EM%C4%B0R&type=all&searchChain=vespa");
+        Query query = new Query("?query=%C4%B0%C5%9EBANKASI%20GAZ%C4%B0EM%C4%B0R&searchChain=vespa");
         assertEquals("AND \u0130\u015EBANKASI GAZ\u0130EM\u0130R", query.getModel().getQueryTree().toString());
-        AndItem root = (AndItem)query.getModel().getQueryTree().getRoot();
+        AndItem root=(AndItem)query.getModel().getQueryTree().getRoot();
 
         {
-            WordItem word = (WordItem)root.getItem(0);
-            assertEquals("\u0130\u015EBANKASI", word.getRawWord());
-            assertEquals(0, word.getOrigin().start);
-            assertEquals(9, word.getOrigin().end);
+            WordItem word=(WordItem)root.getItem(0);
+            assertEquals("\u0130\u015EBANKASI",word.getRawWord());
+            assertEquals(0,word.getOrigin().start);
+            assertEquals(9,word.getOrigin().end);
         }
 
         {
-            WordItem word = (WordItem)root.getItem(1);
-            assertEquals("GAZ\u0130EM\u0130R", word.getRawWord());
-            assertEquals(10, word.getOrigin().start);
-            assertEquals(18, word.getOrigin().end);
+            WordItem word=(WordItem)root.getItem(1);
+            assertEquals("GAZ\u0130EM\u0130R",word.getRawWord());
+            assertEquals(10,word.getOrigin().start);
+            assertEquals(18,word.getOrigin().end);
         }
 
-        assertEquals("Total string is just these words",18,
-                     ((WordItem)root.getItem(0)).getOrigin().getSuperstring().length());
+        assertEquals("Total string is just these words",18,((WordItem)root.getItem(0)).getOrigin().getSuperstring().length());
     }
 
 }