1 files changed, 143 insertions, 146 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java
index 623c480796c..da7b29272a2 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java
@@ -5,14 +5,11 @@ import com.yahoo.prelude.query.AndItem;
 import com.yahoo.prelude.query.IntItem;
 import com.yahoo.prelude.query.WordItem;
 import com.yahoo.prelude.querytransform.PhraseMatcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -20,118 +17,118 @@ import static org.junit.Assert.assertNull;
 public class PhraseMatcherTestCase {
 
     @Test
-    public void testSingleItemMatching() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa");
+    void testSingleItemMatching() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa");
         matcher.setMatchSingleItems(true);
-        List<?> matches=matcher.matchPhrases(new WordItem("aword"));
+        List<?> matches = matcher.matchPhrases(new WordItem("aword"));
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(1,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(null,match.getOwner());
-        assertEquals(0,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem("aword"),i.next());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(1, match.getLength());
+        assertEquals("", match.getData());
+        assertNull(match.getOwner());
+        assertEquals(0, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem("aword"), i.next());
         assertNull(i.getReplace());
         assertFalse(i.hasNext());
     }
 
     @Test
-    public void testSingleItemMatchingCaseInsensitive() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa");
+    void testSingleItemMatchingCaseInsensitive() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa");
         matcher.setMatchSingleItems(true);
         final String mixedCase = "aWoRD";
-        List<?> matches=matcher.matchPhrases(new WordItem(mixedCase));
+        List<?> matches = matcher.matchPhrases(new WordItem(mixedCase));
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(1,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(null,match.getOwner());
-        assertEquals(0,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem(mixedCase),i.next());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(1, match.getLength());
+        assertEquals("", match.getData());
+        assertNull(match.getOwner());
+        assertEquals(0, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem(mixedCase), i.next());
         assertNull(i.getReplace());
         assertFalse(i.hasNext());
     }
 
     @Test
-    public void testSingleItemMatchingWithPluralIgnore() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa",true);
+    void testSingleItemMatchingWithPluralIgnore() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa", true);
         matcher.setMatchSingleItems(true);
-        List<?> matches=matcher.matchPhrases(new WordItem("awords"));
+        List<?> matches = matcher.matchPhrases(new WordItem("awords"));
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(1,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(null,match.getOwner());
-        assertEquals(0,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem("awords"),i.next());
-        assertEquals("aword",i.getReplace());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(1, match.getLength());
+        assertEquals("", match.getData());
+        assertNull(match.getOwner());
+        assertEquals(0, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem("awords"), i.next());
+        assertEquals("aword", i.getReplace());
         assertFalse(i.hasNext());
     }
 
     @Test
-    public void testSingleItemMatchingCaseInsensitiveWithPluralIgnore() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa",true);
+    void testSingleItemMatchingCaseInsensitiveWithPluralIgnore() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa", true);
         matcher.setMatchSingleItems(true);
         final String mixedCase = "aWoRDS";
-        List<?> matches=matcher.matchPhrases(new WordItem(mixedCase));
+        List<?> matches = matcher.matchPhrases(new WordItem(mixedCase));
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(1,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(null,match.getOwner());
-        assertEquals(0,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem(mixedCase),i.next());
-        assertEquals("aword",i.getReplace());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(1, match.getLength());
+        assertEquals("", match.getData());
+        assertNull(match.getOwner());
+        assertEquals(0, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem(mixedCase), i.next());
+        assertEquals("aword", i.getReplace());
         assertFalse(i.hasNext());
     }
 
     @Test
-    public void testPhraseMatching() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa",true);
-        AndItem and=new AndItem();
+    void testPhraseMatching() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa", true);
+        AndItem and = new AndItem();
         and.addItem(new WordItem("noisebefore"));
         and.addItem(new WordItem("this"));
         and.addItem(new WordItem("is"));
         and.addItem(new WordItem("a"));
         and.addItem(new WordItem("test"));
         and.addItem(new WordItem("noiseafter"));
-        List<?> matches=matcher.matchPhrases(and);
+        List<?> matches = matcher.matchPhrases(and);
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(4,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(and,match.getOwner());
-        assertEquals(1,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem("this"),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem("is"),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem("a"),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem("test"),i.next());
-        assertEquals(null,i.getReplace());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(4, match.getLength());
+        assertEquals("", match.getData());
+        assertEquals(and, match.getOwner());
+        assertEquals(1, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem("this"), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem("is"), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem("a"), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem("test"), i.next());
+        assertNull(i.getReplace());
         assertFalse(i.hasNext());
     }
 
     @Test
-    public void testPhraseMatchingCaseInsensitive() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa",true);
-        AndItem and=new AndItem();
+    void testPhraseMatchingCaseInsensitive() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa", true);
+        AndItem and = new AndItem();
         and.addItem(new WordItem("noisebefore"));
         final String firstWord = "thIs";
         and.addItem(new WordItem(firstWord));
@@ -142,93 +139,93 @@ public class PhraseMatcherTestCase {
         final String fourthWord = "tEst";
         and.addItem(new WordItem(fourthWord));
         and.addItem(new WordItem("noiseafter"));
-        List<?> matches=matcher.matchPhrases(and);
+        List<?> matches = matcher.matchPhrases(and);
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(4,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(and,match.getOwner());
-        assertEquals(1,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem(firstWord),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem(secondWord),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem(thirdWord),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem(fourthWord),i.next());
-        assertEquals(null,i.getReplace());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(4, match.getLength());
+        assertEquals("", match.getData());
+        assertEquals(and, match.getOwner());
+        assertEquals(1, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem(firstWord), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem(secondWord), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem(thirdWord), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem(fourthWord), i.next());
+        assertNull(i.getReplace());
         assertFalse(i.hasNext());
     }
 
     @Test
-    public void testPhraseMatchingWithNumber() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa",true);
-        AndItem and=new AndItem();
+    void testPhraseMatchingWithNumber() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa", true);
+        AndItem and = new AndItem();
         and.addItem(new WordItem("noisebefore"));
         and.addItem(new WordItem("this"));
         and.addItem(new WordItem("is"));
         and.addItem(new IntItem("3"));
         and.addItem(new WordItem("tests"));
         and.addItem(new WordItem("noiseafter"));
-        List<?> matches=matcher.matchPhrases(and);
+        List<?> matches = matcher.matchPhrases(and);
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(4,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(and,match.getOwner());
-        assertEquals(1,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem("this"),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem("is"),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new IntItem("3"),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem("tests"),i.next());
-        assertEquals(null,i.getReplace());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(4, match.getLength());
+        assertEquals("", match.getData());
+        assertEquals(and, match.getOwner());
+        assertEquals(1, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem("this"), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem("is"), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new IntItem("3"), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem("tests"), i.next());
+        assertNull(i.getReplace());
         assertFalse(i.hasNext());
     }
 
     @Test
-    public void testPhraseMatchingWithPluralIgnore() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa",true);
-        AndItem and=new AndItem();
+    void testPhraseMatchingWithPluralIgnore() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa", true);
+        AndItem and = new AndItem();
         and.addItem(new WordItem("noisebefore"));
         and.addItem(new WordItem("thi"));
         and.addItem(new WordItem("is"));
         and.addItem(new WordItem("a"));
         and.addItem(new WordItem("tests"));
         and.addItem(new WordItem("noiseafter"));
-        List<?> matches=matcher.matchPhrases(and);
+        List<?> matches = matcher.matchPhrases(and);
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(4,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(and,match.getOwner());
-        assertEquals(1,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem("thi"),i.next());
-        assertEquals("this",i.getReplace());
-        assertEquals(new WordItem("is"),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem("a"),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem("tests"),i.next());
-        assertEquals("test",i.getReplace());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(4, match.getLength());
+        assertEquals("", match.getData());
+        assertEquals(and, match.getOwner());
+        assertEquals(1, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem("thi"), i.next());
+        assertEquals("this", i.getReplace());
+        assertEquals(new WordItem("is"), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem("a"), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem("tests"), i.next());
+        assertEquals("test", i.getReplace());
         assertFalse(i.hasNext());
     }
 
     @Test
-    public void testPhraseMatchingCaseInsensitiveWithPluralIgnore() {
-        PhraseMatcher matcher=new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa",true);
-        AndItem and=new AndItem();
+    void testPhraseMatchingCaseInsensitiveWithPluralIgnore() {
+        PhraseMatcher matcher = new PhraseMatcher("src/test/java/com/yahoo/prelude/querytransform/test/test-fsa.fsa", true);
+        AndItem and = new AndItem();
         and.addItem(new WordItem("noisebefore"));
         final String firstWord = "thI";
         and.addItem(new WordItem(firstWord));
@@ -239,24 +236,24 @@ public class PhraseMatcherTestCase {
         final String fourthWord = "tEsts";
         and.addItem(new WordItem(fourthWord));
         and.addItem(new WordItem("noiseafter"));
-        List<?> matches=matcher.matchPhrases(and);
+        List<?> matches = matcher.matchPhrases(and);
 
         assertNotNull(matches);
-        assertEquals(1,matches.size());
-        PhraseMatcher.Phrase match=(PhraseMatcher.Phrase)matches.get(0);
-        assertEquals(4,match.getLength());
-        assertEquals("",match.getData());
-        assertEquals(and,match.getOwner());
-        assertEquals(1,match.getStartIndex());
-        PhraseMatcher.Phrase.MatchIterator i=match.itemIterator();
-        assertEquals(new WordItem(firstWord),i.next());
-        assertEquals("this",i.getReplace());
-        assertEquals(new WordItem(secondWord),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem(thirdWord),i.next());
-        assertEquals(null,i.getReplace());
-        assertEquals(new WordItem(fourthWord),i.next());
-        assertEquals("test",i.getReplace());
+        assertEquals(1, matches.size());
+        PhraseMatcher.Phrase match = (PhraseMatcher.Phrase) matches.get(0);
+        assertEquals(4, match.getLength());
+        assertEquals("", match.getData());
+        assertEquals(and, match.getOwner());
+        assertEquals(1, match.getStartIndex());
+        PhraseMatcher.Phrase.MatchIterator i = match.itemIterator();
+        assertEquals(new WordItem(firstWord), i.next());
+        assertEquals("this", i.getReplace());
+        assertEquals(new WordItem(secondWord), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem(thirdWord), i.next());
+        assertNull(i.getReplace());
+        assertEquals(new WordItem(fourthWord), i.next());
+        assertEquals("test", i.getReplace());
         assertFalse(i.hasNext());
     }