Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15363 Off-by-one error in test

Mike Drob08d35332bc51
diff --git a/solr/core/src/test/org/apache/solr/search/TestTaskManagement.java b/solr/core/src/test/org/apache/solr/search/TestTaskManagement.java
index ac0a3b09363..daf70e5fb6e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestTaskManagement.java
+++ b/solr/core/src/test/org/apache/solr/search/TestTaskManagement.java
@@ -27,6 +27,8 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.NamedList;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -167,13 +169,16 @@ public class TestTaskManagement extends SolrCloudTestCase {
presentQueryIDs.add(Integer.parseInt(entry.getKey()));
}
- assertTrue(presentQueryIDs.size() > 0 && presentQueryIDs.size() <= 50);
-
+ assertThat(presentQueryIDs.size(), betweenInclusive(0, 50));
for (int value : presentQueryIDs) {
- assertTrue(value >= 0 && value < 50);
+ assertThat(value, betweenInclusive(0, 49));
}
}
+ private static Matcher<Integer> betweenInclusive(int lower, int upper) {
+ return Matchers.allOf(Matchers.greaterThanOrEqualTo(lower), Matchers.lessThanOrEqualTo(upper));
+ }
+
@SuppressWarnings("unchecked")
private NamedList<String> listTasks() throws SolrServerException, IOException {
NamedList<Object> response = cluster.getSolrClient().request(