diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-12 08:30:35 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-12 08:39:04 +0200 |
commit | 76a89b62274060452022ddf24a7685ee2f380cb4 (patch) | |
tree | ef924603de22efd026f519ab31fd8f5a6ff60f2f /predicate-search-core/src/test/java/com/yahoo/document/predicate | |
parent | 7e7ebf7b527be1f163d497a41898e2252d878fe7 (diff) |
Replace all usages of Arrays.asList with List.of where possible.
Diffstat (limited to 'predicate-search-core/src/test/java/com/yahoo/document/predicate')
4 files changed, 38 insertions, 39 deletions
diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java index 56b338453d2..a698248ab6b 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -22,18 +22,18 @@ public class ConjunctionTest { Conjunction node = new Conjunction(); Predicate a = SimplePredicates.newString("a"); node.addOperand(a); - assertEquals(Arrays.asList(a), node.getOperands()); + assertEquals(List.of(a), node.getOperands()); Predicate b = SimplePredicates.newString("b"); node.addOperand(b); - assertEquals(Arrays.asList(a, b), node.getOperands()); + assertEquals(List.of(a, b), node.getOperands()); Predicate c = SimplePredicates.newString("c"); Predicate d = SimplePredicates.newString("d"); - node.addOperands(Arrays.asList(c, d)); - assertEquals(Arrays.asList(a, b, c, d), node.getOperands()); + node.addOperands(List.of(c, d)); + assertEquals(List.of(a, b, c, d), node.getOperands()); Predicate e = SimplePredicates.newString("e"); Predicate f = SimplePredicates.newString("f"); - node.setOperands(Arrays.asList(e, f)); - assertEquals(Arrays.asList(e, f), node.getOperands()); + node.setOperands(List.of(e, f)); + assertEquals(List.of(e, f), node.getOperands()); } @Test @@ -41,10 +41,10 @@ public class ConjunctionTest { Predicate foo = SimplePredicates.newString("foo"); Predicate bar = SimplePredicates.newString("bar"); Conjunction node = new Conjunction(foo, bar); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + assertEquals(List.of(foo, bar), node.getOperands()); - node = new Conjunction(Arrays.asList(foo, bar)); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + node = new Conjunction(List.of(foo, bar)); + assertEquals(List.of(foo, bar), node.getOperands()); } @Test diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java index efde8ec7532..fa1cde8fdd3 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -22,18 +22,18 @@ public class DisjunctionTest { Disjunction node = new Disjunction(); Predicate a = SimplePredicates.newString("a"); node.addOperand(a); - assertEquals(Arrays.asList(a), node.getOperands()); + assertEquals(List.of(a), node.getOperands()); Predicate b = SimplePredicates.newString("b"); node.addOperand(b); - assertEquals(Arrays.asList(a, b), node.getOperands()); + assertEquals(List.of(a, b), node.getOperands()); Predicate c = SimplePredicates.newString("c"); Predicate d = SimplePredicates.newString("d"); - node.addOperands(Arrays.asList(c, d)); - assertEquals(Arrays.asList(a, b, c, d), node.getOperands()); + node.addOperands(List.of(c, d)); + assertEquals(List.of(a, b, c, d), node.getOperands()); Predicate e = SimplePredicates.newString("e"); Predicate f = SimplePredicates.newString("f"); - node.setOperands(Arrays.asList(e, f)); - assertEquals(Arrays.asList(e, f), node.getOperands()); + node.setOperands(List.of(e, f)); + assertEquals(List.of(e, f), node.getOperands()); } @Test @@ -41,10 +41,10 @@ public class DisjunctionTest { Predicate foo = SimplePredicates.newString("foo"); Predicate bar = SimplePredicates.newString("bar"); Disjunction node = new Disjunction(foo, bar); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + assertEquals(List.of(foo, bar), node.getOperands()); - node = new Disjunction(Arrays.asList(foo, bar)); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + node = new Disjunction(List.of(foo, bar)); + assertEquals(List.of(foo, bar), node.getOperands()); } @Test diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java index 06c1a445494..3977ad02999 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -249,15 +249,15 @@ public class FeatureRangeTest { @Test void requireThatFeatureRangeCanBeBuiltFromMixedInNode() { assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10-19"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10-19"), 10)); assertEquals(new FeatureRange("foo", -19L, -10L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=-10-19"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=-10-19"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,9"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,9"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,1073741833"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,1073741833"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,2147483648"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,2147483648"), 10)); } } diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java index b61f843c10e..31cfe4318fb 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java @@ -4,7 +4,6 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -25,35 +24,35 @@ public class FeatureSetTest { void requireThatAccessorsWork() { FeatureSet node = new FeatureSet("key", "valueA", "valueB"); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); node.addValue("valueC"); - assertValues(Arrays.asList("valueA", "valueB", "valueC"), node); - node.addValues(Arrays.asList("valueD", "valueE")); - assertValues(Arrays.asList("valueA", "valueB", "valueC", "valueD", "valueE"), node); - node.setValues(Arrays.asList("valueF", "valueG")); - assertValues(Arrays.asList("valueF", "valueG"), node); + assertValues(List.of("valueA", "valueB", "valueC"), node); + node.addValues(List.of("valueD", "valueE")); + assertValues(List.of("valueA", "valueB", "valueC", "valueD", "valueE"), node); + node.setValues(List.of("valueF", "valueG")); + assertValues(List.of("valueF", "valueG"), node); } @Test void requireThatValueSetIsMutable() { FeatureSet node = new FeatureSet("key"); node.getValues().add("valueA"); - assertValues(Arrays.asList("valueA"), node); + assertValues(List.of("valueA"), node); node = new FeatureSet("key", "valueA"); node.getValues().add("valueB"); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); } @Test void requireThatConstructorsWork() { FeatureSet node = new FeatureSet("key", "valueA", "valueB"); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); - node = new FeatureSet("key", Arrays.asList("valueA", "valueB")); + node = new FeatureSet("key", List.of("valueA", "valueB")); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); } @Test @@ -123,7 +122,7 @@ public class FeatureSetTest { } catch (NullPointerException e) { assertEquals("value", e.getMessage()); } - assertValues(Arrays.asList("bar"), node); + assertValues(List.of("bar"), node); } @Test |