aboutsummaryrefslogtreecommitdiffstats
path: root/predicate-search-core/src/test/java/com/yahoo/search/predicate
diff options
context:
space:
mode:
Diffstat (limited to 'predicate-search-core/src/test/java/com/yahoo/search/predicate')
-rw-r--r--predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java22
-rw-r--r--predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java102
-rw-r--r--predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java18
-rw-r--r--predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java36
-rw-r--r--predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java22
-rw-r--r--predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java16
6 files changed, 108 insertions, 108 deletions
diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java
index bd580ac232e..8e8a4f45562 100644
--- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java
@@ -1,13 +1,13 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.search.predicate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author bjorncs
@@ -15,17 +15,17 @@ import static org.junit.Assert.assertEquals;
public class PredicateQueryParserTest {
@Test
- public void require_that_json_is_correctly_parsed() {
+ void require_that_json_is_correctly_parsed() {
String json =
"{" +
- " \"features\":[" +
- " {\"k\":\"k1\",\"v\":\"value1\",\"s\":\"0x1\"}," +
- " {\"k\":\"k2\",\"v\":\"value2\",\"s\":\"0x3\"}" +
- " ],\"rangeFeatures\":[" +
- " {\"k\":\"range1\",\"v\":123456789123,\"s\":\"0xffff\"}," +
- " {\"k\":\"range2\",\"v\":0,\"s\":\"0xffffffffffffffff\"}" +
- " ]" +
- "}";
+ " \"features\":[" +
+ " {\"k\":\"k1\",\"v\":\"value1\",\"s\":\"0x1\"}," +
+ " {\"k\":\"k2\",\"v\":\"value2\",\"s\":\"0x3\"}" +
+ " ],\"rangeFeatures\":[" +
+ " {\"k\":\"range1\",\"v\":123456789123,\"s\":\"0xffff\"}," +
+ " {\"k\":\"range2\",\"v\":0,\"s\":\"0xffffffffffffffff\"}" +
+ " ]" +
+ "}";
PredicateQueryParser parser = new PredicateQueryParser();
List<String> result = new ArrayList<>();
diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java
index 2725132e68a..497c490b844 100644
--- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java
@@ -2,13 +2,13 @@
package com.yahoo.search.predicate.optimization;
import com.yahoo.document.predicate.Predicate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.yahoo.document.predicate.Predicates.and;
import static com.yahoo.document.predicate.Predicates.feature;
import static com.yahoo.document.predicate.Predicates.not;
import static com.yahoo.document.predicate.Predicates.or;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a>
@@ -16,93 +16,93 @@ import static org.junit.Assert.assertEquals;
public class AndOrSimplifierTest {
@Test
- public void requireThatNestedConjunctionsAreCollapsed() {
+ void requireThatNestedConjunctionsAreCollapsed() {
assertSimplified(and(feature("a").inSet("b"),
- feature("c").inSet("d")),
- and(and(feature("a").inSet("b"),
- feature("c").inSet("d"))));
+ feature("c").inSet("d")),
+ and(and(feature("a").inSet("b"),
+ feature("c").inSet("d"))));
}
@Test
- public void requireThatNestedConjuctionsAreCollapsedInPlace() {
+ void requireThatNestedConjuctionsAreCollapsedInPlace() {
assertSimplified(and(feature("a").inSet("b"),
- feature("c").inSet("d"),
- feature("e").inSet("f")),
- and(feature("a").inSet("b"),
- and(feature("c").inSet("d")),
- feature("e").inSet("f")));
+ feature("c").inSet("d"),
+ feature("e").inSet("f")),
+ and(feature("a").inSet("b"),
+ and(feature("c").inSet("d")),
+ feature("e").inSet("f")));
}
@Test
- public void requireThatDeeplyNestedConjunctionsAreCollapsed() {
+ void requireThatDeeplyNestedConjunctionsAreCollapsed() {
assertSimplified(and(feature("a").inSet("b"),
- feature("c").inSet("d"),
- feature("e").inSet("f"),
- feature("g").inSet("h"),
- feature("i").inSet("j")),
- and(feature("a").inSet("b"),
- and(feature("c").inSet("d")),
- feature("e").inSet("f"),
- and(and(feature("g").inSet("h"),
- feature("i").inSet("j")))));
+ feature("c").inSet("d"),
+ feature("e").inSet("f"),
+ feature("g").inSet("h"),
+ feature("i").inSet("j")),
+ and(feature("a").inSet("b"),
+ and(feature("c").inSet("d")),
+ feature("e").inSet("f"),
+ and(and(feature("g").inSet("h"),
+ feature("i").inSet("j")))));
}
@Test
- public void requireThatNestedDisjunctionsAreCollapsed() {
+ void requireThatNestedDisjunctionsAreCollapsed() {
assertSimplified(or(feature("a").inSet("b"),
- feature("c").inSet("d")),
- or(or(feature("a").inSet("b"),
- feature("c").inSet("d"))));
+ feature("c").inSet("d")),
+ or(or(feature("a").inSet("b"),
+ feature("c").inSet("d"))));
}
@Test
- public void requireThatNestedDisjuctionsAreCollapsedInPlace() {
+ void requireThatNestedDisjuctionsAreCollapsedInPlace() {
assertSimplified(or(feature("a").inSet("b"),
- feature("c").inSet("d"),
- feature("e").inSet("f")),
- or(feature("a").inSet("b"),
- or(feature("c").inSet("d")),
- feature("e").inSet("f")));
+ feature("c").inSet("d"),
+ feature("e").inSet("f")),
+ or(feature("a").inSet("b"),
+ or(feature("c").inSet("d")),
+ feature("e").inSet("f")));
}
@Test
- public void requireThatDeeplyNestedDisjunctionsAreCollapsed() {
+ void requireThatDeeplyNestedDisjunctionsAreCollapsed() {
assertSimplified(or(feature("a").inSet("b"),
- feature("c").inSet("d"),
- feature("e").inSet("f"),
- feature("g").inSet("h"),
- feature("i").inSet("j")),
- or(feature("a").inSet("b"),
- or(feature("c").inSet("d")),
- feature("e").inSet("f"),
- or(or(feature("g").inSet("h"),
- feature("i").inSet("j")))));
+ feature("c").inSet("d"),
+ feature("e").inSet("f"),
+ feature("g").inSet("h"),
+ feature("i").inSet("j")),
+ or(feature("a").inSet("b"),
+ or(feature("c").inSet("d")),
+ feature("e").inSet("f"),
+ or(or(feature("g").inSet("h"),
+ feature("i").inSet("j")))));
}
@Test
- public void requireThatConjunctionsAndDisjunctionsAreNotCollapsed() {
+ void requireThatConjunctionsAndDisjunctionsAreNotCollapsed() {
assertSimplified(and(or(feature("a").inSet("b"),
- feature("c").inSet("d"))),
- and(or(feature("a").inSet("b"),
- feature("c").inSet("d"))));
+ feature("c").inSet("d"))),
+ and(or(feature("a").inSet("b"),
+ feature("c").inSet("d"))));
}
@Test
- public void requireThatNotOrIsTranslatedToAndNot() {
+ void requireThatNotOrIsTranslatedToAndNot() {
assertSimplified(
and(feature("a").notInSet("b"), feature("c").inSet("d")),
not(or(feature("a").inSet("b"), feature("c").notInSet("d"))));
}
@Test
- public void requireThatNotAndIsTranslatedToOrNot() {
+ void requireThatNotAndIsTranslatedToOrNot() {
assertSimplified(
or(feature("a").notInSet("b"), feature("c").inSet("d")),
not(and(feature("a").inSet("b"), feature("c").notInSet("d"))));
}
@Test
- public void requireThatTreeWithoutNotIsNotAffected() {
+ void requireThatTreeWithoutNotIsNotAffected() {
assertSimplified(
and(feature("a").inSet("b"), feature("c").notInSet("d")),
and(feature("a").inSet("b"), feature("c").notInSet("d")));
@@ -113,14 +113,14 @@ public class AndOrSimplifierTest {
}
@Test
- public void requireThatNotOfNotIsRemoved() {
+ void requireThatNotOfNotIsRemoved() {
assertSimplified(feature("a").inSet("b"), not(not(feature("a").inSet("b"))));
assertSimplified(feature("a").inSet("b"), not(feature("a").notInSet("b")));
assertSimplified(feature("a").notInSet("b"), not(not(feature("a").notInSet("b"))));
}
@Test
- public void requireThatNotBeneathAndIsTranslated() {
+ void requireThatNotBeneathAndIsTranslated() {
assertSimplified(
and(feature("a").notInSet("b"), feature("c").inSet("d"), feature("b").inSet("c")),
and(not(or(feature("a").inSet("b"), feature("c").notInSet("d"))), feature("b").inSet("c")));
diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java
index 54031d36b47..e03a01d3996 100644
--- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java
@@ -2,10 +2,10 @@
package com.yahoo.search.predicate.optimization;
import com.yahoo.document.predicate.Predicate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.yahoo.document.predicate.Predicates.*;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a>
@@ -13,32 +13,32 @@ import static org.junit.Assert.assertEquals;
public class BooleanSimplifierTest {
@Test
- public void requireThatOrOfTrueIsTrue() {
+ void requireThatOrOfTrueIsTrue() {
assertSimplifiedTo(value(true), or(feature("a").inSet("b"), value(true)));
}
@Test
- public void requireThatFalseChildrenOfOrAreRemoved() {
+ void requireThatFalseChildrenOfOrAreRemoved() {
assertSimplifiedTo(feature("a").inSet("b"), or(feature("a").inSet("b"), value(false)));
}
@Test
- public void requireThatAndOfFalseIsFalse() {
+ void requireThatAndOfFalseIsFalse() {
assertSimplifiedTo(value(false), and(feature("a").inSet("b"), value(false)));
}
@Test
- public void requireThatTrueChildrenOfAndAreRemoved() {
+ void requireThatTrueChildrenOfAndAreRemoved() {
assertSimplifiedTo(feature("a").inSet("b"), and(feature("a").inSet("b"), value(true)));
}
@Test
- public void requireThatSingleChildAndOrAreRemoved() {
+ void requireThatSingleChildAndOrAreRemoved() {
assertSimplifiedTo(feature("a").inSet("b"), and(or(and(feature("a").inSet("b")))));
}
@Test
- public void requireThatValueChildrenOfNotAreInverted() {
+ void requireThatValueChildrenOfNotAreInverted() {
assertSimplifiedTo(value(true), not(value(false)));
assertSimplifiedTo(value(false), not(value(true)));
assertSimplifiedTo(value(true), not(not(not(value(false)))));
@@ -46,7 +46,7 @@ public class BooleanSimplifierTest {
}
@Test
- public void requireThatComplexExpressionIsSimplified() {
+ void requireThatComplexExpressionIsSimplified() {
assertSimplifiedTo(
Predicate.fromString("'pub_entity' not in [301951]"),
Predicate.fromString("true and true and true and true and true and 'pub_entity' not in [301951] and ((true and true and true and true) or (true and true and true and true) or (true and true and true and true and 'pub_entity' in [86271]))"));
diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java
index ac491d57ecd..596b28e8395 100644
--- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java
@@ -4,9 +4,9 @@ package com.yahoo.search.predicate.optimization;
import com.yahoo.document.predicate.FeatureRange;
import com.yahoo.document.predicate.Predicate;
import com.yahoo.document.predicate.RangePartition;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a>
@@ -29,7 +29,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatSingleValueRangesAreConverted() {
+ void requireThatSingleValueRangesAreConverted() {
testConvert("foo in [0..0]", "foo in [0..0 (foo=0+[..0])]");
testConvert("foo in [5..5]", "foo in [5..5 (foo=0+[5..5])]");
testConvert("foo in [9..9]", "foo in [9..9 (foo=0+[9..])]");
@@ -40,7 +40,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatVeryShortRangesAreConverted() {
+ void requireThatVeryShortRangesAreConverted() {
testConvert("foo in [10..17]", "foo in [10..17 (foo=10+[..7])]");
testConvert("foo in [12..19]", "foo in [12..19 (foo=10+[2..])]");
testConvert("foo in [11..18]", "foo in [11..18 (foo=10+[1..8])]");
@@ -53,7 +53,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatShortRangeIsConverted() {
+ void requireThatShortRangeIsConverted() {
testConvert("foo in [9..19]", "foo in [9..19 (foo=0+[9..],foo=10-19)]");
testConvert("foo in [10..19]", "foo in [10..19 (foo=10-19)]");
testConvert("foo in [10..20]", "foo in [10..20 (foo=20+[..0],foo=10-19)]");
@@ -67,7 +67,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatMediumRangeIsConverted() {
+ void requireThatMediumRangeIsConverted() {
testConvert("foo in [10..39]", "foo in [10..39 (foo=10-19,foo=20-29,foo=30-39)]");
testConvert("foo in [10..38]", "foo in [10..38 (foo=30+[..8],foo=10-19,foo=20-29)]");
testConvert("foo in [18..39]", "foo in [18..39 (foo=10+[8..],foo=20-29,foo=30-39)]");
@@ -80,7 +80,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatLargeRangeIsConverted() {
+ void requireThatLargeRangeIsConverted() {
testConvert("foo in [10..199]", "foo in [10..199 (foo=10-19,foo=20-29,foo=30-39,foo=40-49,foo=50-59,foo=60-69,foo=70-79,foo=80-89,foo=90-99,foo=100-199)]");
testConvert("foo in [8..207]", "foo in [8..207 (foo=0+[8..],foo=200+[..7],foo=10-19,foo=20-29,foo=30-39,foo=40-49,foo=50-59,foo=60-69,foo=70-79,foo=80-89,foo=90-99,foo=100-199)]");
testConvert("foo in [999..2001]", "foo in [999..2001 (foo=990+[9..],foo=2000+[..1],foo=1000-1999)]");
@@ -94,7 +94,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatLongMaxIsConverted() {
+ void requireThatLongMaxIsConverted() {
testConvert("foo in [0..9223372036854775807]",
"foo in [0..9223372036854775807 (" +
"foo=9223372036854775800+[..7]," +
@@ -184,7 +184,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatLongMinIsConverted() {
+ void requireThatLongMinIsConverted() {
testConvert("foo in [-9223372036854775808..-1]",
"foo in [-9223372036854775808..-1 (" +
"foo=-9223372036854775800+[..8]," +
@@ -273,7 +273,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatLowAritiesWork() {
+ void requireThatLowAritiesWork() {
testConvert("foo in [10..39]", "foo in [10..39 (foo=10-11,foo=12-15,foo=32-39,foo=16-31)]", 2);
testConvert("foo in [2..32]", "foo in [2..32 (foo=32+[..0],foo=2-3,foo=4-7,foo=8-15,foo=16-31)]", 2);
testConvert("foo in [-31..63]", "foo in [-31..63 (foo=-31-0,foo=0-63)]", 2);
@@ -327,7 +327,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatHighAritiesWork() {
+ void requireThatHighAritiesWork() {
testConvert("foo in [10..39]", "foo in [10..39 (foo=0+[10..39])]", 1000);
testConvert("foo in [9000..11000]", "foo in [9000..11000 (foo=0+[9000..],foo=10000+[..1000])]", 10000);
testConvert("foo in [10..39]", "foo in [10..39 (foo=0+[10..39])]", 16384);
@@ -338,13 +338,13 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatOpenRangesWork() {
+ void requireThatOpenRangesWork() {
testConvert("foo in [-7..]", "foo in [-7.. (foo=-7-0,foo=0-9223372036854775807)]", 2);
testConvert("foo in [..7]", "foo in [..7 (foo=-9223372036854775808+[..0],foo=-9223372036854775807-0,foo=0-7)]", 2);
}
@Test
- public void requireThatUpperAndLowerBoundsWork() {
+ void requireThatUpperAndLowerBoundsWork() {
lowerBound = -999;
upperBound = 999;
testConvert("foo in [-9..]", "foo in [-9.. (foo=-9-0,foo=0-999)]", 10);
@@ -353,7 +353,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatUpperAndLowerBoundsPruneClosedRanges() {
+ void requireThatUpperAndLowerBoundsPruneClosedRanges() {
lowerBound = -999;
upperBound = 999;
testConvert("foo in [0..10000]", "foo in [0..10000 (foo=0-999)]", 10);
@@ -364,7 +364,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatRangesOutsideBoundsAreSimplifiedToOneImpossibleRange() {
+ void requireThatRangesOutsideBoundsAreSimplifiedToOneImpossibleRange() {
lowerBound = 900;
upperBound = 999;
testConvert("foo in [0..100]", "foo in [0..100 (foo=-9223372036854775799-9223372036854775790)]", 10);
@@ -380,7 +380,7 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatUpperAndLowerBoundsAreAdjustedWithArity() {
+ void requireThatUpperAndLowerBoundsAreAdjustedWithArity() {
lowerBound = -999;
upperBound = 999;
testConvert("foo in [0..10000]", "foo in [0..10000 (foo=0-999)]", 10);
@@ -592,10 +592,10 @@ public class ComplexNodeTransformerTest {
}
@Test
- public void requireThatExistingPartitionsAreCleared() {
+ void requireThatExistingPartitionsAreCleared() {
testConvert("foo in [10..19]", "foo in [10..19 (foo=10-19)]");
Predicate p = Predicate.fromString("foo in [10..19]");
- ((FeatureRange)p).addPartition(new RangePartition("foo", 10000L, 20000L, false));
+ ((FeatureRange) p).addPartition(new RangePartition("foo", 10000L, 20000L, false));
ComplexNodeTransformer tranformer = new ComplexNodeTransformer();
Predicate converted = tranformer.process(p, new PredicateOptions(10, lowerBound, upperBound));
assertEquals("foo in [10..19 (foo=10-19)]", converted.toString());
diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java
index b1a0be796ab..665b88d3af5 100644
--- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java
@@ -2,19 +2,19 @@
package com.yahoo.search.predicate.optimization;
import com.yahoo.document.predicate.Predicate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.yahoo.document.predicate.Predicates.and;
import static com.yahoo.document.predicate.Predicates.feature;
import static com.yahoo.document.predicate.Predicates.or;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a>
*/
public class NotNodeReordererTest {
@Test
- public void requireThatNotChildrenAreMovedAwayFromLastAndChild() {
+ void requireThatNotChildrenAreMovedAwayFromLastAndChild() {
checkReorder(
and(feature("a").inSet("b"), feature("c").notInSet("d")),
and(feature("c").notInSet("d"), feature("a").inSet("b")));
@@ -25,7 +25,7 @@ public class NotNodeReordererTest {
}
@Test
- public void requireThatNotChildrenAreMovedToLastOrChild() {
+ void requireThatNotChildrenAreMovedToLastOrChild() {
checkReorder(
or(feature("c").notInSet("d"), feature("a").inSet("b")),
or(feature("a").inSet("b"), feature("c").notInSet("d")));
@@ -36,15 +36,15 @@ public class NotNodeReordererTest {
}
@Test
- public void requireThatComplexReorderingWork() {
+ void requireThatComplexReorderingWork() {
checkReorder(and(feature("g").inSet("h"),
- or(and(feature("a").notInSet("b"),
- feature("c").notInSet("d")),
- feature("e").inSet("f"))),
+ or(and(feature("a").notInSet("b"),
+ feature("c").notInSet("d")),
+ feature("e").inSet("f"))),
and(or(feature("e").inSet("f"),
- and(feature("a").notInSet("b"),
- feature("c").notInSet("d"))),
- feature("g").inSet("h")));
+ and(feature("a").notInSet("b"),
+ feature("c").notInSet("d"))),
+ feature("g").inSet("h")));
}
private static void checkReorder(Predicate input, Predicate expected) {
diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java
index 90487b761db..e51e3d29ac2 100644
--- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java
@@ -2,18 +2,18 @@
package com.yahoo.search.predicate.optimization;
import com.yahoo.document.predicate.Predicate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.yahoo.document.predicate.Predicates.and;
import static com.yahoo.document.predicate.Predicates.feature;
import static com.yahoo.document.predicate.Predicates.not;
import static com.yahoo.document.predicate.Predicates.or;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class OrSimplifierTest {
@Test
- public void require_that_or_with_feature_sets_of_same_key_is_simplified_to_single_feature_set() {
+ void require_that_or_with_feature_sets_of_same_key_is_simplified_to_single_feature_set() {
Predicate p =
or(
feature("key1").inSet("value1", "value4"),
@@ -24,7 +24,7 @@ public class OrSimplifierTest {
}
@Test
- public void require_that_or_with_feature_sets_of_different_keys_is_simplified() {
+ void require_that_or_with_feature_sets_of_different_keys_is_simplified() {
Predicate p =
or(
feature("key1").inSet("value1", "value3"),
@@ -39,7 +39,7 @@ public class OrSimplifierTest {
}
@Test
- public void require_that_conversion_is_recursive_and_cascades() {
+ void require_that_conversion_is_recursive_and_cascades() {
Predicate p =
or(
feature("key1").inSet("value1", "value4"),
@@ -52,7 +52,7 @@ public class OrSimplifierTest {
}
@Test
- public void require_that_or_below_and_is_converted() {
+ void require_that_or_below_and_is_converted() {
Predicate p =
and(
or(
@@ -67,7 +67,7 @@ public class OrSimplifierTest {
}
@Test
- public void require_that_or_below_not_is_converted() {
+ void require_that_or_below_not_is_converted() {
Predicate p =
not(
or(
@@ -78,7 +78,7 @@ public class OrSimplifierTest {
}
@Test
- public void require_that_non_feature_set_nodes_are_left_untouched() {
+ void require_that_non_feature_set_nodes_are_left_untouched() {
Predicate p =
or(
feature("key1").inSet("value1"),