summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-08-29 11:27:51 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2023-08-29 11:27:51 +0200
commit25adbdafef9b9348ec03b7babef59512c304d3bb (patch)
tree9634b64899c0f590998244ce06c39790b7b7f000 /container-search
parent1057007296b8888aaa87ae4b263509d809fc21ce (diff)
- Bring some libraries up to date.
- Specify versions in dependency-versions module. - Avoid using opentest4j internally.
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java5
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java4
2 files changed, 4 insertions, 5 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
index 62b56e6e8ff..4956698cc2f 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
@@ -7,7 +7,6 @@ import com.yahoo.search.dispatch.LoadBalancer.GroupStatus;
import com.yahoo.search.dispatch.searchcluster.Group;
import com.yahoo.search.dispatch.searchcluster.Node;
import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
import java.time.Duration;
import java.time.Instant;
@@ -34,7 +33,7 @@ public class LoadBalancerTest {
Optional<Group> grp = lb.takeGroup(null);
Group group = grp.orElseThrow(() -> {
- throw new AssertionFailedError("Expected a SearchCluster.Group");
+ throw new IllegalStateException("Expected a SearchCluster.Group");
});
assertEquals(1, group.nodes().size());
}
@@ -47,7 +46,7 @@ public class LoadBalancerTest {
Optional<Group> grp = lb.takeGroup(null);
Group group = grp.orElseThrow(() -> {
- throw new AssertionFailedError("Expected a SearchCluster.Group");
+ throw new IllegalStateException("Expected a SearchCluster.Group");
});
assertEquals(1, group.nodes().size());
}
diff --git a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
index 8422196638a..b325bde05d9 100644
--- a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
@@ -81,8 +81,8 @@ public class SortingTestCase {
private void requireThatChineseHasCorrectRules(Collator col) {
final int reorderCodes [] = {UScript.HAN};
- assertEquals("14.0.0.0", col.getUCAVersion().toString());
- assertEquals("153.112.40.0", col.getVersion().toString());
+ assertEquals("15.0.0.0", col.getUCAVersion().toString());
+ assertEquals("153.120.43.8", col.getVersion().toString());
assertEquals(Arrays.toString(reorderCodes), Arrays.toString(col.getReorderCodes()));
assertNotEquals("", ((RuleBasedCollator) col).getRules());