Skip to content

Apache Lucene open-source search software

Update assert in kNN query timeout test (#15153)

Simon Cooperb7697c94fced
diff --git a/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java b/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java
index 7d6bdf098d0..0f9a6c84578 100644
--- a/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java
+++ b/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java
@@ -20,6 +20,7 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.frequently;
import static com.carrotsearch.randomizedtesting.RandomizedTest.randomBoolean;
import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;
import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
import java.io.IOException;
import java.util.HashSet;
@@ -964,10 +965,10 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {
searcher.setTimeout(new CountingQueryTimeout(1)); // Only score 1 doc
// Note: We get partial results when the HNSW graph has 1 layer, but no results for > 1 layer
// because the timeout is exhausted while finding the best entry node for the last level
- assertTrue(searcher.count(query) <= 1); // Expect at most 1 result
+ assertThat(searcher.count(query), lessThanOrEqualTo(1));
searcher.setTimeout(new CountingQueryTimeout(1)); // Only score 1 doc
- assertEquals(1, searcher.count(exactQuery)); // Expect only 1 result
+ assertThat(searcher.count(exactQuery), lessThanOrEqualTo(1));
}
}
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/ParentBlockJoinKnnVectorQueryTestCase.java b/lucene/join/src/test/org/apache/lucene/search/join/ParentBlockJoinKnnVectorQueryTestCase.java
index 66de05775e2..1971ed629f7 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/ParentBlockJoinKnnVectorQueryTestCase.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/ParentBlockJoinKnnVectorQueryTestCase.java
@@ -18,6 +18,7 @@
package org.apache.lucene.search.join;
import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
import java.io.IOException;
import java.util.ArrayList;
@@ -316,10 +317,10 @@ abstract class ParentBlockJoinKnnVectorQueryTestCase extends LuceneTestCase {
searcher.setTimeout(new CountingQueryTimeout(1)); // Only score 1 parent
// Note: We get partial results when the HNSW graph has 1 layer, but no results for > 1 layer
// because the timeout is exhausted while finding the best entry node for the last level
- assertTrue(searcher.count(query) <= 1); // Expect at most 1 result
+ assertThat(searcher.count(query), lessThanOrEqualTo(1));
searcher.setTimeout(new CountingQueryTimeout(1)); // Only score 1 parent
- assertEquals(1, searcher.count(exactQuery)); // Expect only 1 result
+ assertThat(searcher.count(exactQuery), lessThanOrEqualTo(1));
}
}