From a845add7c80c437d410a91da28dff6357304e748 Mon Sep 17 00:00:00 2001 From: jonmv Date: Thu, 13 Oct 2022 14:19:16 +0200 Subject: Rebase, change to JUnit5, update ABI spec --- .../src/main/java/com/yahoo/prelude/query/MultiRangeItem.java | 2 +- .../test/java/com/yahoo/prelude/query/MultiRangeItemTestCase.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'container-search/src') diff --git a/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java index 24d4623b2b8..27696b85da3 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java @@ -39,7 +39,7 @@ import static java.util.Objects.requireNonNull; * possible to achieve any matching by choosing inclusiveness for the query ranges properly. * For the case where document ranges are to be treated as exclusive, and the query has single points, this * becomes weird, since the ranges [1, 1), (1, 1] and (1, 1) are all logically empty, but this still works :) - * + *

* Unless ranges are added in ascending start order, the implementation lazily sorts and merges ranges, * when a representation of the item is required. This is typically when the query is serialized and sent * to the backend, or when trace information is written, or {@link #toString()} is called on the item. diff --git a/container-search/src/test/java/com/yahoo/prelude/query/MultiRangeItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/MultiRangeItemTestCase.java index b6227c9969d..b9ff28971d0 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/MultiRangeItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/MultiRangeItemTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.prelude.query; import com.yahoo.prelude.query.MultiRangeItem.Range; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.List; @@ -13,9 +13,8 @@ import static java.lang.Double.NEGATIVE_INFINITY; import static java.lang.Double.NaN; import static java.lang.Double.POSITIVE_INFINITY; import static java.util.Comparator.comparingDouble; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author jonmv -- cgit v1.2.3