Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16311: Simplify assert statements (#953)

Eric Pugh981e4039e2fd
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index 03c3a24244b..b4bdfb3c733 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -552,8 +552,8 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
f = ischema.getField("test_notv");
luf = f.createField("test");
- assertTrue(!f.storeTermVector());
- assertTrue(!luf.fieldType().storeTermVectors());
+ assertFalse(f.storeTermVector());
+ assertFalse(luf.fieldType().storeTermVectors());
f = ischema.getField("test_postv");
luf = f.createField("test");
@@ -619,8 +619,8 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertEquals(p.get("ss"), "SSS");
assertEquals(!!p.getBool("bt"), !p.getBool("bf"));
- assertEquals(p.getBool("foo", true), true);
- assertEquals(p.getBool("foo", false), false);
+ assertTrue(p.getBool("foo", true));
+ assertFalse(p.getBool("foo", false));
assertEquals(!!p.getBool("bt"), !p.getBool("bf"));
NamedList<String> more = new NamedList<>();
@@ -764,8 +764,8 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
DocList dl = ((ResultContext) rsp.getResponse()).getDocList();
Document d = req.getSearcher().doc(dl.iterator().nextDoc());
// ensure field in fl is not lazy
- assertFalse(((Field) d.getField("test_hlt")).getClass().getSimpleName().equals("LazyField"));
- assertFalse(((Field) d.getField("title")).getClass().getSimpleName().equals("LazyField"));
+ assertNotEquals("LazyField", ((Field) d.getField("test_hlt")).getClass().getSimpleName());
+ assertNotEquals("LazyField", ((Field) d.getField("title")).getClass().getSimpleName());
req.close();
}
@@ -814,7 +814,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
di = dl.iterator();
Document d2 = req.getSearcher().doc(di.nextDoc());
// ensure same doc, same lazy field now
- assertTrue("Doc was not cached", d1 == d2);
+ assertSame("Doc was not cached", d1, d2);
IndexableField[] values2 = d2.getFields("test_hlt");
assertEquals(values1.length, values2.length);
for (int i = 0; i < values1.length; i++) {
diff --git a/solr/core/src/test/org/apache/solr/CursorPagingTest.java b/solr/core/src/test/org/apache/solr/CursorPagingTest.java
index 78328a190ab..7e5e9131f06 100644
--- a/solr/core/src/test/org/apache/solr/CursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/CursorPagingTest.java
@@ -1313,7 +1313,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
/** Given a set of id, picks some, semi-randomly, to use for elevation */
public static int[] pickElevations(final int numToElevate, final SentinelIntSet ids) {
- assert numToElevate < ids.size();
+ assertTrue(numToElevate < ids.size());
final int[] results = new int[numToElevate];
int slot = 0;
for (int key : ids.keys) {
diff --git a/solr/core/src/test/org/apache/solr/OutputWriterTest.java b/solr/core/src/test/org/apache/solr/OutputWriterTest.java
index 6760c84b6b3..13eb69d9014 100644
--- a/solr/core/src/test/org/apache/solr/OutputWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/OutputWriterTest.java
@@ -72,7 +72,7 @@ public class OutputWriterTest extends SolrTestCaseJ4 {
qrw = h.getCore().getResponseWriters().getRegistry().get("xml");
assertTrue("Should not be a lazy class", qrw.isLoaded());
- assertTrue("Should not be a lazy class", qrw.getClass() == PluginBag.PluginHolder.class);
+ assertSame("Should not be a lazy class", qrw.getClass(), PluginBag.PluginHolder.class);
}
////////////////////////////////////////////////////////////////////////////
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
index 2d33dced1a2..a00c321f92a 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
@@ -1145,7 +1145,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
Double val = (Double) svals.get(s);
assertFalse("stat shouldn't be NaN: " + s, val.isNaN());
assertFalse("stat shouldn't be Inf: " + s, val.isInfinite());
- assertFalse("stat shouldn't be 0: " + s, val.equals(0.0D));
+ assertNotEquals("stat shouldn't be 0: " + s, 0.0D, val, 0.0);
} else {
// count or missing
assertTrue(
@@ -1155,7 +1155,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
"stat should be a Long: " + s + " -> " + svals.get(s).getClass(),
svals.get(s) instanceof Long);
Long val = (Long) svals.get(s);
- assertFalse("stat shouldn't be 0: " + s, val.equals(0L));
+ assertNotEquals("stat shouldn't be 0: " + s, 0L, (long) val);
}
}
}
@@ -1287,7 +1287,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
// things we explicit expect because we asked for them
// NOTE: min is expected to be null even though requested because of no values
- assertEquals("wrong min", null, s.getMin());
+ assertNull("wrong min", s.getMin());
assertTrue("mean should be NaN", ((Double) s.getMean()).isNaN());
assertEquals("wrong stddev", 0.0D, s.getStddev(), 0.0D);
@@ -1842,9 +1842,10 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
+ counts.size(),
counts.size(),
pairs.length / 2);
- assertTrue(
+ assertEquals(
"Variable len param must be an even number, it was: " + pairs.length,
- (pairs.length % 2) == 0);
+ 0,
+ (pairs.length % 2));
for (int pairs_idx = 0, counts_idx = 0;
pairs_idx < pairs.length;
pairs_idx += 2, counts_idx++) {
@@ -1876,9 +1877,10 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
+ counts.size(),
counts.size(),
pairs.length / 2);
- assertTrue(
+ assertEquals(
"Variable len param must be an even number, it was: " + pairs.length,
- (pairs.length % 2) == 0);
+ 0,
+ (pairs.length % 2));
for (int pairs_idx = 0, counts_idx = 0;
pairs_idx < pairs.length;
pairs_idx += 2, counts_idx++) {
@@ -2013,13 +2015,12 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
+ " header set if a shard is down",
Boolean.TRUE,
rsp.getHeader().get(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY));
- assertTrue(
- "Expected to find error in the down shard info: " + info,
- info.get("error") != null);
+ assertNotNull(
+ "Expected to find error in the down shard info: " + info, info.get("error"));
} else {
- assertTrue(
+ assertNotNull(
"Expected timeAllowedError or to find shardAddress in the up shard info: " + info,
- info.get("shardAddress") != null);
+ info.get("shardAddress"));
}
} else {
assertEquals(
@@ -2029,9 +2030,9 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
+ rsp,
Boolean.TRUE,
rsp.getHeader().get(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY));
- assertTrue(
+ assertNotNull(
"Expected to find error in the down shard info: " + info.toString(),
- info.get("error") != null);
+ info.get("error"));
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
index 05479263a3f..1287b9ff4a7 100644
--- a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
+++ b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
@@ -53,17 +53,14 @@ public class TestRandomDVFaceting extends SolrTestCaseJ4 {
initCore("solrconfig-basic.xml", "schema-docValuesFaceting.xml");
- assertEquals(
+ assertFalse(
"DocValues: Schema assumptions are broken",
- false,
h.getCore().getLatestSchema().getField("foo_i").hasDocValues());
- assertEquals(
+ assertTrue(
"DocValues: Schema assumptions are broken",
- true,
h.getCore().getLatestSchema().getField("foo_i_dv").hasDocValues());
- assertEquals(
+ assertTrue(
"DocValues: Schema assumptions are broken",
- true,
h.getCore().getLatestSchema().getField("foo_i_p").hasDocValues());
assertEquals(
diff --git a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
index de8505bc4d7..63cbe0ea8d9 100644
--- a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
+++ b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
@@ -96,12 +96,12 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
// TODO: doubles, multi-floats, ints with precisionStep>0, booleans
types.add(new FldType("small_tf", ZERO_ONE, new FVal(-4, 5)));
- assert trieFields.matcher("small_tf").matches();
- assert !trieFields.matcher("small_f").matches();
+ assertTrue(trieFields.matcher("small_tf").matches());
+ assertFalse(trieFields.matcher("small_f").matches());
types.add(new FldType("foo_ti", ZERO_ONE, new IRange(-2, indexSize)));
- assert trieFields.matcher("foo_ti").matches();
- assert !trieFields.matcher("foo_i").matches();
+ assertTrue(trieFields.matcher("foo_ti").matches());
+ assertFalse(trieFields.matcher("foo_i").matches());
types.add(
new FldType(
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
index 1a99f66f2aa..0c1ed2ee46a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -595,7 +595,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
Replica newReplica = grabNewReplica(response, getCollectionState(collectionName));
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
- assertTrue(newReplica.getNodeName().equals(node));
+ assertEquals(newReplica.getNodeName(), node);
// Test DELETEREPLICA
response =
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteNodeTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteNodeTest.java
index a4f6c35be5a..9f8c33e60f7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteNodeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteNodeTest.java
@@ -110,9 +110,9 @@ public class DeleteNodeTest extends SolrCloudTestCase {
"####### DocCollection after: {}", cloudClient.getClusterState().getCollection(coll));
}
if (shouldFail) {
- assertTrue(String.valueOf(rsp), rsp.getRequestStatus() == RequestStatusState.FAILED);
+ assertSame(String.valueOf(rsp), rsp.getRequestStatus(), RequestStatusState.FAILED);
} else {
- assertFalse(String.valueOf(rsp), rsp.getRequestStatus() == RequestStatusState.FAILED);
+ assertNotSame(String.valueOf(rsp), rsp.getRequestStatus(), RequestStatusState.FAILED);
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
index 3696f4c104b..60a31677adf 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
@@ -176,7 +176,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
Replica newLeader = cluster.getZkStateReader().getLeaderRetry(collectionName, "shard1");
- assertFalse(leader.equals(newLeader));
+ assertNotEquals(leader, newLeader);
// Confirm that the instance and data directory were deleted by default
assertFalse(
@@ -326,7 +326,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
JettySolrRunner leaderJetty = getJettyForReplica(leader);
Replica replica1 =
shard1.getReplicas(replica -> !replica.getName().equals(leader.getName())).get(0);
- assertFalse(replica1.getName().equals(leader.getName()));
+ assertNotEquals(replica1.getName(), leader.getName());
JettySolrRunner replica1Jetty = getJettyForReplica(replica1);
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
index 52caba7ebfa..d49b4e61dd8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
@@ -75,7 +75,7 @@ public class DistribDocExpirationUpdateProcessorTest extends SolrCloudTestCase {
/** Modifies the request to inlcude authentication params if needed, returns the request */
private <T extends SolrRequest<?>> T setAuthIfNeeded(T req) {
if (null != USER) {
- assert null != PASS;
+ assertNotNull(PASS);
req.setBasicAuthCredentials(USER, PASS);
}
return req;
@@ -384,8 +384,8 @@ public class DistribDocExpirationUpdateProcessorTest extends SolrCloudTestCase {
final String coreName,
final long indexVersion,
final long numDocs) {
- assert null != shardName;
- assert null != coreName;
+ assertNotNull(shardName);
+ assertNotNull(coreName);
this.shardName = shardName;
this.coreName = coreName;
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
index a577ff021de..305b28c34d6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
@@ -150,7 +150,7 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase {
new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score"));
QueryResponse rsp = new QueryResponse(client.request(qr), client);
SolrDocumentList hits = rsp.getResults();
- assertTrue("Expected 1 doc, got " + hits, hits.getNumFound() == 1);
+ assertEquals("Expected 1 doc, got " + hits, 1, hits.getNumFound());
SolrDocument doc = hits.get(0);
assertEquals(toDocId, doc.getFirstValue("id"));
assertEquals("b", doc.getFirstValue("get_s"));
@@ -176,7 +176,7 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase {
new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score"));
final QueryResponse rsp = new QueryResponse(client.request(qr), client);
final SolrDocumentList hits = rsp.getResults();
- assertTrue("Expected 1 doc", hits.getNumFound() == 1);
+ assertEquals("Expected 1 doc", 1, hits.getNumFound());
SolrDocument doc = hits.get(0);
assertEquals(toDocId, doc.getFirstValue("id"));
assertEquals("b", doc.getFirstValue("get_s"));
@@ -198,7 +198,7 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase {
new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score"));
final QueryResponse rsp = new QueryResponse(client.request(qr), client);
final SolrDocumentList hits = rsp.getResults();
- assertTrue("Expected no hits", hits.getNumFound() == 0);
+ assertEquals("Expected no hits", 0, hits.getNumFound());
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
index 2e95e685c17..41933370a4e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
@@ -367,8 +367,7 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {
NamedList<?> rsp = solr.request(qr);
SolrDocument doc = (SolrDocument) rsp.get("doc");
String match = JSONTestUtil.matchObj("/id", doc, docId);
- assertTrue(
- "Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match == null);
+ assertNull("Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match);
Long vers = (Long) doc.getFirstValue("_version_");
assertNotNull(vers);
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java
index 6006784744c..84048086eb1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java
@@ -77,14 +77,15 @@ public class HttpPartitionOnCommitTest extends BasicDistributedZkTest {
cloudClient.setDefaultCollection(testCollectionName);
List<Replica> notLeaders = ensureAllReplicasAreActive(testCollectionName, "shard1", 2, 2, 30);
- assertTrue(
+ assertEquals(
"Expected 1 replicas for collection "
+ testCollectionName
+ " but found "
+ notLeaders.size()
+ "; clusterState: "
+ printClusterStateInfo(),
- notLeaders.size() == 1);
+ 1,
+ notLeaders.size());
if (log.isInfoEnabled()) {
log.info("All replicas active for {}", testCollectionName);
@@ -131,14 +132,15 @@ public class HttpPartitionOnCommitTest extends BasicDistributedZkTest {
cloudClient.setDefaultCollection(testCollectionName);
List<Replica> notLeaders = ensureAllReplicasAreActive(testCollectionName, "shard1", 1, 3, 30);
- assertTrue(
+ assertEquals(
"Expected 2 replicas for collection "
+ testCollectionName
+ " but found "
+ notLeaders.size()
+ "; clusterState: "
+ printClusterStateInfo(),
- notLeaders.size() == 2);
+ 2,
+ notLeaders.size());
log.info("All replicas active for {}", testCollectionName);
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index 67867a7ebd7..c97b89e5c64 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -364,14 +364,15 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
List<Replica> notLeaders =
ensureAllReplicasAreActive(testCollectionName, "shard1", 1, 3, maxWaitSecsToSeeAllActive);
- assertTrue(
+ assertEquals(
"Expected 2 replicas for collection "
+ testCollectionName
+ " but found "
+ notLeaders.size()
+ "; clusterState: "
+ printClusterStateInfo(testCollectionName),
- notLeaders.size() == 2);
+ 2,
+ notLeaders.size());
JettySolrRunner leaderJetty =
getJettyOnPort(getReplicaPort(getShardLeader(testCollectionName, "shard1", 1000)));
@@ -425,14 +426,15 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
List<Replica> notLeaders =
ensureAllReplicasAreActive(testCollectionName, "shard1", 1, 2, maxWaitSecsToSeeAllActive);
- assertTrue(
+ assertEquals(
"Expected 1 replicas for collection "
+ testCollectionName
+ " but found "
+ notLeaders.size()
+ "; clusterState: "
+ printClusterStateInfo(testCollectionName),
- notLeaders.size() == 1);
+ 1,
+ notLeaders.size());
Replica leader = ZkStateReader.from(cloudClient).getLeaderRetry(testCollectionName, "shard1");
assertNotNull(
@@ -599,8 +601,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
protected void assertDocExists(SolrClient solr, String docId) throws Exception {
NamedList<?> rsp = realTimeGetDocId(solr, docId);
String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
- assertTrue(
- "Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match == null);
+ assertNull("Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match);
}
private NamedList<Object> realTimeGetDocId(SolrClient solr, String docId)
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java
index 6dd13539a8e..2c4972262e3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java
@@ -66,14 +66,15 @@ public class LeaderFailoverAfterPartitionTest extends HttpPartitionTest {
List<Replica> notLeaders =
ensureAllReplicasAreActive(testCollectionName, "shard1", 1, 3, maxWaitSecsToSeeAllActive);
- assertTrue(
+ assertEquals(
"Expected 2 replicas for collection "
+ testCollectionName
+ " but found "
+ notLeaders.size()
+ "; clusterState: "
+ printClusterStateInfo(testCollectionName),
- notLeaders.size() == 2);
+ 2,
+ notLeaders.size());
// ok, now introduce a network partition between the leader and the replica
SocketProxy proxy0 = null;
@@ -159,12 +160,13 @@ public class LeaderFailoverAfterPartitionTest extends HttpPartitionTest {
+ printClusterStateInfo(testCollectionName),
newLeader);
- assertTrue(
+ assertNotEquals(
"Expected node "
+ shouldNotBeNewLeaderNode
+ " to NOT be the new leader b/c it was out-of-sync with the old leader! ClusterState: "
+ printClusterStateInfo(testCollectionName),
- !shouldNotBeNewLeaderNode.equals(newLeader.getNodeName()));
+ shouldNotBeNewLeaderNode,
+ newLeader.getNodeName());
proxy0.reopen();
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
index f8cac78ef84..a8c127718c8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
@@ -330,8 +330,7 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {
private void assertDocExists(SolrClient solr, String docId) throws Exception {
NamedList<?> rsp = realTimeGetDocId(solr, docId);
String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
- assertTrue(
- "Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match == null);
+ assertNull("Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match);
}
private NamedList<Object> realTimeGetDocId(SolrClient solr, String docId)
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
index 980e29eaf22..bdeb1d5ecfb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
@@ -975,9 +975,9 @@ public class OverseerTest extends SolrTestCaseJ4 {
assertTrue(
COLLECTION + " should remain after removal of the last core",
reader.getClusterState().hasCollection(COLLECTION));
- assertTrue(
+ assertNull(
core_node + " should be gone after publishing the null state",
- null == reader.getClusterState().getCollection(COLLECTION).getReplica(core_node));
+ reader.getClusterState().getCollection(COLLECTION).getReplica(core_node));
} finally {
close(mockController);
close(overseerClient);
@@ -1150,8 +1150,8 @@ public class OverseerTest extends SolrTestCaseJ4 {
Thread.sleep(50);
}
- assertTrue(showQpeek(workQueue), workQueue.peek() == null);
- assertTrue(showQpeek(q), q.peek() == null);
+ assertNull(showQpeek(workQueue), workQueue.peek());
+ assertNull(showQpeek(q), q.peek());
} finally {
close(overseerClient);
close(reader);
diff --git a/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java b/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java
index ef74e192583..a786ea0bc05 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java
@@ -102,7 +102,7 @@ public class ParallelCommitExecutionTest extends SolrCloudTestCase {
}
public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception {
- assert null != client.getDefaultCollection();
+ assertNotNull(client.getDefaultCollection());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(
client.getDefaultCollection(), ZkStateReader.from(client), true, true, 330);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
index 6b24cc7341d..37cd2f99328 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
@@ -114,7 +114,7 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
List<Replica> replicas =
ensureAllReplicasAreActive(testCollectionName, shardId, numShards, replicationFactor, 30);
- assertTrue("Expected active 1 replicas for " + testCollectionName, replicas.size() == 1);
+ assertEquals("Expected active 1 replicas for " + testCollectionName, 1, replicas.size());
List<SolrInputDocument> batch = new ArrayList<>(10);
for (int i = 0; i < 15; i++) {
@@ -149,7 +149,7 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
// so now kill the replica of shard2 and verify the achieved rf is only 1
List<Replica> shard2Replicas =
ensureAllReplicasAreActive(testCollectionName, "shard2", numShards, replicationFactor, 30);
- assertTrue("Expected active 1 replicas for " + testCollectionName, replicas.size() == 1);
+ assertEquals("Expected active 1 replicas for " + testCollectionName, 1, replicas.size());
getProxyForReplica(shard2Replicas.get(0)).close();
@@ -277,14 +277,15 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
Integer batchRf = (Integer) hdr.get(UpdateRequest.REPFACT);
// Note that this also tests if we're wonky and return an achieved rf greater than the number
// of live replicas.
- assertTrue(
+ assertEquals(
"Expected rf="
+ expectedRf
+ " for batch but got "
+ batchRf
+ "; clusterState: "
+ printClusterStateInfo(),
- batchRf == expectedRf);
+ (int) batchRf,
+ expectedRf);
}
}
@@ -300,7 +301,7 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
List<Replica> replicas =
ensureAllReplicasAreActive(testCollectionName, shardId, numShards, replicationFactor, 30);
- assertTrue("Expected 2 active replicas for " + testCollectionName, replicas.size() == 2);
+ assertEquals("Expected 2 active replicas for " + testCollectionName, 2, replicas.size());
log.info("Indexing docId=1");
int rf = sendDoc(1);
diff --git a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
index 0a0e659963d..6166cb31224 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
@@ -95,7 +95,7 @@ class SegmentTerminateEarlyTestState {
void queryTimestampDescending(CloudSolrClient cloudSolrClient) throws Exception {
TestSegmentSorting.assertFalse(maxTimestampDocKeys.isEmpty());
- TestSegmentSorting.assertTrue("numDocs=" + numDocs + " is not even", (numDocs % 2) == 0);
+ TestSegmentSorting.assertEquals("numDocs=" + numDocs + " is not even", 0, (numDocs % 2));
final Long oddFieldValue = (long) (maxTimestampDocKeys.iterator().next() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD + ":" + oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.desc);
@@ -132,7 +132,7 @@ class SegmentTerminateEarlyTestState {
void queryTimestampDescendingSegmentTerminateEarlyYes(
CloudSolrClient cloudSolrClient, boolean appendKeyDescendingToSort) throws Exception {
TestSegmentSorting.assertFalse(maxTimestampDocKeys.isEmpty());
- TestSegmentSorting.assertTrue("numDocs=" + numDocs + " is not even", (numDocs % 2) == 0);
+ TestSegmentSorting.assertEquals("numDocs=" + numDocs + " is not even", 0, (numDocs % 2));
final Long oddFieldValue = (long) (maxTimestampDocKeys.iterator().next() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD + ":" + oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.desc);
@@ -171,11 +171,11 @@ class SegmentTerminateEarlyTestState {
"responseHeader.segmentTerminatedEarly missing in " + rsp.getResponseHeader(),
rsp.getResponseHeader()
.get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY));
- TestSegmentSorting.assertTrue(
+ TestSegmentSorting.assertEquals(
"responseHeader.segmentTerminatedEarly missing/false in " + rsp.getResponseHeader(),
- Boolean.TRUE.equals(
- rsp.getResponseHeader()
- .get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY)));
+ Boolean.TRUE,
+ rsp.getResponseHeader()
+ .get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY));
// check shards info
final Object shardsInfo = rsp.getResponse().get(ShardParams.SHARDS_INFO);
if (!Boolean.TRUE.equals(shardsInfoWanted)) {
@@ -202,7 +202,7 @@ class SegmentTerminateEarlyTestState {
void queryTimestampDescendingSegmentTerminateEarlyNo(
CloudSolrClient cloudSolrClient, boolean appendKeyDescendingToSort) throws Exception {
TestSegmentSorting.assertFalse(maxTimestampDocKeys.isEmpty());
- TestSegmentSorting.assertTrue("numDocs=" + numDocs + " is not even", (numDocs % 2) == 0);
+ TestSegmentSorting.assertEquals("numDocs=" + numDocs + " is not even", 0, (numDocs % 2));
final Long oddFieldValue = (long) (maxTimestampDocKeys.iterator().next() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD + ":" + oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.desc);
@@ -239,11 +239,11 @@ class SegmentTerminateEarlyTestState {
"responseHeader.segmentTerminatedEarly present in " + rsp.getResponseHeader(),
rsp.getResponseHeader()
.get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY));
- TestSegmentSorting.assertFalse(
+ TestSegmentSorting.assertNotEquals(
"responseHeader.segmentTerminatedEarly present/true in " + rsp.getResponseHeader(),
- Boolean.TRUE.equals(
- rsp.getResponseHeader()
- .get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY)));
+ Boolean.TRUE,
+ rsp.getResponseHeader()
+ .get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY));
// check shards info
final Object shardsInfo = rsp.getResponse().get(ShardParams.SHARDS_INFO);
if (!Boolean.TRUE.equals(shardsInfoWanted)) {
@@ -268,7 +268,7 @@ class SegmentTerminateEarlyTestState {
void queryTimestampDescendingSegmentTerminateEarlyYesGrouped(
CloudSolrClient cloudSolrClient, boolean appendKeyDescendingToSort) throws Exception {
TestSegmentSorting.assertFalse(maxTimestampDocKeys.isEmpty());
- TestSegmentSorting.assertTrue("numDocs=" + numDocs + " is not even", (numDocs % 2) == 0);
+ TestSegmentSorting.assertEquals("numDocs=" + numDocs + " is not even", 0, (numDocs % 2));
final Long oddFieldValue = (long) (maxTimestampDocKeys.iterator().next() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD + ":" + oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.desc);
@@ -276,7 +276,7 @@ class SegmentTerminateEarlyTestState {
query.setFields(KEY_FIELD, ODD_FIELD, TIMESTAMP_FIELD);
query.setRows(1);
query.set(CommonParams.SEGMENT_TERMINATE_EARLY, true);
- TestSegmentSorting.assertTrue("numDocs=" + numDocs + " is not quad-able", (numDocs % 4) == 0);
+ TestSegmentSorting.assertEquals("numDocs=" + numDocs + " is not quad-able", 0, (numDocs % 4));
query.add("group.field", QUAD_FIELD);
query.set("group", true);
final QueryResponse rsp = cloudSolrClient.query(query);
@@ -303,17 +303,17 @@ class SegmentTerminateEarlyTestState {
}
// check segmentTerminatedEarly flag
// at present segmentTerminateEarly cannot be used with grouped queries
- TestSegmentSorting.assertFalse(
+ TestSegmentSorting.assertNotEquals(
"responseHeader.segmentTerminatedEarly present/true in " + rsp.getResponseHeader(),
- Boolean.TRUE.equals(
- rsp.getResponseHeader()
- .get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY)));
+ Boolean.TRUE,
+ rsp.getResponseHeader()
+ .get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY));
}
void queryTimestampAscendingSegmentTerminateEarlyYes(
CloudSolrClient cloudSolrClient, boolean appendKeyDescendingToSort) throws Exception {
TestSegmentSorting.assertFalse(minTimestampDocKeys.isEmpty());
- TestSegmentSorting.assertTrue("numDocs=" + numDocs + " is not even", (numDocs % 2) == 0);
+ TestSegmentSorting.assertEquals("numDocs=" + numDocs + " is not even", 0, (numDocs % 2));
final Long oddFieldValue = (long) (minTimestampDocKeys.iterator().next() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD + ":" + oddFieldValue);
// a sort order that is _not_ compatible with the merge sort order
@@ -348,10 +348,10 @@ class SegmentTerminateEarlyTestState {
rsp.getResponseHeader()
.get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY));
// segmentTerminateEarly cannot be used with incompatible sort orders
- TestSegmentSorting.assertTrue(
+ TestSegmentSorting.assertEquals(
"responseHeader.segmentTerminatedEarly missing/true in " + rsp.getResponseHeader(),
- Boolean.FALSE.equals(
- rsp.getResponseHeader()
- .get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY)));
+ Boolean.FALSE,
+ rsp.getResponseHeader()
+ .get(SolrQueryResponse.RESPONSE_HEADER_SEGMENT_TERMINATED_EARLY_KEY));
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCLIZkUtilsTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCLIZkUtilsTest.java
index 0844a14a1b2..2442ab1a4bd 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCLIZkUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCLIZkUtilsTest.java
@@ -940,7 +940,7 @@ public class SolrCLIZkUtilsTest extends SolrCloudTestCase {
tool.runTool(
SolrCLI.processCommandLineArgs(
SolrCLI.joinCommonAndToolOptions(tool.getOptions()), args));
- assertFalse("Should fail when trying to remove /.", res == 0);
+ assertNotEquals("Should fail when trying to remove /.", 0, res);
}
// Check that all children of fileRoot are children of zkRoot and vice-versa
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
index ea8627b3dd6..0a688acabbf 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
@@ -200,7 +200,7 @@ public class SolrCloudExampleTest extends AbstractFullDistribZkTestBase {
SolrCLI.HealthcheckTool tool = new SolrCLI.HealthcheckTool();
CommandLine cli =
SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(tool.getOptions()), args);
- assertTrue("Healthcheck action failed!", tool.runTool(cli) == 0);
+ assertEquals("Healthcheck action failed!", 0, tool.runTool(cli));
}
protected void doTestDeleteAction(String testCollectionName, String solrUrl) throws Exception {
@@ -212,9 +212,9 @@ public class SolrCloudExampleTest extends AbstractFullDistribZkTestBase {
SolrCLI.DeleteTool tool = new SolrCLI.DeleteTool();
CommandLine cli =
SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(tool.getOptions()), args);
- assertTrue("Delete action failed!", tool.runTool(cli) == 0);
- assertTrue(
- !SolrCLI.safeCheckCollectionExists(
+ assertEquals("Delete action failed!", 0, tool.runTool(cli));
+ assertFalse(
+ SolrCLI.safeCheckCollectionExists(
solrUrl, testCollectionName)); // it should not exist anymore
}
@@ -248,7 +248,7 @@ public class SolrCloudExampleTest extends AbstractFullDistribZkTestBase {
CommandLine cli =
SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(tool.getOptions()), args);
log.info("Sending set-property '{}'={} to SolrCLI.ConfigTool.", prop, maxTime);
- assertTrue("Set config property failed!", tool.runTool(cli) == 0);
+ assertEquals("Set config property failed!", 0, tool.runTool(cli));
configJson = SolrCLI.getJson(configUrl);
maxTimeFromConfig = SolrCLI.atPath("/config/updateHandler/autoSoftCommit/maxTime", configJson);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
index 88f629018ff..464225e193d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
@@ -339,8 +339,7 @@ public class TestCloudConsistency extends SolrCloudTestCase {
private void assertDocExists(SolrClient solr, String docId) throws Exception {
NamedList<?> rsp = realTimeGetDocId(solr, docId);
String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
- assertTrue(
- "Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match == null);
+ assertNull("Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match);
}
private NamedList<Object> realTimeGetDocId(SolrClient solr, String docId)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java
index 2e4b47e2c22..6de4be97b52 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java
@@ -202,7 +202,7 @@ public class TestCloudPhrasesIdentificationComponent extends SolrCloudTestCase {
}
public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception {
- assert null != client.getDefaultCollection();
+ assertNotNull(client.getDefaultCollection());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(
client.getDefaultCollection(), ZkStateReader.from(client), true, true, 330);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
index c4b372ceb99..124da0b7913 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
@@ -369,8 +369,6 @@ public class TestCloudPivotFacet extends AbstractFullDistribZkTestBase {
} else {
// regular stats, compare everything...
-
- assert actualStats != null;
try {
String msg = " of " + statsKey;
@@ -672,7 +670,7 @@ public class TestCloudPivotFacet extends AbstractFullDistribZkTestBase {
* @see #useFieldRandomizedFactor
*/
private static boolean useField() {
- assert 0 < useFieldRandomizedFactor;
+ assertTrue(0 < useFieldRandomizedFactor);
return 0 != TestUtil.nextInt(random(), 0, useFieldRandomizedFactor);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java
index 1bc10314931..519727f136d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java
@@ -176,10 +176,8 @@ public class TestCloudPseudoReturnFields extends SolrCloudTestCase {
Boolean.TRUE,
frsp.getField().get("multiValued"));
} catch (SolrServerException e) {
- assertEquals(
- "Couldn't fetch field for '" + name + "' ... schema changed out from under us?",
- null,
- e);
+ assertNull(
+ "Couldn't fetch field for '" + name + "' ... schema changed out from under us?", e);
}
}
@@ -982,7 +980,7 @@ public class TestCloudPseudoReturnFields extends SolrCloudTestCase {
}
public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception {
- assert null != client.getDefaultCollection();
+ assertNotNull(client.getDefaultCollection());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(
client.getDefaultCollection(), ZkStateReader.from(client), true, true, 330);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
index b9a52eef896..a03e3666ea8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
@@ -299,12 +299,9 @@ public class TestCloudSearcherWarming extends SolrCloudTestCase {
if (jettySolrRunner.getNodeName().equals(replica.getNodeName())) {
SolrDispatchFilter solrDispatchFilter = jettySolrRunner.getSolrDispatchFilter();
try (SolrCore core = solrDispatchFilter.getCores().getCore(coreName)) {
- if (core.getSolrConfig().useColdSearcher) {
- log.error(
- "useColdSearcher is enabled! It should not be enabled for this test!");
- assert false;
- return false;
- }
+ assertFalse(
+ "useColdSearcher is enabled! It should not be enabled for this test!",
+ core.getSolrConfig().useColdSearcher);
if (log.isInfoEnabled()) {
log.info("Found SolrCore: {}, id: {}", core.getName(), core);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
index 61b291fd9c3..4d8b35b5cdb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
@@ -40,7 +40,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Deque;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
@@ -399,18 +398,16 @@ public class TestConfigSetsAPI extends SolrCloudTestCase {
}
// check the value in properties are correct
- Iterator<? extends Map.Entry<String, ?>> it = properties.iterator();
- while (it.hasNext()) {
- Map.Entry<String, ?> entry = it.next();
+ for (Map.Entry<String, ?> entry : properties) {
String newValue = newProps != null ? newProps.get(entry.getKey()) : null;
String oldValue = oldProps != null ? oldProps.get(entry.getKey()) : null;
if (newValue != null) {
- assertTrue(newValue.equals(entry.getValue()));
+ assertEquals(newValue, entry.getValue());
} else if (oldValue != null) {
- assertTrue(oldValue.equals(entry.getValue()));
+ assertEquals(oldValue, entry.getValue());
} else {
// not in either
- assert (false);
+ fail();
}
}
}
@@ -1368,24 +1365,22 @@ public class TestConfigSetsAPI extends SolrCloudTestCase {
assertTrue(
"managed-schema.xml file should have been uploaded",
zkClient.exists("/configs/" + configSetName + suffix + "/managed-schema.xml", true));
- assertTrue(
+ assertArrayEquals(
"managed-schema.xml file contents on zookeeper are not exactly same as that of the file uploaded in config",
- Arrays.equals(
- zkClient.getData(
- "/configs/" + configSetName + suffix + "/managed-schema.xml", null, null, true),
- readFile("solr/configsets/upload/" + configSetName + "/managed-schema.xml")));
+ zkClient.getData(
+ "/configs/" + configSetName + suffix + "/managed-schema.xml", null, null, true),
+ readFile("solr/configsets/upload/" + configSetName + "/managed-schema.xml"));
assertTrue(
"solrconfig.xml file should have been uploaded",
zkClient.exists("/configs/" + configSetName + suffix + "/solrconfig.xml", true));
byte data[] = zkClient.getData("/configs/" + configSetName + suffix, null, null, true);
// assertEquals("{\"trusted\": false}", new String(data, StandardCharsets.UTF_8));
- assertTrue(
+ assertArrayEquals(
"solrconfig.xml file contents on zookeeper are not exactly same as that of the file uploaded in config",
- Arrays.equals(
- zkClient.getData(
- "/configs/" + configSetName + suffix + "/solrconfig.xml", null, null, true),
- readFile("solr/configsets/upload/" + configSetName + "/solrconfig.xml")));
+ zkClient.getData(
+ "/configs/" + configSetName + suffix + "/solrconfig.xml", null, null, true),
+ readFile("solr/configsets/upload/" + configSetName + "/solrconfig.xml"));
}
private long uploadConfigSet(
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
index bea102c605b..a93ee2fd171 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
@@ -67,7 +67,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {
static {
try {
DEFAULT_SSL_CONTEXT = SSLContext.getDefault();
- assert null != DEFAULT_SSL_CONTEXT;
+ assertNotNull(DEFAULT_SSL_CONTEXT);
} catch (Exception e) {
throw new RuntimeException(
"Unable to initialize 'Default' SSLContext Algorithm, JVM is borked", e);
@@ -401,7 +401,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {
final SSLConnectionSocketFactory sslFactory =
clientConfig.buildClientSSLConnectionSocketFactory();
- assert null != sslFactory;
+ assertNotNull(sslFactory);
final Registry<ConnectionSocketFactory> socketFactoryReg =
RegistryBuilder.<ConnectionSocketFactory>create()
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java b/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java
index 0567e0ae71f..12959741d59 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java
@@ -116,7 +116,7 @@ public class TestOnReconnectListenerSupport extends AbstractFullDistribZkTestBas
}
// they shouldn't be equal after reload
- assertTrue(!leaderCoreId.equals(reloadedLeaderCoreId));
+ assertNotEquals(leaderCoreId, reloadedLeaderCoreId);
listeners = zkController.getCurrentOnReconnectListeners();
assertNotNull("ZkController returned null OnReconnect listeners", listeners);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
index b4eb112a3c2..012d2477498 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
@@ -504,7 +504,6 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
}
}
} else {
- assert 1 == idsToRequest.size();
params.add("id", idsToRequest.get(0));
}
@@ -644,7 +643,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
}
public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception {
- assert null != client.getDefaultCollection();
+ assertNotNull(client.getDefaultCollection());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(
client.getDefaultCollection(), ZkStateReader.from(client), true, true, 330);
}
@@ -1360,7 +1359,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
final SolrInputDocument expected,
final SolrDocument actual,
final String wt) {
- assertEquals(fl, null, actual.getFirstValue(fieldName));
+ assertNull(fl, actual.getFirstValue(fieldName));
return Collections.emptySet();
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
index 652bfb140dd..468940441d2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
@@ -359,7 +359,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
// check all the final index contents match our expectations
int incorrectDocs = 0;
for (int id = 0; id < numDocsInIndex; id += DOC_ID_INCR) {
- assert 0 == id % DOC_ID_INCR : "WTF? " + id;
+ assertEquals("WTF? " + id, 0, id % DOC_ID_INCR);
final long expect = expected[id / DOC_ID_INCR].longValue();
@@ -421,7 +421,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
}
private void doRandomAtomicUpdate(int docId) throws Exception {
- assert 0 == docId % DOC_ID_INCR : "WTF? " + docId;
+ assertEquals("WTF? " + docId, 0, docId % DOC_ID_INCR);
final int delta = TestUtil.nextInt(rand, -1000, 1000);
log.info("worker={}, docId={}, delta={}", workerId, docId, delta);
@@ -521,7 +521,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
}
public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception {
- assert null != client.getDefaultCollection();
+ assertNotNull(client.getDefaultCollection());
ZkStateReader.from(client).forceUpdateCollection(client.getDefaultCollection());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(
client.getDefaultCollection(), ZkStateReader.from(client), true, true, 330);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
index 760f3e58097..d16ecacce5a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
@@ -600,7 +600,7 @@ public class TestStressInPlaceUpdates extends AbstractFullDistribZkTestBase {
public DocInfo(long version, int val1, long val2) {
// must either be real positive version, or negative deleted version/indicator
- assert version != 0;
+ assertNotEquals(0, version);
this.version = version;
this.intFieldValue = val1;
this.longFieldValue = val2;
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java
index a6ca6604ed7..5c29a30e800 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java
@@ -281,7 +281,7 @@ public class TestTlogReplayVsRecovery extends SolrCloudTestCase {
assertEquals(0, rsp.getStatus());
String match = JSONTestUtil.matchObj("/id", rsp.getResponse().get("doc"), docId);
- assertTrue(
+ assertNull(
"Doc with id="
+ docId
+ " not found in "
@@ -290,6 +290,6 @@ public class TestTlogReplayVsRecovery extends SolrCloudTestCase {
+ match
+ "; rsp="
+ rsp,
- match == null);
+ match);
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
index a195a9fcb59..45586dd4858 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
@@ -214,7 +214,7 @@ public class TestTlogReplica extends SolrCloudTestCase {
0,
docCollection.getReplicas(EnumSet.of(Replica.Type.PULL)).size());
for (Slice s : docCollection.getSlices()) {
- assertTrue(s.getLeader().getType() == Replica.Type.TLOG);
+ assertSame(s.getLeader().getType(), Replica.Type.TLOG);
List<String> shardElectionNodes =
cluster
.getZkClient()
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
index 7bfcf85bea2..a2fac59809e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
@@ -241,15 +241,16 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {
(hiBound < 0) ? maxDocId : hiBound - 1);
if (lo != hi) {
- assert lo < hi : "lo=" + lo + " hi=" + hi;
+ assertTrue("lo=" + lo + " hi=" + hi, lo < hi);
// NOTE: clear & set are exclusive of hi, so we use "}" in range query accordingly
q = "id_i:[" + lo + " TO " + hi + "}";
expectedDocIds.clear(lo, hi);
docsAffectedThisRequest.set(lo, hi);
} else {
// edge case: special case DBQ of one doc
- assert (lo == rangeAxis && hi == rangeAxis)
- : "lo=" + lo + " axis=" + rangeAxis + " hi=" + hi;
+ assertTrue(
+ "lo=" + lo + " axis=" + rangeAxis + " hi=" + hi,
+ lo == rangeAxis && hi == rangeAxis);
q = "id_i:[" + lo + " TO " + lo + "]"; // have to be inclusive of both ends
expectedDocIds.clear(lo);
docsAffectedThisRequest.set(lo);
@@ -319,9 +320,10 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {
final int max = atLeast(100);
BitSet bits = new BitSet(max + 1);
for (int i = 0; i <= max; i++) {
- assertFalse(
+ assertNotEquals(
"how is bitset already full? iter=" + i + " card=" + bits.cardinality() + "/max=" + max,
- bits.cardinality() == max + 1);
+ bits.cardinality(),
+ max + 1);
final int nextBit = randomUnsetBit(random(), bits, max);
assertTrue("nextBit shouldn't be negative yet: " + nextBit, 0 <= nextBit);
assertTrue("nextBit can't exceed max: " + nextBit, nextBit <= max);
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java
index 948e901b645..b06ab9bbd66 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java
@@ -100,7 +100,7 @@ public class SimpleCollectionCreateDeleteTest extends AbstractFullDistribZkTestB
CollectionAdminRequest.createCollection(collectionName, 1, 1)
.setCreateNodeSet(notOverseerNode);
request = create.process(cloudClient).getResponse();
- assertTrue("Collection creation should not have failed", request.get("success") != null);
+ assertNotNull("Collection creation should not have failed", request.get("success"));
}
}
@@ -175,9 +175,9 @@ public class SimpleCollectionCreateDeleteTest extends AbstractFullDistribZkTestB
NamedList<Object> requestWithSharedConfig =
createWithSharedConfig.process(cloudClient).getResponse();
- assertTrue(
+ assertNotNull(
"The collection with shared config set should have been created",
- requestWithSharedConfig.get("success") != null);
+ requestWithSharedConfig.get("success"));
assertTrue(
"The new collection should exist after a successful creation",
getZkClient()
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java
index 3c228f3841e..3991c1d229b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java
@@ -218,7 +218,7 @@ public class SplitByPrefixTest extends SolrCloudTestCase {
Slice slice2 = slices2.iterator().next();
assertTrue(slices1.size() == 1 && slices2.size() == 1);
- assertTrue(slice1 != slice2);
+ assertNotSame(slice1, slice2);
//
// now let's add enough documents to the first prefix to get it split out on its own
@@ -251,7 +251,7 @@ public class SplitByPrefixTest extends SolrCloudTestCase {
slice2 = slices2.iterator().next();
assertTrue(slices1.size() == 1 && slices2.size() == 1);
- assertTrue(slice1 != slice2);
+ assertNotSame(slice1, slice2);
// Now if we call split (with splitByPrefix) on a shard that has a single prefix, it should
// split it in half
@@ -274,7 +274,7 @@ public class SplitByPrefixTest extends SolrCloudTestCase {
collection.getRouter().getSearchSlicesSingle(uniquePrefixes.get(0).key, null, collection);
slice1 = slices1.iterator().next();
- assertTrue(slices1.size() == 2);
+ assertEquals(2, slices1.size());
//
// split one more time, this time on a partial prefix/bucket
@@ -296,7 +296,7 @@ public class SplitByPrefixTest extends SolrCloudTestCase {
slices1 =
collection.getRouter().getSearchSlicesSingle(uniquePrefixes.get(0).key, null, collection);
- assertTrue(slices1.size() == 3);
+ assertEquals(3, slices1.size());
// System.err.println("### STATE=" +
// cluster.getSolrClient().getZkStateReader().getClusterState().getCollection(COLLECTION_NAME));
diff --git a/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java b/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java
index 4f007b73708..5813fb9512c 100644
--- a/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java
+++ b/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java
@@ -261,10 +261,9 @@ public class ClusterEventProducerTest extends SolrCloudTestCase {
ClusterEvent.EventType.CLUSTER_PROPERTIES_CHANGED,
event.getType());
propertiesChanged = (ClusterPropertiesChangedEvent) event;
- assertEquals(
+ assertNull(
"new properties should not have 'ext.foo' property: "
+ propertiesChanged.getNewClusterProperties(),
- null,
propertiesChanged.getNewClusterProperties().get("ext.foo"));
}
diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
index 40d04aa8e64..04c3af33f3b 100644
--- a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
@@ -806,7 +806,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {
PlacementPlan pp = plugin.computePlacement(placementRequest, placementContext);
assertEquals(4, pp.getReplicaPlacements().size());
for (ReplicaPlacement rp : pp.getReplicaPlacements()) {
- assertFalse("should not put any replicas on " + smallNode, rp.getNode().equals(smallNode));
+ assertNotEquals("should not put any replicas on " + smallNode, rp.getNode(), smallNode);
}
}
diff --git a/solr/core/src/test/org/apache/solr/common/cloud/ZkDynamicConfigTest.java b/solr/core/src/test/org/apache/solr/common/cloud/ZkDynamicConfigTest.java
index cf331ee2da7..e260a8a9981 100644
--- a/solr/core/src/test/org/apache/solr/common/cloud/ZkDynamicConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/common/cloud/ZkDynamicConfigTest.java
@@ -56,9 +56,9 @@ public class ZkDynamicConfigTest extends SolrTestCaseJ4 {
// client address/port optional if clientPort specified in static config file (back-compat mode)
assertEquals("participant", parsed.getServers().get(3).role);
- assertEquals(null, parsed.getServers().get(3).clientPortAddress);
+ assertNull(parsed.getServers().get(3).clientPortAddress);
assertEquals("zoo4", parsed.getServers().get(3).resolveClientPortAddress());
- assertEquals(null, parsed.getServers().get(3).clientPort);
+ assertNull(parsed.getServers().get(3).clientPort);
}
@Test(expected = SolrException.class)
diff --git a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
index d9237a47c29..8ad5ee12b76 100644
--- a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
+++ b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
@@ -17,11 +17,6 @@
package org.apache.solr.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
@@ -44,7 +39,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-public class BlobRepositoryMockingTest {
+public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
private static final Charset UTF8 = StandardCharsets.UTF_8;
private static final String[][] PARSED =
@@ -71,7 +66,8 @@ public class BlobRepositoryMockingTest {
}
@Before
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
blobFetched = false;
blobKey = "";
reset(mocks);
diff --git a/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java b/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
index 9ca486a2b13..9eca696f0e0 100644
--- a/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
+++ b/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
@@ -154,11 +154,11 @@ public class CoreSorterTest extends SolrTestCaseJ4 {
for (Map.Entry<CountsForEachShard, List<CoreDescriptor>> entry : myCountsToDescs.entrySet()) {
for (CoreDescriptor descriptor : entry.getValue()) {
CountsForEachShard prev = myDescsToCounts.put(descriptor, entry.getKey());
- assert prev == null; // sanity check
+ assertNull(prev); // sanity check
}
}
- assert myCountsToDescs.size() == perShardCounts.size(); // just a sanity check
+ assertEquals(myCountsToDescs.size(), perShardCounts.size()); // just a sanity check
CoreContainer mockCC = mock(CoreContainer.class);
{
diff --git a/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
index 2493dd6d3a1..1ceb9636b20 100644
--- a/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
@@ -151,9 +151,9 @@ public class ExitableDirectoryReaderTest extends SolrTestCaseJ4 {
assertEquals("Should have exactly " + NUM_DOCS, (long) (body.get("numFound")), NUM_DOCS);
header = (Map<?, ?>) (res.get("responseHeader"));
- assertTrue(
+ assertNull(
"Should NOT have partial results",
- header.get(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY) == null);
+ header.get(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY));
}
// When looking at a problem raised on the user's list I ran across this anomaly with timeAllowed
diff --git a/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java b/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java
index 57e63a7984b..d57c650e967 100644
--- a/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java
+++ b/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java
@@ -78,7 +78,7 @@ public class PluginInfoTest extends DOMUtilTestBase {
Node nodeWithAName = getNode("<plugin name=\"myName\" />", "plugin");
PluginInfo pi2 = new PluginInfo(nodeWithAName, "Node with a Name", true, false);
- assertTrue(pi2.name.equals("myName"));
+ assertEquals("myName", pi2.name);
}
@Test
@@ -99,7 +99,7 @@ public class PluginInfoTest extends DOMUtilTestBase {
Node nodeWithAClass = getNode("<plugin class=\"myName\" />", "plugin");
PluginInfo pi2 = new PluginInfo(nodeWithAClass, "Node with a Class", false, true);
- assertTrue(pi2.className.equals("myName"));
+ assertEquals("myName", pi2.className);
}
@Test
@@ -133,7 +133,7 @@ public class PluginInfoTest extends DOMUtilTestBase {
public void testHasChildren() throws Exception {
Node node = getNode(configWith2Children, "plugin");
PluginInfo pi = new PluginInfo(node, "node with 2 Children", false, false);
- assertTrue(pi.children.size() == 2);
+ assertEquals(2, pi.children.size());
}
@Test
@@ -145,7 +145,7 @@ public class PluginInfoTest extends DOMUtilTestBase {
PluginInfo notExistent = pi.getChild("doesnotExist");
assertNull(notExistent);
assertTrue(childInfo instanceof PluginInfo);
- assertTrue((Integer) childInfo.initArgs.get("index") == 0);
+ assertEquals(0, (int) (Integer) childInfo.initArgs.get("index"));
Node node2 = getNode(configWithNoChildren, "plugin");
PluginInfo pi2 = new PluginInfo(node2, "with No Children", false, false);
PluginInfo noChild = pi2.getChild("long");
@@ -157,7 +157,7 @@ public class PluginInfoTest extends DOMUtilTestBase {
Node node = getNode(configWith2Children, "plugin");
PluginInfo pi = new PluginInfo(node, "with children", false, false);
List<PluginInfo> children = pi.getChildren("child");
- assertTrue(children.size() == 2);
+ assertEquals(2, children.size());
for (PluginInfo childInfo : children) {
assertNotNull(childInfo);
assertTrue(childInfo instanceof PluginInfo);
@@ -168,6 +168,6 @@ public class PluginInfoTest extends DOMUtilTestBase {
public void testInitArgsCount() throws Exception {
Node node = getNode(configWithNoChildren, "plugin");
PluginInfo pi = new PluginInfo(node, "from static", true, false);
- assertTrue(pi.initArgs.size() == node.getChildNodes().getLength());
+ assertEquals(pi.initArgs.size(), node.getChildNodes().getLength());
}
}
diff --git a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
index d766c5d8837..e5f53892b24 100644
--- a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
+++ b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
@@ -90,12 +90,12 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {
assertEquals(fq_ac, fq_aa);
assertEquals(fq_ac, fq_ab);
- assertTrue(!fq_aa.equals(fq_zz));
- assertTrue(!fq_ab.equals(fq_zz));
- assertTrue(!fq_ac.equals(fq_zz));
- assertTrue(!fq_zz.equals(fq_aa));
- assertTrue(!fq_zz.equals(fq_ab));
- assertTrue(!fq_zz.equals(fq_ac));
+ assertNotEquals(fq_aa, fq_zz);
+ assertNotEquals(fq_ab, fq_zz);
+ assertNotEquals(fq_ac, fq_zz);
+ assertNotEquals(fq_zz, fq_aa);
+ assertNotEquals(fq_zz, fq_ab);
+ assertNotEquals(fq_zz, fq_ac);
List<Query> filters1 = Arrays.asList(fq_aa, fq_ab);
List<Query> filters2 = Arrays.asList(fq_zz, fq_ac);
@@ -134,7 +134,6 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {
assertKeyNotEquals(aa, bb);
}
}
- assert minIters <= iter;
}
public void testMinExactCount() {
@@ -166,8 +165,8 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {
/** does bi-directional check that the keys are <em>not</em> equals */
public void assertKeyNotEquals(QueryResultKey key1, QueryResultKey key2) {
- assertTrue(!key1.equals(key2));
- assertTrue(!key2.equals(key1));
+ assertNotEquals(key1, key2);
+ assertNotEquals(key2, key1);
}
/**
diff --git a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
index 80d8c1f9c62..7ac9d6a107e 100644
--- a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
+++ b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
@@ -131,6 +131,6 @@ public class RequestHandlersTest extends SolrTestCaseJ4 {
Long updateTime = (Long) updateStats.get("UPDATE./update.totalTime");
Long termTime = (Long) termStats.get("QUERY./terms.totalTime");
- assertFalse("RequestHandlers should not share statistics!", updateTime.equals(termTime));
+ assertNotEquals("RequestHandlers should not share statistics!", updateTime, termTime);
}
}
diff --git a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
index 9a49035e796..1e81af74233 100644
--- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
@@ -27,7 +27,6 @@ import java.nio.charset.CharacterCodingException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -166,11 +165,12 @@ public class ResourceLoaderTest extends SolrTestCaseJ4 {
assertEquals(
"Should have been able to read 3 bytes from bomStream", 3, bomStream.read(firstBytes));
- assertTrue(
+ assertArrayEquals(
"This test only works if "
+ fileWithBom
+ " contains a BOM -- it appears someone removed it.",
- Arrays.equals(bomExpected, firstBytes));
+ bomExpected,
+ firstBytes);
} finally {
try {
bomStream.close();
diff --git a/solr/core/src/test/org/apache/solr/core/SOLR749Test.java b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
index cdc5e63dbd4..7af7beb55bb 100644
--- a/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
+++ b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
@@ -38,15 +38,15 @@ public class SOLR749Test extends SolrTestCaseJ4 {
public void testConstruction() {
SolrCore core = h.getCore();
- assertTrue("core is null and it shouldn't be", core != null);
+ assertNotNull("core is null and it shouldn't be", core);
QParserPlugin parserPlugin = core.getQueryPlugin(QParserPlugin.DEFAULT_QTYPE);
- assertTrue("parserPlugin is null and it shouldn't be", parserPlugin != null);
+ assertNotNull("parserPlugin is null and it shouldn't be", parserPlugin);
assertTrue(
"parserPlugin is not an instanceof " + FooQParserPlugin.class,
parserPlugin instanceof FooQParserPlugin);
ValueSourceParser vsp = core.getValueSourceParser("boost");
- assertTrue("vsp is null and it shouldn't be", vsp != null);
+ assertNotNull("vsp is null and it shouldn't be", vsp);
assertTrue(
"vsp is not an instanceof " + DummyValueSourceParser.class,
vsp instanceof DummyValueSourceParser);
diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
index a84eec13a99..b7cd61e99e7 100644
--- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
@@ -158,17 +158,17 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
assertEquals(core.getRequestHandlers().get(path), handler1);
core.close();
cores.shutdown();
- assertTrue("Handler not closed", handler1.closed == true);
+ assertTrue("Handler not closed", handler1.closed);
}
@Test
public void testRefCount() {
SolrCore core = h.getCore();
- assertTrue("Refcount != 1", core.getOpenCount() == 1);
+ assertEquals("Refcount != 1", 1, core.getOpenCount());
final CoreContainer cores = h.getCoreContainer();
SolrCore c1 = cores.getCore(SolrTestCaseJ4.DEFAULT_TEST_CORENAME);
- assertTrue("Refcount != 2", core.getOpenCount() == 2);
+ assertEquals("Refcount != 2", 2, core.getOpenCount());
ClosingRequestHandler handler1 = new ClosingRequestHandler();
handler1.inform(core);
@@ -181,26 +181,26 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
SolrCore c2 = cores.getCore(SolrTestCaseJ4.DEFAULT_TEST_CORENAME);
c1.close();
assertTrue("Refcount < 1", core.getOpenCount() >= 1);
- assertTrue("Handler is closed", handler1.closed == false);
+ assertFalse("Handler is closed", handler1.closed);
c1 = cores.getCore(SolrTestCaseJ4.DEFAULT_TEST_CORENAME);
assertTrue("Refcount < 2", core.getOpenCount() >= 2);
- assertTrue("Handler is closed", handler1.closed == false);
+ assertFalse("Handler is closed", handler1.closed);
c2.close();
assertTrue("Refcount < 1", core.getOpenCount() >= 1);
- assertTrue("Handler is closed", handler1.closed == false);
+ assertFalse("Handler is closed", handler1.closed);
c1.close();
cores.shutdown();
- assertTrue("Refcount != 0", core.getOpenCount() == 0);
+ assertEquals("Refcount != 0", 0, core.getOpenCount());
assertTrue("Handler not closed", core.isClosed() && handler1.closed == true);
}
@Test
public void testRefCountMT() throws Exception {
SolrCore core = h.getCore();
- assertTrue("Refcount != 1", core.getOpenCount() == 1);
+ assertEquals("Refcount != 1", 1, core.getOpenCount());
final ClosingRequestHandler handler1 = new ClosingRequestHandler();
handler1.inform(core);
@@ -239,7 +239,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
yieldInt(l);
assertTrue("Refcount > 17", core.getOpenCount() <= 17);
yieldInt(l);
- assertTrue("Handler is closed", handler1.closed == false);
+ assertFalse("Handler is closed", handler1.closed);
yieldInt(l);
core.close();
core = null;
@@ -260,7 +260,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
}
cores.shutdown();
- assertTrue("Refcount != 0", core.getOpenCount() == 0);
+ assertEquals("Refcount != 0", 0, core.getOpenCount());
assertTrue("Handler not closed", core.isClosed() && handler1.closed == true);
service.shutdown();
@@ -292,8 +292,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
assertEquals(
"wrong config for slowQueryThresholdMillis", 2000, solrConfig.slowQueryThresholdMillis);
assertEquals("wrong config for maxBooleanClauses", 1024, solrConfig.booleanQueryMaxClauseCount);
- assertEquals(
- "wrong config for enableLazyFieldLoading", true, solrConfig.enableLazyFieldLoading);
+ assertTrue("wrong config for enableLazyFieldLoading", solrConfig.enableLazyFieldLoading);
assertEquals("wrong config for queryResultWindowSize", 10, solrConfig.queryResultWindowSize);
}
@@ -311,7 +310,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
// make up for the fact that opening a searcher in this empty core is very fast by opening new
// searchers continuously to increase the likelihood for race.
SolrCore core = h.getCore();
- assertTrue("Refcount != 1", core.getOpenCount() == 1);
+ assertEquals("Refcount != 1", 1, core.getOpenCount());
executor.execute(new NewSearcherRunnable(core));
// Since we called getCore() vs getCoreInc() and don't own a refCount, the container should
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java
index 6e5a3a24220..2c17cbf1e1a 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java
@@ -31,7 +31,6 @@ import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.IndexSchemaFactory;
import org.apache.solr.search.CacheConfig;
import org.apache.solr.update.SolrIndexConfig;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -164,7 +163,7 @@ public class TestConfig extends SolrTestCaseJ4 {
SolrIndexConfig sic = sc.indexConfig;
++numDefaultsTested;
- assertEquals("default useCompoundFile", false, sic.useCompoundFile);
+ assertFalse("default useCompoundFile", sic.useCompoundFile);
++numDefaultsTested;
assertEquals("default maxBufferedDocs", -1, sic.maxBufferedDocs);
@@ -221,16 +220,14 @@ public class TestConfig extends SolrTestCaseJ4 {
public void testConvertAutoCommitMaxSizeStringToBytes() {
// Valid values
- Assert.assertEquals(300, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300"));
- Assert.assertEquals(307200, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300k"));
- Assert.assertEquals(307200, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300K"));
- Assert.assertEquals(314572800, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300m"));
- Assert.assertEquals(314572800, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300M"));
- Assert.assertEquals(
- 322122547200L, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300g"));
- Assert.assertEquals(
- 322122547200L, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300G"));
- Assert.assertEquals(-1, SolrConfig.convertHeapOptionStyleConfigStringToBytes(""));
+ assertEquals(300, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300"));
+ assertEquals(307200, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300k"));
+ assertEquals(307200, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300K"));
+ assertEquals(314572800, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300m"));
+ assertEquals(314572800, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300M"));
+ assertEquals(322122547200L, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300g"));
+ assertEquals(322122547200L, SolrConfig.convertHeapOptionStyleConfigStringToBytes("300G"));
+ assertEquals(-1, SolrConfig.convertHeapOptionStyleConfigStringToBytes(""));
// Invalid values
RuntimeException thrown =
@@ -256,9 +253,9 @@ public class TestConfig extends SolrTestCaseJ4 {
public void testMaxSizeSettingWithoutAutoCommit() throws Exception {
SolrConfig solrConfig =
new SolrConfig(TEST_PATH().resolve("collection1"), "bad-solrconfig-no-autocommit-tag.xml");
- Assert.assertEquals(-1, solrConfig.getUpdateHandlerInfo().autoCommitMaxSizeBytes);
- Assert.assertEquals(-1, solrConfig.getUpdateHandlerInfo().autoCommmitMaxDocs);
- Assert.assertEquals(-1, solrConfig.getUpdateHandlerInfo().autoCommmitMaxTime);
+ assertEquals(-1, solrConfig.getUpdateHandlerInfo().autoCommitMaxSizeBytes);
+ assertEquals(-1, solrConfig.getUpdateHandlerInfo().autoCommmitMaxDocs);
+ assertEquals(-1, solrConfig.getUpdateHandlerInfo().autoCommmitMaxTime);
}
// sanity check that sys properties are working as expected
diff --git a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
index d27bff8fbd8..1fde25d409c 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
@@ -51,7 +51,6 @@ import org.apache.solr.servlet.SolrDispatchFilter;
import org.apache.solr.util.ModuleUtils;
import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -455,7 +454,7 @@ public class TestCoreContainer extends SolrTestCaseJ4 {
SolrDispatchFilter.SOLR_INSTALL_DIR_ATTRIBUTE, tmpRoot.toAbsolutePath().toString());
final CoreContainer cc1 = init(tmpRoot, "<solr></solr>");
try {
- Assert.assertThrows(
+ assertThrows(
SolrResourceNotFoundException.class,
() -> cc1.loader.openResource("moduleLibFile").close());
} finally {
@@ -471,7 +470,7 @@ public class TestCoreContainer extends SolrTestCaseJ4 {
}
SolrException ex =
- Assert.assertThrows(
+ assertThrows(
SolrException.class,
() -> init(tmpRoot, "<solr><str name=\"modules\">nope</str></solr>"));
assertEquals("No module with name nope", ex.getMessage());
diff --git a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
index 5c357d7e6c4..0c282618d82 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
@@ -131,13 +131,15 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
long status = container.getStatus();
- assertTrue("Load complete flag should be set", (status & LOAD_COMPLETE) == LOAD_COMPLETE);
- assertTrue(
+ assertEquals("Load complete flag should be set", LOAD_COMPLETE, (status & LOAD_COMPLETE));
+ assertEquals(
"Core discovery should be complete",
- (status & CORE_DISCOVERY_COMPLETE) == CORE_DISCOVERY_COMPLETE);
- assertTrue(
+ CORE_DISCOVERY_COMPLETE,
+ (status & CORE_DISCOVERY_COMPLETE));
+ assertEquals(
"Initial core loading should be complete",
- (status & INITIAL_CORE_LOAD_COMPLETE) == INITIAL_CORE_LOAD_COMPLETE);
+ INITIAL_CORE_LOAD_COMPLETE,
+ (status & INITIAL_CORE_LOAD_COMPLETE));
return container;
}
diff --git a/solr/core/src/test/org/apache/solr/core/TestCorePropertiesReload.java b/solr/core/src/test/org/apache/solr/core/TestCorePropertiesReload.java
index af838144fb7..c2fe57d39ac 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCorePropertiesReload.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCorePropertiesReload.java
@@ -45,7 +45,7 @@ public class TestCorePropertiesReload extends SolrTestCaseJ4 {
SolrCore core = h.getCore();
CoreDescriptor coreDescriptor = core.getCoreDescriptor();
String testProp = coreDescriptor.getCoreProperty("test", null);
- assertTrue(testProp.equals("Before reload"));
+ assertEquals("Before reload", testProp);
// Re-write the properties file
Properties props = new Properties();
@@ -57,7 +57,7 @@ public class TestCorePropertiesReload extends SolrTestCaseJ4 {
coreDescriptor = core.getCoreDescriptor();
testProp = coreDescriptor.getCoreProperty("test", null);
- assertTrue(testProp.equals("After reload"));
+ assertEquals("After reload", testProp);
}
private void writeProperties(Properties props) throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
index ab5acbda0db..126c2219134 100644
--- a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
@@ -69,7 +69,7 @@ public class TestMergePolicyConfig extends SolrTestCaseJ4 {
public void testDefaultMergePolicyConfig() throws Exception {
initCore("solrconfig-mergepolicy-defaults.xml", "schema-minimal.xml");
IndexWriterConfig iwc = solrConfig.indexConfig.toIndexWriterConfig(h.getCore());
- assertEquals(false, iwc.getUseCompoundFile());
+ assertFalse(iwc.getUseCompoundFile());
TieredMergePolicy tieredMP = assertAndCast(TieredMergePolicy.class, iwc.getMergePolicy());
assertEquals(TieredMergePolicy.DEFAULT_NO_CFS_RATIO, tieredMP.getNoCFSRatio(), 0.0D);
diff --git a/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java
index a37ce82f4a5..c61e0d2f0e5 100644
--- a/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java
+++ b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java
@@ -78,9 +78,10 @@ public class TestQuerySenderListener extends SolrTestCaseJ4 {
{
String evt = mock.req.getParams().get(EventParams.EVENT);
assertNotNull("Event is null", evt);
- assertTrue(
+ assertEquals(
evt + " is not equal to " + EventParams.FIRST_SEARCHER,
- evt.equals(EventParams.FIRST_SEARCHER) == true);
+ EventParams.FIRST_SEARCHER,
+ evt);
assertU(adoc("id", "1"));
assertU(commit());
@@ -91,9 +92,10 @@ public class TestQuerySenderListener extends SolrTestCaseJ4 {
newSearcher -> {
String evt = mock.req.getParams().get(EventParams.EVENT);
assertNotNull("Event is null", evt);
- assertTrue(
+ assertEquals(
evt + " is not equal to " + EventParams.NEW_SEARCHER,
- evt.equals(EventParams.NEW_SEARCHER) == true);
+ EventParams.NEW_SEARCHER,
+ evt);
return null;
});
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
index 47a0ad3a6ba..75efcb3b508 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
@@ -109,6 +109,6 @@ public class TestSolrDeletionPolicy1 extends SolrTestCaseJ4 {
assertQ("return all docs", req("id:[0 TO 6]"), "*[count(//doc)=6]");
commits = delPolicy.getCommits();
- assertTrue(!commits.containsKey(ic.getGeneration()));
+ assertFalse(commits.containsKey(ic.getGeneration()));
}
}
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java
index b072721c8e4..74a2301d07b 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java
@@ -35,19 +35,18 @@ public class TestSolrDeletionPolicy2 extends SolrTestCaseJ4 {
FakeDeletionPolicy f = (FakeDeletionPolicy) delPolicy.getWrappedDeletionPolicy();
- assertTrue("value1".equals(f.getVar1()));
- assertTrue("value2".equals(f.getVar2()));
+ assertEquals("value1", f.getVar1());
+ assertEquals("value2", f.getVar2());
assertU(adoc("id", String.valueOf(1), "name", "name" + String.valueOf(1)));
- assertTrue(
- System.getProperty("onInit").equals("test.org.apache.solr.core.FakeDeletionPolicy.onInit"));
+ assertEquals(
+ "test.org.apache.solr.core.FakeDeletionPolicy.onInit", System.getProperty("onInit"));
assertU(commit());
assertQ("return all docs", req("id:[0 TO 1]"), "*[count(//doc)=1]");
- assertTrue(
- System.getProperty("onCommit")
- .equals("test.org.apache.solr.core.FakeDeletionPolicy.onCommit"));
+ assertEquals(
+ "test.org.apache.solr.core.FakeDeletionPolicy.onCommit", System.getProperty("onCommit"));
System.clearProperty("onInit");
System.clearProperty("onCommit");
diff --git a/solr/core/src/test/org/apache/solr/core/backup/BackupFilePathsTest.java b/solr/core/src/test/org/apache/solr/core/backup/BackupFilePathsTest.java
index 06dde0c0eb9..8b382ac7a4e 100644
--- a/solr/core/src/test/org/apache/solr/core/backup/BackupFilePathsTest.java
+++ b/solr/core/src/test/org/apache/solr/core/backup/BackupFilePathsTest.java
@@ -16,16 +16,13 @@
*/
package org.apache.solr.core.backup;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.util.List;
import java.util.Optional;
+import org.apache.solr.SolrTestCase;
import org.junit.Test;
/** Unit tests for {@link BackupFilePaths} */
-public class BackupFilePathsTest {
+public class BackupFilePathsTest extends SolrTestCase {
@Test
public void testGetBackupPropsName() {
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
index 93d74aecfbd..ed4788f63c3 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
@@ -276,7 +276,7 @@ public class TestSolrCoreSnapshots extends SolrCloudTestCase {
// Verify that the index directory contains only 1 index commit (which is not the same as the
// snapshotted commit).
Collection<IndexCommit> commits = listCommits(metaData.getIndexDirPath());
- assertTrue(commits.size() == 1);
+ assertEquals(1, commits.size());
assertFalse(
commits.stream()
.filter(x -> x.getGeneration() == metaData.getGenerationNumber())
diff --git a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
index 1e74ce58842..11bcd7cf96f 100644
--- a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
@@ -64,7 +64,7 @@ public class BinaryUpdateRequestHandlerTest extends SolrTestCaseJ4 {
csl.load(req, rsp, cs, p);
AddUpdateCommand add = p.addCommands.get(0);
System.out.println(add.solrDoc);
- assertEquals(false, add.overwrite);
+ assertFalse(add.overwrite);
assertEquals(100, add.commitWithin);
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
index 45f19dae200..b6f8cbd1f34 100644
--- a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
@@ -192,7 +192,7 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
@SuppressWarnings({"rawtypes"})
NamedList<NamedList> result =
handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
@SuppressWarnings({"rawtypes"})
NamedList<NamedList> fieldTypes = result.get("field_types");
@@ -521,7 +521,7 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
@SuppressWarnings({"rawtypes"})
NamedList<NamedList> result =
handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
@SuppressWarnings({"unchecked", "rawtypes"})
NamedList<NamedList> fieldTypes = result.get("field_types");
@@ -561,7 +561,7 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
@SuppressWarnings({"rawtypes"})
NamedList<NamedList> result =
handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
@SuppressWarnings({"unchecked", "rawtypes"})
NamedList<NamedList> fieldTypes = result.get("field_types");
@@ -645,7 +645,7 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
@SuppressWarnings({"rawtypes"})
NamedList<NamedList> result =
handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
@SuppressWarnings({"rawtypes"})
NamedList<NamedList> fieldTypes = result.get("field_types");
diff --git a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
index ca4067c6ebe..cba62c4fd54 100644
--- a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
@@ -467,7 +467,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
AddUpdateCommand add = p.addCommands.get(0);
assertEquals(add.commitWithin, -1);
- assertEquals(add.overwrite, true);
+ assertTrue(add.overwrite);
assertEquals("SolrInputDocument(fields: [id=1, val_s={add=foo}])", add.solrDoc.toString());
req.close();
@@ -706,47 +706,47 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
assertEquals(9, p.deleteCommands.size());
DeleteUpdateCommand delete = p.deleteCommands.get(0);
assertEquals(delete.id, "10");
- assertEquals(delete.query, null);
+ assertNull(delete.query);
assertEquals(delete.commitWithin, -1);
delete = p.deleteCommands.get(1);
assertEquals(delete.id, "20");
- assertEquals(delete.query, null);
+ assertNull(delete.query);
assertEquals(delete.commitWithin, -1);
delete = p.deleteCommands.get(2);
assertEquals(delete.id, "30");
- assertEquals(delete.query, null);
+ assertNull(delete.query);
assertEquals(delete.commitWithin, -1);
delete = p.deleteCommands.get(3);
assertEquals(delete.id, "40");
- assertEquals(delete.query, null);
+ assertNull(delete.query);
assertEquals(delete.commitWithin, -1);
delete = p.deleteCommands.get(4);
assertEquals(delete.id, "50");
- assertEquals(delete.query, null);
+ assertNull(delete.query);
assertEquals(delete.getVersion(), 12345L);
delete = p.deleteCommands.get(5);
assertEquals(delete.id, "60");
- assertEquals(delete.query, null);
+ assertNull(delete.query);
assertEquals(delete.getVersion(), 67890L);
delete = p.deleteCommands.get(6);
assertEquals(delete.id, "70");
- assertEquals(delete.query, null);
+ assertNull(delete.query);
assertEquals(delete.getVersion(), 77777L);
delete = p.deleteCommands.get(7);
- assertEquals(delete.id, null);
+ assertNull(delete.id);
assertEquals(delete.query, "id:80");
assertEquals(delete.getVersion(), 88888L);
delete = p.deleteCommands.get(8);
assertEquals(delete.id, "90");
- assertEquals(delete.query, null);
+ assertNull(delete.query);
assertEquals(delete.getRoute(), "shard1");
assertEquals(delete.getVersion(), 88888L);
@@ -815,7 +815,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
@Test
public void testChildDocWithoutId() throws Exception {
final String json = DUP_KEYS_ANON_CHILD_DOCS_JSON.replace("\"id\": \"3\",\n", "");
- assert !json.equals(DUP_KEYS_ANON_CHILD_DOCS_JSON);
+ assertFalse(json.equals(DUP_KEYS_ANON_CHILD_DOCS_JSON));
checkTwoAnonymousChildDocs(json, false);
}
diff --git a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
index 29b085c6049..a904a438ba4 100644
--- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
@@ -87,7 +87,7 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {
public void testEnablingServer() throws Exception {
- assertTrue(!healthcheckFile.exists());
+ assertFalse(healthcheckFile.exists());
// first make sure that ping responds back that the service is disabled
SolrQueryResponse sqr = makeRequest(handler, req());
@@ -116,7 +116,7 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {
public void testDisablingServer() throws Exception {
- assertTrue(!healthcheckFile.exists());
+ assertFalse(healthcheckFile.exists());
healthcheckFile.createNewFile();
diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
index a6523454389..ab4743f189a 100644
--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
@@ -16,9 +16,6 @@
*/
package org.apache.solr.handler;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -111,7 +108,7 @@ public final class ReplicationTestHelper {
Long maxVersionClient2 = getVersion(client2);
if (maxVersionClient1 > 0 && maxVersionClient2 > 0) {
- assertEquals(maxVersionClient1, maxVersionClient2);
+ SolrTestCaseJ4.assertEquals(maxVersionClient1, maxVersionClient2);
}
// check vs /replication?command=indexversion call
@@ -123,13 +120,13 @@ public final class ReplicationTestHelper {
NamedList<Object> resp = client1.request(req);
assertReplicationResponseSucceeded(resp);
Long version = (Long) resp.get("indexversion");
- assertEquals(maxVersionClient1, version);
+ SolrTestCaseJ4.assertEquals(maxVersionClient1, version);
// check vs /replication?command=indexversion call
resp = client2.request(req);
assertReplicationResponseSucceeded(resp);
version = (Long) resp.get("indexversion");
- assertEquals(maxVersionClient2, version);
+ SolrTestCaseJ4.assertEquals(maxVersionClient2, version);
}
@SuppressWarnings({"unchecked"})
@@ -202,15 +199,16 @@ public final class ReplicationTestHelper {
@SuppressWarnings("unchecked")
NamedList<Object> details = (NamedList<Object>) res.get("details");
- assertNotNull("null details", details);
+ SolrTestCaseJ4.assertNotNull("null details", details);
return details;
}
public static void assertReplicationResponseSucceeded(NamedList<?> response) {
- assertNotNull("null response from server", response);
- assertNotNull("Expected replication response to have 'status' field", response.get("status"));
- assertEquals("OK", response.get("status"));
+ SolrTestCaseJ4.assertNotNull("null response from server", response);
+ SolrTestCaseJ4.assertNotNull(
+ "Expected replication response to have 'status' field", response.get("status"));
+ SolrTestCaseJ4.assertEquals("OK", response.get("status"));
}
public static void pullFromTo(String srcUrl, String destUrl) throws IOException {
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
index 4a894b25052..ccb342ee316 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -877,7 +877,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
// compare results
String cmp =
BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
// index fetch from the follower to the leader
@@ -896,7 +896,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderQueryRsp = rQuery(nDocs + 3, "*:*", leaderClient);
leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
cmp = BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
assertVersions(leaderClient, followerClient);
@@ -910,7 +910,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderQueryRsp = rQuery(nDocs + 3, "*:*", leaderClient);
leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
cmp = BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
assertVersions(leaderClient, followerClient);
@@ -932,7 +932,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderQueryRsp = rQuery(nDocs + 3, "*:*", leaderClient);
leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
cmp = BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
assertVersions(leaderClient, followerClient);
pullFromTo(followerJetty, leaderJetty);
@@ -945,7 +945,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderQueryRsp = rQuery(nDocs + 3, "*:*", leaderClient);
leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
cmp = BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
assertVersions(leaderClient, followerClient);
@@ -1031,7 +1031,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
// compare results
String cmp =
BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
assertVersions(leaderClient, followerClient);
@@ -1080,7 +1080,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
livePaths.toString() + ":" + livePaths.size(),
3 == livePaths.size() || 4 == livePaths.size());
} else {
- assertTrue(livePaths.toString() + ":" + livePaths.size(), 3 == livePaths.size());
+ assertEquals(livePaths.toString() + ":" + livePaths.size(), 3, livePaths.size());
}
// :TODO: assert that one of the paths is a subpath of hte other
@@ -1093,7 +1093,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
if (afterReload) {
assertTrue("found:" + cnt + Arrays.asList(new File(ddir).list()), 1 == cnt || 2 == cnt);
} else {
- assertTrue("found:" + cnt + Arrays.asList(new File(ddir).list()), 1 == cnt);
+ assertEquals("found:" + cnt + Arrays.asList(new File(ddir).list()), 1, cnt);
}
}
}
@@ -1239,7 +1239,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
// compare results
String cmp =
BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
}
@Test
@@ -1298,7 +1298,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
// compare results
String cmp =
BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
} finally {
resetFactory();
@@ -1348,7 +1348,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
// compare results
String cmp =
BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
Object version = getIndexVersion(leaderClient).get("indexversion");
@@ -1394,7 +1394,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
// compare results
String cmp =
BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
// start config files replication test
// clear leader index
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSampleDocumentsLoader.java b/solr/core/src/test/org/apache/solr/handler/TestSampleDocumentsLoader.java
index bfb3d3960a9..6ecb27c7f02 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSampleDocumentsLoader.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSampleDocumentsLoader.java
@@ -17,15 +17,10 @@
package org.apache.solr.handler;
-import static org.apache.solr.handler.designer.DefaultSampleDocumentsLoader.CSV_MULTI_VALUE_DELIM_PARAM;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.io.File;
import java.io.IOException;
import java.util.List;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
import org.apache.solr.common.params.ModifiableSolrParams;
@@ -40,7 +35,7 @@ import org.apache.solr.util.ExternalPaths;
import org.junit.Before;
import org.junit.Test;
-public class TestSampleDocumentsLoader {
+public class TestSampleDocumentsLoader extends SolrTestCase {
SampleDocumentsLoader loader;
File exampleDir;
@@ -63,7 +58,7 @@ public class TestSampleDocumentsLoader {
@Test
public void testCsv() throws Exception {
ModifiableSolrParams params = new ModifiableSolrParams();
- params.set(CSV_MULTI_VALUE_DELIM_PARAM, "\\|");
+ params.set(DefaultSampleDocumentsLoader.CSV_MULTI_VALUE_DELIM_PARAM, "\\|");
List<SolrInputDocument> docs =
loadTestDocs(params, new File(exampleDir, "films/films.csv"), -1, 1100);
boolean foundIt = false;
diff --git a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java
index b01e3ecec66..ac560e6863a 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java
@@ -243,8 +243,6 @@ public class TestStressThreadBackup extends SolrCloudTestCase {
// and how few iterations we have left
if (3 < namedSnapshots.size()
&& random().nextInt(3 + numBackupIters - i) < random().nextInt(namedSnapshots.size())) {
-
- assert 0 < namedSnapshots.size() : "Something broke the conditional";
final String snapshotName = namedSnapshots.poll();
final String backupName = "backup_as_of_" + snapshotName;
log.info("Creating {} from {} in iter={}", backupName, snapshotName, i);
diff --git a/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java
index c405a0551c8..9eb5bb845bd 100644
--- a/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java
@@ -17,11 +17,9 @@
package org.apache.solr.handler;
-import static org.apache.solr.SolrTestCaseJ4.assumeWorkingMockito;
import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.REQUESTID;
import static org.apache.solr.common.params.CommonParams.ACTION;
import static org.apache.solr.common.params.CommonParams.NAME;
-import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -31,6 +29,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
import org.apache.solr.common.params.CollectionParams;
@@ -49,7 +48,7 @@ import org.junit.Test;
import org.mockito.ArgumentCaptor;
/** Unit tests for the v2 to v1 API mappings found in {@link ClusterAPI} */
-public class V2ClusterAPIMappingTest {
+public class V2ClusterAPIMappingTest extends SolrTestCaseJ4 {
private ApiBag apiBag;
private ArgumentCaptor<SolrQueryRequest> queryRequestCaptor;
private CollectionsHandler mockCollectionsHandler;
diff --git a/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java
index 2c8d11fed48..ae4b31c9d9d 100644
--- a/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java
@@ -17,9 +17,7 @@
package org.apache.solr.handler;
-import static org.apache.solr.SolrTestCaseJ4.assumeWorkingMockito;
import static org.apache.solr.common.params.CommonParams.PATH;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import com.google.common.collect.Maps;
@@ -27,6 +25,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
import org.apache.solr.common.util.CommandOperation;
@@ -39,7 +38,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
/** Unit tests for the v2 to v1 mapping logic in {@link UpdateAPI} */
-public class V2UpdateAPIMappingTest {
+public class V2UpdateAPIMappingTest extends SolrTestCaseJ4 {
private ApiBag apiBag;
private UpdateRequestHandler mockUpdateHandler;
diff --git a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
index 2297a3f6618..da3adaa75b3 100644
--- a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
@@ -99,7 +99,7 @@ public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 {
AddUpdateCommand add = p.addCommands.get(0);
assertEquals(100, add.commitWithin);
- assertEquals(false, add.overwrite);
+ assertFalse(add.overwrite);
req.close();
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
index 870c603113b..8b2461b5c98 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
@@ -257,7 +257,7 @@ public class LukeRequestHandlerTest extends SolrTestCaseJ4 {
field("title") + "/arr[@name='copyDests']/str[.='title_stemmed']",
dynfield("bar_copydest_*") + "/arr[@name='copySources']/str[.='foo_copysource_*']",
dynfield("foo_copysource_*") + "/arr[@name='copyDests']/str[.='bar_copydest_*']");
- assertEquals(xml, null, r);
+ assertNull(xml, r);
}
public void testCatchAllCopyField() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index 53145352b1a..dd4eeb2d73e 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@ -736,15 +736,13 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
"solr.core.collection1:QUERY./dumphandler.dumphandlergauge"),
resp);
- assertEquals(
- null,
+ assertNull(
resp.getValues()
._getStr(
Arrays.asList(
"metrics", "solr.core.collection1:QUERY./dumphandler.dumphandlergauge", "d_k1"),
null));
- assertEquals(
- null,
+ assertNull(
resp.getValues()
._getStr(
Arrays.asList(
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
index a35c8120953..c9335b2a7b6 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
@@ -153,7 +153,7 @@ public class SecurityConfHandlerTest extends SolrTestCaseJ4 {
assertEquals(1, permissions.size());
for (Map permission : permissions) {
- assertFalse("some-permission".equals(permission.get("name")));
+ assertNotEquals("some-permission", permission.get("name"));
}
// -ve test security edit is a well-known permission, only role attribute should be provided
command =
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SolrEnvironmentTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SolrEnvironmentTest.java
index a5668bb4518..bfc02ba34a6 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/SolrEnvironmentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/SolrEnvironmentTest.java
@@ -17,13 +17,11 @@
package org.apache.solr.handler.admin;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
+import org.apache.solr.SolrTestCase;
import org.apache.solr.common.SolrException;
import org.junit.Test;
-public class SolrEnvironmentTest {
+public class SolrEnvironmentTest extends SolrTestCase {
@Test(expected = SolrException.class)
public void parseWrongKey() {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java
index 93250636f38..962092db5fc 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java
@@ -117,7 +117,7 @@ public class ThreadDumpHandlerTest extends SolrTestCaseJ4 {
// (which *MAY* also be waiting on doneWithTestLatch, but may not have reached that line
// yet)
NamedList<?> monitorOwnerThreadInfo = getThreadInfo(rsp, "test-thread-monitor-owner");
- assert monitorOwnerThreadInfo != null;
+ assertNotNull(monitorOwnerThreadInfo);
assertTrue(
"Thread monitor ownerT: ",
monitorOwnerThreadInfo
@@ -145,7 +145,7 @@ public class ThreadDumpHandlerTest extends SolrTestCaseJ4 {
// same monitor owner 'ownerT'
final NamedList<?> monitorOwnerThreadInfo =
getThreadInfo(rsp, "test-thread-monitor-owner");
- assert monitorOwnerThreadInfo != null;
+ assertNotNull(monitorOwnerThreadInfo);
assertTrue(
"Same thread ownerT: ",
monitorOwnerThreadInfo
@@ -155,7 +155,7 @@ public class ThreadDumpHandlerTest extends SolrTestCaseJ4 {
// blocked thread 'blockedT', waiting on the monitor
final NamedList<?> blockedThreadInfo =
getThreadInfo(rsp, "test-thread-monitor-blocked");
- assert blockedThreadInfo != null;
+ assertNotNull(blockedThreadInfo);
assertTrue(
"blocked thread blockedT waiting on the monitor: ",
blockedThreadInfo._getStr("state", "").contains("BLOCKED")
@@ -245,7 +245,7 @@ public class ThreadDumpHandlerTest extends SolrTestCaseJ4 {
// yet)
final NamedList<?> lockOwnerThreadInfo =
getThreadInfo(rsp, "test-thread-sync-lock-owner");
- assert lockOwnerThreadInfo != null;
+ assertNotNull(lockOwnerThreadInfo);
assertTrue(
"Thread lock:",
lockOwnerThreadInfo._getStr("synchronizers-locked", "").contains("ReentrantLock"));
@@ -271,7 +271,7 @@ public class ThreadDumpHandlerTest extends SolrTestCaseJ4 {
// lock owner 'ownerT'
final NamedList<?> lockOwnerThreadInfo =
getThreadInfo(rsp, "test-thread-sync-lock-owner");
- assert lockOwnerThreadInfo != null;
+ assertNotNull(lockOwnerThreadInfo);
assertTrue(
"Thread locked: ",
lockOwnerThreadInfo
@@ -281,7 +281,7 @@ public class ThreadDumpHandlerTest extends SolrTestCaseJ4 {
// blocked thread 'blockedT', waiting on the lock
final NamedList<?> blockedThreadInfo =
getThreadInfo(rsp, "test-thread-sync-lock-blocked");
- assert blockedThreadInfo != null;
+ assertNotNull(blockedThreadInfo);
assertTrue(
"Waiting on the lock: ",
blockedThreadInfo._getStr("state", "").contains("WAITING")
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java
index 38f9220344d..1cdbdc9f0fb 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java
@@ -206,9 +206,8 @@ public abstract class V2ApiMappingTest<T extends RequestHandlerBase> extends Sol
protected AnnotatedApi assertAnnotatedApiExistsFor(String method, String path) {
final AnnotatedApi api = getAnnotatedApiFor(method, path);
- assertTrue(
- "Expected to find API mapping for [" + method + " " + path + "] but none found!",
- api != null);
+ assertNotNull(
+ "Expected to find API mapping for [" + method + " " + path + "] but none found!", api);
return api;
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/V2CollectionBackupsAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/V2CollectionBackupsAPIMappingTest.java
index 57cb85d95fb..a4ff7d2ebe2 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/V2CollectionBackupsAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/V2CollectionBackupsAPIMappingTest.java
@@ -66,7 +66,7 @@ public class V2CollectionBackupsAPIMappingTest extends V2ApiMappingTest<Collecti
assertEquals("someRepository", v1Params.get(CoreAdminParams.BACKUP_REPOSITORY));
assertEquals(123, v1Params.getPrimitiveInt(CoreAdminParams.BACKUP_ID));
assertEquals(456, v1Params.getPrimitiveInt(CoreAdminParams.MAX_NUM_BACKUP_POINTS));
- assertEquals(true, v1Params.getPrimitiveBool(CoreAdminParams.BACKUP_PURGE_UNUSED));
+ assertTrue(v1Params.getPrimitiveBool(CoreAdminParams.BACKUP_PURGE_UNUSED));
assertEquals("requestTrackingId", v1Params.get(CommonAdminParams.ASYNC));
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/V2CollectionsAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/V2CollectionsAPIMappingTest.java
index bf0b2db17cb..230bf604f73 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/V2CollectionsAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/V2CollectionsAPIMappingTest.java
@@ -104,13 +104,12 @@ public class V2CollectionsAPIMappingTest extends V2ApiMappingTest<CollectionsHan
assertEquals(
"localhost:8983_solr,localhost:7574_solr",
v1Params.get(CollectionAdminParams.CREATE_NODE_SET_PARAM));
- assertEquals(
- true, v1Params.getPrimitiveBool(CollectionAdminParams.CREATE_NODE_SET_SHUFFLE_PARAM));
+ assertTrue(v1Params.getPrimitiveBool(CollectionAdminParams.CREATE_NODE_SET_SHUFFLE_PARAM));
assertEquals("bar", v1Params.get("property.foo"));
assertEquals("bar2", v1Params.get("property.foo2"));
assertEquals("requestTrackingId", v1Params.get(CommonAdminParams.ASYNC));
- assertEquals(false, v1Params.getPrimitiveBool(CommonAdminParams.WAIT_FOR_FINAL_STATE));
- assertEquals(false, v1Params.getPrimitiveBool(CollectionAdminParams.PER_REPLICA_STATE));
+ assertFalse(v1Params.getPrimitiveBool(CommonAdminParams.WAIT_FOR_FINAL_STATE));
+ assertFalse(v1Params.getPrimitiveBool(CollectionAdminParams.PER_REPLICA_STATE));
assertEquals(1, v1Params.getPrimitiveInt(CollectionAdminParams.NUM_SHARDS));
}
@@ -239,10 +238,10 @@ public class V2CollectionsAPIMappingTest extends V2ApiMappingTest<CollectionsHan
assertEquals("collectionName", v1Params.get(BackupManager.COLLECTION_NAME_PROP));
assertEquals("/some/location/uri", v1Params.get(CoreAdminParams.BACKUP_LOCATION));
assertEquals("someRepository", v1Params.get(CoreAdminParams.BACKUP_REPOSITORY));
- assertEquals(true, v1Params.getPrimitiveBool(CollectionAdminParams.FOLLOW_ALIASES));
+ assertTrue(v1Params.getPrimitiveBool(CollectionAdminParams.FOLLOW_ALIASES));
assertEquals("copy-files", v1Params.get(CollectionAdminParams.INDEX_BACKUP_STRATEGY));
assertEquals("someSnapshotName", v1Params.get(CoreAdminParams.COMMIT_NAME));
- assertEquals(true, v1Params.getPrimitiveBool(CoreAdminParams.BACKUP_INCREMENTAL));
+ assertTrue(v1Params.getPrimitiveBool(CoreAdminParams.BACKUP_INCREMENTAL));
assertEquals("requestTrackingId", v1Params.get(CommonAdminParams.ASYNC));
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java
index fe847b20d89..6c692880ec8 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java
@@ -111,8 +111,8 @@ public class V2CoresAPIMappingTest extends V2ApiMappingTest<CoreAdminHandler> {
assertEquals("some-schema-file-name", v1Params.get(SCHEMA));
assertEquals("some-config-file-name", v1Params.get(CONFIG));
assertEquals("someConfigSetName", v1Params.get(CONFIGSET));
- assertEquals(true, v1Params.getPrimitiveBool(LOAD_ON_STARTUP));
- assertEquals(true, v1Params.getPrimitiveBool(TRANSIENT));
+ assertTrue(v1Params.getPrimitiveBool(LOAD_ON_STARTUP));
+ assertTrue(v1Params.getPrimitiveBool(TRANSIENT));
assertEquals("someShardName", v1Params.get(SHARD));
assertEquals("someCollectionName", v1Params.get(COLLECTION));
assertEquals("TLOG", v1Params.get(REPLICA_TYPE));
@@ -121,7 +121,7 @@ public class V2CoresAPIMappingTest extends V2ApiMappingTest<CoreAdminHandler> {
assertEquals("role1,role2", v1Params.get(ROLES));
assertEquals("val1", v1Params.get("property.prop1"));
assertEquals("val2", v1Params.get("property.prop2"));
- assertEquals(true, v1Params.getPrimitiveBool(NEW_COLLECTION));
+ assertTrue(v1Params.getPrimitiveBool(NEW_COLLECTION));
assertEquals("requestTrackingId", v1Params.get(ASYNC));
}
@@ -133,7 +133,7 @@ public class V2CoresAPIMappingTest extends V2ApiMappingTest<CoreAdminHandler> {
assertEquals(STATUS.name().toLowerCase(Locale.ROOT), v1Params.get(ACTION));
assertEquals("someCore", v1Params.get(CORE));
- assertEquals(true, v1Params.getPrimitiveBool(INDEX_INFO));
+ assertTrue(v1Params.getPrimitiveBool(INDEX_INFO));
}
@Test
@@ -143,6 +143,6 @@ public class V2CoresAPIMappingTest extends V2ApiMappingTest<CoreAdminHandler> {
assertEquals(STATUS.name().toLowerCase(Locale.ROOT), v1Params.get(ACTION));
assertNull("Expected 'core' parameter to be null", v1Params.get(CORE));
- assertEquals(true, v1Params.getPrimitiveBool(INDEX_INFO));
+ assertTrue(v1Params.getPrimitiveBool(INDEX_INFO));
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/V2CollectionAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/V2CollectionAPIMappingTest.java
index 50ae3b02e4d..99e2f17c933 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/V2CollectionAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/V2CollectionAPIMappingTest.java
@@ -106,7 +106,7 @@ public class V2CollectionAPIMappingTest extends V2ApiMappingTest<CollectionsHand
CollectionParams.CollectionAction.MODIFYCOLLECTION.lowerName, v1Params.get(ACTION));
assertEquals("collName", v1Params.get(COLLECTION));
assertEquals(123, v1Params.getPrimitiveInt(ZkStateReader.REPLICATION_FACTOR));
- assertEquals(true, v1Params.getPrimitiveBool(ZkStateReader.READ_ONLY));
+ assertTrue(v1Params.getPrimitiveBool(ZkStateReader.READ_ONLY));
assertEquals("techproducts_config", v1Params.get(COLL_CONF));
assertEquals("requestTrackingId", v1Params.get(ASYNC));
assertEquals("bar", v1Params.get("property.foo"));
@@ -147,10 +147,10 @@ public class V2CollectionAPIMappingTest extends V2ApiMappingTest<CollectionsHand
assertEquals("someTargetNode", v1Params.get("targetNode"));
assertEquals("someReplica", v1Params.get("replica"));
assertEquals("someShard", v1Params.get("shard"));
- assertEquals(true, v1Params.getPrimitiveBool("waitForFinalState"));
+ assertTrue(v1Params.getPrimitiveBool("waitForFinalState"));
assertEquals(123, v1Params.getPrimitiveInt("timeout"));
- assertEquals(true, v1Params.getPrimitiveBool("inPlaceMove"));
- assertEquals(true, v1Params.getPrimitiveBool("followAliases"));
+ assertTrue(v1Params.getPrimitiveBool("inPlaceMove"));
+ assertTrue(v1Params.getPrimitiveBool("followAliases"));
}
@Test
@@ -172,7 +172,7 @@ public class V2CollectionAPIMappingTest extends V2ApiMappingTest<CollectionsHand
assertEquals("someTargetCollection", v1Params.get("target.collection"));
assertEquals("someSplitKey", v1Params.get("split.key"));
assertEquals(123, v1Params.getPrimitiveInt("forward.timeout"));
- assertEquals(true, v1Params.getPrimitiveBool("followAliases"));
+ assertTrue(v1Params.getPrimitiveBool("followAliases"));
assertEquals("requestTrackingId", v1Params.get(ASYNC));
}
@@ -192,8 +192,8 @@ public class V2CollectionAPIMappingTest extends V2ApiMappingTest<CollectionsHand
CollectionParams.CollectionAction.BALANCESHARDUNIQUE.lowerName, v1Params.get(ACTION));
assertEquals("collName", v1Params.get(COLLECTION));
assertEquals("somePropertyToBalance", v1Params.get("property"));
- assertEquals(false, v1Params.getPrimitiveBool("onlyactivenodes"));
- assertEquals(true, v1Params.getPrimitiveBool("shardUnique"));
+ assertFalse(v1Params.getPrimitiveBool("onlyactivenodes"));
+ assertTrue(v1Params.getPrimitiveBool("shardUnique"));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/V2CoreAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/V2CoreAPIMappingTest.java
index fc5ffb51a9e..e6ecf9fd903 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/V2CoreAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/V2CoreAPIMappingTest.java
@@ -215,9 +215,9 @@ public class V2CoreAPIMappingTest extends V2ApiMappingTest<CoreAdminHandler> {
assertEquals("someNodeName", v1Params.get("nodeName"));
assertEquals("someCoreNodeName", v1Params.get(CORE_NODE_NAME));
assertEquals("someState", v1Params.get(ZkStateReader.STATE_PROP));
- assertEquals(true, v1Params.getPrimitiveBool("checkLive"));
- assertEquals(true, v1Params.getPrimitiveBool("onlyIfLeader"));
- assertEquals(true, v1Params.getPrimitiveBool("onlyIfLeaderActive"));
+ assertTrue(v1Params.getPrimitiveBool("checkLive"));
+ assertTrue(v1Params.getPrimitiveBool("onlyIfLeader"));
+ assertTrue(v1Params.getPrimitiveBool("onlyIfLeaderActive"));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java
index caa3882302f..fb133c63297 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java
@@ -17,10 +17,7 @@
package org.apache.solr.handler.admin.api;
-import static org.apache.solr.SolrTestCaseJ4.assumeWorkingMockito;
import static org.apache.solr.common.params.CommonParams.ACTION;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -32,6 +29,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
import org.apache.solr.common.params.ModifiableSolrParams;
@@ -55,7 +53,7 @@ import org.junit.Test;
import org.mockito.ArgumentCaptor;
/** Unit tests for the v2 to v1 mapping for /node/ APIs. */
-public class V2NodeAPIMappingTest {
+public class V2NodeAPIMappingTest extends SolrTestCaseJ4 {
private ApiBag apiBag;
private ArgumentCaptor<SolrQueryRequest> queryRequestCaptor;
private CoreAdminHandler mockCoresHandler;
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/V2ShardsAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/V2ShardsAPIMappingTest.java
index e555393db62..3982be549b8 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/V2ShardsAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/V2ShardsAPIMappingTest.java
@@ -160,12 +160,12 @@ public class V2ShardsAPIMappingTest extends V2ApiMappingTest<CollectionsHandler>
assertEquals("someSplitKey", v1Params.get(SPLIT_KEY));
assertEquals(123, v1Params.getPrimitiveInt(NUM_SUB_SHARDS));
assertEquals("some_fuzz_value", v1Params.get(SPLIT_FUZZ));
- assertEquals(true, v1Params.getPrimitiveBool(TIMING));
- assertEquals(true, v1Params.getPrimitiveBool(SPLIT_BY_PREFIX));
- assertEquals(true, v1Params.getPrimitiveBool(FOLLOW_ALIASES));
+ assertTrue(v1Params.getPrimitiveBool(TIMING));
+ assertTrue(v1Params.getPrimitiveBool(SPLIT_BY_PREFIX));
+ assertTrue(v1Params.getPrimitiveBool(FOLLOW_ALIASES));
assertEquals("rewrite", v1Params.get(SPLIT_METHOD));
assertEquals("some_async_id", v1Params.get(ASYNC));
- assertEquals(true, v1Params.getPrimitiveBool(WAIT_FOR_FINAL_STATE));
+ assertTrue(v1Params.getPrimitiveBool(WAIT_FOR_FINAL_STATE));
assertEquals("foo1", v1Params.get("property.foo"));
assertEquals("bar1", v1Params.get("property.bar"));
}
@@ -195,9 +195,9 @@ public class V2ShardsAPIMappingTest extends V2ApiMappingTest<CollectionsHandler>
assertEquals("collName", v1Params.get(COLLECTION));
assertEquals("shard1", v1Params.get(SHARD_ID_PROP));
assertEquals("foo,bar,baz", v1Params.get(CREATE_NODE_SET_PARAM));
- assertEquals(true, v1Params.getPrimitiveBool(FOLLOW_ALIASES));
+ assertTrue(v1Params.getPrimitiveBool(FOLLOW_ALIASES));
assertEquals("some_async_id", v1Params.get(ASYNC));
- assertEquals(true, v1Params.getPrimitiveBool(WAIT_FOR_FINAL_STATE));
+ assertTrue(v1Params.getPrimitiveBool(WAIT_FOR_FINAL_STATE));
assertEquals(123, v1Params.getPrimitiveInt(REPLICATION_FACTOR));
assertEquals(456, v1Params.getPrimitiveInt(NRT_REPLICAS));
assertEquals(789, v1Params.getPrimitiveInt(TLOG_REPLICAS));
@@ -241,10 +241,10 @@ public class V2ShardsAPIMappingTest extends V2ApiMappingTest<CollectionsHandler>
assertEquals("dir1", v1Params.get("instanceDir"));
assertEquals("dir2", v1Params.get("dataDir"));
assertEquals("dir3", v1Params.get("ulogDir"));
- assertEquals(true, v1Params.getPrimitiveBool(FOLLOW_ALIASES));
+ assertTrue(v1Params.getPrimitiveBool(FOLLOW_ALIASES));
assertEquals("some_async_id", v1Params.get(ASYNC));
- assertEquals(true, v1Params.getPrimitiveBool(WAIT_FOR_FINAL_STATE));
- assertEquals(true, v1Params.getPrimitiveBool("skipNodeAssignment"));
+ assertTrue(v1Params.getPrimitiveBool(WAIT_FOR_FINAL_STATE));
+ assertTrue(v1Params.getPrimitiveBool("skipNodeAssignment"));
assertEquals("tlog", v1Params.get("type"));
assertEquals("foo1", v1Params.get("property.foo"));
assertEquals("bar1", v1Params.get("property.bar"));
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
index bf95cbbc302..58cbe43717d 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
@@ -464,7 +464,7 @@ public class DistributedDebugComponentTest extends SolrJettyTestBase {
for (String element : elements) {
String value = namedList.get(element);
assertNotNull("Expected element '" + element + "' but was not found", value);
- assertTrue("Expected element '" + element + "' but was empty", !value.isEmpty());
+ assertFalse("Expected element '" + element + "' but was empty", value.isEmpty());
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
index 69060841a6a..2afc6ea3b8b 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
@@ -161,7 +161,7 @@ public class DistributedFacetPivotLongTailTest extends BaseDistributedSearchTest
}
{ // even w/o the long tail, we should have still asked shard2 to refine bbb0
pivot = pivots.get(5);
- assertTrue(pivot.toString(), pivot.getValue().equals("bbb0"));
+ assertEquals(pivot.toString(), "bbb0", pivot.getValue());
assertEquals(pivot.toString(), 101, pivot.getCount());
// basic check of refined stats
FieldStatsInfo bbb0Stats = pivot.getFieldStatsInfo().get(STAT_FIELD);
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java
index 8ae9929b557..bb9959cf2f3 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java
@@ -272,13 +272,14 @@ public class DistributedFacetPivotSmallAdvancedTest extends BaseDistributedSearc
.get("place_t,company_t")
.get(0)
.getValue();
- assertFalse(
+ assertNotEquals(
"both shards have same top constraint, test is invalid"
+ "(did someone change the test data?) ==> "
+ s0pivValue
+ "=="
+ s1pivValue,
- s0pivValue.equals(s1pivValue));
+ s0pivValue,
+ s1pivValue);
}
private void doTestDeepPivotStatsOnString() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
index ff77a3186b3..83a51980349 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
@@ -490,8 +490,8 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
assertNull(krakowFujitsuStatsInfo.getSumOfSquares());
assertNull(krakowFujitsuStatsInfo.getStddev());
} else {
- assertEquals(null, krakowFujitsuStatsInfo.getMin());
- assertEquals(null, krakowFujitsuStatsInfo.getMax());
+ assertNull(krakowFujitsuStatsInfo.getMin());
+ assertNull(krakowFujitsuStatsInfo.getMax());
assertEquals(0, (long) krakowFujitsuStatsInfo.getCount());
assertEquals(1, (long) krakowFujitsuStatsInfo.getMissing());
assertEquals(0.0, krakowFujitsuStatsInfo.getSum());
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
index 1982d5089b6..5f00e3f4264 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
@@ -608,9 +608,10 @@ public class DistributedQueryComponentOptimizationTest extends SolrCloudTestCase
for (int i = 0; i < q.length; i += 2) {
if (ShardParams.DISTRIB_SINGLE_PASS.equals(q[i].toString())
&& Boolean.parseBoolean(q[i + 1].toString())) {
- assertTrue(
+ assertEquals(
"distrib.singlePass=true made more requests than number of shards",
- numRequests == sliceCount);
+ sliceCount,
+ numRequests);
distribSinglePass = true;
}
if (CommonParams.FL.equals(q[i].toString())) {
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
index b5d19730109..72fd63f1004 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
@@ -26,7 +26,6 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SpellingParams;
import org.apache.solr.common.util.NamedList;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -79,7 +78,7 @@ public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTes
explicitNumSuggestExpected,
Integer.toString(sug.size()));
} else if (sug.size() == 0) {
- Assert.fail("Control data did not return any suggestions.");
+ fail("Control data did not return any suggestions.");
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java
index 832f8a3e9e3..f916427d6ae 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.spelling.suggest.SuggesterParams;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -57,7 +56,7 @@ public class DistributedSuggestComponentTest extends BaseDistributedSearchTestCa
(NamedList<SimpleOrderedMap<NamedList<Object>>>) nl.get("suggest");
String command = (String) nl.get("command");
if (sc.size() == 0 && command == null) {
- Assert.fail("Control data did not return any suggestions or execute any command");
+ fail("Control data did not return any suggestions or execute any command");
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java
index 10f57fb5515..ed3fd4a9880 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java
@@ -239,7 +239,7 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
final int inputPositionLength,
final int maxIndexedPositionLength,
final int maxQueryPositionLength) {
- assert 0 < phrases.size() : "Don't use this method if phrases might be empty";
+ assertTrue("Don't use this method if phrases might be empty", 0 < phrases.size());
assertEmptyStream(
"no phrase should be longer then " + maxQueryPositionLength + " positions",
diff --git a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java
index 39458e7dc19..f54536d314e 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java
@@ -308,7 +308,7 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
q.set("shards", shardsParamValue);
}
if (otherParams != null) {
- assert otherParams.length % 2 == 0;
+ assertEquals(0, otherParams.length % 2);
for (int i = 0; i < otherParams.length; i += 2) {
q.set(otherParams[i], otherParams[i + 1]);
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
index 56911b30a05..4a0eda8e506 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
@@ -609,7 +609,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
// TODO: how do we make this into a 1-liner using "assertQ()" ???
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(SpellCheckComponent.COMPONENT_NAME, "true");
@@ -627,8 +627,8 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
NamedList<?> values = rsp.getValues();
NamedList<?> spellCheck = (NamedList<?>) values.get("spellcheck");
NamedList<?> suggestions = (NamedList<?>) spellCheck.get("suggestions");
- assertTrue(suggestions.get("suggestion") == null);
- assertTrue((Boolean) spellCheck.get("correctlySpelled") == false);
+ assertNull(suggestions.get("suggestion"));
+ assertFalse((Boolean) spellCheck.get("correctlySpelled"));
params.remove(SpellingParams.SPELLCHECK_DICT);
params.add(SpellingParams.SPELLCHECK_DICT, "threshold_direct");
@@ -640,7 +640,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
values = rsp.getValues();
spellCheck = (NamedList<?>) values.get("spellcheck");
suggestions = (NamedList<?>) spellCheck.get("suggestions");
- assertTrue(suggestions.get("suggestion") == null);
- assertTrue((Boolean) spellCheck.get("correctlySpelled") == false);
+ assertNull(suggestions.get("suggestion"));
+ assertFalse((Boolean) spellCheck.get("correctlySpelled"));
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index a0a9f733a50..8519dbaa0fe 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -1019,9 +1019,9 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
assertTrue(
"schema no longer satisfies test requirements: foo_ss no longer multivalued",
foo_ss.multiValued());
- assertTrue(
+ assertFalse(
"schema no longer satisfies test requirements: foo_ss's fieldtype no longer single valued",
- !foo_ss.getType().isMultiValued());
+ foo_ss.getType().isMultiValued());
assertQEx(
"no failure trying to get stats facet on foo_ss",
@@ -1078,9 +1078,9 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
assertTrue(
"schema no longer satisfies test requirements: cat_docValues no longer multivalued",
catDocValues.multiValued());
- assertTrue(
+ assertFalse(
"schema no longer satisfies test requirements: cat_docValues fieldtype no longer single valued",
- !catDocValues.getType().isMultiValued());
+ catDocValues.getType().isMultiValued());
assertTrue(
"schema no longer satisfies test requirements: cat_docValues no longer has docValues",
catDocValues.hasDocValues());
@@ -1128,9 +1128,9 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
assertTrue(
"schema no longer satisfies test requirements: cat_docValues no longer multivalued",
catDocValues.multiValued());
- assertTrue(
+ assertFalse(
"schema no longer satisfies test requirements: cat_docValues fieldtype no longer single valued",
- !catDocValues.getType().isMultiValued());
+ catDocValues.getType().isMultiValued());
assertTrue(
"schema no longer satisfies test requirements: cat_docValues no longer has docValues",
catDocValues.hasDocValues());
@@ -1186,9 +1186,9 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
assertTrue(
"schema no longer satisfies test requirements: cat_docValues no longer multivalued",
catDocValues.multiValued());
- assertTrue(
+ assertFalse(
"schema no longer satisfies test requirements: cat_docValues fieldtype no longer single valued",
- !catDocValues.getType().isMultiValued());
+ catDocValues.getType().isMultiValued());
assertTrue(
"schema no longer satisfies test requirements: cat_docValues no longer has docValues",
catDocValues.hasDocValues());
@@ -1311,9 +1311,9 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
assertTrue(
"schema no longer satisfies test requirements: cat_docValues no longer multivalued",
catDocValues.multiValued());
- assertTrue(
+ assertFalse(
"schema no longer satisfies test requirements: cat_docValues fieldtype no longer single valued",
- !catDocValues.getType().isMultiValued());
+ catDocValues.getType().isMultiValued());
assertTrue(
"schema no longer satisfies test requirements: cat_docValues no longer has docValues",
catDocValues.hasDocValues());
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
index ba041108157..764448dbb92 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
@@ -725,7 +725,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
i += count;
// if (i < 10) System.out.println("COUNT=" + count + " OBJ="+v.toObject());
}
- assert (i == nvals);
+ assertEquals(i, nvals);
totBuff = random().nextInt(50) + 1;
minSegBuff = random().nextInt(10) + 1;
@@ -741,7 +741,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
i += count;
// if (i < 10) System.out.println("COUNT=" + count + " OBJ="+v.toObject());
}
- assert (i == nvals);
+ assertEquals(i, nvals);
totBuff = random().nextInt(50) + 1;
minSegBuff = random().nextInt(10) + 1;
@@ -757,7 +757,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
i += count;
// if (i < 10) System.out.println("COUNT=" + count + " OBJ="+v.toObject());
}
- assert (i == nvals);
+ assertEquals(i, nvals);
totBuff = random().nextInt(50) + 1;
minSegBuff = random().nextInt(10) + 1;
@@ -773,7 +773,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
i += count;
// if (i < 10) System.out.println("COUNT=" + count + " OBJ="+v.toObject());
}
- assert (i == nvals);
+ assertEquals(i, nvals);
assertQ(
req(
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java
index c9995fd2d7c..a860ac7c9ef 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java
@@ -61,7 +61,7 @@ public class TestTrackingShardHandlerFactory extends AbstractFullDistribZkTestBa
for (JettySolrRunner runner : runners) {
CoreContainer container = runner.getCoreContainer();
ShardHandlerFactory factory = container.getShardHandlerFactory();
- assert factory instanceof TrackingShardHandlerFactory;
+ assertTrue(factory instanceof TrackingShardHandlerFactory);
@SuppressWarnings("resource")
TrackingShardHandlerFactory trackingShardHandlerFactory =
(TrackingShardHandlerFactory) factory;
@@ -130,7 +130,7 @@ public class TestTrackingShardHandlerFactory extends AbstractFullDistribZkTestBa
for (JettySolrRunner runner : runners) {
CoreContainer container = runner.getCoreContainer();
ShardHandlerFactory factory = container.getShardHandlerFactory();
- assert factory instanceof TrackingShardHandlerFactory;
+ assertTrue(factory instanceof TrackingShardHandlerFactory);
@SuppressWarnings("resource")
TrackingShardHandlerFactory trackingShardHandlerFactory =
(TrackingShardHandlerFactory) factory;
diff --git a/solr/core/src/test/org/apache/solr/handler/designer/ManagedSchemaDiffTest.java b/solr/core/src/test/org/apache/solr/handler/designer/ManagedSchemaDiffTest.java
index 567622cfe20..a53521bfec9 100644
--- a/solr/core/src/test/org/apache/solr/handler/designer/ManagedSchemaDiffTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/designer/ManagedSchemaDiffTest.java
@@ -33,7 +33,6 @@ import org.apache.solr.schema.IntPointField;
import org.apache.solr.schema.ManagedIndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.util.ExternalPaths;
-import org.junit.Assert;
import org.junit.BeforeClass;
public class ManagedSchemaDiffTest extends SolrCloudTestCase {
@@ -62,29 +61,29 @@ public class ManagedSchemaDiffTest extends SolrCloudTestCase {
Map<String, Object> diff =
ManagedSchemaDiff.diff(
mapFieldsToPropertyValues(schema1FieldMap), mapFieldsToPropertyValues(schema2FieldMap));
- Assert.assertTrue(diff.containsKey("updated"));
- Assert.assertTrue(diff.containsKey("added"));
- Assert.assertTrue(diff.containsKey("removed"));
+ assertTrue(diff.containsKey("updated"));
+ assertTrue(diff.containsKey("added"));
+ assertTrue(diff.containsKey("removed"));
Map<String, Object> changedFields = getInnerMap(diff, "updated");
- Assert.assertEquals(1, changedFields.size());
- Assert.assertTrue(changedFields.containsKey("strfield"));
- Assert.assertEquals(
+ assertEquals(1, changedFields.size());
+ assertTrue(changedFields.containsKey("strfield"));
+ assertEquals(
Arrays.asList(
Map.of("type", "string", "multiValued", false),
Map.of("type", "strings", "multiValued", true)),
changedFields.get("strfield"));
Map<String, Object> addedFields = getInnerMap(diff, "added");
- Assert.assertEquals(1, addedFields.size());
- Assert.assertTrue(addedFields.containsKey("intfield"));
- Assert.assertEquals(
+ assertEquals(1, addedFields.size());
+ assertTrue(addedFields.containsKey("intfield"));
+ assertEquals(
schema2FieldMap.get("intfield").getNamedPropertyValues(true), addedFields.get("intfield"));
Map<String, Object> removedFields = getInnerMap(diff, "removed");
- Assert.assertEquals(1, removedFields.size());
- Assert.assertTrue(removedFields.containsKey("boolfield"));
- Assert.assertEquals(
+ assertEquals(1, removedFields.size());
+ assertTrue(removedFields.containsKey("boolfield"));
+ assertEquals(
schema1FieldMap.get("boolfield").getNamedPropertyValues(true),
removedFields.get("boolfield"));
}
@@ -110,10 +109,10 @@ public class ManagedSchemaDiffTest extends SolrCloudTestCase {
List<SimpleOrderedMap<Object>> list2 = Arrays.asList(obj1, obj3, obj4);
Map<String, Object> diff = ManagedSchemaDiff.diff(list1, list2);
- Assert.assertTrue(diff.containsKey("old"));
- Assert.assertTrue(diff.containsKey("new"));
- Assert.assertEquals(Collections.singletonList(obj2), diff.get("old"));
- Assert.assertEquals(Arrays.asList(obj3, obj4), diff.get("new"));
+ assertTrue(diff.containsKey("old"));
+ assertTrue(diff.containsKey("new"));
+ assertEquals(Collections.singletonList(obj2), diff.get("old"));
+ assertEquals(Arrays.asList(obj3, obj4), diff.get("new"));
}
@SuppressWarnings("unchecked")
diff --git a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
index 3dd83702f10..7d0cf5e4e6a 100644
--- a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
+++ b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
@@ -1048,11 +1048,11 @@ public class TestExportWriter extends SolrTestCaseJ4 {
String field = "number_" + type + mv + indexed;
SchemaField sf = h.getCore().getLatestSchema().getField(field + "_t");
assertTrue(sf.hasDocValues());
- assertTrue(sf.getType().getNumberType() != null);
+ assertNotNull(sf.getType().getNumberType());
sf = h.getCore().getLatestSchema().getField(field + "_p");
assertTrue(sf.hasDocValues());
- assertTrue(sf.getType().getNumberType() != null);
+ assertNotNull(sf.getType().getNumberType());
assertTrue(sf.getType().isPointField());
trieFields.add(field + "_t");
@@ -1354,7 +1354,7 @@ public class TestExportWriter extends SolrTestCaseJ4 {
Map rsp = (Map) Utils.fromJSONString(response);
List doclist = (List) (((Map) rsp.get("response")).get("docs"));
- assert docs.size() == numDocs;
+ assertEquals(docs.size(), numDocs);
for (int i = 0; i < docs.size() - 1; i++) { // docs..
assertEquals(
diff --git a/solr/core/src/test/org/apache/solr/handler/loader/JavabinLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/loader/JavabinLoaderTest.java
index b4d4b22e66a..66ac7c724db 100644
--- a/solr/core/src/test/org/apache/solr/handler/loader/JavabinLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/loader/JavabinLoaderTest.java
@@ -87,7 +87,7 @@ public class JavabinLoaderTest extends SolrTestCaseJ4 {
mockUpdateProcessor);
req.close();
- assertTrue(mockUpdateProcessor.addCommands.size() == numDocsInBatch);
+ assertEquals(mockUpdateProcessor.addCommands.size(), numDocsInBatch);
for (int i = 0; i < numDocsInBatch - 1; i++)
assertFalse(mockUpdateProcessor.addCommands.get(i).isLastDocInBatch); // not last doc in batch
diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/RandomizedTaggerTest.java b/solr/core/src/test/org/apache/solr/handler/tagger/RandomizedTaggerTest.java
index f4b8368dfb5..2b366f11311 100644
--- a/solr/core/src/test/org/apache/solr/handler/tagger/RandomizedTaggerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/tagger/RandomizedTaggerTest.java
@@ -113,7 +113,7 @@ public class RandomizedTaggerTest extends TaggerTestCase {
}
private void assertBruteForce(String input) throws Exception {
- assert input.matches(" .* ");
+ assertTrue(input.matches(" .* "));
baseParams.set("overlaps", "ALL");
// loop through NAMES and find all tag offsets
diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTest.java b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTest.java
index 106f96e87fa..d8ce050dc07 100644
--- a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTest.java
@@ -303,14 +303,14 @@ public class TaggerTest extends TaggerTestCase {
}
private TestTag tt(String doc, String substring, int substringIndex, N name) {
- assert substringIndex == 0;
+ assertEquals(0, substringIndex);
// little bit of copy-paste code from super.tt()
int startOffset = -1, endOffset;
int substringIndex1 = 0;
for (int i = 0; i <= substringIndex1; i++) {
startOffset = doc.indexOf(substring, ++startOffset);
- assert startOffset >= 0 : "The test itself is broken";
+ assertTrue("The test itself is broken", startOffset >= 0);
}
endOffset = startOffset + substring.length(); // 1 greater (exclusive)
return new TestTag(startOffset, endOffset, substring, lookupByName(name.getName()));
diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
index f48e3f5a1ab..2f22e0de4c5 100644
--- a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
+++ b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
@@ -112,7 +112,7 @@ public abstract class TaggerTestCase extends SolrTestCaseJ4 {
int substringIndex = 0;
for (int i = 0; i <= substringIndex; i++) {
startOffset = doc.indexOf(substring, ++startOffset);
- assert startOffset >= 0 : "The test itself is broken";
+ assertTrue("The test itself is broken", startOffset >= 0);
}
endOffset = startOffset + substring.length(); // 1 greater (exclusive)
return new TestTag(startOffset, endOffset, substring, lookupByName(substring));
diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
index 801e282b118..ab558c50c9f 100644
--- a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
+++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.internal.csv;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import java.util.Arrays;
import org.apache.solr.SolrTestCase;
/**
@@ -218,10 +217,10 @@ public class CSVParserTest extends SolrTestCase {
String[] tmp = null;
for (String[] re : res) {
tmp = parser.getLine();
- assertTrue(Arrays.equals(re, tmp));
+ assertArrayEquals(re, tmp);
}
tmp = parser.getLine();
- assertTrue(tmp == null);
+ assertNull(tmp);
}
public void testNextValue() throws IOException {
@@ -234,7 +233,7 @@ public class CSVParserTest extends SolrTestCase {
}
}
tmp = parser.nextValue();
- assertTrue(tmp == null);
+ assertNull(tmp);
}
public void testGetAllValues() throws IOException {
@@ -243,7 +242,7 @@ public class CSVParserTest extends SolrTestCase {
assertEquals(res.length, tmp.length);
assertTrue(tmp.length > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
+ assertArrayEquals(res[i], tmp[i]);
}
}
@@ -263,7 +262,7 @@ public class CSVParserTest extends SolrTestCase {
assertEquals(res.length, tmp.length);
assertTrue(tmp.length > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
+ assertArrayEquals(res[i], tmp[i]);
}
}
@@ -281,7 +280,7 @@ public class CSVParserTest extends SolrTestCase {
assertEquals(res.length, tmp.length);
assertTrue(tmp.length > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
+ assertArrayEquals(res[i], tmp[i]);
}
}
@@ -307,7 +306,7 @@ public class CSVParserTest extends SolrTestCase {
assertEquals(res.length, tmp.length);
assertTrue(tmp.length > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
+ assertArrayEquals(res[i], tmp[i]);
}
}
}
@@ -334,7 +333,7 @@ public class CSVParserTest extends SolrTestCase {
assertEquals(res.length, tmp.length);
assertTrue(tmp.length > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
+ assertArrayEquals(res[i], tmp[i]);
}
}
}
@@ -354,7 +353,7 @@ public class CSVParserTest extends SolrTestCase {
assertEquals(res.length, tmp.length);
assertTrue(tmp.length > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
+ assertArrayEquals(res[i], tmp[i]);
}
}
}
@@ -372,7 +371,7 @@ public class CSVParserTest extends SolrTestCase {
assertEquals(res.length, tmp.length);
assertTrue(tmp.length > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
+ assertArrayEquals(res[i], tmp[i]);
}
}
}
@@ -416,7 +415,7 @@ public class CSVParserTest extends SolrTestCase {
String[][] tmp = parser.getAllValues();
assertTrue(tmp.length > 0);
for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
+ assertArrayEquals(res[i], tmp[i]);
}
}
@@ -455,7 +454,7 @@ public class CSVParserTest extends SolrTestCase {
assertTrue(tmp.length > 0);
if (!CSVPrinterTest.equals(res, tmp)) {
- assertTrue(false);
+ fail();
}
}
@@ -481,7 +480,7 @@ public class CSVParserTest extends SolrTestCase {
assertTrue(tmp.length > 0);
if (!CSVPrinterTest.equals(res, tmp)) {
- assertTrue(false);
+ fail();
}
String[][] res_comments = {
@@ -495,7 +494,7 @@ public class CSVParserTest extends SolrTestCase {
tmp = parser.getAllValues();
if (!CSVPrinterTest.equals(res_comments, tmp)) {
- assertTrue(false);
+ fail();
}
}
@@ -542,7 +541,7 @@ public class CSVParserTest extends SolrTestCase {
parser = new CSVParser(new StringReader(code));
CSVParser parser1 = new CSVParser(new StringReader(code));
for (String[] datum : data) {
- assertTrue(Arrays.equals(parser1.getLine(), datum));
+ assertArrayEquals(parser1.getLine(), datum);
for (String d : datum) {
assertEquals(parser.nextValue(), d);
}
diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVPrinterTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVPrinterTest.java
index 72038c44779..ee7e7507ffb 100644
--- a/solr/core/src/test/org/apache/solr/internal/csv/CSVPrinterTest.java
+++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVPrinterTest.java
@@ -131,7 +131,7 @@ public class CSVPrinterTest extends SolrTestCase {
if (!equals(lines, parseResult)) {
System.out.println("Printer output :" + printable(result));
- assertTrue(false);
+ fail();
}
}
diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java
index 9163ac7a32e..e9fd504b551 100644
--- a/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java
+++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java
@@ -52,16 +52,16 @@ public class CSVStrategyTest extends SolrTestCase {
assertEquals(strategy.getDelimiter(), ',');
assertEquals(strategy.getEncapsulator(), '"');
assertEquals(strategy.getCommentStart(), CSVStrategy.COMMENTS_DISABLED);
- assertEquals(true, strategy.getIgnoreLeadingWhitespaces());
- assertEquals(false, strategy.getUnicodeEscapeInterpretation());
- assertEquals(true, strategy.getIgnoreEmptyLines());
+ assertTrue(strategy.getIgnoreLeadingWhitespaces());
+ assertFalse(strategy.getUnicodeEscapeInterpretation());
+ assertTrue(strategy.getIgnoreEmptyLines());
// explicit csv settings
assertEquals(strategy.getDelimiter(), ',');
assertEquals(strategy.getEncapsulator(), '"');
assertEquals(strategy.getCommentStart(), CSVStrategy.COMMENTS_DISABLED);
- assertEquals(true, strategy.getIgnoreLeadingWhitespaces());
- assertEquals(false, strategy.getUnicodeEscapeInterpretation());
- assertEquals(true, strategy.getIgnoreEmptyLines());
+ assertTrue(strategy.getIgnoreLeadingWhitespaces());
+ assertFalse(strategy.getUnicodeEscapeInterpretation());
+ assertTrue(strategy.getIgnoreEmptyLines());
}
public void testSetExcelStrategy() {
@@ -69,8 +69,8 @@ public class CSVStrategyTest extends SolrTestCase {
assertEquals(strategy.getDelimiter(), ',');
assertEquals(strategy.getEncapsulator(), '"');
assertEquals(strategy.getCommentStart(), CSVStrategy.COMMENTS_DISABLED);
- assertEquals(false, strategy.getIgnoreLeadingWhitespaces());
- assertEquals(false, strategy.getUnicodeEscapeInterpretation());
- assertEquals(false, strategy.getIgnoreEmptyLines());
+ assertFalse(strategy.getIgnoreLeadingWhitespaces());
+ assertFalse(strategy.getUnicodeEscapeInterpretation());
+ assertFalse(strategy.getIgnoreEmptyLines());
}
}
diff --git a/solr/core/src/test/org/apache/solr/internal/csv/ExtendedBufferedReaderTest.java b/solr/core/src/test/org/apache/solr/internal/csv/ExtendedBufferedReaderTest.java
index 3fc74da5b44..bc5885f05f1 100644
--- a/solr/core/src/test/org/apache/solr/internal/csv/ExtendedBufferedReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/internal/csv/ExtendedBufferedReaderTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.internal.csv;
import java.io.StringReader;
-import java.util.Arrays;
import org.apache.solr.SolrTestCase;
/** ExtendedBufferedReaderTest */
@@ -89,20 +88,20 @@ public class ExtendedBufferedReaderTest extends SolrTestCase {
ExtendedBufferedReader br = getEBR("");
assertEquals(0, br.read(res, 0, 0));
- assertTrue(Arrays.equals(res, ref));
+ assertArrayEquals(res, ref);
br = getEBR("abcdefg");
ref[0] = 'a';
ref[1] = 'b';
ref[2] = 'c';
assertEquals(3, br.read(res, 0, 3));
- assertTrue(Arrays.equals(res, ref));
+ assertArrayEquals(res, ref);
assertEquals('c', br.readAgain());
assertEquals('d', br.lookAhead());
ref[4] = 'd';
assertEquals(1, br.read(res, 4, 1));
- assertTrue(Arrays.equals(res, ref));
+ assertArrayEquals(res, ref);
assertEquals('d', br.readAgain());
}
@@ -112,43 +111,43 @@ public class ExtendedBufferedReaderTest extends SolrTestCase {
public void testReadLine() throws Exception {
ExtendedBufferedReader br = getEBR("");
- assertTrue(br.readLine() == null);
+ assertNull(br.readLine());
br = getEBR("\n");
- assertTrue(br.readLine().equals(""));
- assertTrue(br.readLine() == null);
+ assertEquals("", br.readLine());
+ assertNull(br.readLine());
br = getEBR("foo\n\nhello");
assertEquals(0, br.getLineNumber());
- assertTrue(br.readLine().equals("foo"));
+ assertEquals("foo", br.readLine());
assertEquals(1, br.getLineNumber());
- assertTrue(br.readLine().equals(""));
+ assertEquals("", br.readLine());
assertEquals(2, br.getLineNumber());
- assertTrue(br.readLine().equals("hello"));
+ assertEquals("hello", br.readLine());
assertEquals(3, br.getLineNumber());
- assertTrue(br.readLine() == null);
+ assertNull(br.readLine());
assertEquals(3, br.getLineNumber());
br = getEBR("foo\n\nhello");
assertEquals('f', br.read());
assertEquals('o', br.lookAhead());
- assertTrue(br.readLine().equals("oo"));
+ assertEquals("oo", br.readLine());
assertEquals(1, br.getLineNumber());
assertEquals('\n', br.lookAhead());
- assertTrue(br.readLine().equals(""));
+ assertEquals("", br.readLine());
assertEquals(2, br.getLineNumber());
assertEquals('h', br.lookAhead());
- assertTrue(br.readLine().equals("hello"));
- assertTrue(br.readLine() == null);
+ assertEquals("hello", br.readLine());
+ assertNull(br.readLine());
assertEquals(3, br.getLineNumber());
br = getEBR("foo\rbaar\r\nfoo");
- assertTrue(br.readLine().equals("foo"));
+ assertEquals("foo", br.readLine());
assertEquals('b', br.lookAhead());
- assertTrue(br.readLine().equals("baar"));
+ assertEquals("baar", br.readLine());
assertEquals('f', br.lookAhead());
- assertTrue(br.readLine().equals("foo"));
- assertTrue(br.readLine() == null);
+ assertEquals("foo", br.readLine());
+ assertNull(br.readLine());
}
public void testSkip0() throws Exception {
@@ -171,11 +170,11 @@ public class ExtendedBufferedReaderTest extends SolrTestCase {
assertEquals(3, br.skip(3));
assertEquals('f', br.lookAhead());
assertEquals(2, br.skip(5));
- assertTrue(br.readLine() == null);
+ assertNull(br.readLine());
br = getEBR("12345");
assertEquals(5, br.skip(5));
- assertTrue(br.lookAhead() == ExtendedBufferedReader.END_OF_STREAM);
+ assertEquals(ExtendedBufferedReader.END_OF_STREAM, br.lookAhead());
}
public void testSkipUntil() throws Exception {
@@ -194,16 +193,16 @@ public class ExtendedBufferedReaderTest extends SolrTestCase {
public void testReadUntil() throws Exception {
ExtendedBufferedReader br = getEBR("");
- assertTrue(br.readUntil(';').equals(""));
+ assertEquals("", br.readUntil(';'));
br = getEBR("ABCDEF;GHL;;MN");
- assertTrue(br.readUntil(';').equals("ABCDEF"));
- assertTrue(br.readUntil(';').length() == 0);
+ assertEquals("ABCDEF", br.readUntil(';'));
+ assertEquals(0, br.readUntil(';').length());
br.skip(1);
- assertTrue(br.readUntil(';').equals("GHL"));
+ assertEquals("GHL", br.readUntil(';'));
br.skip(1);
- assertTrue(br.readUntil(';').equals(""));
+ assertEquals("", br.readUntil(';'));
br.skip(1);
- assertTrue(br.readUntil(',').equals("MN"));
+ assertEquals("MN", br.readUntil(','));
}
private ExtendedBufferedReader getEBR(String s) {
diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java
index 80c1faa6032..ac0dd9b16f3 100644
--- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java
+++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java
@@ -53,7 +53,6 @@ public class TestLegacyFieldReuse extends BaseTokenStreamTestCase {
// pass another bogus stream (numeric, but different precision step!)
legacyIntField = new LegacyIntField("foo", 42, Field.Store.NO);
- assert 3 != LegacyNumericUtils.PRECISION_STEP_DEFAULT;
bogus = new LegacyNumericTokenStream(3);
ts = legacyIntField.tokenStream(null, bogus);
assertNotSame(bogus, ts);
diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java
index 07fd9726e49..b05aaf248d4 100644
--- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java
+++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java
@@ -224,9 +224,10 @@ public class TestLegacyNumericUtils extends SolrTestCase {
// check forward and back conversion
for (int i = 0; i < vals.length; i++) {
longVals[i] = NumericUtils.doubleToSortableLong(vals[i]);
- assertTrue(
+ assertEquals(
"forward and back conversion should generate same double",
- Double.compare(vals[i], NumericUtils.sortableLongToDouble(longVals[i])) == 0);
+ 0,
+ Double.compare(vals[i], NumericUtils.sortableLongToDouble(longVals[i])));
}
// check sort order (prefixVals should be ascending)
@@ -283,9 +284,10 @@ public class TestLegacyNumericUtils extends SolrTestCase {
// check forward and back conversion
for (int i = 0; i < vals.length; i++) {
intVals[i] = NumericUtils.floatToSortableInt(vals[i]);
- assertTrue(
+ assertEquals(
"forward and back conversion should generate same double",
- Float.compare(vals[i], NumericUtils.sortableIntToFloat(intVals[i])) == 0);
+ 0,
+ Float.compare(vals[i], NumericUtils.sortableIntToFloat(intVals[i])));
}
// check sort order (prefixVals should be ascending)
diff --git a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java
index 308a4c12488..73481b5f0b5 100644
--- a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java
+++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java
@@ -543,7 +543,7 @@ public class TestNumericRangeQuery32 extends SolrTestCase {
// only test equality:
Query q1 = LegacyNumericRangeQuery.newIntRange("test14", 4, 10, 20, true, true);
Query q2 = LegacyNumericRangeQuery.newLongRange("test14", 4, 10L, 20L, true, true);
- assertFalse(q1.equals(q2));
- assertFalse(q2.equals(q1));
+ assertNotEquals(q1, q2);
+ assertNotEquals(q2, q1);
}
}
diff --git a/solr/core/src/test/org/apache/solr/metrics/DelegateRegistryTimerTest.java b/solr/core/src/test/org/apache/solr/metrics/DelegateRegistryTimerTest.java
index 4a6f44453e6..71e816fa4f3 100644
--- a/solr/core/src/test/org/apache/solr/metrics/DelegateRegistryTimerTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/DelegateRegistryTimerTest.java
@@ -17,18 +17,16 @@
package org.apache.solr.metrics;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import com.codahale.metrics.Clock;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.solr.SolrTestCase;
import org.junit.Test;
-public class DelegateRegistryTimerTest {
+public class DelegateRegistryTimerTest extends SolrTestCase {
MetricRegistry.MetricSupplier<Timer> timerSupplier =
new MetricSuppliers.DefaultTimerSupplier(null);
diff --git a/solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java b/solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java
index 2b0d4b69525..45c1e3f7601 100644
--- a/solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java
@@ -91,7 +91,7 @@ public class MetricsConfigTest extends SolrTestCaseJ4 {
MockMeterSupplier mockMeterSupplier = ((MockMeterSupplier) mgr.getMeterSupplier());
assertEquals("bar", mockMeterSupplier.foo);
MockTimerSupplier mockTimerSupplier = ((MockTimerSupplier) mgr.getTimerSupplier());
- assertEquals(true, mockTimerSupplier.boolParam);
+ assertTrue(mockTimerSupplier.boolParam);
assertEquals("strParam", mockTimerSupplier.strParam);
assertEquals(-100, mockTimerSupplier.intParam);
@@ -118,7 +118,7 @@ public class MetricsConfigTest extends SolrTestCaseJ4 {
NodeConfig cfg = loadNodeConfig("solr-metricsconfig1.xml");
SolrMetricManager mgr =
new SolrMetricManager(cfg.getSolrResourceLoader(), cfg.getMetricsConfig());
- assertEquals("nullNumber", null, mgr.nullNumber());
+ assertNull("nullNumber", mgr.nullNumber());
assertEquals("notANumber", -1, mgr.notANumber());
assertEquals("nullNumber", "", mgr.nullString());
assertTrue("nullObject", mgr.nullObject() instanceof Map);
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
index b3fc5a49055..4be3a5a583c 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
@@ -272,7 +272,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 {
coreMetricManager.getTag());
String root2 = PREFIX + TestUtil.randomSimpleString(random(), 5, 10);
- assertFalse(root2.equals(root1));
+ assertNotEquals(root2, root1);
PluginInfo pluginInfo2 = createReporterPluginInfo(root2, false);
metricManager.loadReporter(
coreMetricManager.getRegistryName(),
diff --git a/solr/core/src/test/org/apache/solr/parser/SolrQueryParserBaseTest.java b/solr/core/src/test/org/apache/solr/parser/SolrQueryParserBaseTest.java
index 41315b95137..be64a28fe9e 100644
--- a/solr/core/src/test/org/apache/solr/parser/SolrQueryParserBaseTest.java
+++ b/solr/core/src/test/org/apache/solr/parser/SolrQueryParserBaseTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.solr.parser;
-import static org.apache.solr.SolrTestCaseJ4.assumeWorkingMockito;
-import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
@@ -26,6 +24,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.lucene.queryparser.charstream.CharStream;
import org.apache.lucene.search.Query;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
@@ -33,12 +32,9 @@ import org.apache.solr.search.QParser;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.Mockito;
-@RunWith(MockitoJUnitRunner.class)
-public class SolrQueryParserBaseTest {
+public class SolrQueryParserBaseTest extends SolrTestCaseJ4 {
@BeforeClass
public static void setUpClass() {
@@ -55,16 +51,17 @@ public class SolrQueryParserBaseTest {
}
}
- @Mock private QParser qParser;
- @Mock private QParser subQParser;
- @Mock private SolrQueryRequest solrQueryRequest;
- @Mock private Query query;
- @Mock private IndexSchema indexSchema;
+ private final QParser qParser = Mockito.mock(QParser.class);
+ private final QParser subQParser = Mockito.mock(QParser.class);
+ private final SolrQueryRequest solrQueryRequest = Mockito.mock(SolrQueryRequest.class);
+ private final Query query = Mockito.mock(Query.class);
+ private final IndexSchema indexSchema = Mockito.mock(IndexSchema.class);
private MockSolrQueryParser solrQueryParser;
@Before
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
solrQueryParser = new MockSolrQueryParser();
}
diff --git a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
index 6221f424d93..d66e6c6fa45 100644
--- a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
+++ b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
@@ -559,7 +559,7 @@ public class TestIntervalFaceting extends SolrTestCaseJ4 {
Number[] values = new Number[2];
FieldType ft = h.getCore().getLatestSchema().getField(fieldName).getType();
if (ft.getNumberType() == null) {
- assert ft instanceof StrField;
+ assertTrue(ft instanceof StrField);
values[0] = randomInt(max);
values[1] = randomInt(max);
Arrays.sort(values, (o1, o2) -> String.valueOf(o1).compareTo(String.valueOf(o2)));
@@ -1050,7 +1050,7 @@ public class TestIntervalFaceting extends SolrTestCaseJ4 {
private void assertIntervalKey(
String fieldName, String intervalStr, String expectedKey, String... params)
throws SyntaxError {
- assert (params.length & 1) == 0 : "Params must have an even number of elements";
+ assertEquals("Params must have an even number of elements", 0, (params.length & 1));
SchemaField f = h.getCore().getLatestSchema().getField(fieldName);
ModifiableSolrParams solrParams = new ModifiableSolrParams();
for (int i = 0; i < params.length - 1; ) {
@@ -1612,7 +1612,7 @@ public class TestIntervalFaceting extends SolrTestCaseJ4 {
private void assertIntervalQuery(
String field, String query, int resultCount, String... intervals) {
- assert (intervals.length & 1) == 0;
+ assertEquals(0, (intervals.length & 1));
int idx = 0;
String[] params = new String[intervals.length + 6];
params[idx++] = "q";
diff --git a/solr/core/src/test/org/apache/solr/request/macro/TestMacroExpander.java b/solr/core/src/test/org/apache/solr/request/macro/TestMacroExpander.java
index 680b85985b5..a02c400cce8 100644
--- a/solr/core/src/test/org/apache/solr/request/macro/TestMacroExpander.java
+++ b/solr/core/src/test/org/apache/solr/request/macro/TestMacroExpander.java
@@ -108,7 +108,7 @@ public class TestMacroExpander extends SolrTestCase {
"q=popularity:[ " + expandedLow + " TO " + expandedHigh + " ]",
meSkipOnMissingParams.expand(testQuery));
if (testParams.size() < 2) { // at least one of the two parameters missing
- assertEquals(null, meFailOnMissingParams.expand(testQuery));
+ assertNull(meFailOnMissingParams.expand(testQuery));
}
}
diff --git a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
index 79b4ce3765a..66c4f80edb6 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
@@ -21,7 +21,6 @@ import static org.apache.lucene.tests.util.LuceneTestCase.random;
import static org.apache.solr.search.SolrReturnFields.FIELD_SOURCES.ALL_FROM_DV;
import static org.apache.solr.search.SolrReturnFields.FIELD_SOURCES.ALL_FROM_STORED;
import static org.apache.solr.search.SolrReturnFields.FIELD_SOURCES.MIXED_SOURCES;
-import static org.junit.Assert.fail;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import java.io.ByteArrayInputStream;
@@ -616,7 +615,7 @@ class RetrieveField {
break;
default:
- fail("Found no case for field " + name + " type " + type);
+ SolrTestCaseJ4.fail("Found no case for field " + name + " type " + type);
break;
}
// There are tricky cases with multiValued fields that are sometimes fetched from docValues that
@@ -677,7 +676,7 @@ class RetrieveField {
break;
default:
- fail("Found no case for field " + name + " type " + type);
+ SolrTestCaseJ4.fail("Found no case for field " + name + " type " + type);
break;
}
}
diff --git a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
index 060a6f9b320..3d6fbe46e57 100644
--- a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
+++ b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
@@ -79,7 +79,7 @@ public class TestSolrQueryResponse extends SolrTestCase {
@Test
public void testResponse() {
final SolrQueryResponse response = new SolrQueryResponse();
- assertEquals("response initial value", null, response.getResponse());
+ assertNull("response initial value", response.getResponse());
final Object newValue =
(random().nextBoolean() ? (random().nextBoolean() ? "answer" : Integer.valueOf(42)) : null);
response.addResponse(newValue);
@@ -278,20 +278,20 @@ public class TestSolrQueryResponse extends SolrTestCase {
@Test
public void testResponseHeader() {
final SolrQueryResponse response = new SolrQueryResponse();
- assertEquals("responseHeader initially present", null, response.getResponseHeader());
+ assertNull("responseHeader initially present", response.getResponseHeader());
final NamedList<Object> newValue = new SimpleOrderedMap<>();
newValue.add("key1", "value1");
response.add("key2", "value2");
response.addResponseHeader(newValue);
assertEquals("responseHeader new value", newValue, response.getResponseHeader());
response.removeResponseHeader();
- assertEquals("responseHeader removed value", null, response.getResponseHeader());
+ assertNull("responseHeader removed value", response.getResponseHeader());
}
@Test
public void testHttpCaching() {
final SolrQueryResponse response = new SolrQueryResponse();
- assertEquals("httpCaching initial value", true, response.isHttpCaching());
+ assertTrue("httpCaching initial value", response.isHttpCaching());
final boolean newValue = random().nextBoolean();
response.setHttpCaching(newValue);
assertEquals("httpCaching new value", newValue, response.isHttpCaching());
diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
index 9fa02edf51f..40091a7bfba 100644
--- a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
@@ -661,7 +661,7 @@ public class TestSubQueryTransformer extends SolrTestCaseJ4 {
for (int deptNum : new int[] {0, deptMultiplier - 1}) {
SolrDocument deptDoc = subDoc.get(deptNum);
Object expectedDept = (subResult.equals("depts") ? engText : engId);
- assertTrue("" + expectedDept + " equals to " + deptDoc, expectedDept.equals(deptDoc));
+ assertEquals("" + expectedDept + " equals to " + deptDoc, expectedDept, deptDoc);
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
index 7906b6399ed..6dbc2b2111e 100644
--- a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
@@ -133,7 +133,7 @@ public class ChangedSchemaMergeTest extends SolrTestCaseJ4 {
assertSimilarity(changed, simfac2);
// sanity check our sanity check
- assertFalse("test is broken: both simfacs are the same", simfac1.equals(simfac2));
+ assertNotEquals("test is broken: both simfacs are the same", simfac1, simfac2);
addDoc(changed, "id", "1", "text", "some stuff without which");
addDoc(changed, "id", "5", "text", "some stuff without which");
diff --git a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
index 81767b3ec44..a09c5003d36 100644
--- a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
@@ -198,30 +198,32 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
"schema should contain explicit field 'sku2'", schema.getFields().containsKey("sku2"));
assertNull("'sku*' should not be (or match) a dynamic field", schema.getDynamicPattern("sku*"));
- assertTrue(
- "schema should contain dynamic field '*_s'", schema.getDynamicPattern("*_s").equals("*_s"));
+ assertEquals(
+ "schema should contain dynamic field '*_s'", "*_s", schema.getDynamicPattern("*_s"));
final String subsetPattern = "*_dest_sub_s";
final String dynamicPattern1 = schema.getDynamicPattern(subsetPattern);
- assertTrue(
+ assertEquals(
"'"
+ subsetPattern
+ "' should match dynamic field '*_s', but instead matches '"
+ dynamicPattern1
+ "'",
- dynamicPattern1.equals("*_s"));
+ "*_s",
+ dynamicPattern1);
final String dest_sub_no_ast_s = "dest_sub_no_ast_s";
assertFalse(
schema.getFields().containsKey(dest_sub_no_ast_s)); // Should not be an explicit field
final String dynamicPattern2 = schema.getDynamicPattern(dest_sub_no_ast_s);
- assertTrue(
+ assertEquals(
"'"
+ dest_sub_no_ast_s
+ "' should match dynamic field '*_s', but instead matches '"
+ dynamicPattern2
+ "'",
- dynamicPattern2.equals("*_s"));
+ "*_s",
+ dynamicPattern2);
assertU(adoc("id", "5", "sku1", "10-1839ACX-93", "sku2", "AAM46"));
assertU(commit());
@@ -270,8 +272,8 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
"'testing123_*' should not be (or match) a dynamic or explicit field",
schema.getFieldOrNull("testing123_*"));
- assertTrue(
- "schema should contain dynamic field '*_s'", schema.getDynamicPattern("*_s").equals("*_s"));
+ assertEquals(
+ "schema should contain dynamic field '*_s'", "*_s", schema.getDynamicPattern("*_s"));
assertU(adoc("id", "5", "sku1", "10-1839ACX-93", "testing123_s", "AAM46"));
assertU(commit());
diff --git a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
index eb84ee237d1..46f3541551f 100644
--- a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.core.AbstractBadConfigTestBase;
import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
import org.junit.Test;
public class DenseVectorFieldTest extends AbstractBadConfigTestBase {
@@ -167,7 +166,7 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {
@Test
public void parseVector_NotAList_shouldThrowException() {
RuntimeException thrown =
- Assert.assertThrows(
+ assertThrows(
"Single string value should throw an exception",
SolrException.class,
() -> {
@@ -180,7 +179,7 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {
+ " The expected format is an array :'[f1,f2..f3]' where each element f is a float"));
thrown =
- Assert.assertThrows(
+ assertThrows(
"Single float value should throw an exception",
SolrException.class,
() -> {
@@ -198,7 +197,7 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {
toTest = new DenseVectorField(3);
RuntimeException thrown =
- Assert.assertThrows(
+ assertThrows(
"Incorrect elements should throw an exception",
SolrException.class,
() -> {
@@ -217,7 +216,7 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {
toTest = new DenseVectorField(3);
RuntimeException thrown =
- Assert.assertThrows(
+ assertThrows(
"Incorrect vector dimension should throw an exception",
SolrException.class,
() -> {
@@ -234,7 +233,7 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {
toTest = new DenseVectorField(3);
RuntimeException thrown =
- Assert.assertThrows(
+ assertThrows(
"Incorrect elements should throw an exception",
SolrException.class,
() -> {
diff --git a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
index 17a2a7b7ef1..d38e21aea09 100644
--- a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
@@ -107,6 +107,6 @@ public class OpenExchangeRatesOrgProviderTest extends SolrTestCaseJ4 {
@Test(expected = SolrException.class)
public void testNoInit() {
oerp.getExchangeRate("ABC", "DEF");
- assertTrue("Should have thrown exception if not initialized", false);
+ fail("Should have thrown exception if not initialized");
}
}
diff --git a/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
index 14401db3646..1be999ab371 100644
--- a/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
@@ -113,7 +113,7 @@ public class PolyFieldTest extends SolrTestCaseJ4 {
assertNotNull(home);
try {
fields = home.createFields("35.0,foo");
- assertTrue(false);
+ fail();
} catch (Exception e) {
//
}
diff --git a/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java b/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
index b33b68ac0c1..69d7b19a51b 100644
--- a/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
@@ -221,7 +221,7 @@ public class PreAnalyzedFieldTest extends SolrTestCaseJ4 {
CharTermAttribute termAttr = stream.addAttribute(CharTermAttribute.class);
stream.reset();
while (stream.incrementToken()) {
- assertFalse("zero-length token", termAttr.length() == 0);
+ assertNotEquals("zero-length token", 0, termAttr.length());
}
stream.end();
stream.close();
diff --git a/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java b/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
index 91cbfab85a5..d0e54314777 100644
--- a/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
@@ -71,10 +71,8 @@ public class SchemaVersionSpecificBehaviorTest extends SolrTestCaseJ4 {
field.useDocValuesAsStored());
// uninvertable defaults to true (for now)
- assertEquals(
- f + " field's type has wrong uninvertable for ver=" + ver,
- true,
- field.isUninvertible());
+ assertTrue(
+ f + " field's type has wrong uninvertable for ver=" + ver, field.isUninvertible());
}
// regardless of version, explicit multiValued values on field or type
diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
index e930e00f8e9..64ffb41c072 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -3147,9 +3147,10 @@ public class TestPointFields extends SolrTestCaseJ4 {
toStringArray(getRandomInstants(2, false).stream().sorted().collect(Collectors.toList()));
String[] min = new String[] {ints[0], longs[0], doubles[0], floats[0], dates[0]};
String[] max = new String[] {ints[1], longs[1], doubles[1], floats[1], dates[1]};
- assert fieldTypeNames.length == fieldTypes.length
- && fieldTypeNames.length == max.length
- && fieldTypeNames.length == min.length;
+ assertTrue(
+ fieldTypeNames.length == fieldTypes.length
+ && fieldTypeNames.length == max.length
+ && fieldTypeNames.length == min.length);
for (int i = 0; i < fieldTypeNames.length; i++) {
SchemaField fieldIndexed = h.getCore().getLatestSchema().getField("foo_" + fieldTypeNames[i]);
SchemaField fieldIndexedAndDv =
@@ -3264,7 +3265,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
}
private List<Integer> getRandomInts(int length, boolean missingVals, int boundPosNeg) {
- assert boundPosNeg > 0L;
+ assertTrue(boundPosNeg > 0L);
return getRandomList(
length,
missingVals,
@@ -3276,7 +3277,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
}
private List<Long> getRandomLongs(int length, boolean missingVals, long boundPosNeg) {
- assert boundPosNeg > 0L;
+ assertTrue(boundPosNeg > 0L);
return getRandomList(
length,
missingVals,
@@ -3300,7 +3301,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
}
private String[] getSequentialStringArrayWithDates(int length) {
- assert length < 60;
+ assertTrue(length < 60);
String[] arr = new String[length];
for (int i = 0; i < length; i++) {
arr[i] = String.format(Locale.ROOT, "1995-12-11T19:59:%02dZ", i);
@@ -3317,7 +3318,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
}
private void doTestFieldNotIndexed(String field, String[] values) throws IOException {
- assert values.length == 10;
+ assertTrue(values.length == 10);
// test preconditions
SchemaField sf = h.getCore().getLatestSchema().getField(field);
assertFalse("Field should be indexed=false", sf.indexed());
@@ -3411,8 +3412,9 @@ public class TestPointFields extends SolrTestCaseJ4 {
private void doTestPointFieldReturn(String field, String type, String[] values) {
SchemaField sf = h.getCore().getLatestSchema().getField(field);
- assert sf.stored() || (sf.hasDocValues() && sf.useDocValuesAsStored())
- : "Unexpected field definition for " + field;
+ assertTrue(
+ "Unexpected field definition for " + field,
+ sf.stored() || (sf.hasDocValues() && sf.useDocValuesAsStored()));
for (int i = 0; i < values.length; i++) {
assertU(adoc("id", String.valueOf(i), field, values[i]));
}
@@ -3627,7 +3629,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
private void doTestPointFieldFacetField(
String nonDocValuesField, String docValuesField, String[] numbers) {
- assert numbers != null && numbers.length == 10;
+ assertTrue(numbers != null && numbers.length == 10);
assertFalse(h.getCore().getLatestSchema().getField(docValuesField).multiValued());
assertTrue(h.getCore().getLatestSchema().getField(docValuesField).hasDocValues());
@@ -4009,7 +4011,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
final String MATCH_ONE = "//*[@numFound='" + (searchable ? "1" : "0") + "']";
final String MATCH_TWO = "//*[@numFound='" + (searchable ? "2" : "0") + "']";
- assert numbers != null && numbers.length == 20;
+ assertTrue(numbers != null && numbers.length == 20);
assertTrue(h.getCore().getLatestSchema().getField(fieldName).multiValued());
assertTrue(h.getCore().getLatestSchema().getField(fieldName).getType() instanceof PointField);
for (int i = 0; i < 10; i++) {
@@ -4057,7 +4059,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
}
private void doTestPointFieldMultiValuedReturn(String fieldName, String type, String[] numbers) {
- assert numbers != null && numbers.length == 20;
+ assertTrue(numbers != null && numbers.length == 20);
assertTrue(h.getCore().getLatestSchema().getField(fieldName).multiValued());
assertTrue(h.getCore().getLatestSchema().getField(fieldName).getType() instanceof PointField);
for (int i = 9; i >= 0; i--) {
@@ -4116,7 +4118,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
private void doTestPointFieldMultiValuedRangeQuery(
String fieldName, String type, String[] numbers) {
- assert numbers != null && numbers.length == 20;
+ assertTrue(numbers != null && numbers.length == 20);
SchemaField sf = h.getCore().getLatestSchema().getField(fieldName);
assertTrue(sf.multiValued());
assertTrue(sf.getType() instanceof PointField);
@@ -4279,7 +4281,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
private void doTestPointFieldMultiValuedFacetField(
String nonDocValuesField, String dvFieldName, String[] numbers) {
- assert numbers != null && numbers.length == 20;
+ assertTrue(numbers != null && numbers.length == 20);
assertTrue(h.getCore().getLatestSchema().getField(dvFieldName).multiValued());
assertTrue(h.getCore().getLatestSchema().getField(dvFieldName).hasDocValues());
assertTrue(h.getCore().getLatestSchema().getField(dvFieldName).getType() instanceof PointField);
@@ -4590,7 +4592,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
private void doTestPointMultiValuedFunctionQuery(
String nonDocValuesField, String docValuesField, String[] numbers) {
- assert numbers != null && numbers.length == 20;
+ assertTrue(numbers != null && numbers.length == 20);
for (int i = 0; i < 10; i++) {
assertU(
adoc(
@@ -4804,7 +4806,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
* @param values list of values in ascending order
*/
private <T extends Comparable<T>> void doTestPointFieldSort(String field, List<T> values) {
- assert values != null && 2 <= values.size();
+ assertTrue(values != null && 2 <= values.size());
final List<SolrInputDocument> docs = new ArrayList<>(values.size());
final String[] ascXpathChecks = new String[values.size() + 1];
@@ -5749,34 +5751,34 @@ public class TestPointFields extends SolrTestCaseJ4 {
PointValues.size(ir, field));
}
if (ignoredField) {
- assertTrue(
+ assertEquals(
"Field " + field + " should not have docValues",
- DocValues.getSortedNumeric(leafReaderForCheckingDVs, field).nextDoc()
- == DocIdSetIterator.NO_MORE_DOCS);
- assertTrue(
+ DocIdSetIterator.NO_MORE_DOCS,
+ DocValues.getSortedNumeric(leafReaderForCheckingDVs, field).nextDoc());
+ assertEquals(
"Field " + field + " should not have docValues",
- DocValues.getNumeric(leafReaderForCheckingDVs, field).nextDoc()
- == DocIdSetIterator.NO_MORE_DOCS);
- assertTrue(
+ DocIdSetIterator.NO_MORE_DOCS,
+ DocValues.getNumeric(leafReaderForCheckingDVs, field).nextDoc());
+ assertEquals(
"Field " + field + " should not have docValues",
- DocValues.getSorted(leafReaderForCheckingDVs, field).nextDoc()
- == DocIdSetIterator.NO_MORE_DOCS);
- assertTrue(
+ DocIdSetIterator.NO_MORE_DOCS,
+ DocValues.getSorted(leafReaderForCheckingDVs, field).nextDoc());
+ assertEquals(
"Field " + field + " should not have docValues",
- DocValues.getBinary(leafReaderForCheckingDVs, field).nextDoc()
- == DocIdSetIterator.NO_MORE_DOCS);
+ DocIdSetIterator.NO_MORE_DOCS,
+ DocValues.getBinary(leafReaderForCheckingDVs, field).nextDoc());
} else {
if (sf.hasDocValues()) {
if (sf.multiValued()) {
- assertFalse(
+ assertNotEquals(
"Field " + field + " should have docValues",
- DocValues.getSortedNumeric(leafReaderForCheckingDVs, field).nextDoc()
- == DocIdSetIterator.NO_MORE_DOCS);
+ DocIdSetIterator.NO_MORE_DOCS,
+ DocValues.getSortedNumeric(leafReaderForCheckingDVs, field).nextDoc());
} else {
- assertFalse(
+ assertNotEquals(
"Field " + field + " should have docValues",
- DocValues.getNumeric(leafReaderForCheckingDVs, field).nextDoc()
- == DocIdSetIterator.NO_MORE_DOCS);
+ DocIdSetIterator.NO_MORE_DOCS,
+ DocValues.getNumeric(leafReaderForCheckingDVs, field).nextDoc());
}
} else {
expectThrows(
diff --git a/solr/core/src/test/org/apache/solr/schema/TestSchemalessBufferedUpdates.java b/solr/core/src/test/org/apache/solr/schema/TestSchemalessBufferedUpdates.java
index d2aa64899b9..6e35ea5b11e 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestSchemalessBufferedUpdates.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestSchemalessBufferedUpdates.java
@@ -116,7 +116,7 @@ public class TestSchemalessBufferedUpdates extends SolrTestCaseJ4 {
Future<UpdateLog.RecoveryInfo> rinfoFuture = ulog.applyBufferedUpdates();
- assertTrue(rinfoFuture != null);
+ assertNotNull(rinfoFuture);
assertEquals(UpdateLog.State.APPLYING_BUFFERED, ulog.getState());
diff --git a/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java b/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java
index 5b5e0d763c4..a326edbcf1c 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java
@@ -430,16 +430,14 @@ public class TestSortableTextField extends SolrTestCaseJ4 {
for (String n : Arrays.asList("keyword_stxt", "whitespace_max0_stxt", "whitespace_max6_stxt")) {
{
FieldType ft = h.getCore().getLatestSchema().getFieldTypeByName(n);
- assertEquals(
+ assertFalse(
"type " + ft.getTypeName() + " should not default to useDocValuesAsStored",
- false,
ft.useDocValuesAsStored());
}
{
SchemaField sf = h.getCore().getLatestSchema().getField(n);
- assertEquals(
+ assertFalse(
"field " + sf.getName() + " should not default to useDocValuesAsStored",
- false,
sf.useDocValuesAsStored());
}
}
@@ -451,9 +449,8 @@ public class TestSortableTextField extends SolrTestCaseJ4 {
if (entry.getKey().endsWith("_has_usedvs")) {
num_types_found++;
FieldType ft = entry.getValue();
- assertEquals(
+ assertTrue(
"type " + ft.getTypeName() + " has unexpected useDocValuesAsStored value",
- true,
ft.useDocValuesAsStored());
}
}
diff --git a/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java b/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
index 1427f73b7e6..0cde4d58e28 100644
--- a/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
+++ b/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
@@ -167,9 +167,9 @@ public class MergeStrategyTest extends BaseDistributedSearchTestCase {
MergeStrategy[] merges = {m1, m2, m3};
Arrays.sort(merges, MergeStrategy.MERGE_COMP);
- assert (merges[0].getCost() == 1);
- assert (merges[1].getCost() == 50);
- assert (merges[2].getCost() == 100);
+ assertEquals(1, merges[0].getCost());
+ assertEquals(50, merges[1].getCost());
+ assertEquals(100, merges[2].getCost());
}
private void assertOrder(QueryResponse rsp, String... docs) throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
index fa0def076d5..1cbaee0a957 100644
--- a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
@@ -47,6 +47,7 @@ import org.apache.lucene.search.TotalHits;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.InPlaceMergeSorter;
import org.apache.lucene.util.PriorityQueue;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
@@ -664,8 +665,10 @@ public class RankQueryTestPlugin extends QParserPlugin {
final String sortFieldName = sortField.getField();
final String valueFieldName = sortFieldValues.getName(marshalledFieldNum);
- assert sortFieldName.equals(valueFieldName)
- : "sortFieldValues name key does not match expected SortField.getField";
+ SolrTestCase.assertEquals(
+ "sortFieldValues name key does not match expected SortField.getField",
+ sortFieldName,
+ valueFieldName);
List sortVals = (List) sortFieldValues.getVal(marshalledFieldNum);
diff --git a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
index 568095d5421..0db966e01f3 100644
--- a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
+++ b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
@@ -572,12 +572,13 @@ public class ReturnFieldsTest extends SolrTestCaseJ4 {
int offset = TestUtil.nextInt(r, 0, WHITESPACE_CHARACTERS.length - 1);
char c = WHITESPACE_CHARACTERS[offset];
// sanity check
- assert Character.isWhitespace(c)
- : String.format(
+ assertTrue(
+ String.format(
Locale.ENGLISH,
"Not really whitespace? WHITESPACE_CHARACTERS[%d] is '\\u%04X'",
offset,
- (int) c);
+ (int) c),
+ Character.isWhitespace(c));
out.append(c);
}
return out.toString();
diff --git a/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java b/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java
index 2736ec78ba4..2a13531e345 100644
--- a/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java
+++ b/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java
@@ -451,7 +451,7 @@ public class SolrIndexSearcherTest extends SolrTestCaseJ4 {
public MockPostFilter(int maxDocsToCollect, int cost, ScoreMode scoreMode) {
super(new Term("foo", "bar")); // The term won't really be used. just the collector
- assert cost > 100;
+ assertTrue(cost > 100);
this.cost = cost;
this.maxDocsToCollect = maxDocsToCollect;
this.scoreMode = scoreMode;
diff --git a/solr/core/src/test/org/apache/solr/search/SortSpecParsingTest.java b/solr/core/src/test/org/apache/solr/search/SortSpecParsingTest.java
index 613f267356d..dfe4ff6b313 100644
--- a/solr/core/src/test/org/apache/solr/search/SortSpecParsingTest.java
+++ b/solr/core/src/test/org/apache/solr/search/SortSpecParsingTest.java
@@ -74,14 +74,14 @@ public class SortSpecParsingTest extends SolrTestCaseJ4 {
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
- assertEquals(flds[0].getReverse(), true);
+ assertTrue(flds[0].getReverse());
spec = doParseSortSpec("weight dEsC", req);
flds = spec.getSort().getSort();
assertEquals(1, flds.length);
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
- assertEquals(flds[0].getReverse(), true);
+ assertTrue(flds[0].getReverse());
assertEquals(1, spec.getSchemaFields().size());
assertNotNull(spec.getSchemaFields().get(0));
assertEquals("weight", spec.getSchemaFields().get(0).getName());
@@ -90,27 +90,27 @@ public class SortSpecParsingTest extends SolrTestCaseJ4 {
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
- assertEquals(flds[0].getReverse(), true);
+ assertTrue(flds[0].getReverse());
assertEquals(flds[1].getType(), SortField.Type.LONG);
assertEquals(flds[1].getField(), "bday");
- assertEquals(flds[1].getReverse(), false);
+ assertFalse(flds[1].getReverse());
// order aliases
sort = doParseSortSpec("weight top,bday asc", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
- assertEquals(flds[0].getReverse(), true);
+ assertTrue(flds[0].getReverse());
assertEquals(flds[1].getType(), SortField.Type.LONG);
assertEquals(flds[1].getField(), "bday");
- assertEquals(flds[1].getReverse(), false);
+ assertFalse(flds[1].getReverse());
sort = doParseSortSpec("weight top,bday bottom", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
- assertEquals(flds[0].getReverse(), true);
+ assertTrue(flds[0].getReverse());
assertEquals(flds[1].getType(), SortField.Type.LONG);
assertEquals(flds[1].getField(), "bday");
- assertEquals(flds[1].getReverse(), false);
+ assertFalse(flds[1].getReverse());
// test weird spacing
sort = doParseSortSpec("weight DESC, bday asc", req).getSort();
@@ -237,40 +237,40 @@ public class SortSpecParsingTest extends SolrTestCaseJ4 {
// test some bad vals
try {
sort = doParseSortSpec("weight, desc", req).getSort();
- assertTrue(false);
+ fail();
} catch (SolrException e) {
// expected
}
try {
sort = doParseSortSpec("w", req).getSort();
- assertTrue(false);
+ fail();
} catch (SolrException e) {
// expected
}
try {
sort = doParseSortSpec("weight desc, bday", req).getSort();
- assertTrue(false);
+ fail();
} catch (SolrException e) {
}
try {
// bad number of commas
sort = SortSpecParsing.parseSortSpec("pow(weight,,2) desc, bday asc", req).getSort();
- assertTrue(false);
+ fail();
} catch (SolrException e) {
}
try {
// bad function
sort = SortSpecParsing.parseSortSpec("pow() desc, bday asc", req).getSort();
- assertTrue(false);
+ fail();
} catch (SolrException e) {
}
try {
// bad number of parens
sort = SortSpecParsing.parseSortSpec("pow((weight,2) desc, bday asc", req).getSort();
- assertTrue(false);
+ fail();
} catch (SolrException e) {
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java b/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java
index 30758369373..87ff29d5e6a 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java
@@ -65,13 +65,13 @@ public class TestCaffeineCache extends SolrTestCase {
}
assertEquals("15", lfuCache.get(15));
assertEquals("75", lfuCache.get(75));
- assertEquals(null, lfuCache.get(110));
+ assertNull(lfuCache.get(110));
Map<String, Object> nl = lfuCache.getMetricsMap().getValue();
assertEquals(3L, nl.get("lookups"));
assertEquals(2L, nl.get("hits"));
assertEquals(101L, nl.get("inserts"));
- assertEquals(null, lfuCache.get(1)); // first item put in should be the first out
+ assertNull(lfuCache.get(1)); // first item put in should be the first out
// Test autowarming
newLFUCache.init(params, initObj, regenerator);
@@ -81,7 +81,7 @@ public class TestCaffeineCache extends SolrTestCase {
newLFUCache.put(103, "103");
assertEquals("15", newLFUCache.get(15));
assertEquals("75", newLFUCache.get(75));
- assertEquals(null, newLFUCache.get(50));
+ assertNull(newLFUCache.get(50));
nl = newLFUCache.getMetricsMap().getValue();
assertEquals(3L, nl.get("lookups"));
assertEquals(2L, nl.get("hits"));
diff --git a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
index e0c8cfe22ac..d6e20ed93d6 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
@@ -1139,21 +1139,21 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
s = GroupHeadSelector.build(params("max", "foo_s"));
assertEquals(GroupHeadSelectorType.MAX, s.type);
assertEquals("foo_s", s.selectorText);
- assertFalse(s.equals(GroupHeadSelector.build(params("min", "foo_s", "other", "stuff"))));
+ assertNotEquals(s, GroupHeadSelector.build(params("min", "foo_s", "other", "stuff")));
s = GroupHeadSelector.build(params());
assertEquals(GroupHeadSelectorType.SCORE, s.type);
assertNotNull(s.selectorText);
assertEquals(GroupHeadSelector.build(params()), s);
- assertFalse(s.equals(GroupHeadSelector.build(params("min", "BAR_s"))));
+ assertNotEquals(s, GroupHeadSelector.build(params("min", "BAR_s")));
s = GroupHeadSelector.build(params("sort", "foo_s asc"));
assertEquals(GroupHeadSelectorType.SORT, s.type);
assertEquals("foo_s asc", s.selectorText);
assertEquals(GroupHeadSelector.build(params("sort", "foo_s asc")), s);
- assertFalse(s.equals(GroupHeadSelector.build(params("sort", "BAR_s asc"))));
- assertFalse(s.equals(GroupHeadSelector.build(params("min", "BAR_s"))));
- assertFalse(s.equals(GroupHeadSelector.build(params())));
+ assertNotEquals(s, GroupHeadSelector.build(params("sort", "BAR_s asc")));
+ assertNotEquals(s, GroupHeadSelector.build(params("min", "BAR_s")));
+ assertNotEquals(s, GroupHeadSelector.build(params()));
assertEquals(
GroupHeadSelector.build(params("sort", "foo_s asc")).hashCode(),
diff --git a/solr/core/src/test/org/apache/solr/search/TestDocSet.java b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
index 5dc68c09422..cff7e2b8858 100644
--- a/solr/core/src/test/org/apache/solr/search/TestDocSet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
@@ -157,7 +157,7 @@ public class TestDocSet extends SolrTestCase {
DocIterator i1 = d1.iterator();
DocIterator i2 = d2.iterator();
- assert (i1.hasNext() == i2.hasNext());
+ assertEquals(i1.hasNext(), i2.hasNext());
for (; ; ) {
boolean b1 = i1.hasNext();
diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
index b86ca6aa636..98b94d04f2d 100644
--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
@@ -52,7 +52,6 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.BaseTestHarness;
import org.apache.solr.util.SolrPluginUtils;
import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -1518,7 +1517,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
ExtendedDismaxQParser parser =
new ExtendedDismaxQParser(query, null, request.getParams(), request);
List<ExtendedDismaxQParser.Clause> clauses = parser.splitIntoClauses(query, false);
- Assert.assertEquals(3, clauses.size());
+ assertEquals(3, clauses.size());
assertClause(clauses.get(0), "\\(", false, true);
assertClause(clauses.get(1), "foo\nfoo", true, false);
assertClause(clauses.get(2), "\\)", false, true);
@@ -1527,7 +1526,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
request = req("q", query, "qf", "cat_s", "defType", "edismax");
parser = new ExtendedDismaxQParser(query, null, request.getParams(), request);
clauses = parser.splitIntoClauses(query, false);
- Assert.assertEquals(5, clauses.size());
+ assertEquals(5, clauses.size());
assertClause(clauses.get(0), "\\[", false, true, "cat_s");
assertClause(clauses.get(1), "foo\nfoo", true, false);
assertClause(clauses.get(2), "TO", true, false);
@@ -1538,7 +1537,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
request = req("q", query, "qf", "cat_s", "defType", "edismax");
parser = new ExtendedDismaxQParser(query, null, request.getParams(), request);
clauses = parser.splitIntoClauses(query, false);
- Assert.assertEquals(5, clauses.size());
+ assertEquals(5, clauses.size());
assertClause(clauses.get(0), "\\[", true, true, "cat_s");
assertClause(clauses.get(1), "foo\nfoo", true, false);
assertClause(clauses.get(2), "TO", true, false);
@@ -1554,7 +1553,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
parser = new ExtendedDismaxQParser(query, null, request.getParams(), request);
clauses = parser.splitIntoClauses(query, false);
- Assert.assertEquals(1, clauses.size());
+ assertEquals(1, clauses.size());
assertClause(
clauses.get(0), "\\!\\(\\)\\:\\^\\[\\]\\{\\}\\~\\*\\?\\\"\\+\\-\\\\\\|\\&\\/", false, true);
@@ -1563,7 +1562,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
parser = new ExtendedDismaxQParser(query, null, request.getParams(), request);
clauses = parser.splitIntoClauses(query, false);
- Assert.assertEquals(1, clauses.size());
+ assertEquals(1, clauses.size());
assertClause(clauses.get(0), "foo\\/", false, true);
}
@@ -1573,10 +1572,10 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
boolean hasWhitespace,
boolean hasSpecialSyntax,
String field) {
- Assert.assertEquals(value, clause.val);
- Assert.assertEquals(hasWhitespace, clause.hasWhitespace);
- Assert.assertEquals(hasSpecialSyntax, clause.hasSpecialSyntax);
- Assert.assertEquals(field, clause.field);
+ assertEquals(value, clause.val);
+ assertEquals(hasWhitespace, clause.hasWhitespace);
+ assertEquals(hasSpecialSyntax, clause.hasSpecialSyntax);
+ assertEquals(field, clause.field);
}
private static void assertClause(
diff --git a/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java b/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java
index c29b28b96c2..153db65f0f7 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java
@@ -38,7 +38,6 @@ import org.apache.lucene.search.Weight;
import org.apache.lucene.store.Directory;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.solr.SolrTestCase;
-import org.junit.Assert;
public class TestFilteredDocIdSet extends SolrTestCase {
public void testFilteredDocIdSet() throws Exception {
@@ -126,7 +125,7 @@ public class TestFilteredDocIdSet extends SolrTestCase {
// First verify the document is searchable.
IndexSearcher searcher = newSearcher(reader);
- Assert.assertEquals(1, searcher.search(new MatchAllDocsQuery(), 10).totalHits.value);
+ assertEquals(1, searcher.search(new MatchAllDocsQuery(), 10).totalHits.value);
// Now search w/ a Query which returns a null Scorer
DocSetQuery f = new DocSetQuery(DocSet.empty());
@@ -136,7 +135,7 @@ public class TestFilteredDocIdSet extends SolrTestCase {
.add(new MatchAllDocsQuery(), Occur.MUST)
.add(f, Occur.FILTER)
.build();
- Assert.assertEquals(0, searcher.search(filtered, 10).totalHits.value);
+ assertEquals(0, searcher.search(filtered, 10).totalHits.value);
reader.close();
dir.close();
}
@@ -152,7 +151,7 @@ public class TestFilteredDocIdSet extends SolrTestCase {
// First verify the document is searchable.
IndexSearcher searcher = newSearcher(reader);
- Assert.assertEquals(1, searcher.search(new MatchAllDocsQuery(), 10).totalHits.value);
+ assertEquals(1, searcher.search(new MatchAllDocsQuery(), 10).totalHits.value);
// Now search w/ a Query which returns a null Scorer
Query f =
@@ -202,7 +201,7 @@ public class TestFilteredDocIdSet extends SolrTestCase {
.add(new MatchAllDocsQuery(), Occur.MUST)
.add(f, Occur.FILTER)
.build();
- Assert.assertEquals(0, searcher.search(filtered, 10).totalHits.value);
+ assertEquals(0, searcher.search(filtered, 10).totalHits.value);
reader.close();
dir.close();
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
index d00097a27ee..7d559d4d296 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
@@ -84,7 +84,7 @@ public class TestFiltering extends SolrTestCaseJ4 {
if (live == null) {
live = searcher.getLiveDocSet();
}
- assertTrue(set == live);
+ assertSame(set, live);
QueryCommand cmd = new QueryCommand();
cmd.setQuery(QParser.getParser(qstr, null, req).getQuery());
@@ -93,14 +93,14 @@ public class TestFiltering extends SolrTestCaseJ4 {
QueryResult res = new QueryResult();
searcher.search(res, cmd);
set = res.getDocSet();
- assertTrue(set == live);
+ assertSame(set, live);
cmd.setQuery(QParser.getParser(qstr + " OR id:0", null, req).getQuery());
cmd.setFilterList(QParser.getParser(qstr + " OR id:1", null, req).getQuery());
res = new QueryResult();
searcher.search(res, cmd);
set = res.getDocSet();
- assertTrue(set == live);
+ assertSame(set, live);
}
} finally {
diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
index 4170bfd3ca1..d8e7ce65808 100644
--- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
@@ -194,10 +194,10 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
}
}
- assert (set1.size() > 0);
- assert (set2.size() > 0);
- assert (set3.size() > 0);
- assert (set1.size() + set2.size() + set3.size() == set.size());
+ assertTrue(set1.size() > 0);
+ assertTrue(set2.size() > 0);
+ assertTrue(set3.size() > 0);
+ assertTrue(set1.size() + set2.size() + set3.size() == set.size());
assertNoOverLap(set1, set2);
assertNoOverLap(set1, set3);
assertNoOverLap(set2, set3);
@@ -244,9 +244,9 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
}
}
- assert (set1.size() > 0);
- assert (set2.size() > 0);
- assert (set1.size() + set2.size() == set.size());
+ assertTrue(set1.size() > 0);
+ assertTrue(set2.size() > 0);
+ assertTrue(set1.size() + set2.size() == set.size());
assertNoOverLap(set1, set2);
// Test with 2 workers and compound partition Key
@@ -291,9 +291,9 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
}
}
- assert (set1.size() > 0);
- assert (set2.size() > 0);
- assert (set1.size() + set2.size() == set.size());
+ assertTrue(set1.size() > 0);
+ assertTrue(set2.size() > 0);
+ assertEquals(set1.size() + set2.size(), set.size());
assertNoOverLap(set1, set2);
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java b/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
index d44daee769f..6c0b6a4d908 100644
--- a/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
+++ b/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
@@ -174,12 +174,8 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
IndexReaderContext rCtx6 = sr6.getSearcher().getTopReaderContext();
assertEquals(
1, rCtx6.leaves().get(0).reader().numDocs()); // only a single doc left in the first segment
- assertTrue(
- !rCtx5
- .leaves()
- .get(0)
- .reader()
- .equals(rCtx6.leaves().get(0).reader())); // readers now different
+ assertNotEquals(
+ rCtx5.leaves().get(0).reader(), rCtx6.leaves().get(0).reader()); // readers now different
sr5.close();
sr6.close();
@@ -495,8 +491,8 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
@Override
public void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {
try {
- assert currentSearcher == null
- : "SlowSearcherListener should only be used as FirstSearcherListener";
+ assertNull(
+ "SlowSearcherListener should only be used as FirstSearcherListener", currentSearcher);
// simulate a slow searcher listener
latch.await(10, TimeUnit.SECONDS);
} catch (InterruptedException e) {
diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java b/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java
index 2a9a52a5022..2b8d3ec62fc 100644
--- a/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java
+++ b/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java
@@ -45,26 +45,26 @@ public class TestQueryUtils extends SolrTestCaseJ4 {
public void positive(Query q) {
assertFalse(QueryUtils.isNegative(q));
- assertTrue(QueryUtils.getAbs(q) == q);
+ assertSame(QueryUtils.getAbs(q), q);
Collection<BooleanClause> clauses =
(q instanceof BooleanQuery) ? ((BooleanQuery) q).clauses() : null;
if (clauses != null) {
if (clauses.size() != 0) {
- assertTrue(QueryUtils.makeQueryable(q) == q);
+ assertSame(QueryUtils.makeQueryable(q), q);
}
} else {
- assertTrue(QueryUtils.makeQueryable(q) == q);
+ assertSame(QueryUtils.makeQueryable(q), q);
}
}
public void negative(Query q) {
assertTrue(QueryUtils.isNegative(q));
Query abs = QueryUtils.getAbs(q);
- assertTrue(q != abs);
+ assertNotSame(q, abs);
Query neg2 = QueryUtils.fixNegativeQuery(q);
- assertFalse(abs.equals(q));
- assertFalse(neg2.equals(q));
+ assertNotEquals(abs, q);
+ assertNotEquals(neg2, q);
}
public void testNegativeQueries() {
diff --git a/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java
index 3c71eba2fe4..7701f05d4fc 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java
@@ -190,14 +190,15 @@ public class TestRandomCollapseQParserPlugin extends SolrTestCaseJ4 {
continue;
}
- assertFalse(
+ assertNotEquals(
groupHeadId
+ " has null collapseVal but nullPolicy==ignore; "
+ "mainP: "
+ mainP
+ ", collapseP: "
+ collapseP,
- nullPolicy.equals(CollapsingQParserPlugin.NullPolicy.IGNORE.getName()));
+ nullPolicy,
+ CollapsingQParserPlugin.NullPolicy.IGNORE.getName());
}
// workaround for SOLR-8082...
@@ -220,9 +221,9 @@ public class TestRandomCollapseQParserPlugin extends SolrTestCaseJ4 {
final QueryResponse checkRsp = SOLR.query(SolrParams.wrapDefaults(checkP, mainP));
- assertTrue(
+ assertFalse(
"not even 1 match for sanity check query? expected: " + doc,
- !checkRsp.getResults().isEmpty());
+ checkRsp.getResults().isEmpty());
final SolrDocument firstMatch = checkRsp.getResults().get(0);
final Object firstMatchId = firstMatch.getFieldValue("id");
assertEquals(
diff --git a/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
index 705ac0bb211..b8e0380988f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
@@ -771,7 +771,7 @@ public class TestRangeQuery extends SolrTestCaseJ4 {
Number[] values = new Number[2];
FieldType ft = h.getCore().getLatestSchema().getField("field_" + fieldName).getType();
if (ft.getNumberType() == null) {
- assert ft instanceof StrField;
+ assertTrue(ft instanceof StrField);
values[0] = randomInt(max);
values[1] = randomInt(max);
Arrays.sort(values, (o1, o2) -> String.valueOf(o1).compareTo(String.valueOf(o2)));
@@ -958,7 +958,7 @@ public class TestRangeQuery extends SolrTestCaseJ4 {
}
private static <X extends Comparable<? super X>, Y> X randomKey(Map<X, Y> map) {
- assert !map.isEmpty();
+ assertFalse(map.isEmpty());
List<X> sortedKeys = new ArrayList<>(map.keySet());
Collections.sort(sortedKeys);
return sortedKeys.get(random().nextInt(sortedKeys.size()));
diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
index 06b41d7e2ac..8b978ff96e5 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
@@ -623,7 +623,7 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
stats = metrics.getValue();
long inserts2 = (Long) stats.get("inserts");
// Last query was NOT added to the cache
- assertTrue(inserts1 == inserts2);
+ assertEquals(inserts1, inserts2);
// Test range query embedded in larger query
params = new ModifiableSolrParams();
@@ -894,7 +894,7 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
+ ReRankQParserPlugin.RERANK_QUERY
+ " parameter is not specified",
() -> h.query(req(params)));
- assertTrue(se.code() == SolrException.ErrorCode.BAD_REQUEST.code);
+ assertEquals(se.code(), SolrException.ErrorCode.BAD_REQUEST.code);
unIgnoreException("reRankQuery parameter is mandatory");
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
index 1f842ea7025..44749171af4 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
@@ -914,7 +914,7 @@ public class TestRealTimeGet extends TestRTGBase {
|| (foundVer == info.version
&& foundVal != info.val)) { // if the version matches, the val must
verbose("ERROR, id=", id, "found=", response, "model", info);
- assertTrue(false);
+ fail();
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.java
index 12af30af76b..e87a84fb856 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java
@@ -653,7 +653,7 @@ public class TestRecovery extends SolrTestCaseJ4 {
assertEquals(UpdateLog.State.BUFFERING, ulog.getState());
Future<UpdateLog.RecoveryInfo> rinfoFuture = ulog.applyBufferedUpdates();
- assertTrue(rinfoFuture == null);
+ assertNull(rinfoFuture);
assertEquals(UpdateLog.State.ACTIVE, ulog.getState());
ulog.bufferUpdates();
@@ -725,7 +725,7 @@ public class TestRecovery extends SolrTestCaseJ4 {
assertEquals(6, bufferedOps.getValue() - initialOps);
rinfoFuture = ulog.applyBufferedUpdates();
- assertTrue(rinfoFuture != null);
+ assertNotNull(rinfoFuture);
assertEquals(UpdateLog.State.APPLYING_BUFFERED, ulog.getState());
@@ -785,7 +785,7 @@ public class TestRecovery extends SolrTestCaseJ4 {
logReplay.drainPermits();
rinfoFuture = ulog.applyBufferedUpdates();
- assertTrue(rinfoFuture != null);
+ assertNotNull(rinfoFuture);
assertEquals(UpdateLog.State.APPLYING_BUFFERED, ulog.getState());
// apply a single update
@@ -880,7 +880,7 @@ public class TestRecovery extends SolrTestCaseJ4 {
ulog.bufferUpdates();
assertEquals(UpdateLog.State.BUFFERING, ulog.getState());
Future<UpdateLog.RecoveryInfo> rinfoFuture = ulog.applyBufferedUpdates();
- assertTrue(rinfoFuture == null);
+ assertNull(rinfoFuture);
assertEquals(UpdateLog.State.ACTIVE, ulog.getState());
ulog.bufferUpdates();
@@ -1295,7 +1295,7 @@ public class TestRecovery extends SolrTestCaseJ4 {
assertU(commit());
long D1Version2 = getVer(req("q", "id:D1"));
- assert (D1Version2 > D1Version1);
+ assertTrue(D1Version2 > D1Version1);
assertJQ(
req("qt", "/get", "getVersions", "2"),
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressLucene.java b/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
index 9db05f76598..a02b55cb92f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
@@ -173,8 +173,8 @@ public class TestStressLucene extends TestRTGBase {
verbose("reopen result", newReader);
synchronized (globalLock) {
- assert newReader.getRefCount() > 0;
- assert reader.getRefCount() > 0;
+ assertTrue(newReader.getRefCount() > 0);
+ assertTrue(reader.getRefCount() > 0);
// install the new reader if it's newest (and check the current version
// since another reader may have already been installed)
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
index 1068f494893..299a8b82cf0 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
@@ -346,7 +346,7 @@ public class TestStressRecovery extends TestRTGBase {
|| (foundVer == info.version
&& foundVal != info.val)) { // if the version matches, the val must
verbose("ERROR, id=", id, "found=", response, "model", info);
- assertTrue(false);
+ fail();
}
}
}
@@ -373,7 +373,7 @@ public class TestStressRecovery extends TestRTGBase {
int bufferedAddsApplied = 0;
do {
- assertTrue(uLog.getState() == UpdateLog.State.ACTIVE);
+ assertSame(uLog.getState(), UpdateLog.State.ACTIVE);
// before we start buffering updates, we want to point
// visibleModel away from the live model.
@@ -384,7 +384,7 @@ public class TestStressRecovery extends TestRTGBase {
uLog.bufferUpdates();
}
- assertTrue(uLog.getState() == UpdateLog.State.BUFFERING);
+ assertSame(uLog.getState(), UpdateLog.State.BUFFERING);
// sometimes wait for a second to allow time for writers to write something
if (random().nextBoolean()) Thread.sleep(random().nextInt(10) + 1);
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java b/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
index 8c5dedb7f10..54917fa7399 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
@@ -347,7 +347,7 @@ public class TestStressReorder extends TestRTGBase {
|| (foundVer == info.version
&& foundVal != info.val)) { // if the version matches, the val must
log.error("ERROR, id={} found={} model {}", id, response, info);
- assertTrue(false);
+ fail();
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
index 430fce5606b..3314b913f6d 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
@@ -314,7 +314,7 @@ public class TestStressUserVersions extends TestRTGBase {
|| (foundVer == info.version
&& foundVal != info.val)) { // if the version matches, the val must
log.error("ERROR, id={} found={} model {}", id, response, info);
- assertTrue(false);
+ fail();
}
} else {
// if the doc is deleted (via tombstone), it shouldn't have a value on it.
@@ -322,7 +322,7 @@ public class TestStressUserVersions extends TestRTGBase {
if (foundVer < Math.abs(info.version)) {
log.error("ERROR, id={} found={} model {}", id, response, info);
- assertTrue(false);
+ fail();
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
index a01fbce0b64..03adc37a47a 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
@@ -254,7 +254,7 @@ public class TestStressVersions extends TestRTGBase {
|| (foundVer == info.version
&& foundVal != info.val)) { // if the version matches, the val must
verbose("ERROR, id=", id, "found=", response, "model", info);
- assertTrue(false);
+ fail();
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java b/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
index d12ec011172..40cfb8a5019 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
@@ -240,7 +240,7 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
// this will be short the "+1" fo the doc added to shard2...
NamedList bucket = foo_buckets.get(5);
- assertTrue(bucket.toString(), bucket.get("val").equals("bbb0")); // 'tail' is missed
+ assertEquals(bucket.toString(), "bbb0", bucket.get("val")); // 'tail' is missed
assertEquals(
bucket.toString(),
100L,
@@ -281,7 +281,7 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
}
// ...but it should have correctly asked shard2 to refine bbb0
NamedList bucket = foo_buckets.get(5);
- assertTrue(bucket.toString(), bucket.get("val").equals("bbb0"));
+ assertEquals(bucket.toString(), "bbb0", bucket.get("val"));
assertEquals(bucket.toString(), 101L, bucket.get("count"));
// ...and the status under bbb0 should be correct to include the refinement
assertEquals(ALL_STATS.size() + 3, bucket.size()); // val,count,facet
diff --git a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java
index 7a48d045ebb..4de05a620c7 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java
@@ -1114,9 +1114,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
/** Don't use, use the convenience methods */
public ModelRange(int lower, int upper) {
if (lower < 0 || upper < 0) {
- assert (lower < 0 && upper < lower);
+ assertTrue(lower < 0 && upper < lower);
} else {
- assert (lower <= upper);
+ assertTrue(lower <= upper);
}
this.lower = lower;
this.upper = upper;
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java
index 0c7f0fab9e0..a71d90ed4d5 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java
@@ -161,7 +161,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
* @see #randFieldValue
*/
private static String field(final String[] suffixes, final int fieldNum) {
- assert fieldNum < MAX_FIELD_NUM;
+ assertTrue(fieldNum < MAX_FIELD_NUM);
final String suffix = suffixes[fieldNum % suffixes.length];
return "field_" + fieldNum + suffix;
@@ -735,7 +735,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
public TermFacet(
String field, JoinDomain domain, Integer limit, Integer overrequest, Boolean refine) {
- assert null != field;
+ assertNotNull(field);
this.field = field;
this.domain = domain;
this.limit = limit;
@@ -799,8 +799,8 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
* value to use for testing them against in a solr request.
*/
public static CharSequence toJSONFacetParamValue(Map<String, TermFacet> facets) {
- assert null != facets;
- assert 0 < facets.size();
+ assertNotNull(facets);
+ assertTrue(0 < facets.size());
StringBuilder sb = new StringBuilder("{");
for (String key : facets.keySet()) {
sb.append(key).append(" : ").append(facets.get(key).toJSONFacetParamValue());
@@ -931,7 +931,6 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
Map<String, TermFacet> results = new LinkedHashMap<>();
for (int i = 0; i < numFacets; i++) {
final JoinDomain domain = JoinDomain.buildRandomDomain();
- assert null != domain;
final Integer limit = randomLimitParam(random());
final Integer overrequest = randomOverrequestParam(random());
final TermFacet facet =
@@ -967,7 +966,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
* @param filter filter to apply to domain, null if domain involves no filtering
*/
public JoinDomain(String from, String to, String filter) {
- assert !((null == from) ^ (null == to)) : "if from is null, to must be null";
+ assertEquals("if from is null, to must be null", (null == from), (null == to));
this.from = from;
this.to = to;
this.filter = filter;
@@ -983,7 +982,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
}
StringBuilder sb = new StringBuilder("domain:{");
if (null != from) {
- assert null != to;
+ assertNotNull(to);
sb.append("join:{from:").append(from).append(",to:").append(to).append("}");
if (null != filter) {
sb.append(",");
@@ -1002,8 +1001,8 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
* facet
*/
public SolrParams applyDomainToQuery(String safeKey, SolrParams in) {
- assert null
- == in.get(safeKey); // shouldn't be possible if every facet uses a unique key string
+ // shouldn't be possible if every facet uses a unique key string
+ assertNull(in.get(safeKey));
String q = in.get("q");
final ModifiableSolrParams out = new ModifiableSolrParams(in);
@@ -1065,7 +1064,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
}
public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception {
- assert null != client.getDefaultCollection();
+ assertNotNull(client.getDefaultCollection());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(
client.getDefaultCollection(), ZkStateReader.from(client), true, true, 330);
}
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
index 69fafaf05ca..1ca9080ebd6 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
@@ -204,7 +204,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
* @see #randFieldValue
*/
private static String field(final String[] suffixes, final int fieldNum) {
- assert fieldNum < MAX_FIELD_NUM;
+ assertTrue(fieldNum < MAX_FIELD_NUM);
final String suffix = suffixes[fieldNum % suffixes.length];
return "field_" + fieldNum + suffix;
@@ -354,7 +354,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
}
private static String buildORQuery(String... clauses) {
- assert 0 < clauses.length;
+ assertTrue(0 < clauses.length);
return "(" + String.join(" OR ", clauses) + ")";
}
@@ -581,7 +581,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
* @param options can set any of options used in a term facet other than field or (sub) facets
*/
public TermFacet(final String field, final Map<String, Object> options) {
- assert null != field;
+ assertNotNull(field);
this.field = field;
jsonData.putAll(options);
@@ -623,8 +623,8 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
* value to use for testing them against in a solr request.
*/
public static String toJSONFacetParamValue(final Map<String, TermFacet> facets) {
- assert null != facets;
- assert !facets.isEmpty();
+ assertNotNull(facets);
+ assertFalse(facets.isEmpty());
// see class javadocs for why we always want processEmpty
final Map<String, Object> jsonData = map("processEmpty", true);
@@ -700,8 +700,9 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
// never used a prefix on a numeric field
return null;
}
- assert (facetField.contains("multi_s") || facetField.contains("solo_s"))
- : "possible facet fields have changed, breaking test";
+ assertTrue(
+ "possible facet fields have changed, breaking test",
+ facetField.contains("multi_s") || facetField.contains("solo_s"));
switch (r.nextInt(5)) {
case 0:
@@ -899,7 +900,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
}
public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception {
- assert null != client.getDefaultCollection();
+ assertNotNull(client.getDefaultCollection());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(
client.getDefaultCollection(), ZkStateReader.from(client), true, true, 330);
}
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
index 235578d82d0..4bb741e772c 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
@@ -194,7 +194,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
* @see #randFieldValue
*/
private static String field(final String[] suffixes, final int fieldNum) {
- assert fieldNum < MAX_FIELD_NUM;
+ assertTrue(fieldNum < MAX_FIELD_NUM);
final String suffix = suffixes[fieldNum % suffixes.length];
return "field_" + fieldNum + suffix;
@@ -759,7 +759,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
}
private static String buildORQuery(String... clauses) {
- assert 0 < clauses.length;
+ assertTrue(0 < clauses.length);
return "(" + String.join(" OR ", clauses) + ")";
}
@@ -865,8 +865,8 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
* value to use for testing them against in a solr request.
*/
public static String toJSONFacetParamValue(final Map<String, ? extends Facet> facets) {
- assert null != facets;
- assert !facets.isEmpty();
+ assertNotNull(facets);
+ assertFalse(facets.isEmpty());
return JSONUtil.toJSON(facets, -1); // no newlines
}
@@ -925,7 +925,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
public RelatednessFacet(
final String foreQ, final String backQ, final Map<String, Object> options) {
- assert null != options;
+ assertNotNull(options);
final String f = null == foreQ ? "$fore" : "{!v='" + foreQ + "'}";
final String b = null == backQ ? "$back" : "{!v='" + backQ + "'}";
@@ -980,7 +980,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
* @param options can set any of options used in a term facet other than field or (sub) facets
*/
public TermFacet(final String field, final Map<String, Object> options) {
- assert null != field;
+ assertNotNull(field);
jsonData.put("method", "${method_val:smart}");
@@ -1135,8 +1135,9 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
// never used a prefix on a numeric field
return null;
}
- assert (facetField.contains("multi_s") || facetField.contains("solo_s"))
- : "possible facet fields have changed, breaking test";
+ assertTrue(
+ "possible facet fields have changed, breaking test",
+ facetField.contains("multi_s") || facetField.contains("solo_s"));
switch (r.nextInt(5)) {
case 0:
@@ -1306,7 +1307,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
}
public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception {
- assert null != client.getDefaultCollection();
+ assertNotNull(client.getDefaultCollection());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(
client.getDefaultCollection(), ZkStateReader.from(client), true, true, 330);
}
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
index b82414893f9..e2a451e7dcf 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
@@ -3575,7 +3575,7 @@ public class TestJsonFacets extends SolrTestCaseHS {
"facets=={ 'count':6, " + "f1:{ buckets:[{ val:batman, count:1, x:1}]}" + " } ");
assertEquals(1, DebugAgg.Acc.creates.get() - creates);
- assertTrue(DebugAgg.Acc.resets.get() - resets == 0);
+ assertEquals(0, DebugAgg.Acc.resets.get() - resets);
// all slots should be done in a single shot. there may be more than 5 due to special slots or
// hashing.
assertTrue(DebugAgg.Acc.last.numSlots >= 5);
@@ -3593,7 +3593,7 @@ public class TestJsonFacets extends SolrTestCaseHS {
"facets==");
assertEquals(1, DebugAgg.Acc.creates.get() - creates);
- assertTrue(DebugAgg.Acc.resets.get() - resets == 0);
+ assertEquals(0, DebugAgg.Acc.resets.get() - resets);
// all slots should be done in a single shot. there may be more than 5 due to special slots or
// hashing.
assertTrue(DebugAgg.Acc.last.numSlots >= 5);
@@ -3612,7 +3612,7 @@ public class TestJsonFacets extends SolrTestCaseHS {
"facets==");
assertEquals(1, DebugAgg.Acc.creates.get() - creates);
- assertTrue(DebugAgg.Acc.resets.get() - resets == 0);
+ assertEquals(0, DebugAgg.Acc.resets.get() - resets);
// all slots should be done in a single shot. there may be more than 5 due to special slots or
// hashing.
assertTrue(DebugAgg.Acc.last.numSlots >= 5);
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
index a059675089a..56d94a5f2ab 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
@@ -117,7 +117,7 @@ public class TestFunctionQuery extends SolrTestCaseJ4 {
for (int i = 0; i < results.length; i += 2) {
final int id = (int) results[i];
- assert ((float) id) == results[i];
+ assertEquals(((float) id), results[i], 0.0);
String xpath =
"//doc[./str[@name='id']='"
@@ -225,14 +225,14 @@ public class TestFunctionQuery extends SolrTestCaseJ4 {
Object orig = FileFloatSource.onlyForTesting;
singleTest(field, "log(\0)");
// make sure the values were cached
- assertTrue(orig == FileFloatSource.onlyForTesting);
+ assertSame(orig, FileFloatSource.onlyForTesting);
singleTest(field, "sqrt(\0)");
- assertTrue(orig == FileFloatSource.onlyForTesting);
+ assertSame(orig, FileFloatSource.onlyForTesting);
makeExternalFile(field, "0=1");
assertU(h.query("/reloadCache", lrf.makeRequest("", "")));
singleTest(field, "sqrt(\0)");
- assertTrue(orig != FileFloatSource.onlyForTesting);
+ assertNotSame(orig, FileFloatSource.onlyForTesting);
Random r = random();
for (int i = 0; i < 10; i++) { // do more iterations for a thorough test
@@ -1042,15 +1042,15 @@ public class TestFunctionQuery extends SolrTestCaseJ4 {
Object orig = FileFloatSource.onlyForTesting;
singleTest(fieldAsFunc, "log(\0)");
// make sure the values were cached
- assertTrue(orig == FileFloatSource.onlyForTesting);
+ assertSame(orig, FileFloatSource.onlyForTesting);
singleTest(fieldAsFunc, "sqrt(\0)");
- assertTrue(orig == FileFloatSource.onlyForTesting);
+ assertSame(orig, FileFloatSource.onlyForTesting);
makeExternalFile(field, "0=1");
assertU(adoc("id", "10000")); // will get same reader if no index change
assertU(commit());
singleTest(fieldAsFunc, "sqrt(\0)");
- assertTrue(orig != FileFloatSource.onlyForTesting);
+ assertNotSame(orig, FileFloatSource.onlyForTesting);
}
/**
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
index 374b2e510a6..19e3ecf63ca 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
@@ -634,7 +634,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
@SuppressWarnings({"rawtypes"}) final Comparable... vals) {
clearIndex();
- assert 0 < vals.length;
+ assertTrue(0 < vals.length);
@SuppressWarnings({"rawtypes"})
Comparable min = vals[0];
@SuppressWarnings({"rawtypes"})
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java b/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java
index af2f00d4634..5c37805b9e4 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java
@@ -152,8 +152,8 @@ public class TestOrdValues extends SolrTestCase {
inOrder
? id2String(N_DOCS - i) // in-order ==> larger values first
: id2String(i + 1); // reverse ==> smaller values first
- assertTrue(
- "id of result " + i + " should be " + expectedId + " != " + score, expectedId.equals(id));
+ assertEquals(
+ "id of result " + i + " should be " + expectedId + " != " + score, expectedId, id);
}
r.close();
}
@@ -161,10 +161,10 @@ public class TestOrdValues extends SolrTestCase {
// LUCENE-1250
public void testEqualsNull() {
OrdFieldSource ofs = new OrdFieldSource("f");
- assertFalse(ofs.equals(null));
+ assertNotEquals(null, ofs);
ReverseOrdFieldSource rofs = new ReverseOrdFieldSource("f");
- assertFalse(rofs.equals(null));
+ assertNotEquals(null, rofs);
}
/**
diff --git a/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
index 5fd3ebcd0d0..1a6c85e5894 100644
--- a/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
+++ b/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
@@ -294,7 +294,7 @@ public class DistanceFunctionTest extends SolrTestCaseJ4 {
"fq",
"id:1"),
"//float[@name='score']='0.0'");
- assertTrue("should throw an exception", false);
+ fail("should throw an exception");
} catch (Exception e) {
Throwable cause = e.getCause();
assertNotNull(cause);
diff --git a/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java b/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java
index e110c015019..2282f33e1b0 100644
--- a/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java
+++ b/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java
@@ -117,8 +117,9 @@ public class BJQParserTest extends SolrTestCaseJ4 {
// add grandchildren after children
for (ListIterator<String[]> iter = block.listIterator(); iter.hasNext(); ) {
String[] child = iter.next();
- assert Objects.equals(child[0], "child_s") && Objects.equals(child[2], "parentchild_s")
- : Arrays.toString(child);
+ assertTrue(
+ Arrays.toString(child),
+ Objects.equals(child[0], "child_s") && Objects.equals(child[2], "parentchild_s"));
String child_s = child[1];
String parentchild_s = child[3];
int grandChildPos = 0;
@@ -178,7 +179,6 @@ public class BJQParserTest extends SolrTestCaseJ4 {
"//doc/arr[@name='child_s']/str='" + klm[0] + "'",
"//doc/arr[@name='child_s']/str='" + klm[1] + "'",
"//doc/arr[@name='child_s']/str='" + klm[2] + "'");
- assert klm.length == 3 : "change asserts pls " + Arrays.toString(klm);
}
private static final String beParents[] =
diff --git a/solr/core/src/test/org/apache/solr/search/join/TestNestedDocsSort.java b/solr/core/src/test/org/apache/solr/search/join/TestNestedDocsSort.java
index 0ba318c8449..904af50fe7d 100644
--- a/solr/core/src/test/org/apache/solr/search/join/TestNestedDocsSort.java
+++ b/solr/core/src/test/org/apache/solr/search/join/TestNestedDocsSort.java
@@ -100,7 +100,7 @@ public class TestNestedDocsSort extends SolrTestCaseJ4 {
}
private void parseAssertNe(String sortField, String sortField2) {
- assertFalse(parse(sortField).equals(parse(sortField2)));
+ assertNotEquals(parse(sortField), parse(sortField2));
}
private SortField parse(String a) {
diff --git a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
index 61201956565..a3702453162 100644
--- a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
+++ b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
@@ -206,7 +206,7 @@ public class TestScoreJoinQPNoScore extends SolrTestCaseJ4 {
Query y =
QParser.getParser("{!join from=dept_ss to=dept_ss score=none}text_t:develop", req)
.getQuery();
- assertFalse("diff from fields produce equal queries", x.equals(y));
+ assertNotEquals("diff from fields produce equal queries", x, y);
}
}
diff --git a/solr/core/src/test/org/apache/solr/search/join/another/BJQFilterAccessibleTest.java b/solr/core/src/test/org/apache/solr/search/join/another/BJQFilterAccessibleTest.java
index e1f029daff6..680e8be971a 100644
--- a/solr/core/src/test/org/apache/solr/search/join/another/BJQFilterAccessibleTest.java
+++ b/solr/core/src/test/org/apache/solr/search/join/another/BJQFilterAccessibleTest.java
@@ -29,7 +29,6 @@ import org.apache.lucene.search.join.ToParentBlockJoinQuery;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.join.BlockJoinParentQParser;
-import org.junit.Assert;
import org.junit.BeforeClass;
public class BJQFilterAccessibleTest extends SolrTestCaseJ4 {
@@ -49,7 +48,7 @@ public class BJQFilterAccessibleTest extends SolrTestCaseJ4 {
childQuery,
BlockJoinParentQParser.getCachedBitSetProducer(req, parentQuery),
ScoreMode.Max);
- Assert.assertEquals(6, req.getSearcher().search(tpbjq, 10).totalHits.value);
+ assertEquals(6, req.getSearcher().search(tpbjq, 10).totalHits.value);
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java
index f481b03b74c..894054f9921 100644
--- a/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java
+++ b/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java
@@ -34,11 +34,11 @@ public class TestClassicSimilarityFactory extends BaseSimilarityTestCase {
/** Classic w/ default parameters */
public void testDefaults() {
ClassicSimilarity sim = getSimilarity("text", ClassicSimilarity.class);
- assertEquals(true, sim.getDiscountOverlaps());
+ assertTrue(sim.getDiscountOverlaps());
}
/** Classic w/ explicit params */
public void testParams() {
ClassicSimilarity sim = getSimilarity("text_overlap", ClassicSimilarity.class);
- assertEquals(false, sim.getDiscountOverlaps());
+ assertFalse(sim.getDiscountOverlaps());
}
}
diff --git a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
index 30050214d43..77e45711e08 100644
--- a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
@@ -70,7 +70,7 @@ public class CacheHeaderTest extends CacheHeaderTestBase {
HttpRequestBase m = getSelectMethod("GET", "q", "xyz_ignore_exception:solr", "qt", "standard");
// We force an exception from Solr. This should emit "no-cache" HTTP headers
HttpResponse response = getClient().execute(m);
- assertFalse(response.getStatusLine().getStatusCode() == 200);
+ assertNotEquals(200, response.getStatusLine().getStatusCode());
checkVetoHeaders(response, false);
}
diff --git a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
index d19cf56c7bc..b3740e8849c 100644
--- a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
+++ b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
@@ -185,7 +185,7 @@ public class TestRequestRateLimiter extends SolrCloudTestCase {
for (Future<?> future : futures) {
try {
- assertTrue(future.get() != null);
+ assertNotNull(future.get());
} catch (Exception e) {
MatcherAssert.assertThat(
e.getMessage(), containsString("non ok status: 429, message:Too Many Requests"));
diff --git a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
index ecee18313a5..e58c1e8bf6b 100644
--- a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
@@ -24,7 +24,6 @@ import org.apache.lucene.search.spell.StringDistance;
import org.apache.solr.SolrTestCase;
import org.apache.solr.core.SolrCore;
import org.apache.solr.search.SolrIndexSearcher;
-import org.junit.Assert;
import org.junit.Test;
public class ConjunctionSolrSpellCheckerTest extends SolrTestCase {
@@ -55,7 +54,7 @@ public class ConjunctionSolrSpellCheckerTest extends SolrTestCase {
"Cannot set up test. 2 NGramDistances with different gram sizes should not be equal.");
}
}
- Assert.assertEquals(
+ assertEquals(
"The distance " + sameDistance + " does not properly implement equals.",
sameDistance1,
sameDistance2);
diff --git a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
index 36d065f062d..e6fc2bd328e 100644
--- a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
@@ -75,9 +75,10 @@ public class DirectSolrSpellCheckerTest extends SolrTestCaseJ4 {
assertFalse("suggestions shouldn't be empty", suggestions.isEmpty());
Map.Entry<String, Integer> entry = suggestions.entrySet().iterator().next();
assertEquals("foo", entry.getKey());
- assertFalse(
+ assertNotEquals(
entry.getValue() + " equals: " + SpellingResult.NO_FREQUENCY_INFO,
- entry.getValue() == SpellingResult.NO_FREQUENCY_INFO);
+ SpellingResult.NO_FREQUENCY_INFO,
+ (int) entry.getValue());
// check that 'super' is *not* corrected
spellOpts.tokens = queryConverter.convert("super");
diff --git a/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
index 4a68253b6d9..3f6c5381150 100644
--- a/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
@@ -72,7 +72,7 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
- assertTrue(dictName + " is not equal to " + "external", dictName.equals("external") == true);
+ assertEquals(dictName + " is not equal to " + "external", "external", dictName);
checker.build(core, null);
h.getCore()
@@ -84,12 +84,11 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
assertNotNull("result shouldn't be null", result);
Map<String, Integer> suggestions = result.get(spellOpts.tokens.iterator().next());
Map.Entry<String, Integer> entry = suggestions.entrySet().iterator().next();
- assertTrue(
- entry.getKey() + " is not equal to " + "foo",
- entry.getKey().equals("foo") == true);
- assertTrue(
+ assertEquals(entry.getKey() + " is not equal to " + "foo", "foo", entry.getKey());
+ assertEquals(
entry.getValue() + " does not equal: " + SpellingResult.NO_FREQUENCY_INFO,
- entry.getValue() == SpellingResult.NO_FREQUENCY_INFO);
+ SpellingResult.NO_FREQUENCY_INFO,
+ (int) entry.getValue());
spellOpts.tokens = queryConverter.convert("super");
result = checker.getSuggestions(spellOpts);
@@ -124,7 +123,7 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
spellchecker.add(SolrSpellChecker.FIELD_TYPE, "teststop");
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
- assertTrue(dictName + " is not equal to " + "external", dictName.equals("external") == true);
+ assertEquals(dictName + " is not equal to " + "external", "external", dictName);
checker.build(core, null);
Collection<Token> tokens = queryConverter.convert("Solar");
@@ -133,19 +132,19 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
searcher -> {
SpellingOptions spellOpts = new SpellingOptions(tokens, searcher.getIndexReader());
SpellingResult result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
// should be lowercased, b/c we are using a lowercasing analyzer
Map<String, Integer> suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue(
+ assertEquals(
"suggestions Size: " + suggestions.size() + " is not: " + 1,
- suggestions.size() == 1);
+ 1,
+ suggestions.size());
Map.Entry<String, Integer> entry = suggestions.entrySet().iterator().next();
- assertTrue(
- entry.getKey() + " is not equal to " + "solr",
- entry.getKey().equals("solr") == true);
- assertTrue(
+ assertEquals(entry.getKey() + " is not equal to " + "solr", "solr", entry.getKey());
+ assertEquals(
entry.getValue() + " does not equal: " + SpellingResult.NO_FREQUENCY_INFO,
- entry.getValue() == SpellingResult.NO_FREQUENCY_INFO);
+ SpellingResult.NO_FREQUENCY_INFO,
+ (int) entry.getValue());
// test something not in the spell checker
spellOpts.tokens = queryConverter.convert("super");
@@ -174,7 +173,7 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
- assertTrue(dictName + " is not equal to " + "external", dictName.equals("external") == true);
+ assertEquals(dictName + " is not equal to " + "external", "external", dictName);
checker.build(core, null);
h.getCore()
@@ -186,16 +185,16 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
assertNotNull("result shouldn't be null", result);
// should be lowercased, b/c we are using a lowercasing analyzer
Map<String, Integer> suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue(
+ assertEquals(
"suggestions Size: " + suggestions.size() + " is not: " + 1,
- suggestions.size() == 1);
+ 1,
+ suggestions.size());
Map.Entry<String, Integer> entry = suggestions.entrySet().iterator().next();
- assertTrue(
- entry.getKey() + " is not equal to " + "solr",
- entry.getKey().equals("solr") == true);
- assertTrue(
+ assertEquals(entry.getKey() + " is not equal to " + "solr", "solr", entry.getKey());
+ assertEquals(
entry.getValue() + " does not equal: " + SpellingResult.NO_FREQUENCY_INFO,
- entry.getValue() == SpellingResult.NO_FREQUENCY_INFO);
+ SpellingResult.NO_FREQUENCY_INFO,
+ (int) entry.getValue());
spellOpts.tokens = queryConverter.convert("super");
result = checker.getSuggestions(spellOpts);
diff --git a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
index 9f592ea5450..0db7a5d8462 100644
--- a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
@@ -115,9 +115,10 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
- assertTrue(
+ assertEquals(
dictName + " is not equal to " + SolrSpellChecker.DEFAULT_DICTIONARY_NAME,
- dictName.equals(SolrSpellChecker.DEFAULT_DICTIONARY_NAME) == true);
+ SolrSpellChecker.DEFAULT_DICTIONARY_NAME,
+ dictName);
h.getCore()
.withSearcher(
searcher -> {
@@ -127,34 +128,33 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
Collection<Token> tokens = queryConverter.convert("documemt");
SpellingOptions spellOpts = new SpellingOptions(tokens, reader);
SpellingResult result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
// should be lowercased, b/c we are using a lowercasing analyzer
Map<String, Integer> suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("documemt is null and it shouldn't be", suggestions != null);
- assertTrue(
- "documemt Size: " + suggestions.size() + " is not: " + 1,
- suggestions.size() == 1);
+ assertNotNull("documemt is null and it shouldn't be", suggestions);
+ assertEquals(
+ "documemt Size: " + suggestions.size() + " is not: " + 1, 1, suggestions.size());
Map.Entry<String, Integer> entry = suggestions.entrySet().iterator().next();
- assertTrue(
- entry.getKey() + " is not equal to " + "document",
- entry.getKey().equals("document") == true);
- assertTrue(
+ assertEquals(
+ entry.getKey() + " is not equal to " + "document", "document", entry.getKey());
+ assertEquals(
entry.getValue() + " does not equal: " + SpellingResult.NO_FREQUENCY_INFO,
- entry.getValue() == SpellingResult.NO_FREQUENCY_INFO);
+ SpellingResult.NO_FREQUENCY_INFO,
+ (int) entry.getValue());
// test something not in the spell checker
spellOpts.tokens = queryConverter.convert("super");
result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("suggestions size should be 0", suggestions.size() == 0);
+ assertEquals("suggestions size should be 0", 0, suggestions.size());
// test something that is spelled correctly
spellOpts.tokens = queryConverter.convert("document");
result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("suggestions is null and it shouldn't be", suggestions == null);
+ assertNull("suggestions is null and it shouldn't be", suggestions);
// Has multiple possibilities, but the exact exists, so that should be returned
spellOpts.tokens = queryConverter.convert("red");
@@ -162,7 +162,7 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
result = checker.getSuggestions(spellOpts);
assertNotNull(result);
suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("suggestions is not null and it should be", suggestions == null);
+ assertNull("suggestions is not null and it should be", suggestions);
// Try out something which should have multiple suggestions
spellOpts.tokens = queryConverter.convert("bug");
@@ -170,25 +170,30 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
assertNotNull(result);
suggestions = result.get(spellOpts.tokens.iterator().next());
assertNotNull(suggestions);
- assertTrue(
+ assertEquals(
"suggestions Size: " + suggestions.size() + " is not: " + 2,
- suggestions.size() == 2);
+ 2,
+ suggestions.size());
entry = suggestions.entrySet().iterator().next();
- assertTrue(
+ assertNotEquals(
entry.getKey() + " is equal to " + "bug and it shouldn't be",
- entry.getKey().equals("bug") == false);
- assertTrue(
+ "bug",
+ entry.getKey());
+ assertEquals(
entry.getValue() + " does not equal: " + SpellingResult.NO_FREQUENCY_INFO,
- entry.getValue() == SpellingResult.NO_FREQUENCY_INFO);
+ SpellingResult.NO_FREQUENCY_INFO,
+ (int) entry.getValue());
entry = suggestions.entrySet().iterator().next();
- assertTrue(
+ assertNotEquals(
entry.getKey() + " is equal to " + "bug and it shouldn't be",
- entry.getKey().equals("bug") == false);
- assertTrue(
+ "bug",
+ entry.getKey());
+ assertEquals(
entry.getValue() + " does not equal: " + SpellingResult.NO_FREQUENCY_INFO,
- entry.getValue() == SpellingResult.NO_FREQUENCY_INFO);
+ SpellingResult.NO_FREQUENCY_INFO,
+ (int) entry.getValue());
// Check empty token due to spellcheck.q = ""
spellOpts.tokens = Collections.singletonList(new Token("", 0, 0));
@@ -214,9 +219,10 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
spellchecker.add(AbstractLuceneSpellChecker.SPELLCHECKER_ARG_NAME, spellchecker);
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
- assertTrue(
+ assertEquals(
dictName + " is not equal to " + SolrSpellChecker.DEFAULT_DICTIONARY_NAME,
- dictName.equals(SolrSpellChecker.DEFAULT_DICTIONARY_NAME) == true);
+ SolrSpellChecker.DEFAULT_DICTIONARY_NAME,
+ dictName);
h.getCore()
.withSearcher(
searcher -> {
@@ -228,31 +234,29 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
new SpellingOptions(
tokens, reader, 1, SuggestMode.SUGGEST_WHEN_NOT_IN_INDEX, true, 0.5f, null);
SpellingResult result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
// should be lowercased, b/c we are using a lowercasing analyzer
Map<String, Integer> suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("documemt is null and it shouldn't be", suggestions != null);
- assertTrue(
- "documemt Size: " + suggestions.size() + " is not: " + 1,
- suggestions.size() == 1);
+ assertNotNull("documemt is null and it shouldn't be", suggestions);
+ assertEquals(
+ "documemt Size: " + suggestions.size() + " is not: " + 1, 1, suggestions.size());
Map.Entry<String, Integer> entry = suggestions.entrySet().iterator().next();
- assertTrue(
- entry.getKey() + " is not equal to " + "document",
- entry.getKey().equals("document") == true);
- assertTrue(entry.getValue() + " does not equal: " + 2, entry.getValue() == 2);
+ assertEquals(
+ entry.getKey() + " is not equal to " + "document", "document", entry.getKey());
+ assertEquals(entry.getValue() + " does not equal: " + 2, 2, (int) entry.getValue());
// test something not in the spell checker
spellOpts.tokens = queryConverter.convert("super");
result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("suggestions size should be 0", suggestions.size() == 0);
+ assertEquals("suggestions size should be 0", 0, suggestions.size());
spellOpts.tokens = queryConverter.convert("document");
result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("suggestions is not null and it should be", suggestions == null);
+ assertNull("suggestions is not null and it should be", suggestions);
return null;
});
}
@@ -278,17 +282,18 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
AbstractLuceneSpellChecker.STRING_DISTANCE, JaroWinklerDistance.class.getName());
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
- assertTrue(
+ assertEquals(
dictName + " is not equal to " + SolrSpellChecker.DEFAULT_DICTIONARY_NAME,
- dictName.equals(SolrSpellChecker.DEFAULT_DICTIONARY_NAME) == true);
+ SolrSpellChecker.DEFAULT_DICTIONARY_NAME,
+ dictName);
h.getCore()
.withSearcher(
searcher -> {
checker.build(core, searcher);
SpellChecker sc = checker.getSpellChecker();
- assertTrue("sc is null and it shouldn't be", sc != null);
+ assertNotNull("sc is null and it shouldn't be", sc);
StringDistance sd = sc.getStringDistance();
- assertTrue("sd is null and it shouldn't be", sd != null);
+ assertNotNull("sd is null and it shouldn't be", sd);
assertTrue(
"sd is not an instance of " + JaroWinklerDistance.class.getName(),
sd instanceof JaroWinklerDistance);
@@ -334,9 +339,10 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
spellchecker.add(AbstractLuceneSpellChecker.SPELLCHECKER_ARG_NAME, spellchecker);
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
- assertTrue(
+ assertEquals(
dictName + " is not equal to " + SolrSpellChecker.DEFAULT_DICTIONARY_NAME,
- dictName.equals(SolrSpellChecker.DEFAULT_DICTIONARY_NAME) == true);
+ SolrSpellChecker.DEFAULT_DICTIONARY_NAME,
+ dictName);
h.getCore()
.withSearcher(
searcher -> {
@@ -348,30 +354,28 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
new SpellingOptions(
tokens, reader, 1, SuggestMode.SUGGEST_WHEN_NOT_IN_INDEX, true, 0.5f, null);
SpellingResult result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
// should be lowercased, b/c we are using a lowercasing analyzer
Map<String, Integer> suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("flesh is null and it shouldn't be", suggestions != null);
- assertTrue(
- "flesh Size: " + suggestions.size() + " is not: " + 1, suggestions.size() == 1);
+ assertNotNull("flesh is null and it shouldn't be", suggestions);
+ assertEquals(
+ "flesh Size: " + suggestions.size() + " is not: " + 1, 1, suggestions.size());
Map.Entry<String, Integer> entry = suggestions.entrySet().iterator().next();
- assertTrue(
- entry.getKey() + " is not equal to " + "flash",
- entry.getKey().equals("flash") == true);
- assertTrue(entry.getValue() + " does not equal: " + 1, entry.getValue() == 1);
+ assertEquals(entry.getKey() + " is not equal to " + "flash", "flash", entry.getKey());
+ assertEquals(entry.getValue() + " does not equal: " + 1, 1, (int) entry.getValue());
// test something not in the spell checker
spellOpts.tokens = queryConverter.convert("super");
result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("suggestions size should be 0", suggestions.size() == 0);
+ assertEquals("suggestions size should be 0", 0, suggestions.size());
spellOpts.tokens = queryConverter.convert("Caroline");
result = checker.getSuggestions(spellOpts);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
suggestions = result.get(spellOpts.tokens.iterator().next());
- assertTrue("suggestions is not null and it should be", suggestions == null);
+ assertNull("suggestions is not null and it should be", suggestions);
return null;
});
}
diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
index d2843a7ffe8..f7687441d02 100644
--- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
@@ -138,7 +138,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
public void testCollationWithRangeQuery() {
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(SpellCheckComponent.COMPONENT_NAME, "true");
@@ -158,11 +158,11 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
NamedList spellCheck = (NamedList) values.get("spellcheck");
NamedList collationHolder = (NamedList) spellCheck.get("collations");
List<String> collations = collationHolder.getAll("collation");
- assertTrue(collations.size() == 1);
+ assertEquals(1, collations.size());
String collation = collations.iterator().next();
System.out.println(collation);
- assertTrue(
- "Incorrect collation: " + collation, "id:[1 TO 10] AND lowerfilt:love".equals(collation));
+ assertEquals(
+ "Incorrect collation: " + collation, "id:[1 TO 10] AND lowerfilt:love", collation);
}
}
@@ -171,7 +171,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
public void testCollationWithHypens() {
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(SpellCheckComponent.COMPONENT_NAME, "true");
@@ -191,10 +191,9 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
NamedList spellCheck = (NamedList) values.get("spellcheck");
NamedList collationHolder = (NamedList) spellCheck.get("collations");
List<String> collations = collationHolder.getAll("collation");
- assertTrue(collations.size() == 1);
+ assertEquals(1, collations.size());
String collation = collations.iterator().next();
- assertTrue(
- "Incorrect collation: " + collation, "lowerfilt:(hyphenated-word)".equals(collation));
+ assertEquals("Incorrect collation: " + collation, "lowerfilt:(hyphenated-word)", collation);
}
params.remove(CommonParams.Q);
@@ -212,9 +211,9 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
NamedList spellCheck = (NamedList) values.get("spellcheck");
NamedList collationHolder = (NamedList) spellCheck.get("collations");
List<String> collations = collationHolder.getAll("collation");
- assertTrue(collations.size() == 1);
+ assertEquals(1, collations.size());
String collation = collations.iterator().next();
- assertTrue("Incorrect collation: " + collation, "hyphenated-word".equals(collation));
+ assertEquals("Incorrect collation: " + collation, "hyphenated-word", collation);
}
}
@@ -278,7 +277,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
public void testCollateWithFilter() {
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(SpellCheckComponent.COMPONENT_NAME, "true");
@@ -305,7 +304,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
List<String> collations = collationHolder.getAll("collation");
assertTrue(collations.size() > 0);
for (String collation : collations) {
- assertTrue(!collation.equals("lowerfilt:(+faith +hope +loaves)"));
+ assertNotEquals("lowerfilt:(+faith +hope +loaves)", collation);
}
}
@@ -314,7 +313,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
public void testCollateWithMultipleRequestHandlers() {
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(SpellCheckComponent.COMPONENT_NAME, "true");
@@ -361,7 +360,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
public void testExtendedCollate() {
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(CommonParams.QT, "spellCheckCompRH");
@@ -421,7 +420,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
spellCheck = (NamedList) values.get("spellcheck");
collationHolder = (NamedList) spellCheck.get("collations");
List<String> collations = collationHolder.getAll("collation");
- assertTrue(collations.size() == 2);
+ assertEquals(2, collations.size());
for (String multipleCollation : collations) {
assertTrue(
multipleCollation.equals("lowerfilt:(+faith +hope +love)")
@@ -442,26 +441,26 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
collationHolder = (NamedList) spellCheck.get("collations");
List<NamedList> expandedCollationList = collationHolder.getAll("collation");
Set<String> usedcollations = new HashSet<>();
- assertTrue(expandedCollationList.size() == 2);
+ assertEquals(2, expandedCollationList.size());
for (NamedList expandedCollation : expandedCollationList) {
String multipleCollation = (String) expandedCollation.get("collationQuery");
assertTrue(
multipleCollation.equals("lowerfilt:(+faith +hope +love)")
|| multipleCollation.equals("lowerfilt:(+faith +hope +loaves)"));
- assertTrue(!usedcollations.contains(multipleCollation));
+ assertFalse(usedcollations.contains(multipleCollation));
usedcollations.add(multipleCollation);
assertEquals(1L, expandedCollation.get("hits"));
NamedList misspellingsAndCorrections =
(NamedList) expandedCollation.get("misspellingsAndCorrections");
- assertTrue(misspellingsAndCorrections.size() == 3);
+ assertEquals(3, misspellingsAndCorrections.size());
String correctionForFauth = (String) misspellingsAndCorrections.get("fauth");
String correctionForHome = (String) misspellingsAndCorrections.get("home");
String correctionForLoane = (String) misspellingsAndCorrections.get("loane");
- assertTrue(correctionForFauth.equals("faith"));
- assertTrue(correctionForHome.equals("hope"));
+ assertEquals("faith", correctionForFauth);
+ assertEquals("hope", correctionForHome);
assertTrue(correctionForLoane.equals("love") || correctionForLoane.equals("loaves"));
}
}
@@ -471,7 +470,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
public void testCollateWithGrouping() {
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(SpellCheckComponent.COMPONENT_NAME, "true");
@@ -497,7 +496,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
NamedList spellCheck = (NamedList) values.get("spellcheck");
NamedList collationHolder = (NamedList) spellCheck.get("collations");
List<String> collations = collationHolder.getAll("collation");
- assertTrue(collations.size() == 1);
+ assertEquals(1, collations.size());
}
@Test
@@ -705,7 +704,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
public void testZeroTries() {
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(SpellCheckComponent.COMPONENT_NAME, "true");
@@ -725,7 +724,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
NamedList spellCheck = (NamedList) values.get("spellcheck");
NamedList collationList = (NamedList) spellCheck.get("collations");
List<?> collations = (List<?>) collationList.getAll("collation");
- assertTrue(collations.size() == 2);
+ assertEquals(2, collations.size());
}
@Test
@@ -733,7 +732,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
public void testWithCursorMark() {
SolrCore core = h.getCore();
SearchComponent speller = core.getSearchComponent("spellcheck");
- assertTrue("speller is null and it shouldn't be", speller != null);
+ assertNotNull("speller is null and it shouldn't be", speller);
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(SpellCheckComponent.COMPONENT_NAME, "true");
@@ -755,6 +754,6 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
NamedList spellCheck = (NamedList) values.get("spellcheck");
NamedList collationList = (NamedList) spellCheck.get("collations");
List<?> collations = (List<?>) collationList.getAll("collation");
- assertTrue(collations.size() == 1);
+ assertEquals(1, collations.size());
}
}
diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java
index 5e31b0f8ffe..d402044b4ce 100644
--- a/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java
@@ -114,7 +114,7 @@ public class SpellPossibilityIteratorTest extends SolrTestCaseJ4 {
PossibilityIterator.RankedSpellPossibility rsp = iter.next();
count++;
}
- assertTrue(count == 1000);
+ assertEquals(1000, count);
lotsaSuggestions.put(new Token("AYE_BEE1", 0, 7), AYE_BEE);
lotsaSuggestions.put(new Token("AYE_BEE2", 0, 7), AYE_BEE);
@@ -142,15 +142,16 @@ public class SpellPossibilityIteratorTest extends SolrTestCaseJ4 {
PossibilityIterator.RankedSpellPossibility rsp = iter.next();
if (count == 0) {
- assertTrue("I".equals(rsp.corrections.get(0).getCorrection()));
- assertTrue("alpha".equals(rsp.corrections.get(1).getCorrection()));
- assertTrue("one".equals(rsp.corrections.get(2).getCorrection()));
+ assertEquals("I", rsp.corrections.get(0).getCorrection());
+ assertEquals("alpha", rsp.corrections.get(1).getCorrection());
+ assertEquals("one", rsp.corrections.get(2).getCorrection());
}
count++;
}
- assertTrue(
+ assertEquals(
("Three maps (8*9*10) should return 720 iterations but instead returned " + count),
- count == 720);
+ 720,
+ count);
suggestions.remove(TOKEN_CEE);
iter = new PossibilityIterator(suggestions, 100, 10000, false);
@@ -159,8 +160,8 @@ public class SpellPossibilityIteratorTest extends SolrTestCaseJ4 {
iter.next();
count++;
}
- assertTrue(
- ("Two maps (8*9) should return 72 iterations but instead returned " + count), count == 72);
+ assertEquals(
+ ("Two maps (8*9) should return 72 iterations but instead returned " + count), 72, count);
suggestions.remove(TOKEN_BEE);
iter = new PossibilityIterator(suggestions, 5, 10000, false);
@@ -169,7 +170,7 @@ public class SpellPossibilityIteratorTest extends SolrTestCaseJ4 {
iter.next();
count++;
}
- assertTrue(("We requested 5 suggestions but got " + count), count == 5);
+ assertEquals(("We requested 5 suggestions but got " + count), 5, count);
suggestions.remove(TOKEN_AYE);
iter = new PossibilityIterator(suggestions, Integer.MAX_VALUE, 10000, false);
@@ -178,7 +179,7 @@ public class SpellPossibilityIteratorTest extends SolrTestCaseJ4 {
iter.next();
count++;
}
- assertTrue(("No maps should return 0 iterations but instead returned " + count), count == 0);
+ assertEquals(("No maps should return 0 iterations but instead returned " + count), 0, count);
}
@Test
@@ -216,12 +217,12 @@ public class SpellPossibilityIteratorTest extends SolrTestCaseJ4 {
aCount++;
}
}
- assertTrue(c != null);
+ assertNotNull(c);
assertTrue(ab != null || (a != null && b != null));
assertTrue(ab == null || (a == null && b == null));
assertTrue(dupChecker.add(rsp));
}
- assertTrue(aCount == 2160);
- assertTrue(abCount == 180);
+ assertEquals(2160, aCount);
+ assertEquals(180, abCount);
}
}
diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
index e5dbaba66d3..42172c89e45 100644
--- a/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
@@ -37,8 +37,8 @@ public class SpellingQueryConverterTest extends SolrTestCase {
converter.init(new NamedList<>());
converter.setAnalyzer(new WhitespaceAnalyzer());
Collection<Token> tokens = converter.convert("field:foo");
- assertTrue("tokens is null and it shouldn't be", tokens != null);
- assertTrue("tokens Size: " + tokens.size() + " is not: " + 1, tokens.size() == 1);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
+ assertEquals("tokens Size: " + tokens.size() + " is not: " + 1, 1, tokens.size());
}
@Test
@@ -59,9 +59,10 @@ public class SpellingQueryConverterTest extends SolrTestCase {
int[] tokensToExpect = {1, 1, 2, 2, 2, 2, 2, 2};
for (int i = 0; i < queries.length; i++) {
Collection<Token> tokens = converter.convert(queries[i]);
- assertTrue(
+ assertEquals(
"tokens Size: " + tokens.size() + " is not: " + tokensToExpect[i],
- tokens.size() == tokensToExpect[i]);
+ tokens.size(),
+ tokensToExpect[i]);
}
}
@@ -72,19 +73,19 @@ public class SpellingQueryConverterTest extends SolrTestCase {
converter.setAnalyzer(new WhitespaceAnalyzer());
String original = "field_with_underscore:value_with_underscore";
Collection<Token> tokens = converter.convert(original);
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 1", 1, tokens.size());
assertTrue("Token offsets do not match", isOffsetCorrect(original, tokens));
original = "field_with_digits123:value_with_digits123";
tokens = converter.convert(original);
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 1", 1, tokens.size());
assertTrue("Token offsets do not match", isOffsetCorrect(original, tokens));
original = "field-with-hyphens:value-with-hyphens";
tokens = converter.convert(original);
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 1", 1, tokens.size());
assertTrue("Token offsets do not match", isOffsetCorrect(original, tokens));
@@ -97,7 +98,7 @@ public class SpellingQueryConverterTest extends SolrTestCase {
original = "foo:bar^5.0";
tokens = converter.convert(original);
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 1", 1, tokens.size());
assertTrue("Token offsets do not match", isOffsetCorrect(original, tokens));
@@ -105,15 +106,17 @@ public class SpellingQueryConverterTest extends SolrTestCase {
String secondKeyword = "value2";
original = "field-with-parenthesis:(" + firstKeyword + " " + secondKeyword + ")";
tokens = converter.convert(original);
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 2", 2, tokens.size());
assertTrue("Token offsets do not match", isOffsetCorrect(original, tokens));
- assertTrue(
+ assertEquals(
"first Token is not " + firstKeyword,
- new ArrayList<>(tokens).get(0).toString().equals(firstKeyword));
- assertTrue(
+ new ArrayList<>(tokens).get(0).toString(),
+ firstKeyword);
+ assertEquals(
"second Token is not " + secondKeyword,
- new ArrayList<>(tokens).get(1).toString().equals(secondKeyword));
+ new ArrayList<>(tokens).get(1).toString(),
+ secondKeyword);
}
private boolean isOffsetCorrect(String s, Collection<Token> tokens) {
@@ -133,15 +136,15 @@ public class SpellingQueryConverterTest extends SolrTestCase {
// chinese text value
Collection<Token> tokens = converter.convert("text_field:我购买了道具和服装。");
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 1", 1, tokens.size());
tokens = converter.convert("text_购field:我购买了道具和服装。");
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 1", 1, tokens.size());
tokens = converter.convert("text_field:我购xyz买了道具和服装。");
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 1", 1, tokens.size());
}
@@ -153,12 +156,12 @@ public class SpellingQueryConverterTest extends SolrTestCase {
// two field:value pairs should give two tokens
Collection<Token> tokens = converter.convert("买text_field:我购买了道具和服装。 field2:bar");
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 2", 2, tokens.size());
// a field:value pair and a search term should give two tokens
tokens = converter.convert("text_field:我购买了道具和服装。 bar");
- assertTrue("tokens is null and it shouldn't be", tokens != null);
+ assertNotNull("tokens is null and it shouldn't be", tokens);
assertEquals("tokens Size: " + tokens.size() + " is not 2", 2, tokens.size());
}
diff --git a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
index 06eeebb05c4..59d906dc257 100644
--- a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
@@ -78,7 +78,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
SpellingResult result = checker.getSuggestions(spellOpts);
searcher.decref();
assertTrue(result != null && result.getSuggestions() != null);
- assertTrue(result.getSuggestions().size() == 5);
+ assertEquals(5, result.getSuggestions().size());
}
Collection<Token> tokens = qc.convert("paintable pine apple good ness");
@@ -87,70 +87,70 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
searcher.decref();
assertTrue(result != null && result.getSuggestions() != null);
- assertTrue(result.getSuggestions().size() == 9);
+ assertEquals(9, result.getSuggestions().size());
for (Map.Entry<Token, LinkedHashMap<String, Integer>> s : result.getSuggestions().entrySet()) {
Token orig = s.getKey();
String[] corr = s.getValue().keySet().toArray(new String[0]);
if (orig.toString().equals("paintable")) {
- assertTrue(orig.startOffset() == 0);
- assertTrue(orig.endOffset() == 9);
- assertTrue(orig.length() == 9);
- assertTrue(corr.length == 3);
- assertTrue(corr[0].equals("paint able")); // 1 op ; max doc freq=5
- assertTrue(corr[1].equals("pain table")); // 1 op ; max doc freq=2
- assertTrue(corr[2].equals("pa in table")); // 2 ops
+ assertEquals(0, orig.startOffset());
+ assertEquals(9, orig.endOffset());
+ assertEquals(9, orig.length());
+ assertEquals(3, corr.length);
+ assertEquals("paint able", corr[0]); // 1 op ; max doc freq=5
+ assertEquals("pain table", corr[1]); // 1 op ; max doc freq=2
+ assertEquals("pa in table", corr[2]); // 2 ops
} else if (orig.toString().equals("pine apple")) {
- assertTrue(orig.startOffset() == 10);
- assertTrue(orig.endOffset() == 20);
- assertTrue(orig.length() == 10);
- assertTrue(corr.length == 1);
- assertTrue(corr[0].equals("pineapple"));
+ assertEquals(10, orig.startOffset());
+ assertEquals(20, orig.endOffset());
+ assertEquals(10, orig.length());
+ assertEquals(1, corr.length);
+ assertEquals("pineapple", corr[0]);
} else if (orig.toString().equals("paintable pine")) {
- assertTrue(orig.startOffset() == 0);
- assertTrue(orig.endOffset() == 14);
- assertTrue(orig.length() == 14);
- assertTrue(corr.length == 1);
- assertTrue(corr[0].equals("paintablepine"));
+ assertEquals(0, orig.startOffset());
+ assertEquals(14, orig.endOffset());
+ assertEquals(14, orig.length());
+ assertEquals(1, corr.length);
+ assertEquals("paintablepine", corr[0]);
} else if (orig.toString().equals("good ness")) {
- assertTrue(orig.startOffset() == 21);
- assertTrue(orig.endOffset() == 30);
- assertTrue(orig.length() == 9);
- assertTrue(corr.length == 1);
- assertTrue(corr[0].equals("goodness"));
+ assertEquals(21, orig.startOffset());
+ assertEquals(30, orig.endOffset());
+ assertEquals(9, orig.length());
+ assertEquals(1, corr.length);
+ assertEquals("goodness", corr[0]);
} else if (orig.toString().equals("pine apple good ness")) {
- assertTrue(orig.startOffset() == 10);
- assertTrue(orig.endOffset() == 30);
- assertTrue(orig.length() == 20);
- assertTrue(corr.length == 1);
- assertTrue(corr[0].equals("pineapplegoodness"));
+ assertEquals(10, orig.startOffset());
+ assertEquals(30, orig.endOffset());
+ assertEquals(20, orig.length());
+ assertEquals(1, corr.length);
+ assertEquals("pineapplegoodness", corr[0]);
} else if (orig.toString().equals("pine")) {
- assertTrue(orig.startOffset() == 10);
- assertTrue(orig.endOffset() == 14);
- assertTrue(orig.length() == 4);
- assertTrue(corr.length == 1);
- assertTrue(corr[0].equals("pi ne"));
+ assertEquals(10, orig.startOffset());
+ assertEquals(14, orig.endOffset());
+ assertEquals(4, orig.length());
+ assertEquals(1, corr.length);
+ assertEquals("pi ne", corr[0]);
} else if (orig.toString().equals("pine")) {
- assertTrue(orig.startOffset() == 10);
- assertTrue(orig.endOffset() == 14);
- assertTrue(orig.length() == 4);
- assertTrue(corr.length == 1);
- assertTrue(corr[0].equals("pi ne"));
+ assertEquals(10, orig.startOffset());
+ assertEquals(14, orig.endOffset());
+ assertEquals(4, orig.length());
+ assertEquals(1, corr.length);
+ assertEquals("pi ne", corr[0]);
} else if (orig.toString().equals("apple")) {
- assertTrue(orig.startOffset() == 15);
- assertTrue(orig.endOffset() == 20);
- assertTrue(orig.length() == 5);
- assertTrue(corr.length == 0);
+ assertEquals(15, orig.startOffset());
+ assertEquals(20, orig.endOffset());
+ assertEquals(5, orig.length());
+ assertEquals(0, corr.length);
} else if (orig.toString().equals("good")) {
- assertTrue(orig.startOffset() == 21);
- assertTrue(orig.endOffset() == 25);
- assertTrue(orig.length() == 4);
- assertTrue(corr.length == 0);
+ assertEquals(21, orig.startOffset());
+ assertEquals(25, orig.endOffset());
+ assertEquals(4, orig.length());
+ assertEquals(0, corr.length);
} else if (orig.toString().equals("ness")) {
- assertTrue(orig.startOffset() == 26);
- assertTrue(orig.endOffset() == 30);
- assertTrue(orig.length() == 4);
- assertTrue(corr.length == 0);
+ assertEquals(26, orig.startOffset());
+ assertEquals(30, orig.endOffset());
+ assertEquals(4, orig.length());
+ assertEquals(0, corr.length);
} else {
fail("Unexpected original result: " + orig);
}
diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
index a11bcb8f758..5646d10af63 100644
--- a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
@@ -140,6 +140,6 @@ public class SuggesterTest extends SolrTestCaseJ4 {
params.add("field", "test_field");
params.add("lookupImpl", "org.apache.solr.spelling.suggest.tst.TSTLookupFactory");
suggester.init(params, h.getCore());
- assertTrue(suggester.getQueryAnalyzer() != null);
+ assertNotNull(suggester.getQueryAnalyzer());
}
}
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java
index 78b25cd41d3..efbfa28b268 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java
@@ -176,9 +176,10 @@ public class TestFieldCache extends SolrTestCase {
assertTrue(
"docsWithField(theLong) must be class Bits.MatchAllBits",
docsWithField instanceof Bits.MatchAllBits);
- assertTrue(
+ assertEquals(
"docsWithField(theLong) Size: " + docsWithField.length() + " is not: " + NUM_DOCS,
- docsWithField.length() == NUM_DOCS);
+ docsWithField.length(),
+ NUM_DOCS);
for (int i = 0; i < docsWithField.length(); i++) {
assertTrue(docsWithField.get(i));
}
@@ -191,9 +192,10 @@ public class TestFieldCache extends SolrTestCase {
assertFalse(
"docsWithField(sparse) must not be class Bits.MatchAllBits",
docsWithField instanceof Bits.MatchAllBits);
- assertTrue(
+ assertEquals(
"docsWithField(sparse) Size: " + docsWithField.length() + " is not: " + NUM_DOCS,
- docsWithField.length() == NUM_DOCS);
+ docsWithField.length(),
+ NUM_DOCS);
for (int i = 0; i < docsWithField.length(); i++) {
assertEquals(i % 2 == 0, docsWithField.get(i));
}
@@ -279,7 +281,7 @@ public class TestFieldCache extends SolrTestCase {
assertEquals(i, termOrds.nextDoc());
}
long ord = termOrds.nextOrd();
- assert ord != SortedSetDocValues.NO_MORE_ORDS;
+ assertNotEquals(ord, SortedSetDocValues.NO_MORE_ORDS);
BytesRef scratch = termOrds.lookupOrd(ord);
assertEquals(v, scratch);
}
@@ -290,7 +292,7 @@ public class TestFieldCache extends SolrTestCase {
// test bad field
termOrds = cache.getDocTermOrds(reader, "bogusfield", null);
- assertTrue(termOrds.getValueCount() == 0);
+ assertEquals(0, termOrds.getValueCount());
FieldCache.DEFAULT.purgeByCacheKey(reader.getCoreCacheHelper().getKey());
}
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java
index 4a27ebb5b46..410e3a4ee55 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java
@@ -114,7 +114,7 @@ public class TestFieldCacheSortRandom extends SolrTestCase {
if (type == SortField.Type.STRING) {
doc.add(new StringField("stringdv", s, Field.Store.NO));
} else {
- assert type == SortField.Type.STRING_VAL;
+ assertSame(type, SortField.Type.STRING_VAL);
doc.add(new BinaryDocValuesField("stringdv", new BytesRef(s)));
}
docValues.add(new BytesRef(s));
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
index e8aa4f34537..89ae4181f85 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
@@ -320,7 +320,7 @@ public class TestFieldCacheVsDocValues extends SolrTestCase {
int numDocs = atLeast(300);
// numDocs should be always > 256 so that in case of a codec that optimizes
// for numbers of values <= 256, all storage layouts are tested
- assert numDocs > 256;
+ assertTrue(numDocs > 256);
for (int i = 0; i < numDocs; i++) {
idField.setStringValue(Integer.toString(i));
long value = longs.next();
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestLegacyFieldCache.java b/solr/core/src/test/org/apache/solr/uninverting/TestLegacyFieldCache.java
index 6ed4d6c5a21..b1750a59921 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestLegacyFieldCache.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestLegacyFieldCache.java
@@ -143,9 +143,10 @@ public class TestLegacyFieldCache extends SolrTestCase {
assertTrue(
"docsWithField(theLong) must be class Bits.MatchAllBits",
docsWithField instanceof Bits.MatchAllBits);
- assertTrue(
+ assertEquals(
"docsWithField(theLong) Size: " + docsWithField.length() + " is not: " + NUM_DOCS,
- docsWithField.length() == NUM_DOCS);
+ docsWithField.length(),
+ NUM_DOCS);
for (int i = 0; i < docsWithField.length(); i++) {
assertTrue(docsWithField.get(i));
}
@@ -158,9 +159,10 @@ public class TestLegacyFieldCache extends SolrTestCase {
assertFalse(
"docsWithField(sparse) must not be class Bits.MatchAllBits",
docsWithField instanceof Bits.MatchAllBits);
- assertTrue(
+ assertEquals(
"docsWithField(sparse) Size: " + docsWithField.length() + " is not: " + NUM_DOCS,
- docsWithField.length() == NUM_DOCS);
+ docsWithField.length(),
+ NUM_DOCS);
for (int i = 0; i < docsWithField.length(); i++) {
assertEquals(i % 2 == 0, docsWithField.get(i));
}
diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
index 65a424cfb0b..0d30bb0f198 100644
--- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
@@ -443,7 +443,7 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
@Test
public void testPostSoftCommitEvents() {
SolrCore core = h.getCore();
- assert core != null;
+ assertNotNull(core);
DirectUpdateHandler2 updater = (DirectUpdateHandler2) core.getUpdateHandler();
MySolrEventListener listener = new MySolrEventListener();
core.registerNewSearcherListener(listener);
@@ -451,7 +451,8 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
assertU(adoc("id", "999"));
assertU(commit("softCommit", "true"));
assertEquals("newSearcher was called more than once", 1, listener.newSearcherCount.get());
- assertFalse("postSoftCommit was not called", listener.postSoftCommitAt.get() == Long.MAX_VALUE);
+ assertNotEquals(
+ "postSoftCommit was not called", Long.MAX_VALUE, listener.postSoftCommitAt.get());
assertTrue(
"newSearcher was called after postSoftCommitCallback",
listener.postSoftCommitAt.get() >= listener.newSearcherOpenedAt.get());
diff --git a/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
index 96b39d0d035..735fe27c402 100644
--- a/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
@@ -40,7 +40,6 @@ import org.apache.solr.schema.FieldType;
import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -385,7 +384,7 @@ public class DocumentBuilderTest extends SolrTestCaseJ4 {
doc.addField("vector3", Arrays.asList(1.1f, 2.1f, 3.1f, 4.1f));
RuntimeException thrown =
- Assert.assertThrows(
+ assertThrows(
"Incorrect destination field type should raise exception",
SolrException.class,
() -> {
@@ -406,7 +405,7 @@ public class DocumentBuilderTest extends SolrTestCaseJ4 {
doc.addField("vector4", Arrays.asList(1.1f, 2.1f, 3.1f, 4.1f));
RuntimeException thrown =
- Assert.assertThrows(
+ assertThrows(
"Incorrect destination dimension should raise exception",
SolrException.class,
() -> {
diff --git a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
index 1b1b12628cb..08380cf251a 100644
--- a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
@@ -36,7 +36,6 @@ import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -104,15 +103,13 @@ public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 {
@Test
public void testAdds() throws Exception {
-
- Assert.assertEquals(
+ assertEquals(
"There have been no updates yet, so there shouldn't have been any commits",
0,
hardCommitTracker.getCommitCount());
long tlogSizePreUpdates = updateHandler.getUpdateLog().getCurrentLogSizeFromStream();
- Assert.assertEquals(
- "There have been no updates yet, so tlog should be empty", 0, tlogSizePreUpdates);
+ assertEquals("There have been no updates yet, so tlog should be empty", 0, tlogSizePreUpdates);
// Add a large number of docs - should trigger a commit
int numDocsToAdd = 500;
@@ -128,15 +125,13 @@ public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 {
@Test
public void testRedundantDeletes() throws Exception {
-
- Assert.assertEquals(
+ assertEquals(
"There have been no updates yet, so there shouldn't have been any commits",
0,
hardCommitTracker.getCommitCount());
long tlogSizePreUpdates = updateHandler.getUpdateLog().getCurrentLogSizeFromStream();
- Assert.assertEquals(
- "There have been no updates yet, so tlog should be empty", 0, tlogSizePreUpdates);
+ assertEquals("There have been no updates yet, so tlog should be empty", 0, tlogSizePreUpdates);
// Add docs
int numDocsToAdd = 150;
@@ -171,15 +166,13 @@ public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 {
@Test
public void testDeletes() throws Exception {
-
- Assert.assertEquals(
+ assertEquals(
"There have been no updates yet, so there shouldn't have been any commits",
0,
hardCommitTracker.getCommitCount());
long tlogSizePreUpdates = updateHandler.getUpdateLog().getCurrentLogSizeFromStream();
- Assert.assertEquals(
- "There have been no updates yet, so tlog should be empty", 0, tlogSizePreUpdates);
+ assertEquals("There have been no updates yet, so tlog should be empty", 0, tlogSizePreUpdates);
// Add docs
int numDocsToAdd = 500;
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
index 7a603bd74cc..fb010f9d3a1 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
@@ -463,7 +463,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
otherVersions, completeList, ourUpdates, ourLowThreshold);
// no updates requested since other has nothing
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
}
}
@@ -478,7 +478,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
otherVersions, completeList, ourUpdates, ourLowThreshold);
// no updates requested since us and other have the same versions
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
}
}
@@ -512,7 +512,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
*/
assertTrue(missing < ourLowThreshold);
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
}
}
}
@@ -548,7 +548,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
*/
assertTrue(missing < ourLowThreshold);
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
}
}
}
@@ -583,7 +583,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
} else {
// request no updates because ???
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
}
}
{
@@ -598,7 +598,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
} else {
// request no updates because ???
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
}
}
{
@@ -613,7 +613,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
} else {
// request no updates since we don't need a complete list ...
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
// ... and all the missing versions are older/lower than our 'low' threshold
for (Long version : otherVersions) {
if (!ourUpdates.contains(version)) {
@@ -656,7 +656,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
} else {
// request no updates because ???
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
}
}
{
@@ -671,7 +671,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
} else {
// request no updates since we don't need a complete list ...
assertEquals(0L, mur.totalRequestedUpdates);
- assertEquals(null, mur.versionsAndRanges);
+ assertNull(mur.versionsAndRanges);
// ... and all the missing versions are older/lower than our 'low' threshold
for (Long version : otherVersions) {
if (!ourUpdates.contains(version)) {
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java
index 07fd1ec8c4c..02e62252efa 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java
@@ -29,7 +29,6 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;
-import org.junit.Assert;
import org.junit.Test;
/**
@@ -80,7 +79,7 @@ public class PeerSyncWithIndexFingerprintCachingTest extends BaseDistributedSear
IndexFingerprint after = getFingerprint(client0, Long.MAX_VALUE);
// make sure fingerprint before and after deleting are not the same
- Assert.assertTrue(IndexFingerprint.compare(before, after) != 0);
+ assertTrue(IndexFingerprint.compare(before, after) != 0);
// replica which missed the delete operation should be able to sync
assertSync(client1, numVersions, shardsArr[0]);
diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
index 141c45651b8..7a329d5c109 100644
--- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
@@ -18,7 +18,6 @@ package org.apache.solr.update;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import static org.junit.Assert.assertEquals;
import java.lang.invoke.MethodHandles;
import java.util.concurrent.BlockingQueue;
@@ -94,7 +93,7 @@ public class SoftAutoCommitTest extends SolrTestCaseJ4 {
final int hardCommitMaxDocs = 7;
// remainder of test designed with these assumptions
- assert softCommitMaxDocs < hardCommitMaxDocs;
+ assertTrue(softCommitMaxDocs < hardCommitMaxDocs);
CommitTracker hardTracker = updater.commitTracker;
CommitTracker softTracker = updater.softCommitTracker;
@@ -524,7 +523,7 @@ public class SoftAutoCommitTest extends SolrTestCaseJ4 {
final BlockingQueue<Long> queue)
throws InterruptedException {
- assert 0 < maxNumCommits;
+ assertTrue(0 < maxNumCommits);
// these will be modified in each iteration of our assertion loop
long prevTimestampNanos = startTimestampNanos;
@@ -637,6 +636,6 @@ class MockEventListener implements SolrEventListener {
}
public void assertSaneOffers() {
- assertEquals("Failure of MockEventListener" + fail.toString(), 0, fail.length());
+ SolrTestCaseJ4.assertEquals("Failure of MockEventListener" + fail.toString(), 0, fail.length());
}
}
diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
index 0f8caaa755d..f4b32d93522 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
@@ -114,7 +114,7 @@ public class SolrIndexConfigTest extends SolrTestCaseJ4 {
ConcurrentMergeScheduler ms = (ConcurrentMergeScheduler) iwc.getMergeScheduler();
assertEquals("ms.maxMergeCount", 987, ms.getMaxMergeCount());
assertEquals("ms.maxThreadCount", 42, ms.getMaxThreadCount());
- assertEquals("ms.isAutoIOThrottle", true, ms.getAutoIOThrottle());
+ assertTrue("ms.isAutoIOThrottle", ms.getAutoIOThrottle());
}
@Test
@@ -135,7 +135,7 @@ public class SolrIndexConfigTest extends SolrTestCaseJ4 {
ConcurrentMergeScheduler ms = (ConcurrentMergeScheduler) iwc.getMergeScheduler();
assertEquals("ms.maxMergeCount", 987, ms.getMaxMergeCount());
assertEquals("ms.maxThreadCount", 42, ms.getMaxThreadCount());
- assertEquals("ms.isAutoIOThrottle", false, ms.getAutoIOThrottle());
+ assertFalse("ms.isAutoIOThrottle", ms.getAutoIOThrottle());
}
public void testSortingMPSolrIndexConfigCreation() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
index bfc47dd83cf..64078919cf0 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -490,7 +490,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
// already had an init value of 0 -- which is an interesting edge case, so we don't exclude it
final float multiplier = r.nextBoolean() ? -5.0F : 5.0F;
final float value = r.nextFloat() * multiplier;
- assert -5.0F <= value && value <= 5.0F;
+ assertTrue(-5.0F <= value && value <= 5.0F);
valuesList.set(id, value);
}
log.info("inplace_updatable_float: {}", valuesList);
@@ -523,9 +523,9 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
// thus ensuring that after all increments are done, there should be
// 0 test docs matching the query inplace_updatable_float:[-10 TO 10]
final float inc = (r.nextBoolean() ? -1.0F : 1.0F) * (r.nextFloat() + (float) atLeast(20));
- assert 20 < Math.abs(inc);
+ assertTrue(20 < Math.abs(inc));
final float value = (float) valuesList.get(id) + inc;
- assert value < -10 || 10 < value;
+ assertTrue(value < -10 || 10 < value);
valuesList.set(id, value);
index("id", id, "inplace_updatable_float", map("inc", inc));
@@ -651,7 +651,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
final String fieldName,
final List<Number> valuesList)
throws Exception {
- assert luceneDocids.size() == valuesList.size();
+ assertEquals(luceneDocids.size(), valuesList.size());
final long numFoundExpected = luceneDocids.size();
for (SolrClient client : clients) {
@@ -708,7 +708,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
final String fieldName,
final List<Number> valuesList) {
- assert luceneDocids.size() == valuesList.size();
+ assertEquals(luceneDocids.size(), valuesList.size());
assertEquals(
msgPre
+ ": rows param wasn't big enough, we need to compare all results matching the query",
@@ -758,9 +758,10 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
assertTrue(currentVersion > version);
version = currentVersion;
LEADER.commit();
- assertTrue(
+ assertEquals(
"Earlier: " + docids + ", now: " + getInternalDocIds("100"),
- docids.equals(getInternalDocIds("100")));
+ docids,
+ getInternalDocIds("100"));
SolrDocument sdoc = LEADER.getById("100"); // RTG straight from the index
assertEquals(sdoc.toString(), inplace_updatable_float, sdoc.get("inplace_updatable_float"));
@@ -795,9 +796,10 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
assertTrue(currentVersion > version);
version = currentVersion;
LEADER.commit();
- assertTrue(
+ assertEquals(
"Earlier: " + docids + ", now: " + getInternalDocIds("100"),
- docids.equals(getInternalDocIds("100")));
+ docids,
+ getInternalDocIds("100"));
currentVersion = addDocAndGetVersion("id", 100, "inplace_updatable_int", map("set", "100"));
assertTrue(currentVersion > version);
@@ -844,9 +846,10 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
// assert that the internal docid for id=100 document remains same, in each replica, as before
LEADER.commit(); // can't get (real) [docid] from the tlogs, need to force a commit
- assertTrue(
+ assertEquals(
"Earlier: " + docids + ", now: " + getInternalDocIds("100"),
- docids.equals(getInternalDocIds("100")));
+ docids,
+ getInternalDocIds("100"));
log.info("ensureRtgWorksWithPartialUpdatesTest: This test passed fine...");
}
@@ -864,7 +867,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
assertEquals(Integer.class, docid.getClass());
ret.add((Integer) docid);
}
- assert clients.size() == ret.size();
+ assertEquals(clients.size(), ret.size());
return ret;
}
@@ -1585,7 +1588,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
}
LEADER.commit();
- assert specialIds.size() == versions.size();
+ assertEquals(specialIds.size(), versions.size());
return versions;
}
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
index dd819b690c3..cd0fab5c1c5 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
@@ -750,7 +750,7 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {
public static long addAndAssertVersion(long expectedCurrentVersion, Object... fields)
throws Exception {
- assert 0 < expectedCurrentVersion;
+ assertTrue(0 < expectedCurrentVersion);
long currentVersion = addAndGetVersion(sdoc(fields), null);
assertTrue(currentVersion > expectedCurrentVersion);
return currentVersion;
diff --git a/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java b/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
index 1355f5b783f..f8eaf7b47ca 100644
--- a/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
+++ b/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
@@ -403,7 +403,7 @@ public class TestNestedUpdateProcessor extends SolrTestCaseJ4 {
// doc_id -> descendentId must have at least one ancestor (since it's not a root level
// document)
final String descendentId = doc_id;
- assert allDocs.get(descendentId).containsKey("ancestor_ids_ss");
+ assertTrue(allDocs.get(descendentId).containsKey("ancestor_ids_ss"));
final List<Object> allAncestorIds =
new ArrayList<>(allDocs.get(descendentId).getFieldValues("ancestor_ids_ss"));
@@ -670,8 +670,8 @@ public class TestNestedUpdateProcessor extends SolrTestCaseJ4 {
}
private void assertValidPathSyntax(String path) {
- assert path.startsWith("/");
- assert (1 == path.length()) ^ !path.endsWith("/");
+ assertTrue(path.startsWith("/"));
+ assertTrue((1 == path.length()) ^ !path.endsWith("/"));
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java b/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java
index 4c87d0ad313..6d7e743c1ee 100644
--- a/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java
+++ b/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java
@@ -52,9 +52,10 @@ public class UpdateParamsTest extends SolrTestCaseJ4 {
handler.handleRequestBody(req, rsp);
assertTrue("Old param update.processor should not have any effect anymore", true);
} catch (Exception e) {
- assertFalse(
+ assertNotEquals(
"Got wrong exception while testing update.chain",
- e.getMessage().equals("unknown UpdateRequestProcessorChain: nonexistent"));
+ "unknown UpdateRequestProcessorChain: nonexistent",
+ e.getMessage());
}
// Then check that the new param behaves correctly
@@ -63,8 +64,7 @@ public class UpdateParamsTest extends SolrTestCaseJ4 {
req.setParams(params);
try {
handler.handleRequestBody(req, rsp);
- assertFalse(
- "Faulty update.chain parameter not causing an error - i.e. it is not detected", true);
+ fail("Faulty update.chain parameter not causing an error - i.e. it is not detected");
} catch (Exception e) {
assertEquals(
"Got wrong exception while testing update.chain",
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateJavabinTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateJavabinTest.java
index 4e51a2817cc..38b1957ea70 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateJavabinTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateJavabinTest.java
@@ -423,7 +423,7 @@ public class AtomicUpdateJavabinTest extends SolrCloudTestCase {
final QueryResponse response = request.process(cluster.getSolrClient(), COLLECTION);
final NamedList<Object> rawResponse = response.getResponse();
- assertTrue(rawResponse.get("doc") != null);
+ assertNotNull(rawResponse.get("doc"));
assertTrue(rawResponse.get("doc") instanceof SolrDocument);
final SolrDocument doc = (SolrDocument) rawResponse.get("doc");
final Collection<Object> valuesAfterUpdate = doc.getFieldValues(fieldName);
diff --git a/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java
index ebf912b27b0..9c3943634e5 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java
@@ -466,7 +466,7 @@ public class CategoryRoutedAliasUpdateProcessorTest extends RoutedAliasUpdatePro
.get(getAlias());
observedCols = new ArrayList<>(observedCols);
observedCols.sort(String::compareTo); // don't really care about the order here.
- assert !observedCols.isEmpty();
+ assertFalse(observedCols.isEmpty());
int numFoundViaCollections = 0;
for (String col : observedCols) {
diff --git a/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java
index 7d8ae26aa48..28e5e665813 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java
@@ -562,7 +562,7 @@ public class DimensionalRoutedAliasUpdateProcessorTest extends RoutedAliasUpdate
.process(solrClient)
.getAliasesAsLists()
.get(getSaferTestName());
- assert !cols.isEmpty();
+ assertFalse(cols.isEmpty());
for (String category : categories) {
List<String> cats =
diff --git a/solr/core/src/test/org/apache/solr/update/processor/NestedAtomicUpdateTest.java b/solr/core/src/test/org/apache/solr/update/processor/NestedAtomicUpdateTest.java
index 007eba8d4d3..c8d11232809 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/NestedAtomicUpdateTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/NestedAtomicUpdateTest.java
@@ -247,10 +247,9 @@ public class NestedAtomicUpdateTest extends SolrTestCaseJ4 {
() -> {
docMerger.merge(updateDoc, existingDoc);
});
- assertTrue(
- expected
- .getMessage()
- .equals("A nested atomic update can only update an existing nested document"));
+ assertEquals(
+ "A nested atomic update can only update an existing nested document",
+ expected.getMessage());
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java
index 550edc12328..f48fce7c9bf 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.solr.update.processor;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -38,7 +36,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
-public class SkipExistingDocumentsProcessorFactoryTest {
+public class SkipExistingDocumentsProcessorFactoryTest extends SolrTestCaseJ4 {
private BytesRef docId = new BytesRef();
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java b/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java
index b1b8f5984f0..85f7952c4f6 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java
@@ -110,7 +110,7 @@ public class TestCloudDeduplication extends SolrCloudTestCase {
}
assertEquals("commit failed", 0, getRandClient().commit(COLLECTION).getStatus());
- assert docCounter > uniqueMod;
+ assertTrue(docCounter > uniqueMod);
// query our collection and confirm no duplicates on the signature field (using faceting)
// Check every (node) for consistency...
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestDocBasedVersionConstraints.java b/solr/core/src/test/org/apache/solr/update/processor/TestDocBasedVersionConstraints.java
index 7ff2c37a4cf..0e2e0c2476a 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TestDocBasedVersionConstraints.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TestDocBasedVersionConstraints.java
@@ -789,7 +789,7 @@ public class TestDocBasedVersionConstraints extends SolrTestCaseJ4 {
}
private void updateWithChain(String chain, String... fields) throws Exception {
- assert fields.length % 2 == 0;
+ assertEquals(0, fields.length % 2);
SolrInputDocument doc = new SolrInputDocument(fields);
updateJ(jsonAdd(doc), params("update.chain", chain));
}
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
index 2725d3d1e11..ecb05fad51f 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
@@ -720,9 +720,9 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
colsT1 =
new CollectionAdminRequest.ListAliases().process(solrClient).getAliasesAsLists().get(alias);
assertEquals(3, colsT1.size());
- assertTrue(
+ assertFalse(
"Preemptive creation appears to not be asynchronous anymore",
- !colsT1.contains("myalias" + TRA + "2017-10-26"));
+ colsT1.contains("myalias" + TRA + "2017-10-26"));
assertNumDocs("2017-10-23", 1, alias);
assertNumDocs("2017-10-24", 1, alias);
assertNumDocs("2017-10-25", 3, alias);
@@ -748,10 +748,10 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
List<String> cols;
cols =
new CollectionAdminRequest.ListAliases().process(solrClient).getAliasesAsLists().get(alias);
- assertTrue(
+ assertFalse(
"Preemptive creation happened twice and created a collection "
+ "further in the future than the configured time slice!",
- !cols.contains("myalias" + TRA + "2017-10-27"));
+ cols.contains("myalias" + TRA + "2017-10-27"));
validateCollectionCountAndAvailability(
alias, 4, "Only 4 cols expected (preemptive create happened" + "twice among threads");
@@ -857,7 +857,7 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
final List<String> cols =
new CollectionAdminRequest.ListAliases().process(solrClient).getAliasesAsLists().get(alias);
- assert !cols.isEmpty();
+ assertFalse(cols.isEmpty());
assertArrayEquals(
"expected reverse sorted",
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TrackingUpdateProcessorFactory.java b/solr/core/src/test/org/apache/solr/update/processor/TrackingUpdateProcessorFactory.java
index 38eb42390f4..89efbdbe699 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TrackingUpdateProcessorFactory.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TrackingUpdateProcessorFactory.java
@@ -69,11 +69,11 @@ public final class TrackingUpdateProcessorFactory extends UpdateRequestProcessor
public static void startRecording(String group) {
final List<UpdateCommand> updateCommands = groupToCommands.get(group);
- assert updateCommands == null || updateCommands.isEmpty();
+ SolrCloudTestCase.assertTrue(updateCommands == null || updateCommands.isEmpty());
List<UpdateCommand> existing =
groupToCommands.put(group, Collections.synchronizedList(new ArrayList<>()));
- assert existing == null : "Test cross-talk?";
+ SolrCloudTestCase.assertNull("Test cross-talk?", existing);
}
/**
diff --git a/solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java b/solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java
index 68b5b325d8c..f3731645856 100644
--- a/solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java
+++ b/solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java
@@ -224,7 +224,7 @@ public class OrderedExecutorTest extends SolrTestCase {
orderedExecutor.execute(key, () -> run.put(key, run.get(key) + 1));
}
orderedExecutor.shutdownAndAwaitTermination();
- assertTrue(base.equals(run));
+ assertEquals(base, run);
}
private static class IntBox {
diff --git a/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java b/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
index 6d108c0bd4c..e844582eeb1 100644
--- a/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
+++ b/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
@@ -79,13 +79,13 @@ public class SimplePostToolTest extends SolrTestCaseJ4 {
@Test
public void testParseArgsAndInit() {
- assertEquals(false, t_file.auto);
- assertEquals(true, t_file_auto.auto);
+ assertFalse(t_file.auto);
+ assertTrue(t_file_auto.auto);
assertEquals(0, t_file_auto.recursive);
assertEquals(999, t_file_rec.recursive);
- assertEquals(true, t_file.commit);
- assertEquals(false, t_file.optimize);
- assertEquals(null, t_file.out);
+ assertTrue(t_file.commit);
+ assertFalse(t_file.optimize);
+ assertNull(t_file.out);
assertEquals(1, t_web.recursive);
assertEquals(10, t_web.delay);
@@ -119,10 +119,9 @@ public class SimplePostToolTest extends SolrTestCaseJ4 {
// TODO: How to know what is the base if URL path ends with "foo"??
// assertEquals("http://[ff01::114]/fil.html", t_web.computeFullUrl(new
// URL("http://[ff01::114]/foo?baz#hello"), "fil.html"));
- assertEquals(null, t_web.computeFullUrl(new URL("http://[ff01::114]/"), "fil.jpg"));
- assertEquals(
- null, t_web.computeFullUrl(new URL("http://[ff01::114]/"), "mailto:[email protected]"));
- assertEquals(null, t_web.computeFullUrl(new URL("http://[ff01::114]/"), "ftp://server/file"));
+ assertNull(t_web.computeFullUrl(new URL("http://[ff01::114]/"), "fil.jpg"));
+ assertNull(t_web.computeFullUrl(new URL("http://[ff01::114]/"), "mailto:[email protected]"));
+ assertNull(t_web.computeFullUrl(new URL("http://[ff01::114]/"), "ftp://server/file"));
}
@Test
@@ -201,9 +200,10 @@ public class SimplePostToolTest extends SolrTestCaseJ4 {
public void testRobotsExclusion() throws MalformedURLException {
assertFalse(t_web.pageFetcher.isDisallowedByRobots(new URL("http://[ff01::114]/")));
assertTrue(t_web.pageFetcher.isDisallowedByRobots(new URL("http://[ff01::114]/disallowed")));
- assertTrue(
+ assertEquals(
"There should be two entries parsed from robots.txt",
- t_web.pageFetcher.robotsCache.get("[ff01::114]").size() == 2);
+ 2,
+ t_web.pageFetcher.robotsCache.get("[ff01::114]").size());
}
static class MockPageFetcher extends PageFetcher {
diff --git a/solr/core/src/test/org/apache/solr/util/SolrCliUptimeTest.java b/solr/core/src/test/org/apache/solr/util/SolrCliUptimeTest.java
index cb5312cf22f..ff8def5eab6 100644
--- a/solr/core/src/test/org/apache/solr/util/SolrCliUptimeTest.java
+++ b/solr/core/src/test/org/apache/solr/util/SolrCliUptimeTest.java
@@ -16,11 +16,10 @@
*/
package org.apache.solr.util;
-import static org.junit.Assert.assertEquals;
-
+import org.apache.solr.SolrTestCase;
import org.junit.Test;
-public class SolrCliUptimeTest {
+public class SolrCliUptimeTest extends SolrTestCase {
@Test
public void testUptime() {
assertEquals("?", SolrCLI.uptime(0));
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
index 7b1c0aff652..3503706c2eb 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
@@ -415,14 +415,15 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
}
numFound = solrClient.query(query).getResults().getNumFound();
}
- assertTrue(
+ assertEquals(
"expected 32 docs in the "
+ exampleName
+ " example but found "
+ numFound
+ ", output: "
+ toolOutput,
- numFound == 32);
+ 32,
+ numFound);
} finally {
solrClient.close();
}
@@ -605,6 +606,6 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
tool.runTool(
SolrCLI.processCommandLineArgs(
SolrCLI.joinCommonAndToolOptions(tool.getOptions()), toolArgs));
- assertTrue("Execution should have failed with return code 1", code == 1);
+ assertEquals("Execution should have failed with return code 1", 1, code);
}
}
diff --git a/solr/core/src/test/org/apache/solr/util/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java
index 3d17bf046f2..698e6843281 100644
--- a/solr/core/src/test/org/apache/solr/util/TestUtils.java
+++ b/solr/core/src/test/org/apache/solr/util/TestUtils.java
@@ -136,7 +136,7 @@ public class TestUtils extends SolrTestCaseJ4 {
assertEquals("ONE", map.getName(0));
assertEquals(Integer.valueOf(100), map.get("one", 1));
assertEquals(4, map.indexOf(null, 1));
- assertEquals(null, map.get(null, 1));
+ assertNull(map.get(null, 1));
map = new SimpleOrderedMap<>();
map.add("one", 1);
diff --git a/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordSerializerTest.java b/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordSerializerTest.java
index e6b9a790aaf..b13ec118740 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordSerializerTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordSerializerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.util.hll;
-import java.util.Arrays;
import org.apache.solr.SolrTestCase;
import org.junit.Test;
@@ -100,7 +99,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
new BigEndianAscendingWordSerializer(
shortWordLength, 0 /*wordCount*/, 0 /*bytePadding, none*/);
- assert (Arrays.equals(serializer.getBytes(), new byte[0]));
+ assertArrayEquals(serializer.getBytes(), new byte[0]);
}
{ // Should work on a byte-divisible sequence, with no padding.
final BigEndianAscendingWordSerializer serializer =
@@ -123,7 +122,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
-70, -86, -86, -86, -86, -86, -86, -84,
-113, -1, -1, -1, -1, -1, -1, -15
};
- assertTrue(Arrays.equals(bytes, expectedBytes));
+ assertArrayEquals(bytes, expectedBytes);
}
{ // Should pad the array correctly.
final BigEndianAscendingWordSerializer serializer =
@@ -135,7 +134,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
// 0x00 | 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x01
final byte[] bytes = serializer.getBytes();
final byte[] expectedBytes = new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 1};
- assertTrue(Arrays.equals(bytes, expectedBytes));
+ assertArrayEquals(bytes, expectedBytes);
}
}
@@ -148,8 +147,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
final BigEndianAscendingWordSerializer serializer =
new BigEndianAscendingWordSerializer(
shortWordLength, 0 /*wordCount*/, 0 /*bytePadding, none*/);
-
- assert (Arrays.equals(serializer.getBytes(), new byte[0]));
+ assertArrayEquals(serializer.getBytes(), new byte[0]);
}
{ // Should work on a non-byte-divisible sequence, with no padding.
final BigEndianAscendingWordSerializer serializer =
@@ -175,7 +173,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
final byte[] bytes = serializer.getBytes();
final byte[] expectedBytes = new byte[] {79, -62};
- assertTrue(Arrays.equals(bytes, expectedBytes));
+ assertArrayEquals(bytes, expectedBytes);
}
{ // Should work on a byte-divisible sequence, with no padding.
final BigEndianAscendingWordSerializer serializer =
@@ -208,7 +206,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
final byte[] bytes = serializer.getBytes();
final byte[] expectedBytes = new byte[] {8, -122, 66, -104, -24};
- assertTrue(Arrays.equals(bytes, expectedBytes));
+ assertArrayEquals(bytes, expectedBytes);
}
{ // Should pad the array correctly.
final BigEndianAscendingWordSerializer serializer =
@@ -219,7 +217,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
// 0000 0000 | 0000 1|000
final byte[] bytes = serializer.getBytes();
final byte[] expectedBytes = new byte[] {0, 8};
- assertTrue(Arrays.equals(bytes, expectedBytes));
+ assertArrayEquals(bytes, expectedBytes);
}
}
@@ -232,8 +230,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
final BigEndianAscendingWordSerializer serializer =
new BigEndianAscendingWordSerializer(
shortWordLength, 0 /*wordCount*/, 0 /*bytePadding, none*/);
-
- assert (Arrays.equals(serializer.getBytes(), new byte[0]));
+ assertArrayEquals(serializer.getBytes(), new byte[0]);
}
{ // Should work on a non-byte-divisible sequence, with no padding.
final BigEndianAscendingWordSerializer serializer =
@@ -264,7 +261,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
final byte[] bytes = serializer.getBytes();
final byte[] expectedBytes = new byte[] {0, 4, -128, 10, -128, 9, 96};
- assertTrue(Arrays.equals(bytes, expectedBytes));
+ assertArrayEquals(bytes, expectedBytes);
}
{ // Should work on a byte-divisible sequence, with no padding.
final BigEndianAscendingWordSerializer serializer =
@@ -311,7 +308,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
final byte[] bytes = serializer.getBytes();
final byte[] expectedBytes =
new byte[] {0, 0, -128, 0, -128, 0, 96, 0, 64, 0, 40, 0, 24, 0, 14, 0, 8};
- assertTrue(Arrays.equals(bytes, expectedBytes));
+ assertArrayEquals(bytes, expectedBytes);
}
{ // Should pad the array correctly.
final BigEndianAscendingWordSerializer serializer =
@@ -323,7 +320,7 @@ public class BigEndianAscendingWordSerializerTest extends SolrTestCase {
// 0x00 0x00 0x00 0x80
final byte[] bytes = serializer.getBytes();
final byte[] expectedBytes = new byte[] {0, 0, 0, -128};
- assertTrue(Arrays.equals(bytes, expectedBytes));
+ assertArrayEquals(bytes, expectedBytes);
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java b/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
index 832f1bc29cd..158027174bd 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
@@ -72,20 +72,20 @@ public class BitVectorTest extends SolrTestCase {
final LongIterator registerIterator3 = vector3.registerIterator();
final LongIterator registerIterator4 = vector4.registerIterator();
for (int i = 0; i < 128 /*2^7*/; i++) {
- assertEquals(registerIterator1.hasNext(), true);
- assertEquals(registerIterator2.hasNext(), true);
- assertEquals(registerIterator3.hasNext(), true);
- assertEquals(registerIterator4.hasNext(), true);
+ assertTrue(registerIterator1.hasNext());
+ assertTrue(registerIterator2.hasNext());
+ assertTrue(registerIterator3.hasNext());
+ assertTrue(registerIterator4.hasNext());
assertEquals(registerIterator1.next(), 0x1F);
assertEquals(registerIterator2.next(), (i & 0x1F));
assertEquals(registerIterator3.next(), ((127 - i) & 0x1F));
assertEquals(registerIterator4.next(), 0x15);
}
- assertEquals(registerIterator1.hasNext(), false /*no more*/);
- assertEquals(registerIterator2.hasNext(), false /*no more*/);
- assertEquals(registerIterator3.hasNext(), false /*no more*/);
- assertEquals(registerIterator4.hasNext(), false /*no more*/);
+ assertFalse(registerIterator1.hasNext());
+ assertFalse(registerIterator2.hasNext());
+ assertFalse(registerIterator3.hasNext());
+ assertFalse(registerIterator4.hasNext());
}
{ // scoped locally for sanity
diff --git a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
index c4696721433..aec3fc6d912 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
@@ -211,7 +211,7 @@ public class ExplicitHLLTest extends SolrTestCase {
final LongHashSet internalSetA = hllA.explicitStorage;
final LongHashSet internalSetB = hllB.explicitStorage;
- assertTrue(internalSetA.equals(internalSetB));
+ assertEquals(internalSetA, internalSetB);
}
/**
diff --git a/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java b/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java
index 89f30a9083d..d44822fc425 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java
@@ -111,7 +111,7 @@ public class HLLSerializationTest extends SolrTestCase {
final long NUM_VALS = TestUtil.nextLong(random(), 150000, 1000000);
final long MIN_VAL = TestUtil.nextLong(random(), Long.MIN_VALUE, Long.MAX_VALUE - NUM_VALS);
final long MAX_VAL = MIN_VAL + NUM_VALS;
- assert MIN_VAL < MAX_VAL;
+ assertTrue(MIN_VAL < MAX_VAL);
for (long val = MIN_VAL; val < MAX_VAL; val++) {
hll.addRaw(val);
@@ -152,7 +152,7 @@ public class HLLSerializationTest extends SolrTestCase {
final long NUM_VALS = TestUtil.nextLong(random(), 150000, 1000000);
final long MIN_VAL = TestUtil.nextLong(random(), Long.MIN_VALUE, Long.MAX_VALUE - NUM_VALS);
final long MAX_VAL = MIN_VAL + NUM_VALS;
- assert MIN_VAL < MAX_VAL;
+ assertTrue(MIN_VAL < MAX_VAL);
for (long val = MIN_VAL; val < MAX_VAL; val++) {
hll.addRaw(val);
@@ -209,13 +209,13 @@ public class HLLSerializationTest extends SolrTestCase {
HLL copy = HLL.fromBytes(hllBytes);
assertEquals(copy.cardinality(), hllCardinality);
assertEquals(copy.getType(), hllType);
- assertTrue(Arrays.equals(copy.toBytes(), hllBytes));
+ assertArrayEquals(copy.toBytes(), hllBytes);
HLL clone = copy.clone();
copy = null; // allow some GC
assertEquals(clone.cardinality(), hllCardinality);
assertEquals(clone.getType(), hllType);
- assertTrue(Arrays.equals(clone.toBytes(), hllBytes));
+ assertArrayEquals(clone.toBytes(), hllBytes);
}
}
diff --git a/solr/core/src/test/org/apache/solr/util/hll/NumberUtilTest.java b/solr/core/src/test/org/apache/solr/util/hll/NumberUtilTest.java
index 3a0c4ae2c5b..e6ca7b99b43 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/NumberUtilTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/NumberUtilTest.java
@@ -16,13 +16,11 @@
*/
package org.apache.solr.util.hll;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
+import org.apache.solr.SolrTestCase;
import org.junit.Test;
/** Tests {@link NumberUtil} */
-public class NumberUtilTest {
+public class NumberUtilTest extends SolrTestCase {
static final byte[] ALL_PRINTABLE_ASCII_CHARS =
new byte[] {
@@ -70,65 +68,62 @@ public class NumberUtilTest {
@Test
public void testLog2() {
final double log2Result = NumberUtil.log2(2d);
- assertTrue(log2Result == 1);
+ assertEquals(1, log2Result, 0.0);
}
/** Test {@link NumberUtil#toHex(byte[], int, int)} */
@Test
public void TestToHex() {
- assertTrue(
- ALL_PRINTABLE_ASCII_CHARS_IN_HEX.equals(
- NumberUtil.toHex(ALL_PRINTABLE_ASCII_CHARS, 0, ALL_PRINTABLE_ASCII_CHARS.length)));
+ assertEquals(
+ ALL_PRINTABLE_ASCII_CHARS_IN_HEX,
+ NumberUtil.toHex(ALL_PRINTABLE_ASCII_CHARS, 0, ALL_PRINTABLE_ASCII_CHARS.length));
}
/** Test {@link NumberUtil#toHex(byte[], int, int)} */
@Test
public void TestToHexWithOffset() {
- assertTrue(
- ALL_MAJ_LETTERS_ASCII_CHARS_IN_HEX.equals(
- NumberUtil.toHex(ALL_WORD_CHARAC_ASCII_CHARS, 10, ALL_PRINTABLE_ASCII_CHARS.length)));
+ assertEquals(
+ ALL_MAJ_LETTERS_ASCII_CHARS_IN_HEX,
+ NumberUtil.toHex(ALL_WORD_CHARAC_ASCII_CHARS, 10, ALL_PRINTABLE_ASCII_CHARS.length));
}
/** Test {@link NumberUtil#toHex(byte[], int, int)} */
@Test
public void TestToHexWithCountt() {
- assertTrue(
- ALL_NUMBER_ASCII_CHARS_IN_HEX.equals(NumberUtil.toHex(ALL_WORD_CHARAC_ASCII_CHARS, 0, 10)));
+ assertEquals(
+ ALL_NUMBER_ASCII_CHARS_IN_HEX, NumberUtil.toHex(ALL_WORD_CHARAC_ASCII_CHARS, 0, 10));
}
/** Test {@link NumberUtil#fromHex(String, int, int)} */
@Test
public void TestFromHex() {
- assertTrue(
- Arrays.equals(
- NumberUtil.fromHex(
- ALL_NUMBER_ASCII_CHARS_IN_HEX
- + ALL_MAJ_LETTERS_ASCII_CHARS_IN_HEX
- + ALL_LOW_LETTERS_ASCII_CHARS_IN_HEX,
- 0,
- ALL_WORD_CHARAC_ASCII_CHARS.length * 2),
- ALL_WORD_CHARAC_ASCII_CHARS));
+ assertArrayEquals(
+ NumberUtil.fromHex(
+ ALL_NUMBER_ASCII_CHARS_IN_HEX
+ + ALL_MAJ_LETTERS_ASCII_CHARS_IN_HEX
+ + ALL_LOW_LETTERS_ASCII_CHARS_IN_HEX,
+ 0,
+ ALL_WORD_CHARAC_ASCII_CHARS.length * 2),
+ ALL_WORD_CHARAC_ASCII_CHARS);
}
/** Test {@link NumberUtil#fromHex(String, int, int)} */
@Test
public void TestFromHexWithOffset() {
- assertTrue(
- Arrays.equals(
- NumberUtil.fromHex(
- ALL_NUMBER_ASCII_CHARS_IN_HEX + ALL_MAJ_LETTERS_ASCII_CHARS_IN_HEX,
- 20,
- ALL_LETTER_ASCII_CHARS.length * 2),
- ALL_LETTER_ASCII_CHARS));
+ assertArrayEquals(
+ NumberUtil.fromHex(
+ ALL_NUMBER_ASCII_CHARS_IN_HEX + ALL_MAJ_LETTERS_ASCII_CHARS_IN_HEX,
+ 20,
+ ALL_LETTER_ASCII_CHARS.length * 2),
+ ALL_LETTER_ASCII_CHARS);
}
/** Test {@link NumberUtil#fromHex(String, int, int)} */
@Test
public void TestFromHexWithCount() {
- assertTrue(
- Arrays.equals(
- NumberUtil.fromHex(
- ALL_NUMBER_ASCII_CHARS_IN_HEX + ALL_MAJ_LETTERS_ASCII_CHARS_IN_HEX, 0, 20),
- ALL_NUMBER_CHARAC_ASCII_CHARS));
+ assertArrayEquals(
+ NumberUtil.fromHex(
+ ALL_NUMBER_ASCII_CHARS_IN_HEX + ALL_MAJ_LETTERS_ASCII_CHARS_IN_HEX, 0, 20),
+ ALL_NUMBER_CHARAC_ASCII_CHARS);
}
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/ExpressionFactoryTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/ExpressionFactoryTest.java
index bf11cdd3515..2bedb3fe32a 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/ExpressionFactoryTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/ExpressionFactoryTest.java
@@ -139,56 +139,54 @@ public class ExpressionFactoryTest extends SolrTestCaseJ4 {
// Two ungrouped exactly the same expression
fact.startRequest();
- assertTrue(
+ assertSame(
"The objects of the two mapping expressions are not the same.",
- fact.createExpression("pow(int_i,double_d)")
- == fact.createExpression("pow(int_i,double_d)"));
- assertTrue(
+ fact.createExpression("pow(int_i,double_d)"),
+ fact.createExpression("pow(int_i,double_d)"));
+ assertSame(
"The objects of the two reduced expressions are not the same.",
- fact.createExpression("unique(add(int_i,double_d))")
- == fact.createExpression("unique(add(int_i,double_d))"));
+ fact.createExpression("unique(add(int_i,double_d))"),
+ fact.createExpression("unique(add(int_i,double_d))"));
// Two ungrouped different expressions
fact.startRequest();
- assertFalse(
+ assertNotSame(
"The objects of the two mapping expressions are not the same.",
- fact.createExpression("pow(int_i,double_d)")
- == fact.createExpression("pow(int_i,float_f)"));
- assertFalse(
+ fact.createExpression("pow(int_i,double_d)"),
+ fact.createExpression("pow(int_i,float_f)"));
+ assertNotSame(
"The objects of the two reduced expressions are not the same.",
- fact.createExpression("unique(add(int_i,double_d))")
- == fact.createExpression("unique(add(int_i,float_f))"));
+ fact.createExpression("unique(add(int_i,double_d))"),
+ fact.createExpression("unique(add(int_i,float_f))"));
// Grouped and ungrouped mapping expression
fact.startRequest();
Object ungrouped = fact.createExpression("pow(int_i,double_d)");
fact.startGrouping();
Object grouped = fact.createExpression("pow(int_i,double_d)");
- assertTrue(
- "The objects of the two mapping expressions are not the same.", ungrouped == grouped);
+ assertSame("The objects of the two mapping expressions are not the same.", ungrouped, grouped);
// Grouped and ungrouped diferent mapping expressions
fact.startRequest();
ungrouped = fact.createExpression("pow(int_i,double_d)");
fact.startGrouping();
grouped = fact.createExpression("pow(int_i,float_f)");
- assertFalse(
- "The objects of the two mapping expressions are not the same.", ungrouped == grouped);
+ assertNotSame(
+ "The objects of the two mapping expressions are not the same.", ungrouped, grouped);
// Grouped and ungrouped reduced expression.
fact.startRequest();
ungrouped = fact.createExpression("unique(add(int_i,double_d))");
fact.startGrouping();
grouped = fact.createExpression("unique(add(int_i,double_d))");
- assertTrue(
- "The objects of the two mapping expressions are not the same.", ungrouped == grouped);
+ assertSame("The objects of the two mapping expressions are not the same.", ungrouped, grouped);
// Grouped and ungrouped different reduced expressions.
fact.startRequest();
ungrouped = fact.createExpression("unique(add(int_i,double_d))");
fact.startGrouping();
grouped = fact.createExpression("unique(add(int_i,float_f))");
- assertFalse("The objects of the two mapping expressions are the same.", ungrouped == grouped);
+ assertNotSame("The objects of the two mapping expressions are the same.", ungrouped, grouped);
}
@Test
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AbsoluteValueFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AbsoluteValueFunctionTest.java
index 2aa3634fd9e..310bf191262 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AbsoluteValueFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AbsoluteValueFunctionTest.java
@@ -149,7 +149,7 @@ public class AbsoluteValueFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -186,7 +186,7 @@ public class AbsoluteValueFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -223,7 +223,7 @@ public class AbsoluteValueFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -260,7 +260,7 @@ public class AbsoluteValueFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AddFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AddFunctionTest.java
index bb26a074cae..35efe555112 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AddFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AddFunctionTest.java
@@ -100,7 +100,7 @@ public class AddFunctionTest extends SolrTestCaseJ4 {
val2.setValue(21.56F).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -108,7 +108,7 @@ public class AddFunctionTest extends SolrTestCaseJ4 {
val2.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AndFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AndFunctionTest.java
index 34005cb7487..341b9419e00 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AndFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AndFunctionTest.java
@@ -53,22 +53,22 @@ public class AndFunctionTest extends SolrTestCaseJ4 {
// Both exist
val1.setValue(false).setExists(true);
val2.setValue(false).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val1.setValue(true).setExists(true);
val2.setValue(false).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val1.setValue(false).setExists(true);
val2.setValue(true).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val1.setValue(true).setExists(true);
val2.setValue(true).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -88,20 +88,20 @@ public class AndFunctionTest extends SolrTestCaseJ4 {
// One value
val.setValues(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val.setValues(false);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
// Multiple values
val.setValues(true, true, false, true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val.setValues(true, true, true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -120,7 +120,7 @@ public class AndFunctionTest extends SolrTestCaseJ4 {
val2.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -128,7 +128,7 @@ public class AndFunctionTest extends SolrTestCaseJ4 {
val2.setValues(true, false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
@@ -186,14 +186,14 @@ public class AndFunctionTest extends SolrTestCaseJ4 {
val2.setValue(false).setExists(true);
val3.setValue(true).setExists(true);
val4.setValue(true).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val1.setValue(true).setExists(true);
val2.setValue(true).setExists(true);
val3.setValue(true).setExists(true);
val4.setValue(true).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/CeilingFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/CeilingFunctionTest.java
index 18d7d55c264..31355fa9e1f 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/CeilingFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/CeilingFunctionTest.java
@@ -98,7 +98,7 @@ public class CeilingFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -135,7 +135,7 @@ public class CeilingFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ConcatFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ConcatFunctionTest.java
index 92f0c72459c..fe4e4356786 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ConcatFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ConcatFunctionTest.java
@@ -96,7 +96,7 @@ public class ConcatFunctionTest extends SolrTestCaseJ4 {
val2.setValues();
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One exists
@@ -104,14 +104,14 @@ public class ConcatFunctionTest extends SolrTestCaseJ4 {
val2.setValues("def");
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValue("abc").setExists(true);
val2.setValues();
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Both exist
@@ -142,7 +142,7 @@ public class ConcatFunctionTest extends SolrTestCaseJ4 {
val2.setValues();
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One exists
@@ -150,14 +150,14 @@ public class ConcatFunctionTest extends SolrTestCaseJ4 {
val2.setValues("def");
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValue("abc").setExists(true);
val2.setValues();
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Both exist
@@ -187,7 +187,7 @@ public class ConcatFunctionTest extends SolrTestCaseJ4 {
val2.setExists(false);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One exists
@@ -195,14 +195,14 @@ public class ConcatFunctionTest extends SolrTestCaseJ4 {
val2.setExists(false);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues();
val2.setValue("abc").setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Both exist
@@ -233,7 +233,7 @@ public class ConcatFunctionTest extends SolrTestCaseJ4 {
val2.setExists(false);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One exists
@@ -241,14 +241,14 @@ public class ConcatFunctionTest extends SolrTestCaseJ4 {
val2.setExists(false);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues();
val2.setValue("abc").setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Both exist
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DivideFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DivideFunctionTest.java
index 51202ced7b5..c069e97abd0 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DivideFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DivideFunctionTest.java
@@ -73,7 +73,7 @@ public class DivideFunctionTest extends SolrTestCaseJ4 {
divisor.setValue(21.56F).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -81,7 +81,7 @@ public class DivideFunctionTest extends SolrTestCaseJ4 {
divisor.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
@@ -111,7 +111,7 @@ public class DivideFunctionTest extends SolrTestCaseJ4 {
divisor.setValues();
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -119,7 +119,7 @@ public class DivideFunctionTest extends SolrTestCaseJ4 {
divisor.setValues(4L, 10023L);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java
index 39aa068aef2..569471ce46b 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java
@@ -63,12 +63,12 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
// Value exists
val1.setValue(false).setExists(true);
val2.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val1.setValue(false).setExists(true);
val2.setValue(true).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -101,12 +101,12 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
// Value exists
val1.setValue(21.56).setExists(true);
val2.setValue(21.56).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val1.setValue(21.56).setExists(true);
val2.setValue(21.57).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -139,12 +139,12 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
// Value exists
val1.setValue("1800-01-02T10:20:30Z").setExists(true);
val2.setValue("1800-01-02T10:20:30Z").setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val1.setValue("1800-01-02T10:20:30Z").setExists(true);
val2.setValue("1800-01-02T10:20:31Z").setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -177,12 +177,12 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
// Value exists
val1.setValue("abcdefghi").setExists(true);
val2.setValue("abcdefghi").setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val1.setValue("abcdefghi1").setExists(true);
val2.setValue("abcdefghi2").setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -201,14 +201,14 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
val2.setValue(false).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues(true);
val2.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -249,14 +249,14 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
val2.setValue(false).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues(true);
val2.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -297,14 +297,14 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
val2.setValue(-4.2).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues(-4.2);
val2.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -345,14 +345,14 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
val2.setValue(-4.2).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues(-4.2);
val2.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -393,14 +393,14 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
val2.setValue("1800-01-02T10:20:30Z").setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues("1800-01-02T10:20:30Z");
val2.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -445,14 +445,14 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
val2.setValue("1800-01-02T10:20:30Z").setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues("1800-01-02T10:20:30Z");
val2.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -497,14 +497,14 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
val2.setValue("abcdefghi").setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues("abcdefghi");
val2.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -545,14 +545,14 @@ public class EqualFunctionTest extends SolrTestCaseJ4 {
val2.setValue("abcdefghi").setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val1.setValues("abcdefghi");
val2.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.java
index 7c079945ac0..eb0b560b54e 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.java
@@ -120,32 +120,32 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
// Value exists
val.setValue(true).setExists(true);
filler.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val.setValue(false).setExists(true);
filler.setValue(false).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val.setValue(true).setExists(true);
filler.setExists(false);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val.setValue(false).setExists(true);
filler.setExists(false);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val.setExists(false);
filler.setValue(false).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val.setExists(false);
filler.setValue(true).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -399,7 +399,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
filler.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -449,7 +449,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
filler.setValues();
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -499,7 +499,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
filler.setValues();
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -549,7 +549,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
filler.setValues();
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -599,7 +599,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
filler.setValues();
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -653,7 +653,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
filler.setValues();
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -703,7 +703,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
filler.setValues();
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -752,7 +752,7 @@ public class FillMissingFunctionTest extends SolrTestCaseJ4 {
filler.setValues();
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.java
index 730a60135a5..cf272e996cb 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.java
@@ -87,7 +87,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
// Value exists
val.setValue(true).setExists(true);
filter.setValue(true).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val.setValue(true).setExists(true);
@@ -97,7 +97,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
val.setValue(false).setExists(true);
filter.setValue(true).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val.setValue(false).setExists(true);
@@ -460,21 +460,21 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues(false, true, false);
filter.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
filter.setValue(true).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -492,7 +492,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -510,7 +510,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -525,7 +525,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -544,21 +544,21 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setExists(false);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues(1, 3, 5);
filter.setExists(false);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
filter.setValue(true).setExists(true);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -576,7 +576,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -594,7 +594,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -609,7 +609,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -628,21 +628,21 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setExists(false);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues(1L, 3L, 5L);
filter.setExists(false);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
filter.setValue(true).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -660,7 +660,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -678,7 +678,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -693,7 +693,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -712,21 +712,21 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setExists(false);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues(50.343F, -74.9874F, 2342332342.32F);
filter.setExists(false);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
filter.setValue(true).setExists(true);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -744,7 +744,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -762,7 +762,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -777,7 +777,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -796,21 +796,21 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues(50.343, -74.9874, 2342332342.32);
filter.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
filter.setValue(true).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -828,7 +828,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -846,7 +846,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -861,7 +861,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -884,21 +884,21 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setExists(false);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues("1810-12-02T10:30:15Z", "1850-12-02T20:30:15Z");
filter.setExists(false);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
filter.setValue(true).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -916,7 +916,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -934,7 +934,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -950,7 +950,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -969,21 +969,21 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setExists(false);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues("abc", "123", "def", "456");
filter.setExists(false);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
filter.setValue(true).setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -1001,7 +1001,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -1019,7 +1019,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -1034,7 +1034,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -1051,21 +1051,21 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setExists(false);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues(3, "3", new Date(3));
filter.setExists(false);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
filter.setValue(true).setExists(true);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -1084,7 +1084,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -1102,7 +1102,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
filter.setValue(true).setExists(true);
@@ -1117,7 +1117,7 @@ public class FilterFunctionTest extends SolrTestCaseJ4 {
filter.setValue(false).setExists(true);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FloorFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FloorFunctionTest.java
index cd51d890157..22145ef5f30 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FloorFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FloorFunctionTest.java
@@ -98,7 +98,7 @@ public class FloorFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -135,7 +135,7 @@ public class FloorFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTEFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTEFunctionTest.java
index 086265b671e..93fae174c5b 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTEFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTEFunctionTest.java
@@ -60,17 +60,17 @@ public class GTEFunctionTest extends SolrTestCaseJ4 {
// Value exists
base.setValue(21.56).setExists(true);
comp.setValue(21.56).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
base.setValue(21.56).setExists(true);
comp.setValue(21.57).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
base.setValue(21.56).setExists(true);
comp.setValue(-21.57).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -103,17 +103,17 @@ public class GTEFunctionTest extends SolrTestCaseJ4 {
// Value exists
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1800-01-02T10:20:30Z").setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1800-01-02T10:20:31Z").setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1000-01-02T10:20:31Z").setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -132,14 +132,14 @@ public class GTEFunctionTest extends SolrTestCaseJ4 {
comp.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setExists(false);
comp.setValues(-4.2);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -180,14 +180,14 @@ public class GTEFunctionTest extends SolrTestCaseJ4 {
comp.setValue(-4.2).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setValues(-4.2);
comp.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -228,14 +228,14 @@ public class GTEFunctionTest extends SolrTestCaseJ4 {
comp.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setExists(false);
comp.setValues("1800-01-02T10:20:30Z");
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -281,14 +281,14 @@ public class GTEFunctionTest extends SolrTestCaseJ4 {
comp.setValue("1800-01-02T10:20:30Z").setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setValues("1800-01-02T10:20:30Z");
comp.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTFunctionTest.java
index 6beabb2725f..6ac044ab930 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTFunctionTest.java
@@ -60,17 +60,17 @@ public class GTFunctionTest extends SolrTestCaseJ4 {
// Value exists
base.setValue(21.56).setExists(true);
comp.setValue(21.56).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
base.setValue(21.56).setExists(true);
comp.setValue(21.57).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
base.setValue(21.56).setExists(true);
comp.setValue(-21.57).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -103,17 +103,17 @@ public class GTFunctionTest extends SolrTestCaseJ4 {
// Value exists
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1800-01-02T10:20:30Z").setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1800-01-02T10:20:31Z").setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1000-01-02T10:20:31Z").setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -132,14 +132,14 @@ public class GTFunctionTest extends SolrTestCaseJ4 {
comp.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setExists(false);
comp.setValues(-4.2);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -180,14 +180,14 @@ public class GTFunctionTest extends SolrTestCaseJ4 {
comp.setValue(-4.2).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setValues(-4.2);
comp.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -228,14 +228,14 @@ public class GTFunctionTest extends SolrTestCaseJ4 {
comp.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setExists(false);
comp.setValues("1800-01-02T10:20:30Z");
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -281,14 +281,14 @@ public class GTFunctionTest extends SolrTestCaseJ4 {
comp.setValue("1800-01-02T10:20:30Z").setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setValues("1800-01-02T10:20:30Z");
comp.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.java
index 92a3c08e10d..50e970fe74b 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.java
@@ -158,25 +158,25 @@ public class IfFunctionTest extends SolrTestCaseJ4 {
cond.setValue(true).setExists(true);
then.setValue(false).setExists(true);
els.setValue(true).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
cond.setValue(true).setExists(true);
then.setValue(true).setExists(true);
els.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
cond.setValue(false).setExists(true);
then.setValue(false).setExists(true);
els.setValue(true).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
cond.setValue(false).setExists(true);
then.setValue(true).setExists(true);
els.setValue(false).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTEFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTEFunctionTest.java
index 964f2424a87..0a3b7f9d202 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTEFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTEFunctionTest.java
@@ -60,17 +60,17 @@ public class LTEFunctionTest extends SolrTestCaseJ4 {
// Value exists
base.setValue(21.56).setExists(true);
comp.setValue(21.56).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
base.setValue(21.56).setExists(true);
comp.setValue(21.57).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
base.setValue(21.56).setExists(true);
comp.setValue(-21.57).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -103,17 +103,17 @@ public class LTEFunctionTest extends SolrTestCaseJ4 {
// Value exists
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1800-01-02T10:20:30Z").setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1800-01-02T10:20:31Z").setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1000-01-02T10:20:31Z").setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -132,14 +132,14 @@ public class LTEFunctionTest extends SolrTestCaseJ4 {
comp.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setExists(false);
comp.setValues(-4.2);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -180,14 +180,14 @@ public class LTEFunctionTest extends SolrTestCaseJ4 {
comp.setValue(-4.2).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setValues(-4.2);
comp.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -228,14 +228,14 @@ public class LTEFunctionTest extends SolrTestCaseJ4 {
comp.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setExists(false);
comp.setValues("1800-01-02T10:20:30Z");
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -281,14 +281,14 @@ public class LTEFunctionTest extends SolrTestCaseJ4 {
comp.setValue("1800-01-02T10:20:30Z").setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setValues("1800-01-02T10:20:30Z");
comp.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTFunctionTest.java
index c44a093fc96..1c83670b996 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTFunctionTest.java
@@ -60,17 +60,17 @@ public class LTFunctionTest extends SolrTestCaseJ4 {
// Value exists
base.setValue(21.56).setExists(true);
comp.setValue(21.56).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
base.setValue(21.56).setExists(true);
comp.setValue(21.57).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
base.setValue(21.56).setExists(true);
comp.setValue(-21.57).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -103,17 +103,17 @@ public class LTFunctionTest extends SolrTestCaseJ4 {
// Value exists
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1800-01-02T10:20:30Z").setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1800-01-02T10:20:31Z").setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
base.setValue("1800-01-02T10:20:30Z").setExists(true);
comp.setValue("1000-01-02T10:20:31Z").setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -132,14 +132,14 @@ public class LTFunctionTest extends SolrTestCaseJ4 {
comp.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setExists(false);
comp.setValues(-4.2);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -180,14 +180,14 @@ public class LTFunctionTest extends SolrTestCaseJ4 {
comp.setValue(-4.2).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setValues(-4.2);
comp.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -228,14 +228,14 @@ public class LTFunctionTest extends SolrTestCaseJ4 {
comp.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setExists(false);
comp.setValues("1800-01-02T10:20:30Z");
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -281,14 +281,14 @@ public class LTFunctionTest extends SolrTestCaseJ4 {
comp.setValue("1800-01-02T10:20:30Z").setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
base.setValues("1800-01-02T10:20:30Z");
comp.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LogFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LogFunctionTest.java
index 77a38c1342b..2c000768438 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LogFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LogFunctionTest.java
@@ -68,7 +68,7 @@ public class LogFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -137,7 +137,7 @@ public class LogFunctionTest extends SolrTestCaseJ4 {
val.setValue(21.56F).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -145,7 +145,7 @@ public class LogFunctionTest extends SolrTestCaseJ4 {
val.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
@@ -180,7 +180,7 @@ public class LogFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -188,7 +188,7 @@ public class LogFunctionTest extends SolrTestCaseJ4 {
val.setValues(4L, 10023L);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/MultFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/MultFunctionTest.java
index 2d558f4913a..54965049aff 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/MultFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/MultFunctionTest.java
@@ -99,7 +99,7 @@ public class MultFunctionTest extends SolrTestCaseJ4 {
val2.setValue(21.56F).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -107,7 +107,7 @@ public class MultFunctionTest extends SolrTestCaseJ4 {
val2.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/NegateFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/NegateFunctionTest.java
index f0ca115aa72..ff710d8990c 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/NegateFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/NegateFunctionTest.java
@@ -60,11 +60,11 @@ public class NegateFunctionTest extends SolrTestCaseJ4 {
// Value exists
val.setValue(true).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -177,7 +177,7 @@ public class NegateFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -214,7 +214,7 @@ public class NegateFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -251,7 +251,7 @@ public class NegateFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -288,7 +288,7 @@ public class NegateFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -325,7 +325,7 @@ public class NegateFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/OrFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/OrFunctionTest.java
index 05a3d2ddf16..3aa96e2aa3f 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/OrFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/OrFunctionTest.java
@@ -53,22 +53,22 @@ public class OrFunctionTest extends SolrTestCaseJ4 {
// Both exist
val1.setValue(false).setExists(true);
val2.setValue(false).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val1.setValue(true).setExists(true);
val2.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val1.setValue(false).setExists(true);
val2.setValue(true).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val1.setValue(true).setExists(true);
val2.setValue(true).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
}
@@ -88,20 +88,20 @@ public class OrFunctionTest extends SolrTestCaseJ4 {
// One value
val.setValues(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val.setValues(false);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
// Multiple values
val.setValues(false, false, true, false);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val.setValues(false, false, false);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -120,7 +120,7 @@ public class OrFunctionTest extends SolrTestCaseJ4 {
val2.setValues();
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -128,7 +128,7 @@ public class OrFunctionTest extends SolrTestCaseJ4 {
val2.setValues(true, false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
@@ -186,14 +186,14 @@ public class OrFunctionTest extends SolrTestCaseJ4 {
val2.setValue(true).setExists(true);
val3.setValue(false).setExists(true);
val4.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val1.setValue(false).setExists(true);
val2.setValue(false).setExists(true);
val3.setValue(false).setExists(true);
val4.setValue(false).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/PowerFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/PowerFunctionTest.java
index 7b11abbadfa..74fb9364505 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/PowerFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/PowerFunctionTest.java
@@ -73,7 +73,7 @@ public class PowerFunctionTest extends SolrTestCaseJ4 {
pow.setValue(21.56F).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -81,7 +81,7 @@ public class PowerFunctionTest extends SolrTestCaseJ4 {
pow.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
@@ -111,7 +111,7 @@ public class PowerFunctionTest extends SolrTestCaseJ4 {
pow.setValues();
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -119,7 +119,7 @@ public class PowerFunctionTest extends SolrTestCaseJ4 {
pow.setValues(4L, 10023L);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.java
index cbaa11744e8..85990332cae 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.java
@@ -125,7 +125,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
// Value exists
val.setValue(true).setExists(true);
remover.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val.setValue(true).setExists(true);
@@ -135,7 +135,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
val.setValue(false).setExists(true);
remover.setValue(true).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val.setValue(false).setExists(true);
@@ -145,7 +145,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
val.setValue(false).setExists(true);
remover.setExists(false);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
}
@@ -434,14 +434,14 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
remover.setValue(true).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -479,7 +479,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setValue(false).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -498,14 +498,14 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setExists(false);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
remover.setValue(324).setExists(true);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -543,7 +543,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setValue(1).setExists(true);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -562,14 +562,14 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setExists(false);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
remover.setValue(2323L).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -607,7 +607,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setValue(10L).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -626,14 +626,14 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setExists(false);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
remover.setValue(230.32F).setExists(true);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -673,7 +673,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setValue(23.56F).setExists(true);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -692,14 +692,14 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
remover.setValue(234237.67).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -737,7 +737,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setValue(3124.96).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -760,14 +760,14 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setExists(false);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
remover.setValue("1700-12-14").setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -821,7 +821,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setValue("1810-12-02T10:30:15Z").setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -840,14 +840,14 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setExists(false);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
remover.setValue("ads").setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -886,7 +886,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setValue("abc123").setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
@@ -903,14 +903,14 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setExists(false);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
remover.setValue("doesn't matter").setExists(true);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Values exist
@@ -949,7 +949,7 @@ public class RemoveFunctionTest extends SolrTestCaseJ4 {
remover.setValue(new Date(4)).setExists(true);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
}
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.java
index 4f732bcdbea..079bdabba08 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.java
@@ -145,20 +145,20 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
val.setValue(true).setExists(true);
comp.setExists(false);
fill.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
// Value exists
val.setValue(true).setExists(true);
comp.setValue(false).setExists(true);
fill.setValue(false).setExists(true);
- assertEquals(true, func.getBoolean());
+ assertTrue(func.getBoolean());
assertTrue(func.exists());
val.setValue(true).setExists(true);
comp.setValue(true).setExists(true);
fill.setValue(false).setExists(true);
- assertEquals(false, func.getBoolean());
+ assertFalse(func.getBoolean());
assertTrue(func.exists());
val.setValue(false).setExists(true);
@@ -586,7 +586,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setExists(false);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
@@ -594,7 +594,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setValue(false).setExists(true);
func.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Comp doesn't exist
@@ -650,7 +650,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setExists(false);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
@@ -658,7 +658,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setValue(52341).setExists(true);
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Comp doesn't exist
@@ -714,7 +714,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setExists(false);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
@@ -722,7 +722,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setValue(-5943L).setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Comp doesn't exist
@@ -778,7 +778,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setExists(false);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
@@ -786,7 +786,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setValue(9459.3458F).setExists(true);
func.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Comp doesn't exist
@@ -844,7 +844,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
@@ -852,7 +852,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setValue(-234.312).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Comp doesn't exist
@@ -914,7 +914,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setExists(false);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
@@ -922,7 +922,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setValue("3450-04-23").setExists(true);
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Comp doesn't exist
@@ -994,7 +994,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setExists(false);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
@@ -1002,7 +1002,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setValue("empty").setExists(true);
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Comp doesn't exist
@@ -1056,7 +1056,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setExists(false);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
val.setValues();
@@ -1064,7 +1064,7 @@ public class ReplaceFunctionTest extends SolrTestCaseJ4 {
fill.setValue("won't show up").setExists(true);
func.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Comp doesn't exist
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RoundFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RoundFunctionTest.java
index ff5132a9010..1af9ea6685e 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RoundFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RoundFunctionTest.java
@@ -98,7 +98,7 @@ public class RoundFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
@@ -135,7 +135,7 @@ public class RoundFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/StringCastFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/StringCastFunctionTest.java
index 402504821bb..def48b58ed1 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/StringCastFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/StringCastFunctionTest.java
@@ -65,7 +65,7 @@ public class StringCastFunctionTest extends SolrTestCaseJ4 {
val.setValues();
func.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// One value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/SubtractFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/SubtractFunctionTest.java
index c61a04cb2e5..0345365a37e 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/SubtractFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/SubtractFunctionTest.java
@@ -73,7 +73,7 @@ public class SubtractFunctionTest extends SolrTestCaseJ4 {
subtrahend.setValue(21.56F).setExists(true);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -81,7 +81,7 @@ public class SubtractFunctionTest extends SolrTestCaseJ4 {
subtrahend.setExists(false);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
@@ -111,7 +111,7 @@ public class SubtractFunctionTest extends SolrTestCaseJ4 {
subtrahend.setValues();
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, no value
@@ -119,7 +119,7 @@ public class SubtractFunctionTest extends SolrTestCaseJ4 {
subtrahend.setValues(4L, 10023L);
func.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple values, one value
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java
index 8d6291a1a72..4769395a042 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java
@@ -141,7 +141,7 @@ public class LegacyFunctionTest extends LegacyAbstractAnalyticsTest {
result = (Double) getStatResult("ar", "mean", VAL_TYPE.DOUBLE);
calculated = (Double) getStatResult("ar", "meanc", VAL_TYPE.DOUBLE);
- assertTrue(result == calculated);
+ assertEquals(result, calculated, 0.0);
assertEquals(getRawResponse(), result, calculated, 0.0);
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetCloudTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetCloudTest.java
index e38dfd7d08e..9a8802b5729 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetCloudTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetCloudTest.java
@@ -18,12 +18,10 @@ package org.apache.solr.analytics.legacy.facet;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.util.NamedList;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -442,48 +440,48 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Double> intDate =
+ ArrayList<Double> intDate =
getValueList(response, "sum", "fieldFacets", "date_dtd", "int", false);
ArrayList<Double> intDateTest = calculateFacetedNumberStat(intDateTestStart, "sum");
- assertEquals(responseStr.toString(), intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Double> intString =
+ ArrayList<Double> intString =
getValueList(response, "sum", "fieldFacets", "string_sd", "int", false);
ArrayList<Double> intStringTest = calculateFacetedNumberStat(intStringTestStart, "sum");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Double> longDate =
+ ArrayList<Double> longDate =
getValueList(response, "sum", "fieldFacets", "date_dtd", "long", false);
ArrayList<Double> longDateTest = calculateFacetedNumberStat(longDateTestStart, "sum");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Double> longString =
+ ArrayList<Double> longString =
getValueList(response, "sum", "fieldFacets", "string_sd", "long", false);
ArrayList<Double> longStringTest = calculateFacetedNumberStat(longStringTestStart, "sum");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Double> floatDate =
+ ArrayList<Double> floatDate =
getValueList(response, "sum", "fieldFacets", "date_dtd", "float", false);
ArrayList<Double> floatDateTest = calculateFacetedNumberStat(floatDateTestStart, "sum");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Double> floatString =
+ ArrayList<Double> floatString =
getValueList(response, "sum", "fieldFacets", "string_sd", "float", false);
ArrayList<Double> floatStringTest = calculateFacetedNumberStat(floatStringTestStart, "sum");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getValueList(response, "sum", "fieldFacets", "date_dtd", "double", false);
ArrayList<Double> doubleDateTest = calculateFacetedNumberStat(doubleDateTestStart, "sum");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getValueList(response, "sum", "fieldFacets", "string_sd", "double", false);
ArrayList<Double> doubleStringTest = calculateFacetedNumberStat(doubleStringTestStart, "sum");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
}
@SuppressWarnings("unchecked")
@@ -502,48 +500,48 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Double> intDate =
+ ArrayList<Double> intDate =
getValueList(response, "mean", "fieldFacets", "date_dtd", "int", false);
ArrayList<Double> intDateTest = calculateFacetedNumberStat(intDateTestStart, "mean");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Double> intString =
+ ArrayList<Double> intString =
getValueList(response, "mean", "fieldFacets", "string_sd", "int", false);
ArrayList<Double> intStringTest = calculateFacetedNumberStat(intStringTestStart, "mean");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Double> longDate =
+ ArrayList<Double> longDate =
getValueList(response, "mean", "fieldFacets", "date_dtd", "long", false);
ArrayList<Double> longDateTest = calculateFacetedNumberStat(longDateTestStart, "mean");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Double> longString =
+ ArrayList<Double> longString =
getValueList(response, "mean", "fieldFacets", "string_sd", "long", false);
ArrayList<Double> longStringTest = calculateFacetedNumberStat(longStringTestStart, "mean");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Double> floatDate =
+ ArrayList<Double> floatDate =
getValueList(response, "mean", "fieldFacets", "date_dtd", "float", false);
ArrayList<Double> floatDateTest = calculateFacetedNumberStat(floatDateTestStart, "mean");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Double> floatString =
+ ArrayList<Double> floatString =
getValueList(response, "mean", "fieldFacets", "string_sd", "float", false);
ArrayList<Double> floatStringTest = calculateFacetedNumberStat(floatStringTestStart, "mean");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getValueList(response, "mean", "fieldFacets", "date_dtd", "double", false);
ArrayList<Double> doubleDateTest = calculateFacetedNumberStat(doubleDateTestStart, "mean");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getValueList(response, "mean", "fieldFacets", "string_sd", "double", false);
ArrayList<Double> doubleStringTest = calculateFacetedNumberStat(doubleStringTestStart, "mean");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
}
@SuppressWarnings("unchecked")
@@ -622,49 +620,49 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Double> intDate =
+ ArrayList<Double> intDate =
getValueList(response, "median", "fieldFacets", "date_dtd", "int", false);
ArrayList<Double> intDateTest = calculateFacetedNumberStat(intDateTestStart, "median");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Double> intString =
+ ArrayList<Double> intString =
getValueList(response, "median", "fieldFacets", "string_sd", "int", false);
ArrayList<Double> intStringTest = calculateFacetedNumberStat(intStringTestStart, "median");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Double> longDate =
+ ArrayList<Double> longDate =
getValueList(response, "median", "fieldFacets", "date_dtd", "long", false);
ArrayList<Double> longDateTest = calculateFacetedNumberStat(longDateTestStart, "median");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Double> longString =
+ ArrayList<Double> longString =
getValueList(response, "median", "fieldFacets", "string_sd", "long", false);
ArrayList<Double> longStringTest = calculateFacetedNumberStat(longStringTestStart, "median");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Double> floatDate =
+ ArrayList<Double> floatDate =
getValueList(response, "median", "fieldFacets", "date_dtd", "float", false);
ArrayList<Double> floatDateTest = calculateFacetedNumberStat(floatDateTestStart, "median");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Double> floatString =
+ ArrayList<Double> floatString =
getValueList(response, "median", "fieldFacets", "string_sd", "float", false);
ArrayList<Double> floatStringTest = calculateFacetedNumberStat(floatStringTestStart, "median");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getValueList(response, "median", "fieldFacets", "date_dtd", "double", false);
ArrayList<Double> doubleDateTest = calculateFacetedNumberStat(doubleDateTestStart, "median");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getValueList(response, "median", "fieldFacets", "string_sd", "double", false);
ArrayList<Double> doubleStringTest =
calculateFacetedNumberStat(doubleStringTestStart, "median");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
}
@SuppressWarnings("unchecked")
@@ -687,82 +685,82 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Integer> intDate =
+ ArrayList<Integer> intDate =
getValueList(response, "percentile_20n", "fieldFacets", "date_dtd", "int", false);
ArrayList<Integer> intDateTest =
(ArrayList<Integer>) calculateFacetedStat(intDateTestStart, "perc_20");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Integer> intString =
+ ArrayList<Integer> intString =
getValueList(response, "percentile_20n", "fieldFacets", "string_sd", "int", false);
ArrayList<Integer> intStringTest =
(ArrayList<Integer>) calculateFacetedStat(intStringTestStart, "perc_20");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getValueList(response, "percentile_20n", "fieldFacets", "date_dtd", "long", false);
ArrayList<Long> longDateTest =
(ArrayList<Long>) calculateFacetedStat(longDateTestStart, "perc_20");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getValueList(response, "percentile_20n", "fieldFacets", "string_sd", "long", false);
ArrayList<Long> longStringTest =
(ArrayList<Long>) calculateFacetedStat(longStringTestStart, "perc_20");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Float> floatDate =
+ ArrayList<Float> floatDate =
getValueList(response, "percentile_20n", "fieldFacets", "date_dtd", "float", false);
ArrayList<Float> floatDateTest =
(ArrayList<Float>) calculateFacetedStat(floatDateTestStart, "perc_20");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Float> floatString =
+ ArrayList<Float> floatString =
getValueList(response, "percentile_20n", "fieldFacets", "string_sd", "float", false);
ArrayList<Float> floatStringTest =
(ArrayList<Float>) calculateFacetedStat(floatStringTestStart, "perc_20");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getValueList(response, "percentile_20n", "fieldFacets", "date_dtd", "double", false);
ArrayList<Double> doubleDateTest =
(ArrayList<Double>) calculateFacetedStat(doubleDateTestStart, "perc_20");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getValueList(response, "percentile_20n", "fieldFacets", "string_sd", "double", false);
ArrayList<Double> doubleStringTest =
(ArrayList<Double>) calculateFacetedStat(doubleStringTestStart, "perc_20");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
// Date Int
- Collection<String> dateInt =
+ ArrayList<String> dateInt =
getValueList(response, "percentile_20", "fieldFacets", "int_id", "date", false);
ArrayList<String> dateIntTest =
(ArrayList<String>) calculateFacetedStat(dateIntTestStart, "perc_20");
- assertEquals(responseStr, dateInt, dateIntTest);
+ assertEqualsList(responseStr, dateInt, dateIntTest);
// Date Long
- Collection<String> dateString =
+ ArrayList<String> dateString =
getValueList(response, "percentile_20", "fieldFacets", "long_ld", "date", false);
ArrayList<String> dateLongTest =
(ArrayList<String>) calculateFacetedStat(dateLongTestStart, "perc_20");
- assertEquals(responseStr, dateString, dateLongTest);
+ assertEqualsList(responseStr, dateString, dateLongTest);
// String Int
- Collection<String> stringInt =
+ ArrayList<String> stringInt =
getValueList(response, "percentile_20", "fieldFacets", "int_id", "str", false);
ArrayList<String> stringIntTest =
(ArrayList<String>) calculateFacetedStat(stringIntTestStart, "perc_20");
- assertEquals(responseStr, stringInt, stringIntTest);
+ assertEqualsList(responseStr, stringInt, stringIntTest);
// String Long
- Collection<String> stringLong =
+ ArrayList<String> stringLong =
getValueList(response, "percentile_20", "fieldFacets", "long_ld", "str", false);
ArrayList<String> stringLongTest =
(ArrayList<String>) calculateFacetedStat(stringLongTestStart, "perc_20");
- assertEquals(responseStr, stringLong, stringLongTest);
+ assertEqualsList(responseStr, stringLong, stringLongTest);
}
@SuppressWarnings("unchecked")
@@ -785,82 +783,82 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Integer> intDate =
+ ArrayList<Integer> intDate =
getValueList(response, "percentile_60n", "fieldFacets", "date_dtd", "int", false);
ArrayList<Integer> intDateTest =
(ArrayList<Integer>) calculateFacetedStat(intDateTestStart, "perc_60");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Integer> intString =
+ ArrayList<Integer> intString =
getValueList(response, "percentile_60n", "fieldFacets", "string_sd", "int", false);
ArrayList<Integer> intStringTest =
(ArrayList<Integer>) calculateFacetedStat(intStringTestStart, "perc_60");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getValueList(response, "percentile_60n", "fieldFacets", "date_dtd", "long", false);
ArrayList<Long> longDateTest =
(ArrayList<Long>) calculateFacetedStat(longDateTestStart, "perc_60");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getValueList(response, "percentile_60n", "fieldFacets", "string_sd", "long", false);
ArrayList<Long> longStringTest =
(ArrayList<Long>) calculateFacetedStat(longStringTestStart, "perc_60");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Float> floatDate =
+ ArrayList<Float> floatDate =
getValueList(response, "percentile_60n", "fieldFacets", "date_dtd", "float", false);
ArrayList<Float> floatDateTest =
(ArrayList<Float>) calculateFacetedStat(floatDateTestStart, "perc_60");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Float> floatString =
+ ArrayList<Float> floatString =
getValueList(response, "percentile_60n", "fieldFacets", "string_sd", "float", false);
ArrayList<Float> floatStringTest =
(ArrayList<Float>) calculateFacetedStat(floatStringTestStart, "perc_60");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getValueList(response, "percentile_60n", "fieldFacets", "date_dtd", "double", false);
ArrayList<Double> doubleDateTest =
(ArrayList<Double>) calculateFacetedStat(doubleDateTestStart, "perc_60");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getValueList(response, "percentile_60n", "fieldFacets", "string_sd", "double", false);
ArrayList<Double> doubleStringTest =
(ArrayList<Double>) calculateFacetedStat(doubleStringTestStart, "perc_60");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
// Date Int
- Collection<String> dateInt =
+ ArrayList<String> dateInt =
getValueList(response, "percentile_60", "fieldFacets", "int_id", "date", false);
ArrayList<String> dateIntTest =
(ArrayList<String>) calculateFacetedStat(dateIntTestStart, "perc_60");
- assertEquals(responseStr, dateInt, dateIntTest);
+ assertEqualsList(responseStr, dateInt, dateIntTest);
// Date Long
- Collection<String> dateString =
+ ArrayList<String> dateString =
getValueList(response, "percentile_60", "fieldFacets", "long_ld", "date", false);
ArrayList<String> dateLongTest =
(ArrayList<String>) calculateFacetedStat(dateLongTestStart, "perc_60");
- assertEquals(responseStr, dateString, dateLongTest);
+ assertEqualsList(responseStr, dateString, dateLongTest);
// String Int
- Collection<String> stringInt =
+ ArrayList<String> stringInt =
getValueList(response, "percentile_60", "fieldFacets", "int_id", "str", false);
ArrayList<String> stringIntTest =
(ArrayList<String>) calculateFacetedStat(stringIntTestStart, "perc_60");
- assertEquals(responseStr, stringInt, stringIntTest);
+ assertEqualsList(responseStr, stringInt, stringIntTest);
// String Long
- Collection<String> stringLong =
+ ArrayList<String> stringLong =
getValueList(response, "percentile_60", "fieldFacets", "long_ld", "str", false);
ArrayList<String> stringLongTest =
(ArrayList<String>) calculateFacetedStat(stringLongTestStart, "perc_60");
- assertEquals(responseStr, stringLong, stringLongTest);
+ assertEqualsList(responseStr, stringLong, stringLongTest);
}
@SuppressWarnings("unchecked")
@@ -883,81 +881,81 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Integer> intDate =
+ ArrayList<Integer> intDate =
getValueList(response, "minn", "fieldFacets", "date_dtd", "int", false);
ArrayList<Integer> intDateTest =
(ArrayList<Integer>) calculateFacetedStat(intDateTestStart, "min");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Integer> intString =
+ ArrayList<Integer> intString =
getValueList(response, "minn", "fieldFacets", "string_sd", "int", false);
ArrayList<Integer> intStringTest =
(ArrayList<Integer>) calculateFacetedStat(intStringTestStart, "min");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getValueList(response, "minn", "fieldFacets", "date_dtd", "long", false);
ArrayList<Long> longDateTest = (ArrayList<Long>) calculateFacetedStat(longDateTestStart, "min");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getValueList(response, "minn", "fieldFacets", "string_sd", "long", false);
ArrayList<Long> longStringTest =
(ArrayList<Long>) calculateFacetedStat(longStringTestStart, "min");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Float> floatDate =
+ ArrayList<Float> floatDate =
getValueList(response, "minn", "fieldFacets", "date_dtd", "float", false);
ArrayList<Float> floatDateTest =
(ArrayList<Float>) calculateFacetedStat(floatDateTestStart, "min");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Float> floatString =
+ ArrayList<Float> floatString =
getValueList(response, "minn", "fieldFacets", "string_sd", "float", false);
ArrayList<Float> floatStringTest =
(ArrayList<Float>) calculateFacetedStat(floatStringTestStart, "min");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getValueList(response, "minn", "fieldFacets", "date_dtd", "double", false);
ArrayList<Double> doubleDateTest =
(ArrayList<Double>) calculateFacetedStat(doubleDateTestStart, "min");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getValueList(response, "minn", "fieldFacets", "string_sd", "double", false);
ArrayList<Double> doubleStringTest =
(ArrayList<Double>) calculateFacetedStat(doubleStringTestStart, "min");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
// Date Int
- Collection<String> dateInt =
+ ArrayList<String> dateInt =
getValueList(response, "min", "fieldFacets", "int_id", "date", false);
ArrayList<String> dateIntTest =
(ArrayList<String>) calculateFacetedStat(dateIntTestStart, "min");
- assertEquals(responseStr, dateInt, dateIntTest);
+ assertEqualsList(responseStr, dateInt, dateIntTest);
// Date Long
- Collection<String> dateString =
+ ArrayList<String> dateString =
getValueList(response, "min", "fieldFacets", "long_ld", "date", false);
ArrayList<String> dateLongTest =
(ArrayList<String>) calculateFacetedStat(dateLongTestStart, "min");
- assertEquals(responseStr, dateString, dateLongTest);
+ assertEqualsList(responseStr, dateString, dateLongTest);
// String Int
- Collection<String> stringInt =
+ ArrayList<String> stringInt =
getValueList(response, "min", "fieldFacets", "int_id", "str", false);
ArrayList<String> stringIntTest =
(ArrayList<String>) calculateFacetedStat(stringIntTestStart, "min");
- assertEquals(responseStr, stringInt, stringIntTest);
+ assertEqualsList(responseStr, stringInt, stringIntTest);
// String Long
- Collection<String> stringLong =
+ ArrayList<String> stringLong =
getValueList(response, "min", "fieldFacets", "long_ld", "str", false);
ArrayList<String> stringLongTest =
(ArrayList<String>) calculateFacetedStat(stringLongTestStart, "min");
- assertEquals(responseStr, stringLong, stringLongTest);
+ assertEqualsList(responseStr, stringLong, stringLongTest);
}
@SuppressWarnings("unchecked")
@@ -980,87 +978,87 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Integer> intDate =
+ ArrayList<Integer> intDate =
getValueList(response, "maxn", "fieldFacets", "date_dtd", "int", false);
ArrayList<Integer> intDateTest =
(ArrayList<Integer>) calculateFacetedStat(intDateTestStart, "max");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Integer> intString =
+ ArrayList<Integer> intString =
getValueList(response, "maxn", "fieldFacets", "string_sd", "int", false);
ArrayList<Integer> intStringTest =
(ArrayList<Integer>) calculateFacetedStat(intStringTestStart, "max");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getValueList(response, "maxn", "fieldFacets", "date_dtd", "long", false);
ArrayList<Long> longDateTest = (ArrayList<Long>) calculateFacetedStat(longDateTestStart, "max");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getValueList(response, "maxn", "fieldFacets", "string_sd", "long", false);
ArrayList<Long> longStringTest =
(ArrayList<Long>) calculateFacetedStat(longStringTestStart, "max");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Float> floatDate =
+ ArrayList<Float> floatDate =
getValueList(response, "maxn", "fieldFacets", "date_dtd", "float", false);
ArrayList<Float> floatDateTest =
(ArrayList<Float>) calculateFacetedStat(floatDateTestStart, "max");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Float> floatString =
+ ArrayList<Float> floatString =
getValueList(response, "maxn", "fieldFacets", "string_sd", "float", false);
ArrayList<Float> floatStringTest =
(ArrayList<Float>) calculateFacetedStat(floatStringTestStart, "max");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getValueList(response, "maxn", "fieldFacets", "date_dtd", "double", false);
ArrayList<Double> doubleDateTest =
(ArrayList<Double>) calculateFacetedStat(doubleDateTestStart, "max");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getValueList(response, "maxn", "fieldFacets", "string_sd", "double", false);
ArrayList<Double> doubleStringTest =
(ArrayList<Double>) calculateFacetedStat(doubleStringTestStart, "max");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
// String Int
- Collection<String> stringInt =
+ ArrayList<String> stringInt =
getValueList(response, "max", "fieldFacets", "int_id", "str", false);
ArrayList<String> stringIntTest =
(ArrayList<String>) calculateFacetedStat(stringIntTestStart, "max");
- assertEquals(responseStr, stringInt, stringIntTest);
+ assertEqualsList(responseStr, stringInt, stringIntTest);
// String Long
- Collection<String> stringLong =
+ ArrayList<String> stringLong =
getValueList(response, "max", "fieldFacets", "long_ld", "str", false);
ArrayList<String> stringLongTest =
(ArrayList<String>) calculateFacetedStat(stringLongTestStart, "max");
- assertEquals(responseStr, stringLong, stringLongTest);
+ assertEqualsList(responseStr, stringLong, stringLongTest);
// Date Int
- Collection<String> dateInt =
+ ArrayList<String> dateInt =
getValueList(response, "max", "fieldFacets", "int_id", "date", false);
ArrayList<String> dateIntTest =
(ArrayList<String>) calculateFacetedStat(dateIntTestStart, "max");
- assertEquals(responseStr, dateInt, dateIntTest);
+ assertEqualsList(responseStr, dateInt, dateIntTest);
// Date Long
- Collection<String> dateString =
+ ArrayList<String> dateString =
getValueList(response, "max", "fieldFacets", "long_ld", "date", false);
ArrayList<String> dateLongTest =
(ArrayList<String>) calculateFacetedStat(dateLongTestStart, "max");
- assertEquals(responseStr, dateString, dateLongTest);
+ assertEqualsList(responseStr, dateString, dateLongTest);
}
@SuppressWarnings("unchecked")
@@ -1083,82 +1081,82 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Long> intDate =
+ ArrayList<Long> intDate =
getValueList(response, "uniquen", "fieldFacets", "date_dtd", "int", false);
ArrayList<Long> intDateTest =
(ArrayList<Long>) calculateFacetedStat(intDateTestStart, "unique");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Long> intString =
+ ArrayList<Long> intString =
getValueList(response, "uniquen", "fieldFacets", "string_sd", "int", false);
ArrayList<Long> intStringTest =
(ArrayList<Long>) calculateFacetedStat(intStringTestStart, "unique");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getValueList(response, "uniquen", "fieldFacets", "date_dtd", "long", false);
ArrayList<Long> longDateTest =
(ArrayList<Long>) calculateFacetedStat(longDateTestStart, "unique");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getValueList(response, "uniquen", "fieldFacets", "string_sd", "long", false);
ArrayList<Long> longStringTest =
(ArrayList<Long>) calculateFacetedStat(longStringTestStart, "unique");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Long> floatDate =
+ ArrayList<Long> floatDate =
getValueList(response, "uniquen", "fieldFacets", "date_dtd", "float", false);
ArrayList<Long> floatDateTest =
(ArrayList<Long>) calculateFacetedStat(floatDateTestStart, "unique");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Long> floatString =
+ ArrayList<Long> floatString =
getValueList(response, "uniquen", "fieldFacets", "string_sd", "float", false);
ArrayList<Long> floatStringTest =
(ArrayList<Long>) calculateFacetedStat(floatStringTestStart, "unique");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Long> doubleDate =
+ ArrayList<Long> doubleDate =
getValueList(response, "uniquen", "fieldFacets", "date_dtd", "double", false);
ArrayList<Long> doubleDateTest =
(ArrayList<Long>) calculateFacetedStat(doubleDateTestStart, "unique");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Long> doubleString =
+ ArrayList<Long> doubleString =
getValueList(response, "uniquen", "fieldFacets", "string_sd", "double", false);
ArrayList<Long> doubleStringTest =
(ArrayList<Long>) calculateFacetedStat(doubleStringTestStart, "unique");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
// Date Int
- Collection<Long> dateInt =
+ ArrayList<Long> dateInt =
getValueList(response, "unique", "fieldFacets", "int_id", "date", false);
ArrayList<Long> dateIntTest =
(ArrayList<Long>) calculateFacetedStat(dateIntTestStart, "unique");
- assertEquals(responseStr, dateInt, dateIntTest);
+ assertEqualsList(responseStr, dateInt, dateIntTest);
// Date Long
- Collection<Long> dateString =
+ ArrayList<Long> dateString =
getValueList(response, "unique", "fieldFacets", "long_ld", "date", false);
ArrayList<Long> dateLongTest =
(ArrayList<Long>) calculateFacetedStat(dateLongTestStart, "unique");
- assertEquals(responseStr, dateString, dateLongTest);
+ assertEqualsList(responseStr, dateString, dateLongTest);
// String Int
- Collection<Long> stringInt =
+ ArrayList<Long> stringInt =
getValueList(response, "unique", "fieldFacets", "int_id", "str", false);
ArrayList<Long> stringIntTest =
(ArrayList<Long>) calculateFacetedStat(stringIntTestStart, "unique");
- assertEquals(responseStr, stringInt, stringIntTest);
+ assertEqualsList(responseStr, stringInt, stringIntTest);
// String Long
- Collection<Long> stringLong =
+ ArrayList<Long> stringLong =
getValueList(response, "unique", "fieldFacets", "long_ld", "str", false);
ArrayList<Long> stringLongTest =
(ArrayList<Long>) calculateFacetedStat(stringLongTestStart, "unique");
- assertEquals(responseStr, stringLong, stringLongTest);
+ assertEqualsList(responseStr, stringLong, stringLongTest);
}
@SuppressWarnings("unchecked")
@@ -1181,86 +1179,86 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Long> intDate =
+ ArrayList<Long> intDate =
getValueList(response, "countn", "fieldFacets", "date_dtd", "int", false);
ArrayList<Long> intDateTest = (ArrayList<Long>) calculateFacetedStat(intDateTestStart, "count");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
// Int String
- Collection<Long> intString =
+ ArrayList<Long> intString =
getValueList(response, "countn", "fieldFacets", "string_sd", "int", false);
ArrayList<Long> intStringTest =
(ArrayList<Long>) calculateFacetedStat(intStringTestStart, "count");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getValueList(response, "countn", "fieldFacets", "date_dtd", "long", false);
ArrayList<Long> longDateTest =
(ArrayList<Long>) calculateFacetedStat(longDateTestStart, "count");
- assertEquals(responseStr, longDate, longDateTest);
+ assertEqualsList(responseStr, longDate, longDateTest);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getValueList(response, "countn", "fieldFacets", "string_sd", "long", false);
ArrayList<Long> longStringTest =
(ArrayList<Long>) calculateFacetedStat(longStringTestStart, "count");
- assertEquals(responseStr, longString, longStringTest);
+ assertEqualsList(responseStr, longString, longStringTest);
// Float Date
- Collection<Long> floatDate =
+ ArrayList<Long> floatDate =
getValueList(response, "countn", "fieldFacets", "date_dtd", "float", false);
ArrayList<Long> floatDateTest =
(ArrayList<Long>) calculateFacetedStat(floatDateTestStart, "count");
- assertEquals(responseStr, floatDate, floatDateTest);
+ assertEqualsList(responseStr, floatDate, floatDateTest);
// Float String
- Collection<Long> floatString =
+ ArrayList<Long> floatString =
getValueList(response, "countn", "fieldFacets", "string_sd", "float", false);
ArrayList<Long> floatStringTest =
(ArrayList<Long>) calculateFacetedStat(floatStringTestStart, "count");
- assertEquals(responseStr, floatString, floatStringTest);
+ assertEqualsList(responseStr, floatString, floatStringTest);
// Double Date
- Collection<Long> doubleDate =
+ ArrayList<Long> doubleDate =
getValueList(response, "countn", "fieldFacets", "date_dtd", "double", false);
ArrayList<Long> doubleDateTest =
(ArrayList<Long>) calculateFacetedStat(doubleDateTestStart, "count");
- assertEquals(responseStr, doubleDate, doubleDateTest);
+ assertEqualsList(responseStr, doubleDate, doubleDateTest);
// Double String
- Collection<Long> doubleString =
+ ArrayList<Long> doubleString =
getValueList(response, "countn", "fieldFacets", "string_sd", "double", false);
ArrayList<Long> doubleStringTest =
(ArrayList<Long>) calculateFacetedStat(doubleStringTestStart, "count");
- assertEquals(responseStr, doubleString, doubleStringTest);
+ assertEqualsList(responseStr, doubleString, doubleStringTest);
// Date Int
- Collection<Long> dateInt =
+ ArrayList<Long> dateInt =
getValueList(response, "count", "fieldFacets", "int_id", "date", false);
ArrayList<Long> dateIntTest = (ArrayList<Long>) calculateFacetedStat(dateIntTestStart, "count");
- assertEquals(responseStr, dateIntTest, dateInt);
+ assertEqualsList(responseStr, dateIntTest, dateInt);
// Date Long
- Collection<Long> dateLong =
+ ArrayList<Long> dateLong =
getValueList(response, "count", "fieldFacets", "long_ld", "date", false);
ArrayList<Long> dateLongTest =
(ArrayList<Long>) calculateFacetedStat(dateLongTestStart, "count");
- assertEquals(responseStr, dateLong, dateLongTest);
+ assertEqualsList(responseStr, dateLong, dateLongTest);
// String Int
- Collection<Long> stringInt =
+ ArrayList<Long> stringInt =
getValueList(response, "count", "fieldFacets", "int_id", "str", false);
ArrayList<Long> stringIntTest =
(ArrayList<Long>) calculateFacetedStat(stringIntTestStart, "count");
- assertEquals(responseStr, stringInt, stringIntTest);
+ assertEqualsList(responseStr, stringInt, stringIntTest);
// String Long
- Collection<Long> stringLong =
+ ArrayList<Long> stringLong =
getValueList(response, "count", "fieldFacets", "long_ld", "str", false);
ArrayList<Long> stringLongTest =
(ArrayList<Long>) calculateFacetedStat(stringLongTestStart, "count");
- assertEquals(responseStr, stringLong, stringLongTest);
+ assertEqualsList(responseStr, stringLong, stringLongTest);
}
@Test
@@ -1282,70 +1280,70 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Int Date
- Collection<Long> intDate =
+ ArrayList<Long> intDate =
getValueList(response, "missingn", "fieldFacets", "date_dtd", "int", false);
setLatestType("int");
- assertEquals(responseStr, intDateTestMissing, intDate);
+ assertEqualsList(responseStr, intDateTestMissing, intDate);
// Int String
- Collection<Long> intString =
+ ArrayList<Long> intString =
getValueList(response, "missingn", "fieldFacets", "string_sd", "int", false);
- assertEquals(responseStr, intStringTestMissing, intString);
+ assertEqualsList(responseStr, intStringTestMissing, intString);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getValueList(response, "missingn", "fieldFacets", "date_dtd", "long", false);
setLatestType("long");
- assertEquals(responseStr, longDateTestMissing, longDate);
+ assertEqualsList(responseStr, longDateTestMissing, longDate);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getValueList(response, "missingn", "fieldFacets", "string_sd", "long", false);
- assertEquals(responseStr, longStringTestMissing, longString);
+ assertEqualsList(responseStr, longStringTestMissing, longString);
// Float Date
- Collection<Long> floatDate =
+ ArrayList<Long> floatDate =
getValueList(response, "missingn", "fieldFacets", "date_dtd", "float", false);
setLatestType("float");
- assertEquals(responseStr, floatDateTestMissing, floatDate);
+ assertEqualsList(responseStr, floatDateTestMissing, floatDate);
// Float String
- Collection<Long> floatString =
+ ArrayList<Long> floatString =
getValueList(response, "missingn", "fieldFacets", "string_sd", "float", false);
- assertEquals(responseStr, floatStringTestMissing, floatString);
+ assertEqualsList(responseStr, floatStringTestMissing, floatString);
// Double Date
- Collection<Long> doubleDate =
+ ArrayList<Long> doubleDate =
getValueList(response, "missingn", "fieldFacets", "date_dtd", "double", false);
setLatestType("double");
- assertEquals(responseStr, doubleDateTestMissing, doubleDate);
+ assertEqualsList(responseStr, doubleDateTestMissing, doubleDate);
// Double String
- Collection<Long> doubleString =
+ ArrayList<Long> doubleString =
getValueList(response, "missingn", "fieldFacets", "string_sd", "double", false);
- assertEquals(responseStr, doubleStringTestMissing, doubleString);
+ assertEqualsList(responseStr, doubleStringTestMissing, doubleString);
// Date Int
- Collection<Long> dateInt =
+ ArrayList<Long> dateInt =
getValueList(response, "missing", "fieldFacets", "int_id", "date", false);
setLatestType("date");
- assertEquals(responseStr, dateIntTestMissing, dateInt);
+ assertEqualsList(responseStr, dateIntTestMissing, dateInt);
// Date Long
- Collection<Long> dateLong =
+ ArrayList<Long> dateLong =
getValueList(response, "missing", "fieldFacets", "long_ld", "date", false);
- assertEquals(responseStr, dateLongTestMissing, dateLong);
+ assertEqualsList(responseStr, dateLongTestMissing, dateLong);
// String Int
- Collection<Long> stringInt =
+ ArrayList<Long> stringInt =
getValueList(response, "missing", "fieldFacets", "int_id", "str", false);
setLatestType("string");
- assertEquals(responseStr, stringIntTestMissing, stringInt);
+ assertEqualsList(responseStr, stringIntTestMissing, stringInt);
// String Long
- Collection<Long> stringLong =
+ ArrayList<Long> stringLong =
getValueList(response, "missing", "fieldFacets", "long_ld", "str", false);
- assertEquals(responseStr, stringLongTestMissing, stringLong);
+ assertEqualsList(responseStr, stringLongTestMissing, stringLong);
}
@SuppressWarnings("unchecked")
@@ -1362,20 +1360,20 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
String responseStr = response.toString();
// Long
- Collection<Double> lon =
+ ArrayList<Double> lon =
getValueList(response, "multivalued", "fieldFacets", "long_ldm", "mean", false);
ArrayList<Double> longTest = calculateFacetedNumberStat(multiLongTestStart, "mean");
- assertEquals(responseStr, lon, longTest);
+ assertEqualsList(responseStr, lon, longTest);
// Date
- Collection<Double> date =
+ ArrayList<Double> date =
getValueList(response, "multivalued", "fieldFacets", "date_dtdm", "mean", false);
ArrayList<Double> dateTest = calculateFacetedNumberStat(multiDateTestStart, "mean");
- assertEquals(responseStr, date, dateTest);
+ assertEqualsList(responseStr, date, dateTest);
// String
- Collection<Double> string =
+ ArrayList<Double> string =
getValueList(response, "multivalued", "fieldFacets", "string_sdm", "mean", false);
ArrayList<Double> stringTest = calculateFacetedNumberStat(multiStringTestStart, "mean");
- assertEquals(responseStr, string, stringTest);
+ assertEqualsList(responseStr, string, stringTest);
}
@SuppressWarnings("unchecked")
@@ -1400,27 +1398,27 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
ArrayList<Double> string =
getValueList(response, "missingf", "fieldFacets", "date_dtdm", "mean", false);
ArrayList<Double> stringTest = calculateFacetedNumberStat(multiDateTestStart, "mean");
- assertEquals(responseStr, string, stringTest);
+ assertEqualsList(responseStr, string, stringTest);
// Int String
assertTrue(
responseStr,
responseContainsFacetValue(response, "missingf", "fieldFacets", "string_sd", "(MISSING)"));
- assertTrue(
+ assertFalse(
responseStr,
- !responseContainsFacetValue(response, "missingf", "fieldFacets", "string_sd", "str0"));
- List<Double> intString =
+ responseContainsFacetValue(response, "missingf", "fieldFacets", "string_sd", "str0"));
+ ArrayList<Double> intString =
getValueList(response, "missingf", "fieldFacets", "string_sd", "mean", false);
ArrayList<Double> intStringTest = calculateFacetedNumberStat(intStringTestStart, "mean");
- assertEquals(responseStr, intString, intStringTest);
+ assertEqualsList(responseStr, intString, intStringTest);
// Int Date
- Collection<Double> intDate =
+ ArrayList<Double> intDate =
getValueList(response, "missingf", "fieldFacets", "date_dtd", "mean", false);
ArrayList<ArrayList<Double>> intDateMissingTestStart =
(ArrayList<ArrayList<Double>>) intDateTestStart.clone();
ArrayList<Double> intDateTest = calculateFacetedNumberStat(intDateMissingTestStart, "mean");
- assertEquals(responseStr, intDate, intDateTest);
+ assertEqualsList(responseStr, intDate, intDateTest);
}
private void checkStddevs(
@@ -1429,15 +1427,18 @@ public class LegacyFieldFacetCloudTest extends LegacyAbstractAnalyticsFacetCloud
Collections.sort(list2);
for (int i = 0; i < list2.size(); i++) {
if ((Math.abs(list1.get(i) - list2.get(i)) < .00000000001) == false) {
- Assert.assertEquals(response.toString(), list1.get(i), list2.get(i), 0.00000000001);
+ assertEquals(response.toString(), list1.get(i), list2.get(i), 0.00000000001);
}
}
}
@SuppressWarnings({"unchecked", "rawtypes"})
- public static void assertEquals(String mes, Object actual, Object expected) {
- Collections.sort((List<Comparable>) actual);
- Collections.sort((List<Comparable>) expected);
- Assert.assertEquals(mes, actual, expected);
+ public static void assertEqualsList(
+ String mes,
+ ArrayList<? extends Comparable> actual,
+ ArrayList<? extends Comparable> expected) {
+ Collections.sort(actual);
+ Collections.sort(expected);
+ assertEquals(mes, actual, expected);
}
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
index 3ab850a25cc..7b08517638e 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
@@ -17,13 +17,11 @@
package org.apache.solr.analytics.legacy.facet;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.w3c.dom.Node;
@@ -465,8 +463,7 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest {
"false")) {
SolrQueryResponse resp = h.queryAndResponse(req.getParams().get(CommonParams.QT), req);
- Assert.assertEquals(
- resp.getResponseHeader().toString(), 0, resp.getResponseHeader().get("status"));
+ assertEquals(resp.getResponseHeader().toString(), 0, resp.getResponseHeader().get("status"));
Boolean partialResults =
resp.getResponseHeader()
.getBooleanArg(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY);
@@ -483,93 +480,91 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest {
@Test
public void sumTest() throws Exception {
// Int Date
- Collection<Double> intDate = getDoubleList("sum", "fieldFacets", "date_dtd", "double", "int");
+ ArrayList<Double> intDate = getDoubleList("sum", "fieldFacets", "date_dtd", "double", "int");
ArrayList<Double> intDateTest = calculateNumberStat(intDateTestStart, "sum");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Double> intString =
- getDoubleList("sum", "fieldFacets", "string_sd", "double", "int");
+ ArrayList<Double> intString = getDoubleList("sum", "fieldFacets", "string_sd", "double", "int");
ArrayList<Double> intStringTest = calculateNumberStat(intStringTestStart, "sum");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Double> longDate = getDoubleList("sum", "fieldFacets", "date_dtd", "double", "long");
+ ArrayList<Double> longDate = getDoubleList("sum", "fieldFacets", "date_dtd", "double", "long");
ArrayList<Double> longDateTest = calculateNumberStat(longDateTestStart, "sum");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Double> longString =
+ ArrayList<Double> longString =
getDoubleList("sum", "fieldFacets", "string_sd", "double", "long");
ArrayList<Double> longStringTest = calculateNumberStat(longStringTestStart, "sum");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Double> floatDate =
+ ArrayList<Double> floatDate =
getDoubleList("sum", "fieldFacets", "date_dtd", "double", "float");
ArrayList<Double> floatDateTest = calculateNumberStat(floatDateTestStart, "sum");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Double> floatString =
+ ArrayList<Double> floatString =
getDoubleList("sum", "fieldFacets", "string_sd", "double", "float");
ArrayList<Double> floatStringTest = calculateNumberStat(floatStringTestStart, "sum");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getDoubleList("sum", "fieldFacets", "date_dtd", "double", "double");
ArrayList<Double> doubleDateTest = calculateNumberStat(doubleDateTestStart, "sum");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getDoubleList("sum", "fieldFacets", "string_sd", "double", "double");
ArrayList<Double> doubleStringTest = calculateNumberStat(doubleStringTestStart, "sum");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
}
@SuppressWarnings("unchecked")
@Test
public void meanTest() throws Exception {
// Int Date
- Collection<Double> intDate = getDoubleList("mean", "fieldFacets", "date_dtd", "double", "int");
+ ArrayList<Double> intDate = getDoubleList("mean", "fieldFacets", "date_dtd", "double", "int");
ArrayList<Double> intDateTest = calculateNumberStat(intDateTestStart, "mean");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Double> intString =
+ ArrayList<Double> intString =
getDoubleList("mean", "fieldFacets", "string_sd", "double", "int");
ArrayList<Double> intStringTest = calculateNumberStat(intStringTestStart, "mean");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Double> longDate =
- getDoubleList("mean", "fieldFacets", "date_dtd", "double", "long");
+ ArrayList<Double> longDate = getDoubleList("mean", "fieldFacets", "date_dtd", "double", "long");
ArrayList<Double> longDateTest = calculateNumberStat(longDateTestStart, "mean");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Double> longString =
+ ArrayList<Double> longString =
getDoubleList("mean", "fieldFacets", "string_sd", "double", "long");
ArrayList<Double> longStringTest = calculateNumberStat(longStringTestStart, "mean");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Double> floatDate =
+ ArrayList<Double> floatDate =
getDoubleList("mean", "fieldFacets", "date_dtd", "double", "float");
ArrayList<Double> floatDateTest = calculateNumberStat(floatDateTestStart, "mean");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Double> floatString =
+ ArrayList<Double> floatString =
getDoubleList("mean", "fieldFacets", "string_sd", "double", "float");
ArrayList<Double> floatStringTest = calculateNumberStat(floatStringTestStart, "mean");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getDoubleList("mean", "fieldFacets", "date_dtd", "double", "double");
ArrayList<Double> doubleDateTest = calculateNumberStat(doubleDateTestStart, "mean");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getDoubleList("mean", "fieldFacets", "string_sd", "double", "double");
ArrayList<Double> doubleStringTest = calculateNumberStat(doubleStringTestStart, "mean");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
}
@SuppressWarnings("unchecked")
@@ -623,564 +618,557 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest {
@Test
public void medianFacetAscTest() throws Exception {
// Int Date
- Collection<Double> intDate =
- getDoubleList("median", "fieldFacets", "date_dtd", "double", "int");
+ ArrayList<Double> intDate = getDoubleList("median", "fieldFacets", "date_dtd", "double", "int");
ArrayList<Double> intDateTest = calculateNumberStat(intDateTestStart, "median");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Double> intString =
+ ArrayList<Double> intString =
getDoubleList("median", "fieldFacets", "string_sd", "double", "int");
ArrayList<Double> intStringTest = calculateNumberStat(intStringTestStart, "median");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Double> longDate =
+ ArrayList<Double> longDate =
getDoubleList("median", "fieldFacets", "date_dtd", "double", "long");
ArrayList<Double> longDateTest = calculateNumberStat(longDateTestStart, "median");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Double> longString =
+ ArrayList<Double> longString =
getDoubleList("median", "fieldFacets", "string_sd", "double", "long");
ArrayList<Double> longStringTest = calculateNumberStat(longStringTestStart, "median");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Double> floatDate =
+ ArrayList<Double> floatDate =
getDoubleList("median", "fieldFacets", "date_dtd", "double", "float");
ArrayList<Double> floatDateTest = calculateNumberStat(floatDateTestStart, "median");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Double> floatString =
+ ArrayList<Double> floatString =
getDoubleList("median", "fieldFacets", "string_sd", "double", "float");
ArrayList<Double> floatStringTest = calculateNumberStat(floatStringTestStart, "median");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getDoubleList("median", "fieldFacets", "date_dtd", "double", "double");
ArrayList<Double> doubleDateTest = calculateNumberStat(doubleDateTestStart, "median");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getDoubleList("median", "fieldFacets", "string_sd", "double", "double");
ArrayList<Double> doubleStringTest = calculateNumberStat(doubleStringTestStart, "median");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
}
@SuppressWarnings("unchecked")
@Test
public void perc20Test() throws Exception {
// Int Date
- Collection<Integer> intDate =
+ ArrayList<Integer> intDate =
getIntegerList("percentile_20n", "fieldFacets", "date_dtd", "int", "int");
ArrayList<Integer> intDateTest =
(ArrayList<Integer>) calculateStat(intDateTestStart, "perc_20");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Integer> intString =
+ ArrayList<Integer> intString =
getIntegerList("percentile_20n", "fieldFacets", "string_sd", "int", "int");
ArrayList<Integer> intStringTest =
(ArrayList<Integer>) calculateStat(intStringTestStart, "perc_20");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getLongList("percentile_20n", "fieldFacets", "date_dtd", "long", "long");
ArrayList<Long> longDateTest = (ArrayList<Long>) calculateStat(longDateTestStart, "perc_20");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getLongList("percentile_20n", "fieldFacets", "string_sd", "long", "long");
ArrayList<Long> longStringTest =
(ArrayList<Long>) calculateStat(longStringTestStart, "perc_20");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Float> floatDate =
+ ArrayList<Float> floatDate =
getFloatList("percentile_20n", "fieldFacets", "date_dtd", "float", "float");
ArrayList<Float> floatDateTest =
(ArrayList<Float>) calculateStat(floatDateTestStart, "perc_20");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Float> floatString =
+ ArrayList<Float> floatString =
getFloatList("percentile_20n", "fieldFacets", "string_sd", "float", "float");
ArrayList<Float> floatStringTest =
(ArrayList<Float>) calculateStat(floatStringTestStart, "perc_20");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getDoubleList("percentile_20n", "fieldFacets", "date_dtd", "double", "double");
ArrayList<Double> doubleDateTest =
(ArrayList<Double>) calculateStat(doubleDateTestStart, "perc_20");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getDoubleList("percentile_20n", "fieldFacets", "string_sd", "double", "double");
ArrayList<Double> doubleStringTest =
(ArrayList<Double>) calculateStat(doubleStringTestStart, "perc_20");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
// Date Int
- Collection<String> dateInt =
+ ArrayList<String> dateInt =
getStringList("percentile_20", "fieldFacets", "int_id", "date", "date");
ArrayList<String> dateIntTest = (ArrayList<String>) calculateStat(dateIntTestStart, "perc_20");
- assertEquals(getRawResponse(), dateInt, dateIntTest);
+ assertEqualsList(getRawResponse(), dateInt, dateIntTest);
// Date Long
- Collection<String> dateString =
+ ArrayList<String> dateString =
getStringList("percentile_20", "fieldFacets", "long_ld", "date", "date");
ArrayList<String> dateLongTest =
(ArrayList<String>) calculateStat(dateLongTestStart, "perc_20");
- assertEquals(getRawResponse(), dateString, dateLongTest);
+ assertEqualsList(getRawResponse(), dateString, dateLongTest);
// String Int
- Collection<String> stringInt =
+ ArrayList<String> stringInt =
getStringList("percentile_20", "fieldFacets", "int_id", "str", "str");
ArrayList<String> stringIntTest =
(ArrayList<String>) calculateStat(stringIntTestStart, "perc_20");
- assertEquals(getRawResponse(), stringInt, stringIntTest);
+ assertEqualsList(getRawResponse(), stringInt, stringIntTest);
// String Long
- Collection<String> stringLong =
+ ArrayList<String> stringLong =
getStringList("percentile_20", "fieldFacets", "long_ld", "str", "str");
ArrayList<String> stringLongTest =
(ArrayList<String>) calculateStat(stringLongTestStart, "perc_20");
- assertEquals(getRawResponse(), stringLong, stringLongTest);
+ assertEqualsList(getRawResponse(), stringLong, stringLongTest);
}
@SuppressWarnings("unchecked")
@Test
public void perc60Test() throws Exception {
// Int Date
- Collection<Integer> intDate =
+ ArrayList<Integer> intDate =
getIntegerList("percentile_60n", "fieldFacets", "date_dtd", "int", "int");
ArrayList<Integer> intDateTest =
(ArrayList<Integer>) calculateStat(intDateTestStart, "perc_60");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Integer> intString =
+ ArrayList<Integer> intString =
getIntegerList("percentile_60n", "fieldFacets", "string_sd", "int", "int");
ArrayList<Integer> intStringTest =
(ArrayList<Integer>) calculateStat(intStringTestStart, "perc_60");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Long> longDate =
+ ArrayList<Long> longDate =
getLongList("percentile_60n", "fieldFacets", "date_dtd", "long", "long");
ArrayList<Long> longDateTest = (ArrayList<Long>) calculateStat(longDateTestStart, "perc_60");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getLongList("percentile_60n", "fieldFacets", "string_sd", "long", "long");
ArrayList<Long> longStringTest =
(ArrayList<Long>) calculateStat(longStringTestStart, "perc_60");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Float> floatDate =
+ ArrayList<Float> floatDate =
getFloatList("percentile_60n", "fieldFacets", "date_dtd", "float", "float");
ArrayList<Float> floatDateTest =
(ArrayList<Float>) calculateStat(floatDateTestStart, "perc_60");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Float> floatString =
+ ArrayList<Float> floatString =
getFloatList("percentile_60n", "fieldFacets", "string_sd", "float", "float");
ArrayList<Float> floatStringTest =
(ArrayList<Float>) calculateStat(floatStringTestStart, "perc_60");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getDoubleList("percentile_60n", "fieldFacets", "date_dtd", "double", "double");
ArrayList<Double> doubleDateTest =
(ArrayList<Double>) calculateStat(doubleDateTestStart, "perc_60");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getDoubleList("percentile_60n", "fieldFacets", "string_sd", "double", "double");
ArrayList<Double> doubleStringTest =
(ArrayList<Double>) calculateStat(doubleStringTestStart, "perc_60");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
// Date Int
- Collection<String> dateInt =
+ ArrayList<String> dateInt =
getStringList("percentile_60", "fieldFacets", "int_id", "date", "date");
ArrayList<String> dateIntTest = (ArrayList<String>) calculateStat(dateIntTestStart, "perc_60");
- assertEquals(getRawResponse(), dateInt, dateIntTest);
+ assertEqualsList(getRawResponse(), dateInt, dateIntTest);
// Date Long
- Collection<String> dateString =
+ ArrayList<String> dateString =
getStringList("percentile_60", "fieldFacets", "long_ld", "date", "date");
ArrayList<String> dateLongTest =
(ArrayList<String>) calculateStat(dateLongTestStart, "perc_60");
- assertEquals(getRawResponse(), dateString, dateLongTest);
+ assertEqualsList(getRawResponse(), dateString, dateLongTest);
// String Int
- Collection<String> stringInt =
+ ArrayList<String> stringInt =
getStringList("percentile_60", "fieldFacets", "int_id", "str", "str");
ArrayList<String> stringIntTest =
(ArrayList<String>) calculateStat(stringIntTestStart, "perc_60");
- assertEquals(getRawResponse(), stringInt, stringIntTest);
+ assertEqualsList(getRawResponse(), stringInt, stringIntTest);
// String Long
- Collection<String> stringLong =
+ ArrayList<String> stringLong =
getStringList("percentile_60", "fieldFacets", "long_ld", "str", "str");
ArrayList<String> stringLongTest =
(ArrayList<String>) calculateStat(stringLongTestStart, "perc_60");
- assertEquals(getRawResponse(), stringLong, stringLongTest);
+ assertEqualsList(getRawResponse(), stringLong, stringLongTest);
}
@SuppressWarnings("unchecked")
@Test
public void minTest() throws Exception {
// Int Date
- Collection<Integer> intDate = getIntegerList("minn", "fieldFacets", "date_dtd", "int", "int");
+ ArrayList<Integer> intDate = getIntegerList("minn", "fieldFacets", "date_dtd", "int", "int");
ArrayList<Integer> intDateTest = (ArrayList<Integer>) calculateStat(intDateTestStart, "min");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Integer> intString =
- getIntegerList("minn", "fieldFacets", "string_sd", "int", "int");
+ ArrayList<Integer> intString = getIntegerList("minn", "fieldFacets", "string_sd", "int", "int");
ArrayList<Integer> intStringTest =
(ArrayList<Integer>) calculateStat(intStringTestStart, "min");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Long> longDate = getLongList("minn", "fieldFacets", "date_dtd", "long", "long");
+ ArrayList<Long> longDate = getLongList("minn", "fieldFacets", "date_dtd", "long", "long");
ArrayList<Long> longDateTest = (ArrayList<Long>) calculateStat(longDateTestStart, "min");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Long> longString = getLongList("minn", "fieldFacets", "string_sd", "long", "long");
+ ArrayList<Long> longString = getLongList("minn", "fieldFacets", "string_sd", "long", "long");
ArrayList<Long> longStringTest = (ArrayList<Long>) calculateStat(longStringTestStart, "min");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Float> floatDate = getFloatList("minn", "fieldFacets", "date_dtd", "float", "float");
+ ArrayList<Float> floatDate = getFloatList("minn", "fieldFacets", "date_dtd", "float", "float");
ArrayList<Float> floatDateTest = (ArrayList<Float>) calculateStat(floatDateTestStart, "min");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Float> floatString =
+ ArrayList<Float> floatString =
getFloatList("minn", "fieldFacets", "string_sd", "float", "float");
ArrayList<Float> floatStringTest =
(ArrayList<Float>) calculateStat(floatStringTestStart, "min");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getDoubleList("minn", "fieldFacets", "date_dtd", "double", "double");
ArrayList<Double> doubleDateTest =
(ArrayList<Double>) calculateStat(doubleDateTestStart, "min");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getDoubleList("minn", "fieldFacets", "string_sd", "double", "double");
ArrayList<Double> doubleStringTest =
(ArrayList<Double>) calculateStat(doubleStringTestStart, "min");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
// Date Int
- Collection<String> dateInt = getStringList("min", "fieldFacets", "int_id", "date", "date");
+ ArrayList<String> dateInt = getStringList("min", "fieldFacets", "int_id", "date", "date");
ArrayList<String> dateIntTest = (ArrayList<String>) calculateStat(dateIntTestStart, "min");
- assertEquals(getRawResponse(), dateInt, dateIntTest);
+ assertEqualsList(getRawResponse(), dateInt, dateIntTest);
// Date Long
- Collection<String> dateString = getStringList("min", "fieldFacets", "long_ld", "date", "date");
+ ArrayList<String> dateString = getStringList("min", "fieldFacets", "long_ld", "date", "date");
ArrayList<String> dateLongTest = (ArrayList<String>) calculateStat(dateLongTestStart, "min");
- assertEquals(getRawResponse(), dateString, dateLongTest);
+ assertEqualsList(getRawResponse(), dateString, dateLongTest);
// String Int
- Collection<String> stringInt = getStringList("min", "fieldFacets", "int_id", "str", "str");
+ ArrayList<String> stringInt = getStringList("min", "fieldFacets", "int_id", "str", "str");
ArrayList<String> stringIntTest = (ArrayList<String>) calculateStat(stringIntTestStart, "min");
- assertEquals(getRawResponse(), stringInt, stringIntTest);
+ assertEqualsList(getRawResponse(), stringInt, stringIntTest);
// String Long
- Collection<String> stringLong = getStringList("min", "fieldFacets", "long_ld", "str", "str");
+ ArrayList<String> stringLong = getStringList("min", "fieldFacets", "long_ld", "str", "str");
ArrayList<String> stringLongTest =
(ArrayList<String>) calculateStat(stringLongTestStart, "min");
- assertEquals(getRawResponse(), stringLong, stringLongTest);
+ assertEqualsList(getRawResponse(), stringLong, stringLongTest);
}
@SuppressWarnings("unchecked")
@Test
public void maxTest() throws Exception {
// Int Date
- Collection<Integer> intDate = getIntegerList("maxn", "fieldFacets", "date_dtd", "int", "int");
+ ArrayList<Integer> intDate = getIntegerList("maxn", "fieldFacets", "date_dtd", "int", "int");
ArrayList<Integer> intDateTest = (ArrayList<Integer>) calculateStat(intDateTestStart, "max");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Integer> intString =
- getIntegerList("maxn", "fieldFacets", "string_sd", "int", "int");
+ ArrayList<Integer> intString = getIntegerList("maxn", "fieldFacets", "string_sd", "int", "int");
ArrayList<Integer> intStringTest =
(ArrayList<Integer>) calculateStat(intStringTestStart, "max");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Long> longDate = getLongList("maxn", "fieldFacets", "date_dtd", "long", "long");
+ ArrayList<Long> longDate = getLongList("maxn", "fieldFacets", "date_dtd", "long", "long");
ArrayList<Long> longDateTest = (ArrayList<Long>) calculateStat(longDateTestStart, "max");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Long> longString = getLongList("maxn", "fieldFacets", "string_sd", "long", "long");
+ ArrayList<Long> longString = getLongList("maxn", "fieldFacets", "string_sd", "long", "long");
ArrayList<Long> longStringTest = (ArrayList<Long>) calculateStat(longStringTestStart, "max");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Float> floatDate = getFloatList("maxn", "fieldFacets", "date_dtd", "float", "float");
+ ArrayList<Float> floatDate = getFloatList("maxn", "fieldFacets", "date_dtd", "float", "float");
ArrayList<Float> floatDateTest = (ArrayList<Float>) calculateStat(floatDateTestStart, "max");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Float> floatString =
+ ArrayList<Float> floatString =
getFloatList("maxn", "fieldFacets", "string_sd", "float", "float");
ArrayList<Float> floatStringTest =
(ArrayList<Float>) calculateStat(floatStringTestStart, "max");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Double> doubleDate =
+ ArrayList<Double> doubleDate =
getDoubleList("maxn", "fieldFacets", "date_dtd", "double", "double");
ArrayList<Double> doubleDateTest =
(ArrayList<Double>) calculateStat(doubleDateTestStart, "max");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Double> doubleString =
+ ArrayList<Double> doubleString =
getDoubleList("maxn", "fieldFacets", "string_sd", "double", "double");
ArrayList<Double> doubleStringTest =
(ArrayList<Double>) calculateStat(doubleStringTestStart, "max");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
// String Int
- Collection<String> stringInt = getStringList("max", "fieldFacets", "int_id", "str", "str");
+ ArrayList<String> stringInt = getStringList("max", "fieldFacets", "int_id", "str", "str");
ArrayList<String> stringIntTest = (ArrayList<String>) calculateStat(stringIntTestStart, "max");
- assertEquals(getRawResponse(), stringInt, stringIntTest);
+ assertEqualsList(getRawResponse(), stringInt, stringIntTest);
// String Long
- Collection<String> stringLong = getStringList("max", "fieldFacets", "long_ld", "str", "str");
+ ArrayList<String> stringLong = getStringList("max", "fieldFacets", "long_ld", "str", "str");
ArrayList<String> stringLongTest =
(ArrayList<String>) calculateStat(stringLongTestStart, "max");
- assertEquals(getRawResponse(), stringLong, stringLongTest);
+ assertEqualsList(getRawResponse(), stringLong, stringLongTest);
// Date Int
- Collection<String> dateInt = getStringList("max", "fieldFacets", "int_id", "date", "date");
+ ArrayList<String> dateInt = getStringList("max", "fieldFacets", "int_id", "date", "date");
ArrayList<String> dateIntTest = (ArrayList<String>) calculateStat(dateIntTestStart, "max");
- assertEquals(getRawResponse(), dateInt, dateIntTest);
+ assertEqualsList(getRawResponse(), dateInt, dateIntTest);
// Date Long
- Collection<String> dateString = getStringList("max", "fieldFacets", "long_ld", "date", "date");
+ ArrayList<String> dateString = getStringList("max", "fieldFacets", "long_ld", "date", "date");
ArrayList<String> dateLongTest = (ArrayList<String>) calculateStat(dateLongTestStart, "max");
- assertEquals(getRawResponse(), dateString, dateLongTest);
+ assertEqualsList(getRawResponse(), dateString, dateLongTest);
}
@SuppressWarnings("unchecked")
@Test
public void uniqueTest() throws Exception {
// Int Date
- Collection<Long> intDate = getLongList("uniquen", "fieldFacets", "date_dtd", "long", "int");
+ ArrayList<Long> intDate = getLongList("uniquen", "fieldFacets", "date_dtd", "long", "int");
ArrayList<Long> intDateTest = (ArrayList<Long>) calculateStat(intDateTestStart, "unique");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Long> intString = getLongList("uniquen", "fieldFacets", "string_sd", "long", "int");
+ ArrayList<Long> intString = getLongList("uniquen", "fieldFacets", "string_sd", "long", "int");
ArrayList<Long> intStringTest = (ArrayList<Long>) calculateStat(intStringTestStart, "unique");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Long> longDate = getLongList("uniquen", "fieldFacets", "date_dtd", "long", "long");
+ ArrayList<Long> longDate = getLongList("uniquen", "fieldFacets", "date_dtd", "long", "long");
ArrayList<Long> longDateTest = (ArrayList<Long>) calculateStat(longDateTestStart, "unique");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Long> longString =
- getLongList("uniquen", "fieldFacets", "string_sd", "long", "long");
+ ArrayList<Long> longString = getLongList("uniquen", "fieldFacets", "string_sd", "long", "long");
ArrayList<Long> longStringTest = (ArrayList<Long>) calculateStat(longStringTestStart, "unique");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Long> floatDate = getLongList("uniquen", "fieldFacets", "date_dtd", "long", "float");
+ ArrayList<Long> floatDate = getLongList("uniquen", "fieldFacets", "date_dtd", "long", "float");
ArrayList<Long> floatDateTest = (ArrayList<Long>) calculateStat(floatDateTestStart, "unique");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Long> floatString =
+ ArrayList<Long> floatString =
getLongList("uniquen", "fieldFacets", "string_sd", "long", "float");
ArrayList<Long> floatStringTest =
(ArrayList<Long>) calculateStat(floatStringTestStart, "unique");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Long> doubleDate =
+ ArrayList<Long> doubleDate =
getLongList("uniquen", "fieldFacets", "date_dtd", "long", "double");
ArrayList<Long> doubleDateTest = (ArrayList<Long>) calculateStat(doubleDateTestStart, "unique");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Long> doubleString =
+ ArrayList<Long> doubleString =
getLongList("uniquen", "fieldFacets", "string_sd", "long", "double");
ArrayList<Long> doubleStringTest =
(ArrayList<Long>) calculateStat(doubleStringTestStart, "unique");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
// Date Int
- Collection<Long> dateInt = getLongList("unique", "fieldFacets", "int_id", "long", "date");
+ ArrayList<Long> dateInt = getLongList("unique", "fieldFacets", "int_id", "long", "date");
ArrayList<Long> dateIntTest = (ArrayList<Long>) calculateStat(dateIntTestStart, "unique");
- assertEquals(getRawResponse(), dateInt, dateIntTest);
+ assertEqualsList(getRawResponse(), dateInt, dateIntTest);
// Date Long
- Collection<Long> dateString = getLongList("unique", "fieldFacets", "long_ld", "long", "date");
+ ArrayList<Long> dateString = getLongList("unique", "fieldFacets", "long_ld", "long", "date");
ArrayList<Long> dateLongTest = (ArrayList<Long>) calculateStat(dateLongTestStart, "unique");
- assertEquals(getRawResponse(), dateString, dateLongTest);
+ assertEqualsList(getRawResponse(), dateString, dateLongTest);
// String Int
- Collection<Long> stringInt = getLongList("unique", "fieldFacets", "int_id", "long", "str");
+ ArrayList<Long> stringInt = getLongList("unique", "fieldFacets", "int_id", "long", "str");
ArrayList<Long> stringIntTest = (ArrayList<Long>) calculateStat(stringIntTestStart, "unique");
- assertEquals(getRawResponse(), stringInt, stringIntTest);
+ assertEqualsList(getRawResponse(), stringInt, stringIntTest);
// String Long
- Collection<Long> stringLong = getLongList("unique", "fieldFacets", "long_ld", "long", "str");
+ ArrayList<Long> stringLong = getLongList("unique", "fieldFacets", "long_ld", "long", "str");
ArrayList<Long> stringLongTest = (ArrayList<Long>) calculateStat(stringLongTestStart, "unique");
- assertEquals(getRawResponse(), stringLong, stringLongTest);
+ assertEqualsList(getRawResponse(), stringLong, stringLongTest);
}
@SuppressWarnings("unchecked")
@Test
public void countTest() throws Exception {
// Int Date
- Collection<Long> intDate = getLongList("countn", "fieldFacets", "date_dtd", "long", "int");
+ ArrayList<Long> intDate = getLongList("countn", "fieldFacets", "date_dtd", "long", "int");
ArrayList<Long> intDateTest = (ArrayList<Long>) calculateStat(intDateTestStart, "count");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
// Int String
- Collection<Long> intString = getLongList("countn", "fieldFacets", "string_sd", "long", "int");
+ ArrayList<Long> intString = getLongList("countn", "fieldFacets", "string_sd", "long", "int");
ArrayList<Long> intStringTest = (ArrayList<Long>) calculateStat(intStringTestStart, "count");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Long Date
- Collection<Long> longDate = getLongList("countn", "fieldFacets", "date_dtd", "long", "long");
+ ArrayList<Long> longDate = getLongList("countn", "fieldFacets", "date_dtd", "long", "long");
ArrayList<Long> longDateTest = (ArrayList<Long>) calculateStat(longDateTestStart, "count");
- assertEquals(getRawResponse(), longDate, longDateTest);
+ assertEqualsList(getRawResponse(), longDate, longDateTest);
// Long String
- Collection<Long> longString = getLongList("countn", "fieldFacets", "string_sd", "long", "long");
+ ArrayList<Long> longString = getLongList("countn", "fieldFacets", "string_sd", "long", "long");
ArrayList<Long> longStringTest = (ArrayList<Long>) calculateStat(longStringTestStart, "count");
- assertEquals(getRawResponse(), longString, longStringTest);
+ assertEqualsList(getRawResponse(), longString, longStringTest);
// Float Date
- Collection<Long> floatDate = getLongList("countn", "fieldFacets", "date_dtd", "long", "float");
+ ArrayList<Long> floatDate = getLongList("countn", "fieldFacets", "date_dtd", "long", "float");
ArrayList<Long> floatDateTest = (ArrayList<Long>) calculateStat(floatDateTestStart, "count");
- assertEquals(getRawResponse(), floatDate, floatDateTest);
+ assertEqualsList(getRawResponse(), floatDate, floatDateTest);
// Float String
- Collection<Long> floatString =
+ ArrayList<Long> floatString =
getLongList("countn", "fieldFacets", "string_sd", "long", "float");
ArrayList<Long> floatStringTest =
(ArrayList<Long>) calculateStat(floatStringTestStart, "count");
- assertEquals(getRawResponse(), floatString, floatStringTest);
+ assertEqualsList(getRawResponse(), floatString, floatStringTest);
// Double Date
- Collection<Long> doubleDate =
- getLongList("countn", "fieldFacets", "date_dtd", "long", "double");
+ ArrayList<Long> doubleDate = getLongList("countn", "fieldFacets", "date_dtd", "long", "double");
ArrayList<Long> doubleDateTest = (ArrayList<Long>) calculateStat(doubleDateTestStart, "count");
- assertEquals(getRawResponse(), doubleDate, doubleDateTest);
+ assertEqualsList(getRawResponse(), doubleDate, doubleDateTest);
// Double String
- Collection<Long> doubleString =
+ ArrayList<Long> doubleString =
getLongList("countn", "fieldFacets", "string_sd", "long", "double");
ArrayList<Long> doubleStringTest =
(ArrayList<Long>) calculateStat(doubleStringTestStart, "count");
- assertEquals(getRawResponse(), doubleString, doubleStringTest);
+ assertEqualsList(getRawResponse(), doubleString, doubleStringTest);
// Date Int
- Collection<Long> dateInt = getLongList("count", "fieldFacets", "int_id", "long", "date");
+ ArrayList<Long> dateInt = getLongList("count", "fieldFacets", "int_id", "long", "date");
ArrayList<Long> dateIntTest = (ArrayList<Long>) calculateStat(dateIntTestStart, "count");
- assertEquals(getRawResponse(), dateIntTest, dateInt);
+ assertEqualsList(getRawResponse(), dateIntTest, dateInt);
// Date Long
- Collection<Long> dateLong = getLongList("count", "fieldFacets", "long_ld", "long", "date");
+ ArrayList<Long> dateLong = getLongList("count", "fieldFacets", "long_ld", "long", "date");
ArrayList<Long> dateLongTest = (ArrayList<Long>) calculateStat(dateLongTestStart, "count");
- assertEquals(getRawResponse(), dateLong, dateLongTest);
+ assertEqualsList(getRawResponse(), dateLong, dateLongTest);
// String Int
- Collection<Long> stringInt = getLongList("count", "fieldFacets", "int_id", "long", "str");
+ ArrayList<Long> stringInt = getLongList("count", "fieldFacets", "int_id", "long", "str");
ArrayList<Long> stringIntTest = (ArrayList<Long>) calculateStat(stringIntTestStart, "count");
- assertEquals(getRawResponse(), stringInt, stringIntTest);
+ assertEqualsList(getRawResponse(), stringInt, stringIntTest);
// String Long
- Collection<Long> stringLong = getLongList("count", "fieldFacets", "long_ld", "long", "str");
+ ArrayList<Long> stringLong = getLongList("count", "fieldFacets", "long_ld", "long", "str");
ArrayList<Long> stringLongTest = (ArrayList<Long>) calculateStat(stringLongTestStart, "count");
- assertEquals(getRawResponse(), stringLong, stringLongTest);
+ assertEqualsList(getRawResponse(), stringLong, stringLongTest);
}
- @SuppressWarnings("unchecked")
@Test
public void missingTest() throws Exception {
// Int Date
- Collection<Long> intDate = getLongList("missingn", "fieldFacets", "date_dtd", "long", "int");
+ ArrayList<Long> intDate = getLongList("missingn", "fieldFacets", "date_dtd", "long", "int");
setLatestType("int");
- assertEquals(getRawResponse(), intDateTestMissing, intDate);
+ assertEqualsList(getRawResponse(), intDateTestMissing, intDate);
// Int String
- Collection<Long> intString = getLongList("missingn", "fieldFacets", "string_sd", "long", "int");
- assertEquals(getRawResponse(), intStringTestMissing, intString);
+ ArrayList<Long> intString = getLongList("missingn", "fieldFacets", "string_sd", "long", "int");
+ assertEqualsList(getRawResponse(), intStringTestMissing, intString);
// Long Date
- Collection<Long> longDate = getLongList("missingn", "fieldFacets", "date_dtd", "long", "long");
+ ArrayList<Long> longDate = getLongList("missingn", "fieldFacets", "date_dtd", "long", "long");
setLatestType("long");
- assertEquals(getRawResponse(), longDateTestMissing, longDate);
+ assertEqualsList(getRawResponse(), longDateTestMissing, longDate);
// Long String
- Collection<Long> longString =
+ ArrayList<Long> longString =
getLongList("missingn", "fieldFacets", "string_sd", "long", "long");
- assertEquals(getRawResponse(), longStringTestMissing, longString);
+ assertEqualsList(getRawResponse(), longStringTestMissing, longString);
// Float Date
- Collection<Long> floatDate =
- getLongList("missingn", "fieldFacets", "date_dtd", "long", "float");
+ ArrayList<Long> floatDate = getLongList("missingn", "fieldFacets", "date_dtd", "long", "float");
setLatestType("float");
- assertEquals(getRawResponse(), floatDateTestMissing, floatDate);
+ assertEqualsList(getRawResponse(), floatDateTestMissing, floatDate);
// Float String
- Collection<Long> floatString =
+ ArrayList<Long> floatString =
getLongList("missingn", "fieldFacets", "string_sd", "long", "float");
- assertEquals(getRawResponse(), floatStringTestMissing, floatString);
+ assertEqualsList(getRawResponse(), floatStringTestMissing, floatString);
// Double Date
- Collection<Long> doubleDate =
+ ArrayList<Long> doubleDate =
getLongList("missingn", "fieldFacets", "date_dtd", "long", "double");
setLatestType("double");
- assertEquals(getRawResponse(), doubleDateTestMissing, doubleDate);
+ assertEqualsList(getRawResponse(), doubleDateTestMissing, doubleDate);
// Double String
- Collection<Long> doubleString =
+ ArrayList<Long> doubleString =
getLongList("missingn", "fieldFacets", "string_sd", "long", "double");
- assertEquals(getRawResponse(), doubleStringTestMissing, doubleString);
+ assertEqualsList(getRawResponse(), doubleStringTestMissing, doubleString);
// Date Int
- Collection<Long> dateInt = getLongList("missing", "fieldFacets", "int_id", "long", "date");
+ ArrayList<Long> dateInt = getLongList("missing", "fieldFacets", "int_id", "long", "date");
setLatestType("date");
- assertEquals(getRawResponse(), dateIntTestMissing, dateInt);
+ assertEqualsList(getRawResponse(), dateIntTestMissing, dateInt);
// Date Long
- Collection<Long> dateLong = getLongList("missing", "fieldFacets", "long_ld", "long", "date");
- assertEquals(getRawResponse(), dateLongTestMissing, dateLong);
+ ArrayList<Long> dateLong = getLongList("missing", "fieldFacets", "long_ld", "long", "date");
+ assertEqualsList(getRawResponse(), dateLongTestMissing, dateLong);
// String Int
- Collection<Long> stringInt = getLongList("missing", "fieldFacets", "int_id", "long", "str");
+ ArrayList<Long> stringInt = getLongList("missing", "fieldFacets", "int_id", "long", "str");
setLatestType("string");
- assertEquals(getRawResponse(), stringIntTestMissing, stringInt);
+ assertEqualsList(getRawResponse(), stringIntTestMissing, stringInt);
// String Long
- Collection<Long> stringLong = getLongList("missing", "fieldFacets", "long_ld", "long", "str");
- assertEquals(getRawResponse(), stringLongTestMissing, stringLong);
+ ArrayList<Long> stringLong = getLongList("missing", "fieldFacets", "long_ld", "long", "str");
+ assertEqualsList(getRawResponse(), stringLongTestMissing, stringLong);
}
@SuppressWarnings("unchecked")
@Test
public void multiValueTest() throws Exception {
// Long
- Collection<Double> lon =
+ ArrayList<Double> lon =
getDoubleList("multivalued", "fieldFacets", "long_ldm", "double", "mean");
ArrayList<Double> longTest = calculateNumberStat(multiLongTestStart, "mean");
- assertEquals(getRawResponse(), lon, longTest);
+ assertEqualsList(getRawResponse(), lon, longTest);
// Date
- Collection<Double> date =
+ ArrayList<Double> date =
getDoubleList("multivalued", "fieldFacets", "date_dtdm", "double", "mean");
ArrayList<Double> dateTest = calculateNumberStat(multiDateTestStart, "mean");
- assertEquals(getRawResponse(), date, dateTest);
+ assertEqualsList(getRawResponse(), date, dateTest);
// String
- Collection<Double> string =
+ ArrayList<Double> string =
getDoubleList("multivalued", "fieldFacets", "string_sdm", "double", "mean");
ArrayList<Double> stringTest = calculateNumberStat(multiStringTestStart, "mean");
- assertEquals(getRawResponse(), string, stringTest);
+ assertEqualsList(getRawResponse(), string, stringTest);
}
@SuppressWarnings("unchecked")
@@ -1196,7 +1184,7 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest {
getDoubleList("missingf", "fieldFacets", "date_dtdm", "double", "mean");
// super.removeNodes(xPath, string);
ArrayList<Double> stringTest = calculateNumberStat(multiDateTestStart, "mean");
- assertEquals(getRawResponse(), string, stringTest);
+ assertEqualsList(getRawResponse(), string, stringTest);
// Int String
xPath =
@@ -1209,19 +1197,19 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest {
"/response/lst[@name='stats']/lst[@name='missingf']/lst[@name='fieldFacets']/lst[@name='string_sd']/lst[@name='str0']";
assertNull(getRawResponse(), getNode(xPath));
- List<Double> intString =
+ ArrayList<Double> intString =
getDoubleList("missingf", "fieldFacets", "string_sd", "double", "mean");
// removeNodes(missingNodeXPathStr, intString);
ArrayList<Double> intStringTest = calculateNumberStat(intStringTestStart, "mean");
- assertEquals(getRawResponse(), intString, intStringTest);
+ assertEqualsList(getRawResponse(), intString, intStringTest);
// Int Date
- Collection<Double> intDate =
+ ArrayList<Double> intDate =
getDoubleList("missingf", "fieldFacets", "date_dtd", "double", "mean");
ArrayList<ArrayList<Double>> intDateMissingTestStart =
(ArrayList<ArrayList<Double>>) intDateTestStart.clone();
ArrayList<Double> intDateTest = calculateNumberStat(intDateMissingTestStart, "mean");
- assertEquals(getRawResponse(), intDate, intDateTest);
+ assertEqualsList(getRawResponse(), intDate, intDateTest);
}
private void checkStddevs(ArrayList<Double> list1, ArrayList<Double> list2) {
@@ -1229,15 +1217,18 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest {
Collections.sort(list2);
for (int i = 0; i < list1.size(); i++) {
if ((Math.abs(list1.get(i) - list2.get(i)) < .00000000001) == false) {
- Assert.assertEquals(getRawResponse(), list1.get(i), list2.get(i), 0.00000000001);
+ assertEquals(getRawResponse(), list1.get(i), list2.get(i), 0.00000000001);
}
}
}
@SuppressWarnings({"unchecked", "rawtypes"})
- public static void assertEquals(String mes, Object actual, Object expected) {
- Collections.sort((List<Comparable>) actual);
- Collections.sort((List<Comparable>) expected);
- Assert.assertEquals(mes, actual, expected);
+ public static void assertEqualsList(
+ String mes,
+ ArrayList<? extends Comparable> actual,
+ ArrayList<? extends Comparable> expected) {
+ Collections.sort(actual);
+ Collections.sort(expected);
+ assertEquals(mes, actual, expected);
}
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/util/OldAnalyticsRequestConverterUnitTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/util/OldAnalyticsRequestConverterUnitTest.java
index d939a0401d6..2fe0876cee1 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/util/OldAnalyticsRequestConverterUnitTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/util/OldAnalyticsRequestConverterUnitTest.java
@@ -68,6 +68,6 @@ public class OldAnalyticsRequestConverterUnitTest extends LegacyAbstractAnalytic
request.groupings.get("df2").facets.get("long.dotfield");
assertNotNull("Range facet param should be parsed for dotted field", analyticsFacetRequest);
assertEquals("30", ((AnalyticsRangeFacetRequest) analyticsFacetRequest).end);
- assertEquals(true, ((AnalyticsRangeFacetRequest) analyticsFacetRequest).hardend);
+ assertTrue(((AnalyticsRangeFacetRequest) analyticsFacetRequest).hardend);
}
}
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.java
index 0420662232f..4cfc86b1fbe 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.java
@@ -35,7 +35,7 @@ public class CastingAnalyticsValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.java
index cca845ab3f4..73a43b34010 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.java
@@ -35,7 +35,7 @@ public class CastingBooleanValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -60,7 +60,7 @@ public class CastingBooleanValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.java
index f6c90053f73..f881be35c8b 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.java
@@ -69,7 +69,7 @@ public class CastingBooleanValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamBooleans(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -94,7 +94,7 @@ public class CastingBooleanValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -119,7 +119,7 @@ public class CastingBooleanValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -139,7 +139,7 @@ public class CastingBooleanValueTest extends SolrTestCaseJ4 {
val.setValue(true).setExists(true);
AnalyticsValueStream conv = val.convertToConstant();
assertTrue(conv instanceof ConstantBooleanValue);
- assertEquals(true, ((ConstantBooleanValue) conv).getBoolean());
+ assertTrue(((ConstantBooleanValue) conv).getBoolean());
val = new TestBooleanValue(ExpressionType.FIELD);
val.setValue(true).setExists(true);
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.java
index bdd485628de..578e164277c 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.java
@@ -35,7 +35,7 @@ public class CastingDoubleValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -60,7 +60,7 @@ public class CastingDoubleValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.java
index 689175a17c2..d352ea8f021 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.java
@@ -69,7 +69,7 @@ public class CastingDoubleValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -94,7 +94,7 @@ public class CastingDoubleValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -119,7 +119,7 @@ public class CastingDoubleValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.java
index ef9a556b47f..70e54148457 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.java
@@ -35,7 +35,7 @@ public class CastingFloatValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -60,7 +60,7 @@ public class CastingFloatValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -85,7 +85,7 @@ public class CastingFloatValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.java
index a08d625d114..e8e6e77f035 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.java
@@ -85,7 +85,7 @@ public class CastingFloatValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -110,7 +110,7 @@ public class CastingFloatValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -135,7 +135,7 @@ public class CastingFloatValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -160,7 +160,7 @@ public class CastingFloatValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.java
index e4599e8cab1..1319d341e75 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.java
@@ -35,7 +35,7 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -60,7 +60,7 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -85,7 +85,7 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -110,7 +110,7 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -135,7 +135,7 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.java
index 291712ac0fb..4f167306d31 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.java
@@ -117,7 +117,7 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamInts(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -142,7 +142,7 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -167,7 +167,7 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamFloats(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -192,7 +192,7 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -217,7 +217,7 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -242,7 +242,7 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.java
index 77ee11452ac..150d0d7d444 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.java
@@ -35,7 +35,7 @@ public class CastingLongValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -60,7 +60,7 @@ public class CastingLongValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -85,7 +85,7 @@ public class CastingLongValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.java
index ec160b58895..21b576cef91 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.java
@@ -85,7 +85,7 @@ public class CastingLongValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamLongs(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -110,7 +110,7 @@ public class CastingLongValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamDoubles(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -135,7 +135,7 @@ public class CastingLongValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -160,7 +160,7 @@ public class CastingLongValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.java
index 9f7d7d5fbee..aadba5f3cfc 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.java
@@ -35,7 +35,7 @@ public class CastingStringValueStreamTest extends SolrTestCaseJ4 {
val.setValues();
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.java
index 10824815a7f..a9cc98e94ec 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.java
@@ -53,7 +53,7 @@ public class CastingStringValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamStrings(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
@@ -78,7 +78,7 @@ public class CastingStringValueTest extends SolrTestCaseJ4 {
val.setExists(false);
casted.streamObjects(
value -> {
- assertTrue("There should be no values to stream", false);
+ fail("There should be no values to stream");
});
// Multiple Values
diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/ConstantValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/ConstantValueTest.java
index 007c171be8e..85e40b7c1e5 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/ConstantValueTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/ConstantValueTest.java
@@ -98,7 +98,7 @@ public class ConstantValueTest extends SolrTestCaseJ4 {
ConstantBooleanValue val = new ConstantBooleanValue(true);
assertTrue(val.exists());
- assertEquals(true, val.getBoolean());
+ assertTrue(val.getBoolean());
assertEquals("true", val.getString());
assertEquals(Boolean.TRUE, val.getObject());
@@ -106,7 +106,7 @@ public class ConstantValueTest extends SolrTestCaseJ4 {
counter.setValue(0);
val.streamBooleans(
value -> {
- assertEquals(true, value);
+ assertTrue(value);
assertEquals(0, counter.getInt());
counter.setValue(1);
});
@@ -128,14 +128,14 @@ public class ConstantValueTest extends SolrTestCaseJ4 {
val = new ConstantBooleanValue(false);
assertTrue(val.exists());
- assertEquals(false, val.getBoolean());
+ assertFalse(val.getBoolean());
assertEquals("false", val.getString());
assertEquals(Boolean.FALSE, val.getObject());
counter.setValue(0);
val.streamBooleans(
value -> {
- assertEquals(false, value);
+ assertFalse(value);
assertEquals(0, counter.getInt());
counter.setValue(1);
});
diff --git a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java
index 1a9398a6ba5..e427e8840f9 100644
--- a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java
+++ b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java
@@ -27,7 +27,6 @@ import org.apache.solr.client.solrj.response.ClusteringResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -105,7 +104,7 @@ public class ClusteringComponentDistributedTest extends BaseDistributedSearchTes
QueryResponse response = query(true, params);
ClusteringResponse clusteringResponse = response.getClusteringResponse();
- Assert.assertNotNull(clusteringResponse);
+ assertNotNull(clusteringResponse);
return clusteringResponse.getClusters();
}
diff --git a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
index 0c6c968444b..609e11c9358 100644
--- a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
+++ b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
@@ -47,7 +47,6 @@ import org.apache.solr.response.SolrQueryResponse;
import org.carrot2.clustering.Cluster;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -162,7 +161,7 @@ public class ClusteringComponentTest extends SolrTestCaseJ4 {
// Echo clustering algorithm just returns document fields as cluster labels
// so highlighted snippets should never be longer than full field content.
- Assert.assertEquals(highlighted.size(), full.size());
+ assertEquals(highlighted.size(), full.size());
for (int i = 0; i < highlighted.size(); i++) {
List<String> labels1 = highlighted.get(i).getLabels();
List<String> labels2 = full.get(i).getLabels();
@@ -209,7 +208,7 @@ public class ClusteringComponentTest extends SolrTestCaseJ4 {
params.add(EngineParameters.PARAM_CONTEXT_COUNT, Integer.toString(80));
}));
- Assert.assertEquals(shortSummaries.size(), longSummaries.size());
+ assertEquals(shortSummaries.size(), longSummaries.size());
for (int i = 0; i < shortSummaries.size(); i++) {
List<String> shortLabels = shortSummaries.get(i).getLabels();
List<String> longLabels = longSummaries.get(i).getLabels();
diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
index 7b7f924b79a..e5a340bf3c0 100644
--- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
+++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
@@ -66,7 +66,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testExtraction() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
loadLocal(
"extraction/solr-word.pdf",
"fmap.created",
@@ -403,7 +403,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testLiterals() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
// test literal
loadLocal(
"extraction/version_control.xml",
@@ -579,7 +579,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testPlainTextSpecifyingMimeType() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
// Load plain text specifying MIME type:
loadLocal(
@@ -613,7 +613,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testPlainTextSpecifyingResourceName() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
// Load plain text specifying filename
loadLocal(
@@ -647,7 +647,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testCommitWithin() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
SolrQueryRequest req =
req(
@@ -679,21 +679,21 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testExtractOnly() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
SolrQueryResponse rsp =
loadLocal("extraction/solr-word.pdf", ExtractingParams.EXTRACT_ONLY, "true");
- assertTrue("rsp is null and it shouldn't be", rsp != null);
+ assertNotNull("rsp is null and it shouldn't be", rsp);
NamedList<?> list = rsp.getValues();
String extraction = (String) list.get("solr-word.pdf");
- assertTrue("extraction is null and it shouldn't be", extraction != null);
+ assertNotNull("extraction is null and it shouldn't be", extraction);
assertTrue(
extraction + " does not contain " + "solr-word", extraction.indexOf("solr-word") != -1);
NamedList<?> nl = (NamedList<?>) list.get("solr-word.pdf_metadata");
- assertTrue("nl is null and it shouldn't be", nl != null);
+ assertNotNull("nl is null and it shouldn't be", nl);
Object title = nl.get("title");
- assertTrue("title is null and it shouldn't be", title != null);
+ assertNotNull("title is null and it shouldn't be", title);
assertTrue(extraction.indexOf("<?xml") != -1);
rsp =
@@ -703,26 +703,26 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
"true",
ExtractingParams.EXTRACT_FORMAT,
ExtractingDocumentLoader.TEXT_FORMAT);
- assertTrue("rsp is null and it shouldn't be", rsp != null);
+ assertNotNull("rsp is null and it shouldn't be", rsp);
list = rsp.getValues();
extraction = (String) list.get("solr-word.pdf");
- assertTrue("extraction is null and it shouldn't be", extraction != null);
+ assertNotNull("extraction is null and it shouldn't be", extraction);
assertTrue(
extraction + " does not contain " + "solr-word", extraction.indexOf("solr-word") != -1);
- assertTrue(extraction.indexOf("<?xml") == -1);
+ assertEquals(-1, extraction.indexOf("<?xml"));
nl = (NamedList<?>) list.get("solr-word.pdf_metadata");
- assertTrue("nl is null and it shouldn't be", nl != null);
+ assertNotNull("nl is null and it shouldn't be", nl);
title = nl.get("title");
- assertTrue("title is null and it shouldn't be", title != null);
+ assertNotNull("title is null and it shouldn't be", title);
}
@Test
public void testXPath() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
SolrQueryResponse rsp =
loadLocal(
"extraction/example.html",
@@ -730,7 +730,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
"/xhtml:html/xhtml:body/xhtml:a/descendant::node()",
ExtractingParams.EXTRACT_ONLY,
"true");
- assertTrue("rsp is null and it shouldn't be", rsp != null);
+ assertNotNull("rsp is null and it shouldn't be", rsp);
NamedList<?> list = rsp.getValues();
String val = (String) list.get("example.html");
assertEquals("News", val.trim()); // there is only one matching <a> tag
@@ -761,7 +761,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testArabicPDF() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
loadLocal(
"extraction/arabic.pdf",
@@ -794,7 +794,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testTikaExceptionHandling() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
expectThrows(
Exception.class,
@@ -840,7 +840,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testWrongStreamType() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
expectThrows(
Exception.class,
@@ -870,7 +870,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public void testLiteralsOverride() throws Exception {
ExtractingRequestHandler handler =
(ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
- assertTrue("handler is null and it shouldn't be", handler != null);
+ assertNotNull("handler is null and it shouldn't be", handler);
assertQ(req("*:*"), "//*[@numFound='0']");
diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java
index 680ba14ebc2..a8ce0cb74b2 100644
--- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java
+++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java
@@ -47,6 +47,6 @@ public class ParseContextConfigTest extends SolrTestCaseJ4 {
PDFParserConfig pdfParserConfig = parseContext.get(PDFParserConfig.class);
- assertEquals(true, pdfParserConfig.getExtractInlineImages());
+ assertTrue(pdfParserConfig.getExtractInlineImages());
}
}
diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/backup/repository/HdfsBackupRepositoryTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/backup/repository/HdfsBackupRepositoryTest.java
index c188bb8f7a5..635f2b77b2c 100644
--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/backup/repository/HdfsBackupRepositoryTest.java
+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/backup/repository/HdfsBackupRepositoryTest.java
@@ -17,16 +17,29 @@
package org.apache.solr.hdfs.backup.repository;
-import static org.junit.Assert.assertEquals;
-
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
import java.io.IOException;
+import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.hdfs.HdfsDirectoryFactory;
import org.apache.solr.hdfs.store.HdfsDirectory;
+import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;
import org.junit.Test;
-public class HdfsBackupRepositoryTest {
+ "SimpleText"
+}) // Backups do checksum validation against a footer value not present in 'SimpleText'
+@ThreadLeakFilters(
+ defaultFilters = true,
+ filters = {
+ BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
+ })
+@ThreadLeakLingering(
+ linger = 1000) // Wait at least 1 second for Netty GlobalEventExecutor to shutdown
+public class HdfsBackupRepositoryTest extends SolrTestCase {
@Test(expected = NullPointerException.class)
public void testHdfsHomePropertyMissing() throws IOException {
diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java
index 8741e08df2e..d6500b3f87e 100644
--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java
+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java
@@ -125,7 +125,7 @@ public class MoveReplicaHdfsFailoverTest extends SolrCloudTestCase {
assertEquals(replica.getName(), newReplica.getName());
assertEquals(replica.getCoreName(), newReplica.getCoreName());
- assertFalse(replica.getNodeName().equals(newReplica.getNodeName()));
+ assertNotEquals(replica.getNodeName(), newReplica.getNodeName());
final int numDocs = 100;
addDocs(coll, numDocs); // indexed but not committed
diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java
index 543f17080dd..5d31edfd7eb 100644
--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java
+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java
@@ -658,7 +658,7 @@ public class TestRecoveryHdfs extends SolrTestCaseJ4 {
assertU(commit());
long v2 = getVer(req("q", "id:D1"));
- assert (v2 > v1);
+ assertTrue(v2 > v1);
assertJQ(req("qt", "/get", "getVersions", "2"), "/versions==[" + v2 + "," + v1a + "]");
}
diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsLockFactoryTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsLockFactoryTest.java
index 66588089b6e..cb7c6000aa1 100644
--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsLockFactoryTest.java
+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/HdfsLockFactoryTest.java
@@ -67,9 +67,9 @@ public class HdfsLockFactoryTest extends SolrTestCaseJ4 {
HdfsDirectory dir = new HdfsDirectory(lockPath, conf);
try (Lock lock = dir.obtainLock("testlock")) {
- assert lock != null;
+ assertNotNull(lock);
try (Lock lock2 = dir.obtainLock("testlock")) {
- assert lock2 != null;
+ assertNotNull(lock2);
fail("Locking should fail");
} catch (LockObtainFailedException lofe) {
// pass
@@ -77,9 +77,9 @@ public class HdfsLockFactoryTest extends SolrTestCaseJ4 {
}
// now repeat after close()
try (Lock lock = dir.obtainLock("testlock")) {
- assert lock != null;
+ assertNotNull(lock);
try (Lock lock2 = dir.obtainLock("testlock")) {
- assert lock2 != null;
+ assertNotNull(lock2);
fail("Locking should fail");
} catch (LockObtainFailedException lofe) {
// pass
diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BlockCacheTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BlockCacheTest.java
index 8e1fbaad21c..248e5666887 100644
--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BlockCacheTest.java
+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/store/blockcache/BlockCacheTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.hdfs.store.blockcache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.RemovalCause;
import com.github.benmanes.caffeine.cache.RemovalListener;
-import java.util.Arrays;
import java.util.Random;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -71,7 +70,7 @@ public class BlockCacheTest extends SolrTestCase {
long t3 = System.nanoTime();
if (blockCache.fetch(blockCacheKey, buffer)) {
fetchTime += (System.nanoTime() - t3);
- assertTrue("buffer content differs", Arrays.equals(testData, buffer));
+ assertArrayEquals("buffer content differs", testData, buffer);
}
}
System.out.println("Cache Hits = " + hitsInCache.get());
diff --git a/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java b/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java
index 95a3a3b8adc..4d8d398a25c 100644
--- a/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java
+++ b/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java
@@ -238,7 +238,7 @@ public abstract class LanguageIdentifierUpdateProcessorFactoryTestCase extends S
// Test that enforceSchema correctly catches illegal field and returns null
parameters.set("langid.enforceSchema", "true");
liProcessor = createLangIdProcessor(parameters);
- assertEquals(null, liProcessor.getMappedField("inputfield", "sv"));
+ assertNull(liProcessor.getMappedField("inputfield", "sv"));
// Prove support for other mapping regex, still with enforceSchema=true
parameters.add("langid.map.pattern", "text_(.*?)_field");
diff --git a/solr/modules/langid/src/test/org/apache/solr/update/processor/SolrInputDocumentReaderTest.java b/solr/modules/langid/src/test/org/apache/solr/update/processor/SolrInputDocumentReaderTest.java
index b6ceda799c5..8bacd60b805 100644
--- a/solr/modules/langid/src/test/org/apache/solr/update/processor/SolrInputDocumentReaderTest.java
+++ b/solr/modules/langid/src/test/org/apache/solr/update/processor/SolrInputDocumentReaderTest.java
@@ -16,21 +16,19 @@
*/
package org.apache.solr.update.processor;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.util.Arrays;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.junit.Before;
import org.junit.Test;
-public class SolrInputDocumentReaderTest {
+public class SolrInputDocumentReaderTest extends SolrTestCase {
private SolrInputDocument doc;
private String[] allFields;
@Before
public void setUp() throws Exception {
+ super.setUp();
doc = new SolrInputDocument();
doc.addField("f1", "a b c");
doc.addField("f2", "multi");
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
index 1bdca68ce58..c2c47c2fa6a 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
@@ -47,7 +47,7 @@ public class TestLTRQParserPlugin extends TestRerankBase {
query.add("rq", "{!ltr reRankDocs=100}");
final String res = restTestHarness.query("/query" + query.toQueryString());
- assert (res.contains("Must provide one or two models in the request"));
+ assertTrue(res.contains("Must provide one or two models in the request"));
}
@Test
@@ -61,7 +61,7 @@ public class TestLTRQParserPlugin extends TestRerankBase {
query.add("rq", "{!ltr model=-1 reRankDocs=100}");
final String res = restTestHarness.query("/query" + query.toQueryString());
- assert (res.contains("cannot find model"));
+ assertTrue(res.contains("cannot find model"));
}
@Test
@@ -75,7 +75,7 @@ public class TestLTRQParserPlugin extends TestRerankBase {
query.add("rq", "{!ltr model=\"\" reRankDocs=100}");
final String res = restTestHarness.query("/query" + query.toQueryString());
- assert (res.contains("the model 0 is empty"));
+ assertTrue(res.contains("the model 0 is empty"));
}
@Test
@@ -89,7 +89,7 @@ public class TestLTRQParserPlugin extends TestRerankBase {
query.add("rq", "{!ltr model=6029760550880411648 reRankDocs=-1}");
final String res = restTestHarness.query("/query" + query.toQueryString());
- assert (res.contains("Must rerank at least 1 document"));
+ assertTrue(res.contains("Must rerank at least 1 document"));
}
@Test
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java
index 0edc0379445..d0cdcaa9b27 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java
@@ -145,24 +145,24 @@ public class TestLTRScoringQuery extends SolrTestCase {
assertEquals(m1.hashCode(), m2.hashCode());
// Models with same algorithm, but different efi content should not match
- assertFalse(m1.equals(m0));
- assertFalse(m1.hashCode() == m0.hashCode());
+ assertNotEquals(m1, m0);
+ assertNotEquals(m1.hashCode(), m0.hashCode());
final LTRScoringModel algorithm2 =
TestLinearModel.createLinearModel(
"testModelName2", features, norms, "testStoreName", allFeatures, modelParams);
final LTRScoringQuery m3 = new LTRScoringQuery(algorithm2);
- assertFalse(m1.equals(m3));
- assertFalse(m1.hashCode() == m3.hashCode());
+ assertNotEquals(m1, m3);
+ assertNotEquals(m1.hashCode(), m3.hashCode());
final LTRScoringModel algorithm3 =
TestLinearModel.createLinearModel(
"testModelName", features, norms, "testStoreName3", allFeatures, modelParams);
final LTRScoringQuery m4 = new LTRScoringQuery(algorithm3);
- assertFalse(m1.equals(m4));
- assertFalse(m1.hashCode() == m4.hashCode());
+ assertNotEquals(m1, m4);
+ assertNotEquals(m1.hashCode(), m4.hashCode());
}
@Test
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
index 9f2e54f91d7..04fa1583a38 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
@@ -60,7 +60,7 @@ public class TestParallelWeightCreation extends TestRerankBase {
msg1 = iae.getMessage();
;
}
- assertTrue(msg1.equals("numThreadsPerRequest cannot be less than 1"));
+ assertEquals("numThreadsPerRequest cannot be less than 1", msg1);
// set totalPoolThreads to 1 and numThreadsPerRequest to 2 and verify that an exception is
// thrown
@@ -70,6 +70,6 @@ public class TestParallelWeightCreation extends TestRerankBase {
} catch (IllegalArgumentException iae) {
msg2 = iae.getMessage();
}
- assertTrue(msg2.equals("numThreadsPerRequest cannot be greater than totalPoolThreads"));
+ assertEquals("numThreadsPerRequest cannot be greater than totalPoolThreads", msg2);
}
}
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
index c7c2288d18a..3e6e986e591 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
@@ -255,9 +255,9 @@ public class TestFeatureExtractionFromMultipleSegments extends TestRerankBase {
int passCount = 0;
for (final Map<String, Object> doc : docs) {
String features = (String) doc.get("fv");
- assert (features.length() > 0);
+ assertTrue(features.length() > 0);
++passCount;
}
- assert (passCount == numRows);
+ assertEquals(passCount, numRows);
}
}
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.java
index ad30023663d..0f76655ff18 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.java
@@ -131,7 +131,7 @@ public class TestLTRQParserInterleaving extends TestRerankBase {
"rq", "{!ltr model=modelA model=modelB interleavingAlgorithm=unsupported reRankDocs=100}");
final String res = restTestHarness.query("/query" + query.toQueryString());
- assert (res.contains("Unknown Interleaving algorithm: unsupported"));
+ assertTrue(res.contains("Unknown Interleaving algorithm: unsupported"));
}
@Test
@@ -145,7 +145,7 @@ public class TestLTRQParserInterleaving extends TestRerankBase {
query.add("rq", "{!ltr model=modelA model=modelB model=C reRankDocs=100}");
final String res = restTestHarness.query("/query" + query.toQueryString());
- assert (res.contains("Must provide one or two models in the request"));
+ assertTrue(res.contains("Must provide one or two models in the request"));
}
@Test
@@ -159,7 +159,7 @@ public class TestLTRQParserInterleaving extends TestRerankBase {
query.add("rq", "{!ltr model=modelA model=\"\" reRankDocs=100}");
final String res = restTestHarness.query("/query" + query.toQueryString());
- assert (res.contains("the model 1 is empty"));
+ assertTrue(res.contains("the model 1 is empty"));
}
@Test
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java
index aae619161f7..f112402075b 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java
@@ -16,9 +16,6 @@
*/
package org.apache.solr.ltr.norm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +23,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrResourceLoader;
import org.junit.Test;
-public class TestMinMaxNormalizer {
+public class TestMinMaxNormalizer extends SolrTestCaseJ4 {
private final SolrResourceLoader solrResourceLoader =
new SolrResourceLoader(Paths.get("").toAbsolutePath());
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java
index dee5aab4f3f..d040f763ba6 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java
@@ -16,9 +16,6 @@
*/
package org.apache.solr.ltr.norm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +23,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrResourceLoader;
import org.junit.Test;
-public class TestStandardNormalizer {
+public class TestStandardNormalizer extends SolrTestCaseJ4 {
private final SolrResourceLoader solrResourceLoader =
new SolrResourceLoader(Paths.get("").toAbsolutePath());
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java
index 96eeda9f61d..ef745f481a1 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java
@@ -150,9 +150,10 @@ public class TestModelManager extends TestRerankBase {
assertJPut(ManagedModelStore.REST_END_POINT, multipleModels, "/responseHeader/status==0");
final String qryResult = JQ(ManagedModelStore.REST_END_POINT);
- assert (qryResult.contains("\"name\":\"testmodel3\"")
- && qryResult.contains("\"name\":\"testmodel4\"")
- && qryResult.contains("\"name\":\"testmodel5\""));
+ assertTrue(
+ qryResult.contains("\"name\":\"testmodel3\"")
+ && qryResult.contains("\"name\":\"testmodel4\"")
+ && qryResult.contains("\"name\":\"testmodel5\""));
assertJQ(ManagedModelStore.REST_END_POINT, "/models/[0]/name=='testmodel3'");
assertJQ(ManagedModelStore.REST_END_POINT, "/models/[1]/name=='testmodel4'");
diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java
index e714f8da8b2..d468281920d 100644
--- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java
+++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java
@@ -39,7 +39,6 @@ import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SolrParams;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -218,13 +217,13 @@ public class TestSQLHandler extends SolrCloudTestCase {
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
List<Tuple> tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
Tuple tuple;
tuple = tuples.get(0);
assertEquals(tuple.getLong("id").longValue(), 8);
assertEquals(tuple.getLong("field_i").longValue(), 60);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals("c", tuple.get("str_s"));
assertEquals(tuple.getLong("field_i").longValue(), 60L);
assertEquals(tuple.getDouble("field_f"), 60.5, 0.0);
assertEquals(tuple.getDouble("field_d"), 60.5, 0.0);
@@ -233,7 +232,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuple = tuples.get(1);
assertEquals(tuple.getLong("id").longValue(), 7);
assertEquals(tuple.getLong("field_i").longValue(), 50);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals("c", tuple.get("str_s"));
assertEquals(tuple.getLong("field_i").longValue(), 50);
assertEquals(tuple.getDouble("field_f"), 50.5, 0.0);
assertEquals(tuple.getDouble("field_d"), 50.5, 0.0);
@@ -242,7 +241,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuple = tuples.get(2);
assertEquals(tuple.getLong("id").longValue(), 6);
assertEquals(tuple.getLong("field_i").longValue(), 40);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals("c", tuple.get("str_s"));
assertEquals(tuple.getLong("field_i").longValue(), 40);
assertEquals(tuple.getDouble("field_f"), 40.5, 0.0);
assertEquals(tuple.getDouble("field_d"), 40.5, 0.0);
@@ -251,7 +250,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuple = tuples.get(3);
assertEquals(tuple.getLong("id").longValue(), 5);
assertEquals(tuple.getLong("field_i").longValue(), 30);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals("c", tuple.get("str_s"));
assertEquals(tuple.getLong("field_i").longValue(), 30);
assertEquals(tuple.getDouble("field_f"), 30.5, 0.0);
assertEquals(tuple.getDouble("field_d"), 30.5, 0.0);
@@ -260,7 +259,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuple = tuples.get(4);
assertEquals(tuple.getLong("id").longValue(), 3);
assertEquals(tuple.getLong("field_i").longValue(), 20);
- assert (tuple.get("str_s").equals("a"));
+ assertEquals("a", tuple.get("str_s"));
assertEquals(tuple.getLong("field_i").longValue(), 20);
assertEquals(tuple.getDouble("field_f"), 20.5, 0.0);
assertEquals(tuple.getDouble("field_d"), 20.5, 0.0);
@@ -269,7 +268,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuple = tuples.get(5);
assertEquals(tuple.getLong("id").longValue(), 4);
assertEquals(tuple.getLong("field_i").longValue(), 11);
- assert (tuple.get("str_s").equals("b"));
+ assertEquals("b", tuple.get("str_s"));
assertEquals(tuple.getLong("field_i").longValue(), 11);
assertEquals(tuple.getDouble("field_f"), 11.5, 0.0);
assertEquals(tuple.getDouble("field_d"), 11.5, 0.0);
@@ -278,7 +277,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuple = tuples.get(6);
assertEquals(tuple.getLong("id").longValue(), 2);
assertEquals(tuple.getLong("field_i").longValue(), 8);
- assert (tuple.get("str_s").equals("b"));
+ assertEquals("b", tuple.get("str_s"));
assertEquals(tuple.getLong("field_i").longValue(), 8);
assertEquals(tuple.getDouble("field_f"), 8.5, 0.0);
assertEquals(tuple.getDouble("field_d"), 8.5, 0.0);
@@ -287,7 +286,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuple = tuples.get(7);
assertEquals(tuple.getLong("id").longValue(), 1);
assertEquals(tuple.getLong("field_i").longValue(), 7);
- assert (tuple.get("str_s").equals("a"));
+ assertEquals("a", tuple.get("str_s"));
assertEquals(tuple.getLong("field_i").longValue(), 7);
assertEquals(tuple.getDouble("field_f"), 7.5, 0.0);
assertEquals(tuple.getDouble("field_d"), 7.5, 0.0);
@@ -306,47 +305,47 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("id") == 8);
- assert (tuple.getLong("field_i") == 60);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals(8, tuple.getLong("id").longValue());
+ assertEquals(60, tuple.getLong("field_i").longValue());
+ assertEquals("c", tuple.get("str_s"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 7);
- assert (tuple.getLong("field_i") == 50);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals(7, tuple.getLong("id").longValue());
+ assertEquals(50, tuple.getLong("field_i").longValue());
+ assertEquals("c", tuple.get("str_s"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 6);
- assert (tuple.getLong("field_i") == 40);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals(6, tuple.getLong("id").longValue());
+ assertEquals(40, tuple.getLong("field_i").longValue());
+ assertEquals("c", tuple.get("str_s"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 5);
- assert (tuple.getLong("field_i") == 30);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals(5, tuple.getLong("id").longValue());
+ assertEquals(30, tuple.getLong("field_i").longValue());
+ assertEquals("c", tuple.get("str_s"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 4);
- assert (tuple.getLong("field_i") == 11);
- assert (tuple.get("str_s").equals("b"));
+ assertEquals(4, tuple.getLong("id").longValue());
+ assertEquals(11, tuple.getLong("field_i").longValue());
+ assertEquals("b", tuple.get("str_s"));
tuple = tuples.get(5);
- assert (tuple.getLong("id") == 3);
- assert (tuple.getLong("field_i") == 20);
- assert (tuple.get("str_s").equals("a"));
+ assertEquals(3, tuple.getLong("id").longValue());
+ assertEquals(20, tuple.getLong("field_i").longValue());
+ assertEquals("a", tuple.get("str_s"));
tuple = tuples.get(6);
- assert (tuple.getLong("id") == 2);
- assert (tuple.getLong("field_i") == 8);
- assert (tuple.get("str_s").equals("b"));
+ assertEquals(2, tuple.getLong("id").longValue());
+ assertEquals(8, tuple.getLong("field_i").longValue());
+ assertEquals("b", tuple.get("str_s"));
tuple = tuples.get(7);
- assert (tuple.getLong("id") == 1);
- assert (tuple.getLong("field_i") == 7);
- assert (tuple.get("str_s").equals("a"));
+ assertEquals(1, tuple.getLong("id").longValue());
+ assertEquals(7, tuple.getLong("field_i").longValue());
+ assertEquals("a", tuple.get("str_s"));
sParams =
params(
@@ -357,12 +356,12 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("id") == 8);
- assert (tuple.getLong("field_i") == 60);
- assert (tuple.get("str_s").equals("c"));
+ assertEquals(8, tuple.getLong("id").longValue());
+ assertEquals(60, tuple.getLong("field_i").longValue());
+ assertEquals("c", tuple.get("str_s"));
sParams =
params(
@@ -373,22 +372,22 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("id") == 3);
- assert (tuple.getLong("field_i") == 20);
- assert (tuple.get("str_s").equals("a"));
+ assertEquals(3, tuple.getLong("id").longValue());
+ assertEquals(20, tuple.getLong("field_i").longValue());
+ assertEquals("a", tuple.get("str_s"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 2);
- assert (tuple.getLong("field_i") == 8);
- assert (tuple.get("str_s").equals("b"));
+ assertEquals(2, tuple.getLong("id").longValue());
+ assertEquals(8, tuple.getLong("field_i").longValue());
+ assertEquals("b", tuple.get("str_s"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 1);
- assert (tuple.getLong("field_i") == 7);
- assert (tuple.get("str_s").equals("a"));
+ assertEquals(1, tuple.getLong("id").longValue());
+ assertEquals(7, tuple.getLong("field_i").longValue());
+ assertEquals("a", tuple.get("str_s"));
sParams =
params(
@@ -399,22 +398,22 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("myId") == 3);
- assert (tuple.getLong("myInt") == 20);
- assert (tuple.get("myString").equals("a"));
+ assertEquals(3, tuple.getLong("myId").longValue());
+ assertEquals(20, tuple.getLong("myInt").longValue());
+ assertEquals("a", tuple.get("myString"));
tuple = tuples.get(1);
- assert (tuple.getLong("myId") == 2);
- assert (tuple.getLong("myInt") == 8);
- assert (tuple.get("myString").equals("b"));
+ assertEquals(2, tuple.getLong("myId").longValue());
+ assertEquals(8, tuple.getLong("myInt").longValue());
+ assertEquals("b", tuple.get("myString"));
tuple = tuples.get(2);
- assert (tuple.getLong("myId") == 1);
- assert (tuple.getLong("myInt") == 7);
- assert (tuple.get("myString").equals("a"));
+ assertEquals(1, tuple.getLong("myId").longValue());
+ assertEquals(7, tuple.getLong("myInt").longValue());
+ assertEquals("a", tuple.get("myString"));
sParams =
params(
@@ -425,22 +424,22 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("myId") == 3);
- assert (tuple.getLong("myInt") == 20);
- assert (tuple.get("myString").equals("a"));
+ assertEquals(3, tuple.getLong("myId").longValue());
+ assertEquals(20, tuple.getLong("myInt").longValue());
+ assertEquals("a", tuple.get("myString"));
tuple = tuples.get(1);
- assert (tuple.getLong("myId") == 2);
- assert (tuple.getLong("myInt") == 8);
- assert (tuple.get("myString").equals("b"));
+ assertEquals(2, tuple.getLong("myId").longValue());
+ assertEquals(8, tuple.getLong("myInt").longValue());
+ assertEquals("b", tuple.get("myString"));
tuple = tuples.get(2);
- assert (tuple.getLong("myId") == 1);
- assert (tuple.getLong("myInt") == 7);
- assert (tuple.get("myString").equals("a"));
+ assertEquals(1, tuple.getLong("myId").longValue());
+ assertEquals(7, tuple.getLong("myInt").longValue());
+ assertEquals("a", tuple.get("myString"));
// SOLR-8845 - Test to make sure that 1 = 0 works for things like Spark SQL
sParams =
@@ -685,44 +684,44 @@ public class TestSQLHandler extends SolrCloudTestCase {
Tuple tuple;
tuple = tuples.get(0);
- assert (tuple.getLong("id") == 8);
- assert (tuple.getLong("Field_i") == 60);
- assert (tuple.get("Str_s").equals("c"));
+ assertEquals(8, tuple.getLong("id").longValue());
+ assertEquals(60, tuple.getLong("Field_i").longValue());
+ assertEquals("c", tuple.get("Str_s"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 7);
- assert (tuple.getLong("Field_i") == 50);
- assert (tuple.get("Str_s").equals("c"));
+ assertEquals(7, tuple.getLong("id").longValue());
+ assertEquals(50, tuple.getLong("Field_i").longValue());
+ assertEquals("c", tuple.get("Str_s"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 6);
- assert (tuple.getLong("Field_i") == 40);
- assert (tuple.get("Str_s").equals("c"));
+ assertEquals(6, tuple.getLong("id").longValue());
+ assertEquals(40, tuple.getLong("Field_i").longValue());
+ assertEquals("c", tuple.get("Str_s"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 5);
- assert (tuple.getLong("Field_i") == 30);
- assert (tuple.get("Str_s").equals("c"));
+ assertEquals(5, tuple.getLong("id").longValue());
+ assertEquals(30, tuple.getLong("Field_i").longValue());
+ assertEquals("c", tuple.get("Str_s"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 3);
- assert (tuple.getLong("Field_i") == 20);
- assert (tuple.get("Str_s").equals("a"));
+ assertEquals(3, tuple.getLong("id").longValue());
+ assertEquals(20, tuple.getLong("Field_i").longValue());
+ assertEquals("a", tuple.get("Str_s"));
tuple = tuples.get(5);
- assert (tuple.getLong("id") == 4);
- assert (tuple.getLong("Field_i") == 11);
- assert (tuple.get("Str_s").equals("b"));
+ assertEquals(4, tuple.getLong("id").longValue());
+ assertEquals(11, tuple.getLong("Field_i").longValue());
+ assertEquals("b", tuple.get("Str_s"));
tuple = tuples.get(6);
- assert (tuple.getLong("id") == 2);
- assert (tuple.getLong("Field_i") == 8);
- assert (tuple.get("Str_s").equals("b"));
+ assertEquals(2, tuple.getLong("id").longValue());
+ assertEquals(8, tuple.getLong("Field_i").longValue());
+ assertEquals("b", tuple.get("Str_s"));
tuple = tuples.get(7);
- assert (tuple.getLong("id") == 1);
- assert (tuple.getLong("Field_i") == 7);
- assert (tuple.get("Str_s").equals("a"));
+ assertEquals(1, tuple.getLong("id").longValue());
+ assertEquals(7, tuple.getLong("Field_i").longValue());
+ assertEquals("a", tuple.get("Str_s"));
// TODO get sum(Field_i) as named one
sParams =
@@ -737,12 +736,12 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals(tuples.toString(), 2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("Str_s").equals("c"));
- assert (tuple.getDouble("EXPR$1") == 60);
+ assertEquals("c", tuple.get("Str_s"));
+ assertEquals(60, tuple.getDouble("EXPR$1"), 0.0);
tuple = tuples.get(1);
- assert (tuple.get("Str_s").equals("a"));
- assert (tuple.getDouble("EXPR$1") == 7);
+ assertEquals("a", tuple.get("Str_s"));
+ assertEquals(7, tuple.getDouble("EXPR$1"), 0.0);
sParams =
params(
@@ -755,15 +754,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("Str_s").equals("c"));
- assert (tuple.getDouble("EXPR$1") == 60);
+ assertEquals("c", tuple.get("Str_s"));
+ assertEquals(60, tuple.getDouble("EXPR$1"), 0.0);
tuple = tuples.get(1);
- assert (tuple.get("Str_s").equals("a"));
- assert (tuple.getDouble("EXPR$1") == 7);
+ assertEquals("a", tuple.get("Str_s"));
+ assertEquals(7, tuple.getDouble("EXPR$1"), 0.0);
}
@Test
@@ -795,33 +794,33 @@ public class TestSQLHandler extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(sParams, baseUrl);
// assert(false);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
Tuple tuple;
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
// reverse the sort
sParams =
@@ -835,31 +834,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
// reverse the sort
sParams =
@@ -873,31 +872,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("myInt") == 60);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(60, tuple.getLong("myInt").longValue());
tuple = tuples.get(1);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("myInt") == 50);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(50, tuple.getLong("myInt").longValue());
tuple = tuples.get(2);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("myInt") == 30);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(30, tuple.getLong("myInt").longValue());
tuple = tuples.get(3);
- assert (tuple.get("myString").equals("b"));
- assert (tuple.getLong("myInt") == 2);
+ assertEquals("b", tuple.get("myString"));
+ assertEquals(2, tuple.getLong("myInt").longValue());
tuple = tuples.get(4);
- assert (tuple.get("myString").equals("a"));
- assert (tuple.getLong("myInt") == 20);
+ assertEquals("a", tuple.get("myString"));
+ assertEquals(20, tuple.getLong("myInt").longValue());
tuple = tuples.get(5);
- assert (tuple.get("myString").equals("a"));
- assert (tuple.getLong("myInt") == 1);
+ assertEquals("a", tuple.get("myString"));
+ assertEquals(1, tuple.getLong("myInt").longValue());
// test with limit
sParams =
@@ -911,15 +910,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
// Test without a sort. Sort should be asc by default.
sParams =
@@ -933,36 +932,36 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
// Test with a predicate.
sParams =
@@ -976,15 +975,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
}
@Test
@@ -1015,30 +1014,30 @@ public class TestSQLHandler extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
Tuple tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
// reverse the sort
sParams =
@@ -1052,31 +1051,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
sParams =
params(
@@ -1089,31 +1088,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("myString").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("myString"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("myString").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("myString"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("myString").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("myString"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
// test with limit
sParams =
@@ -1127,15 +1126,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
// Test without a sort. Sort should be asc by default.
sParams =
@@ -1149,31 +1148,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
// Test with a predicate.
sParams =
@@ -1186,15 +1185,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
"select distinct str_s, field_i from collection1 where str_s = 'a'");
tuples = getTuples(sParams, baseUrl);
- Assert.assertEquals(tuples.toString(), 2, tuples.size());
+ assertEquals(tuples.toString(), 2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
}
@Test
@@ -1226,33 +1225,33 @@ public class TestSQLHandler extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
Tuple tuple;
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
// reverse the sort
sParams =
@@ -1268,31 +1267,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
// reverse the sort
sParams =
@@ -1308,31 +1307,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("myString").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("myString"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("myString").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("myString"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("myString").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("myString"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
// test with limit
sParams =
@@ -1348,15 +1347,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
// Test without a sort. Sort should be asc by default.
sParams =
@@ -1372,31 +1371,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getLong("field_i") == 2);
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getLong("field_i").longValue());
tuple = tuples.get(3);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 30);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(30, tuple.getLong("field_i").longValue());
tuple = tuples.get(4);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 50);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(50, tuple.getLong("field_i").longValue());
tuple = tuples.get(5);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getLong("field_i") == 60);
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(60, tuple.getLong("field_i").longValue());
// Test with a predicate.
sParams =
@@ -1412,15 +1411,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 1);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(1, tuple.getLong("field_i").longValue());
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getLong("field_i") == 20);
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(20, tuple.getLong("field_i").longValue());
}
@Test
@@ -1455,25 +1454,25 @@ public class TestSQLHandler extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(sParams, baseUrl);
// Only two results because of the limit.
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
Tuple tuple;
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("EXPR$2") == 19); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 8); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(19, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(8, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(11, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(9.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("EXPR$2") == 27); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 7); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 20); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 13.5D); // avg(field_i)
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(27, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(7, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(20, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(13.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
sParams =
params(
@@ -1489,23 +1488,23 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
// Only two results because of the limit.
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("EXPR$2") == 19); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 8); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 10); // avg(field_i)
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(19, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(8, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(11, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(10, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("EXPR$2") == 27); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 7); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 20); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 14); // avg(field_i)
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(27, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(7, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(20, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(14, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
sParams =
params(
@@ -1526,28 +1525,28 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals(tuples.toString(), 3, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("c"));
- assert (tuple.getDouble("EXPR$1") == 4); // count(*)
- assert (tuple.getDouble("EXPR$2") == 180); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 30); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 60); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 45); // avg(field_i)
+ assertEquals("c", tuple.get("str_s"));
+ assertEquals(4, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(180, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(30, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(60, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(45, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
tuple = tuples.get(1);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("EXPR$2") == 19); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 8); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(19, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(8, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(11, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(9.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
tuple = tuples.get(2);
- assert (tuple.get("str_s").equals("a"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("EXPR$2") == 27); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 7); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 20); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 13.5D); // avg(field_i)
+ assertEquals("a", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(27, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(7, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(20, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(13.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
sParams =
params(
@@ -1565,31 +1564,31 @@ public class TestSQLHandler extends SolrCloudTestCase {
// The sort by and order by match and no limit is applied. All the Tuples should be returned in
// this scenario.
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("myString").equals("c"));
- assert (tuple.getDouble("EXPR$1") == 4); // count(*)
- assert (tuple.getDouble("mySum") == 180);
- assert (tuple.getDouble("EXPR$3") == 30); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 60); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 45); // avg(field_i)
+ assertEquals("c", tuple.get("myString"));
+ assertEquals(4, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(180, tuple.getDouble("mySum"), 0.0);
+ assertEquals(30, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(60, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(45, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
tuple = tuples.get(1);
- assert (tuple.get("myString").equals("b"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("mySum") == 19);
- assert (tuple.getDouble("EXPR$3") == 8); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
+ assertEquals("b", tuple.get("myString"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(19, tuple.getDouble("mySum"), 0.0);
+ assertEquals(8, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(11, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(9.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
tuple = tuples.get(2);
- assert (tuple.get("myString").equals("a"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("mySum") == 27);
- assert (tuple.getDouble("EXPR$3") == 7); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 20); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 13.5D); // avg(field_i)
+ assertEquals("a", tuple.get("myString"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(27, tuple.getDouble("mySum"), 0.0);
+ assertEquals(7, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(20, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(13.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
sParams =
params(
@@ -1603,15 +1602,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("EXPR$2") == 19); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 8); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(19, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(8, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(11, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(9.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
sParams =
params(
@@ -1626,15 +1625,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("EXPR$2") == 19); // sum(field_i)
- assert (tuple.getDouble("EXPR$3") == 8); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(19, tuple.getDouble("EXPR$2"), 0.0); // sum(field_i)
+ assertEquals(8, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(11, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(9.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
sParams =
params(
@@ -1649,15 +1648,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
- assert (tuple.get("str_s").equals("b"));
- assert (tuple.getDouble("EXPR$1") == 2); // count(*)
- assert (tuple.getDouble("mySum") == 19);
- assert (tuple.getDouble("EXPR$3") == 8); // min(field_i)
- assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
- assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
+ assertEquals("b", tuple.get("str_s"));
+ assertEquals(2, tuple.getDouble("EXPR$1"), 0.0); // count(*)
+ assertEquals(19, tuple.getDouble("mySum"), 0.0);
+ assertEquals(8, tuple.getDouble("EXPR$3"), 0.0); // min(field_i)
+ assertEquals(11, tuple.getDouble("EXPR$4"), 0.0); // max(field_i)
+ assertEquals(9.5D, tuple.getDouble("EXPR$5"), 0.0); // avg(field_i)
sParams =
params(
@@ -1672,7 +1671,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 0);
+ assertEquals(0, tuples.size());
}
@Test
@@ -1704,7 +1703,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
// Test Long and Double Sums
@@ -1720,15 +1719,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
Double maxf = tuple.getDouble("EXPR$7"); // max(a_f)
Double avgf = tuple.getDouble("EXPR$8"); // avg(a_f)
- assertTrue(count == 10);
- assertTrue(sumi == 70);
- assertTrue(mini == 0.0D);
- assertTrue(maxi == 14.0D);
- assertTrue(avgi == 7.0D);
- assertTrue(sumf == 55.0D);
- assertTrue(minf == 1.0D);
- assertTrue(maxf == 10.0D);
- assertTrue(avgf == 5.5D);
+ assertEquals(10, count, 0.0);
+ assertEquals(70, sumi, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(7.0D, avgi, 0.0);
+ assertEquals(55.0D, sumf, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
sParams =
params(
@@ -1740,7 +1739,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
// Test Long and Double Sums
@@ -1756,15 +1755,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
maxf = tuple.getDouble("EXPR$7"); // max(a_f)
avgf = tuple.getDouble("EXPR$8"); // avg(a_f)
- assertTrue(count == 10);
- assertTrue(mini == 0.0D);
- assertTrue(maxi == 14.0D);
- assertTrue(sumi == 70);
- assertTrue(avgi == 7.0D);
- assertTrue(sumf == 55.0D);
- assertTrue(minf == 1.0D);
- assertTrue(maxf == 10.0D);
- assertTrue(avgf == 5.5D);
+ assertEquals(10, count, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(70, sumi, 0.0);
+ assertEquals(7.0D, avgi, 0.0);
+ assertEquals(55.0D, sumf, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
// Test without cast on average int field
sParams =
@@ -1777,7 +1776,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
// Test Long and Double Sums
@@ -1794,15 +1793,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
maxf = tuple.getDouble("EXPR$7"); // max(a_f)
avgf = tuple.getDouble("EXPR$8"); // avg(a_f)
- assertTrue(count == 10);
- assertTrue(mini == 0.0D);
- assertTrue(maxi == 14.0D);
- assertTrue(sumi == 70);
- assertTrue(avgi == 7);
- assertTrue(sumf == 55.0D);
- assertTrue(minf == 1.0D);
- assertTrue(maxf == 10.0D);
- assertTrue(avgf == 5.5D);
+ assertEquals(10, count, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(70, sumi, 0.0);
+ assertEquals(7, avgi, 0.0);
+ assertEquals(55.0D, sumf, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
// Test where clause hits
sParams =
@@ -1815,7 +1814,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
@@ -1829,15 +1828,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
maxf = tuple.getDouble("EXPR$7"); // max(a_f)
avgf = tuple.getDouble("EXPR$8"); // avg(a_f)
- assertTrue(count == 1);
- assertTrue(sumi == 2);
- assertTrue(mini == 2);
- assertTrue(maxi == 2);
- assertTrue(avgi == 2.0D);
- assertTrue(sumf == 2.0D);
- assertTrue(minf == 2);
- assertTrue(maxf == 2);
- assertTrue(avgf == 2.0);
+ assertEquals(1, count, 0.0);
+ assertEquals(2, sumi, 0.0);
+ assertEquals(2, mini, 0.0);
+ assertEquals(2, maxi, 0.0);
+ assertEquals(2.0D, avgi, 0.0);
+ assertEquals(2.0D, sumf, 0.0);
+ assertEquals(2, minf, 0.0);
+ assertEquals(2, maxf, 0.0);
+ assertEquals(2.0, avgf, 0.0);
// Test zero hits
sParams =
@@ -1850,7 +1849,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
@@ -1864,15 +1863,15 @@ public class TestSQLHandler extends SolrCloudTestCase {
maxf = tuple.getDouble("EXPR$7"); // max(a_f)
avgf = tuple.getDouble("EXPR$8"); // avg(a_f)
- assertTrue(count == 0);
- assertTrue(sumi == null);
- assertTrue(mini == null);
- assertTrue(maxi == null);
- assertTrue(avgi == null);
- assertTrue(sumf == null);
- assertTrue(minf == null);
- assertTrue(maxf == null);
- assertTrue(avgf == null);
+ assertEquals(0, count, 0.0);
+ assertNull(sumi);
+ assertNull(mini);
+ assertNull(maxi);
+ assertNull(avgi);
+ assertNull(sumf);
+ assertNull(minf);
+ assertNull(maxf);
+ assertNull(avgf);
// test bunch of where predicates
sParams =
@@ -1884,7 +1883,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
+ "min(a_f), max(a_f), avg(a_f) from collection1 where id = 2 AND a_s='hello0' AND a_i=2 AND a_f=2");
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
}
@Test
@@ -1915,17 +1914,17 @@ public class TestSQLHandler extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
Tuple tuple;
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getDouble("EXPR$1") == 66); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(66, tuple.getDouble("EXPR$1"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getDouble("EXPR$1") == 7); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(7, tuple.getDouble("EXPR$1"), 0.0); // sum(item_i)
sParams =
params(
@@ -1937,22 +1936,22 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.getDouble("EXPR$2") == 57); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertEquals(57, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getDouble("EXPR$2") == 9); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(9, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
tuple = tuples.get(2);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getDouble("EXPR$2") == 7); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(7, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
sParams =
params(
@@ -1964,43 +1963,43 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.getLong("day_i") == 8);
- assert (tuple.getDouble("EXPR$3") == 42); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertEquals(8, tuple.getLong("day_i").longValue());
+ assertEquals(42, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.getLong("day_i") == 7);
- assert (tuple.getDouble("EXPR$3") == 15); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertEquals(7, tuple.getLong("day_i").longValue());
+ assertEquals(15, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(2);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getLong("day_i") == 3);
- assert (tuple.getDouble("EXPR$3") == 5); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(3, tuple.getLong("day_i").longValue());
+ assertEquals(5, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(3);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getLong("day_i") == 1);
- assert (tuple.getDouble("EXPR$3") == 4); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(1, tuple.getLong("day_i").longValue());
+ assertEquals(4, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(4);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getLong("day_i") == 4);
- assert (tuple.getDouble("EXPR$3") == 6); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(4, tuple.getLong("day_i").longValue());
+ assertEquals(6, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(5);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getLong("day_i") == 2);
- assert (tuple.getDouble("EXPR$3") == 1); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(2, tuple.getLong("day_i").longValue());
+ assertEquals(1, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
}
@Test
@@ -2031,9 +2030,9 @@ public class TestSQLHandler extends SolrCloudTestCase {
SolrStream solrStream = new SolrStream(baseUrl, sParams);
Tuple tuple = getTuple(new ExceptionStream(solrStream));
- assert (tuple.EOF);
- assert (tuple.EXCEPTION);
- assert (tuple.getException().contains("Column 'field_iff' not found in any table"));
+ assertTrue(tuple.EOF);
+ assertTrue(tuple.EXCEPTION);
+ assertTrue(tuple.getException().contains("Column 'field_iff' not found in any table"));
sParams =
params(
@@ -2044,10 +2043,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
solrStream = new SolrStream(baseUrl, sParams);
tuple = getTuple(new ExceptionStream(solrStream));
- assert (tuple.EOF);
- assert (tuple.EXCEPTION);
+ assertTrue(tuple.EOF);
+ assertTrue(tuple.EXCEPTION);
- assert (tuple.getException().contains("Column 'field_iff' not found in any table"));
+ assertTrue(tuple.getException().contains("Column 'field_iff' not found in any table"));
sParams =
params(
@@ -2060,9 +2059,9 @@ public class TestSQLHandler extends SolrCloudTestCase {
solrStream = new SolrStream(baseUrl, sParams);
tuple = getTuple(new ExceptionStream(solrStream));
- assert (tuple.EOF);
- assert (tuple.EXCEPTION);
- assert (tuple.getException().contains("Column 'field_iff' not found in any table"));
+ assertTrue(tuple.EOF);
+ assertTrue(tuple.EXCEPTION);
+ assertTrue(tuple.getException().contains("Column 'field_iff' not found in any table"));
sParams =
params(
@@ -2075,9 +2074,9 @@ public class TestSQLHandler extends SolrCloudTestCase {
solrStream = new SolrStream(baseUrl, sParams);
tuple = getTuple(new ExceptionStream(solrStream));
- assert (tuple.EOF);
- assert (tuple.EXCEPTION);
- assert (tuple.getException().contains("No match found for function signature blah"));
+ assertTrue(tuple.EOF);
+ assertTrue(tuple.EXCEPTION);
+ assertTrue(tuple.getException().contains("No match found for function signature blah"));
// verify exception message formatting with wildcard query
sParams =
@@ -2091,9 +2090,9 @@ public class TestSQLHandler extends SolrCloudTestCase {
solrStream = new SolrStream(baseUrl, sParams);
tuple = getTuple(new ExceptionStream(solrStream));
- assert (tuple.EOF);
- assert (tuple.EXCEPTION);
- assert (tuple.getException().contains("Column 'not_a_field' not found in any table"));
+ assertTrue(tuple.EOF);
+ assertTrue(tuple.EXCEPTION);
+ assertTrue(tuple.getException().contains("Column 'not_a_field' not found in any table"));
}
@Test
@@ -2124,17 +2123,17 @@ public class TestSQLHandler extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
Tuple tuple;
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getDouble("EXPR$1") == 66); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(66, tuple.getDouble("EXPR$1"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getDouble("EXPR$1") == 7); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(7, tuple.getDouble("EXPR$1"), 0.0); // sum(item_i)
sParams =
params(
@@ -2148,22 +2147,22 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.getDouble("EXPR$2") == 57); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertEquals(57, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getDouble("EXPR$2") == 9); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(9, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
tuple = tuples.get(2);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getDouble("EXPR$2") == 7); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(7, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
sParams =
params(
@@ -2177,43 +2176,43 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.getLong("day_i") == 8);
- assert (tuple.getDouble("EXPR$3") == 42); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertEquals(8, tuple.getLong("day_i").longValue());
+ assertEquals(42, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.getLong("day_i") == 7);
- assert (tuple.getDouble("EXPR$3") == 15); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertEquals(7, tuple.getLong("day_i").longValue());
+ assertEquals(15, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(2);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getLong("day_i") == 3);
- assert (tuple.getDouble("EXPR$3") == 5); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(3, tuple.getLong("day_i").longValue());
+ assertEquals(5, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(3);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getLong("day_i") == 1);
- assert (tuple.getDouble("EXPR$3") == 4); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(1, tuple.getLong("day_i").longValue());
+ assertEquals(4, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(4);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getLong("day_i") == 4);
- assert (tuple.getDouble("EXPR$3") == 6); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(4, tuple.getLong("day_i").longValue());
+ assertEquals(6, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(5);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getLong("day_i") == 2);
- assert (tuple.getDouble("EXPR$3") == 1); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(2, tuple.getLong("day_i").longValue());
+ assertEquals(1, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
}
@Test
@@ -2246,20 +2245,21 @@ public class TestSQLHandler extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
Tuple tuple;
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.get("year_i")
- instanceof Long); // SOLR-8601, This tests that the bucket is actually a Long and not
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertTrue(
+ tuple.get("year_i")
+ instanceof Long); // SOLR-8601, This tests that the bucket is actually a Long and not
// parsed from a String.
- assert (tuple.getDouble("EXPR$1") == 66); // sum(item_i)
+ assertEquals(66, tuple.getDouble("EXPR$1"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getDouble("EXPR$1") == 7); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(7, tuple.getDouble("EXPR$1"), 0.0); // sum(item_i)
sParams =
params(
@@ -2275,24 +2275,24 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.get("year_i") instanceof Long);
- assert (tuple.get("month_i") instanceof Long);
- assert (tuple.getDouble("EXPR$2") == 57); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertTrue(tuple.get("year_i") instanceof Long);
+ assertTrue(tuple.get("month_i") instanceof Long);
+ assertEquals(57, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getDouble("EXPR$2") == 9); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(9, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
tuple = tuples.get(2);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getDouble("EXPR$2") == 7); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(7, tuple.getDouble("EXPR$2"), 0.0); // sum(item_i)
sParams =
params(
@@ -2308,43 +2308,43 @@ public class TestSQLHandler extends SolrCloudTestCase {
tuples = getTuples(sParams, baseUrl);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.getLong("day_i") == 8);
- assert (tuple.getDouble("EXPR$3") == 42); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertEquals(8, tuple.getLong("day_i").longValue());
+ assertEquals(42, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(1);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 11);
- assert (tuple.getLong("day_i") == 7);
- assert (tuple.getDouble("EXPR$3") == 15); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(11, tuple.getLong("month_i").longValue());
+ assertEquals(7, tuple.getLong("day_i").longValue());
+ assertEquals(15, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(2);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getLong("day_i") == 3);
- assert (tuple.getDouble("EXPR$3") == 5); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(3, tuple.getLong("day_i").longValue());
+ assertEquals(5, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(3);
- assert (tuple.getLong("year_i") == 2015);
- assert (tuple.getLong("month_i") == 10);
- assert (tuple.getLong("day_i") == 1);
- assert (tuple.getDouble("EXPR$3") == 4); // sum(item_i)
+ assertEquals(2015, tuple.getLong("year_i").longValue());
+ assertEquals(10, tuple.getLong("month_i").longValue());
+ assertEquals(1, tuple.getLong("day_i").longValue());
+ assertEquals(4, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(4);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getLong("day_i") == 4);
- assert (tuple.getDouble("EXPR$3") == 6); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(4, tuple.getLong("day_i").longValue());
+ assertEquals(6, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
tuple = tuples.get(5);
- assert (tuple.getLong("year_i") == 2014);
- assert (tuple.getLong("month_i") == 4);
- assert (tuple.getLong("day_i") == 2);
- assert (tuple.getDouble("EXPR$3") == 1); // sum(item_i)
+ assertEquals(2014, tuple.getLong("year_i").longValue());
+ assertEquals(4, tuple.getLong("month_i").longValue());
+ assertEquals(2, tuple.getLong("day_i").longValue());
+ assertEquals(1, tuple.getDouble("EXPR$3"), 0.0); // sum(item_i)
}
protected List<Tuple> getTuples(final SolrParams params, String baseUrl) throws IOException {
@@ -2633,7 +2633,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
expectResults(
"SELECT COUNT(1) as `the_count` FROM $ALIAS as `alias` WHERE (`alias`.`b_s`='foo' AND `alias`.`a_s` LIKE 'hell%' AND `alias`.`c_s` IS NOT NULL) HAVING (COUNT(1) > 0)",
1);
- assertEquals(4L, (long) tuples.get(0).getLong("the_count"));
+ assertEquals(4L, tuples.get(0).getLong("the_count").longValue());
}
@Test
@@ -2797,16 +2797,16 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("C", stats.getString("max_stringx"));
assertEquals("aaa", stats.getString("min_textx"));
assertEquals("ccc", stats.getString("max_textx"));
- assertEquals(1L, (long) stats.getLong("min_tintx"));
- assertEquals(3L, (long) stats.getLong("max_tintx"));
- assertEquals(2L, (long) stats.getLong("min_pintx"));
- assertEquals(6L, (long) stats.getLong("max_pintx"));
- assertEquals(1L, (long) stats.getLong("min_pintxs"));
- assertEquals(7L, (long) stats.getLong("max_pintxs"));
- assertEquals(1623875868000L, (long) stats.getLong("min_tlongx"));
- assertEquals(1823875868000L, (long) stats.getLong("max_tlongx"));
- assertEquals(1623875868000L, (long) stats.getLong("min_plongx"));
- assertEquals(1823875868000L, (long) stats.getLong("max_plongx"));
+ assertEquals(1L, stats.getLong("min_tintx").longValue());
+ assertEquals(3L, stats.getLong("max_tintx").longValue());
+ assertEquals(2L, stats.getLong("min_pintx").longValue());
+ assertEquals(6L, stats.getLong("max_pintx").longValue());
+ assertEquals(1L, stats.getLong("min_pintxs").longValue());
+ assertEquals(7L, stats.getLong("max_pintxs").longValue());
+ assertEquals(1623875868000L, stats.getLong("min_tlongx").longValue());
+ assertEquals(1823875868000L, stats.getLong("max_tlongx").longValue());
+ assertEquals(1623875868000L, stats.getLong("min_plongx").longValue());
+ assertEquals(1823875868000L, stats.getLong("max_plongx").longValue());
final double delta = 0.00001d;
assertEquals(3.33d, stats.getDouble("min_tfloatx"), delta);
assertEquals(5.55d, stats.getDouble("max_tfloatx"), delta);
@@ -2923,8 +2923,8 @@ public class TestSQLHandler extends SolrCloudTestCase {
"SELECT COUNT(1) AS total_rows, COUNT(distinct str_s) AS distinct_str, MIN(str_s) AS min_str, MAX(str_s) AS max_str FROM $ALIAS",
1);
Tuple firstRow = tuples.get(0);
- assertEquals(maxDocs, (long) firstRow.getLong("total_rows"));
- assertEquals(cardinality, (long) firstRow.getLong("distinct_str"));
+ assertEquals(maxDocs, firstRow.getLong("total_rows").longValue());
+ assertEquals(cardinality, firstRow.getLong("distinct_str").longValue());
String expectedMin = String.format(Locale.ROOT, padFmt, 0);
String expectedMax = String.format(Locale.ROOT, padFmt, cardinality - 1); // max is card-1
@@ -2940,13 +2940,13 @@ public class TestSQLHandler extends SolrCloudTestCase {
expectResults(
"SELECT APPROX_COUNT_DISTINCT(distinct str_s) AS approx_distinct FROM $ALIAS", 1);
firstRow = tuples.get(0);
- assertEquals(cardinality, (long) firstRow.getLong("approx_distinct"));
+ assertEquals(cardinality, firstRow.getLong("approx_distinct").longValue());
tuples =
expectResults(
"SELECT country_s, COUNT(*) AS count_per_bucket FROM $ALIAS GROUP BY country_s", 2);
- assertEquals(maxDocs / 2L, (long) tuples.get(0).getLong("count_per_bucket"));
- assertEquals(maxDocs / 2L, (long) tuples.get(1).getLong("count_per_bucket"));
+ assertEquals(maxDocs / 2L, tuples.get(0).getLong("count_per_bucket").longValue());
+ assertEquals(maxDocs / 2L, tuples.get(1).getLong("count_per_bucket").longValue());
}
private UpdateRequest addDocForDistinctTests(
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.java
index 7e9254780c0..de2d754c8f6 100644
--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.java
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.java
@@ -17,8 +17,6 @@
package org.apache.solr.prometheus.collector;
-import static org.junit.Assert.assertEquals;
-
import io.prometheus.client.Collector;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,9 +25,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.solr.SolrTestCase;
import org.junit.Test;
-public class MetricSamplesTest {
+public class MetricSamplesTest extends SolrTestCase {
private Collector.MetricFamilySamples.Sample sample(String name, Double value) {
return new Collector.MetricFamilySamples.Sample(
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.java
index c315a81b1fa..9a23a1f19d8 100644
--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.java
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.java
@@ -18,9 +18,6 @@
package org.apache.solr.prometheus.exporter;
import static org.apache.solr.prometheus.exporter.MetricsConfiguration.xpathFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -36,7 +33,7 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
-public class MetricsQueryTemplateTest {
+public class MetricsQueryTemplateTest extends SolrTestCaseJ4 {
@Test
public void testTemplatesApplyDuringInit() throws Exception {
MetricsConfiguration config = Helpers.loadConfiguration("conf/test-config-with-templates.xml");
@@ -128,7 +125,7 @@ public class MetricsQueryTemplateTest {
JsonQuery jsonQuery = JsonQuery.compile(coreQueryTemplate.applyTemplate(matcher));
List<JsonNode> results = jsonQuery.apply(parsedMetrics);
assertNotNull(results);
- assertTrue(results.size() == 1);
+ assertEquals(1, results.size());
double value = results.get(0).get("value").doubleValue();
assertEquals(expectedMetrics[m], value, 0.0001);
}
diff --git a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java
index 716231ff62f..71bcbf9037d 100644
--- a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java
+++ b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java
@@ -764,9 +764,9 @@ public class JsonRequestApiTest extends SolrCloudTestCase {
private void assertHasFacetWithBucketValues(
NestableJsonFacet response, String expectedFacetName, FacetBucket... expectedBuckets) {
- assertTrue(
+ assertNotNull(
"Expected response to have facet with name " + expectedFacetName,
- response.getBucketBasedFacets(expectedFacetName) != null);
+ response.getBucketBasedFacets(expectedFacetName));
final List<BucketJsonFacet> buckets =
response.getBucketBasedFacets(expectedFacetName).getBuckets();
assertEquals(expectedBuckets.length, buckets.size());
diff --git a/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java b/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java
index 086c9159091..a86e9264225 100644
--- a/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java
+++ b/solr/solrj-zookeeper/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java
@@ -185,9 +185,9 @@ public class SolrZkClientTest extends SolrCloudTestCase {
Watcher wrapped1A = defaultClient.wrapWatcher(watcherA);
Watcher wrapped2A = defaultClient.wrapWatcher(watcherA);
Watcher wrappedB = defaultClient.wrapWatcher(watcherB);
- assertTrue(wrapped1A.equals(wrapped2A));
- assertTrue(wrapped2A.equals(wrapped1A));
- assertFalse(wrapped1A.equals(wrappedB));
+ assertEquals(wrapped1A, wrapped2A);
+ assertEquals(wrapped2A, wrapped1A);
+ assertNotEquals(wrapped1A, wrappedB);
assertEquals(wrapped1A.hashCode(), wrapped2A.hashCode());
CollectionAdminRequest.createCollection(getSaferTestName(), "_default", 1, 1)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
index bc0deddaa77..02664119495 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
@@ -77,7 +77,6 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.Pair;
import org.apache.solr.util.RTimer;
import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.noggit.JSONParser;
@@ -319,26 +318,26 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
doc.addField("id", docID);
doc.addField("name", "my name!");
- Assert.assertEquals(null, doc.getField("foo"));
- Assert.assertTrue(doc.getField("name").getValue() != null);
+ assertNull(doc.getField("foo"));
+ assertNotNull(doc.getField("name").getValue());
UpdateResponse upres = client.add(doc);
// System.out.println( "ADD:"+upres.getResponse() );
- Assert.assertEquals(0, upres.getStatus());
+ assertEquals(0, upres.getStatus());
upres = client.commit(true, true);
// System.out.println( "COMMIT:"+upres.getResponse() );
- Assert.assertEquals(0, upres.getStatus());
+ assertEquals(0, upres.getStatus());
upres = client.optimize(true, true);
// System.out.println( "OPTIMIZE:"+upres.getResponse() );
- Assert.assertEquals(0, upres.getStatus());
+ assertEquals(0, upres.getStatus());
SolrQuery query = new SolrQuery();
query.setQuery("id:" + docID);
QueryResponse response = client.query(query);
- Assert.assertEquals(docID, response.getResults().get(0).getFieldValue("id"));
+ assertEquals(docID, response.getResults().get(0).getFieldValue("id"));
// Now add a few docs for facet testing...
List<SolrInputDocument> docs = new ArrayList<>();
@@ -369,15 +368,15 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
upres = client.add(docs);
// System.out.println( "ADD:"+upres.getResponse() );
- Assert.assertEquals(0, upres.getStatus());
+ assertEquals(0, upres.getStatus());
upres = client.commit(true, true);
// System.out.println( "COMMIT:"+upres.getResponse() );
- Assert.assertEquals(0, upres.getStatus());
+ assertEquals(0, upres.getStatus());
upres = client.optimize(true, true);
// System.out.println( "OPTIMIZE:"+upres.getResponse() );
- Assert.assertEquals(0, upres.getStatus());
+ assertEquals(0, upres.getStatus());
query = new SolrQuery("*:*");
query.addFacetQuery("price:[* TO 2]");
@@ -389,20 +388,20 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
query.removeFilterQuery("inStock:true");
response = client.query(query);
- Assert.assertEquals(0, response.getStatus());
- Assert.assertEquals(5, response.getResults().getNumFound());
- Assert.assertEquals(3, response.getFacetQuery().size());
- Assert.assertEquals(2, response.getFacetField("inStock").getValueCount());
- Assert.assertEquals(4, response.getFacetField("price").getValueCount());
+ assertEquals(0, response.getStatus());
+ assertEquals(5, response.getResults().getNumFound());
+ assertEquals(3, response.getFacetQuery().size());
+ assertEquals(2, response.getFacetField("inStock").getValueCount());
+ assertEquals(4, response.getFacetField("price").getValueCount());
// test a second query, test making a copy of the main query
SolrQuery query2 = query.getCopy();
query2.addFilterQuery("inStock:true");
- Assert.assertFalse(query.getFilterQueries() == query2.getFilterQueries());
+ assertNotSame(query.getFilterQueries(), query2.getFilterQueries());
response = client.query(query2);
- Assert.assertEquals(1, query2.getFilterQueries().length);
- Assert.assertEquals(0, response.getStatus());
- Assert.assertEquals(2, response.getResults().getNumFound());
+ assertEquals(1, query2.getFilterQueries().length);
+ assertEquals(0, response.getStatus());
+ assertEquals(2, response.getResults().getNumFound());
for (SolrDocument outDoc : response.getResults()) {
assertEquals(true, outDoc.getFieldValue("inStock"));
}
@@ -425,16 +424,16 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
assertTrue(
"echoed fq is not a List: " + echo.get("fq").getClass(), echo.get("fq") instanceof List);
values = (List) echo.get("fq");
- Assert.assertEquals(2, values.size());
- Assert.assertEquals("{!field f=inStock}true", values.get(0));
- Assert.assertEquals("{!term f=name}hoss", values.get(1));
+ assertEquals(2, values.size());
+ assertEquals("{!field f=inStock}true", values.get(0));
+ assertEquals("{!term f=name}hoss", values.get(1));
assertTrue(
"echoed facet.query is not a List: " + echo.get("facet.query").getClass(),
echo.get("facet.query") instanceof List);
values = (List) echo.get("facet.query");
- Assert.assertEquals(2, values.size());
- Assert.assertEquals("price:[* TO 2]", values.get(0));
- Assert.assertEquals("price:[2 TO 4]", values.get(1));
+ assertEquals(2, values.size());
+ assertEquals("price:[* TO 2]", values.get(0));
+ assertEquals("price:[2 TO 4]", values.get(1));
if (jetty != null) {
// check system wide system handler + "/admin/info/system"
@@ -884,7 +883,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
client.deleteByQuery("*:*"); // delete everything!
client.commit();
QueryResponse rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(0, rsp.getResults().getNumFound());
+ assertEquals(0, rsp.getResults().getNumFound());
ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update");
File file = getFile("solrj/books.csv");
@@ -923,7 +922,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
assertEquals("close exactly once", 1, closed[0]);
}
rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(10, rsp.getResults().getNumFound());
+ assertEquals(10, rsp.getResults().getNumFound());
}
@Test
@@ -932,7 +931,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
client.deleteByQuery("*:*"); // delete everything!
client.commit();
QueryResponse rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(0, rsp.getResults().getNumFound());
+ assertEquals(0, rsp.getResults().getNumFound());
NamedList<Object> result =
client.request(
new StreamingUpdateRequest(
@@ -940,7 +939,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true));
assertNotNull("Couldn't upload books.csv", result);
rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(10, rsp.getResults().getNumFound());
+ assertEquals(10, rsp.getResults().getNumFound());
}
@Test
@@ -949,7 +948,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
client.deleteByQuery("*:*"); // delete everything!
client.commit();
QueryResponse rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(0, rsp.getResults().getNumFound());
+ assertEquals(0, rsp.getResults().getNumFound());
List<Pair<NamedList<String>, Object>> docs = new ArrayList<>();
NamedList<String> params = new NamedList<>();
@@ -965,7 +964,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
NamedList<Object> result = client.request(up);
System.out.println(result.jsonStr());
rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(12, rsp.getResults().getNumFound());
+ assertEquals(12, rsp.getResults().getNumFound());
}
private ByteBuffer getFileContent(NamedList<?> nl, String name) throws IOException {
@@ -980,7 +979,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
client.deleteByQuery("*:*"); // delete everything!
client.commit();
QueryResponse rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(0, rsp.getResults().getNumFound());
+ assertEquals(0, rsp.getResults().getNumFound());
ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update");
up.addFile(getFile("solrj/docs1.xml"), "application/xml"); // 2
@@ -989,11 +988,11 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
up.setParam(CommonParams.HEADER_ECHO_PARAMS, CommonParams.EchoParamStyle.ALL.toString());
up.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
NamedList<Object> result = client.request(up);
- Assert.assertEquals(
+ assertEquals(
"\u1234", ((NamedList) ((NamedList) result.get("responseHeader")).get("params")).get("a"));
assertNotNull("Couldn't upload xml files", result);
rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(5, rsp.getResults().getNumFound());
+ assertEquals(5, rsp.getResults().getNumFound());
}
@Test
@@ -1445,7 +1444,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
// now get deeper and look at the pivots...
NamedList<List<PivotField>> pivots = rsp.getFacetPivot();
- assertTrue(!pivots.get("pivot_key").isEmpty());
+ assertFalse(pivots.get("pivot_key").isEmpty());
List<PivotField> list = pivots.get("pivot_key");
PivotField featuresBBBPivot = list.get(0);
@@ -2130,7 +2129,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
if (missing) {
ff = pivot.get(2);
assertEquals("features", ff.getField());
- assertEquals(null, ff.getValue());
+ assertNull(ff.getValue());
assertEquals(1, ff.getCount());
counts = ff.getPivot();
assertEquals(1, counts.size());
@@ -2164,7 +2163,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
assertEquals("aaa", counts.get(1).getValue());
assertEquals(2, counts.get(1).getCount());
if (missing) {
- assertEquals(null, counts.get(2).getValue());
+ assertNull(counts.get(2).getValue());
assertEquals(1, counts.get(2).getCount());
}
@@ -2220,7 +2219,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
if (missing) {
p = pivot.get(2);
assertEquals("features", p.getField());
- assertEquals(null, p.getValue());
+ assertNull(p.getValue());
assertEquals(1, p.getCount());
assertEquals(1, p.getPivot().size());
p = p.getPivot().get(0);
@@ -2230,9 +2229,9 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
assertEquals(1, p.getPivot().size());
p = p.getPivot().get(0);
assertEquals("inStock", p.getField());
- assertEquals(null, p.getValue());
+ assertNull(p.getValue());
assertEquals(1, p.getCount());
- assertEquals(null, p.getPivot());
+ assertNull(p.getPivot());
}
// -- SOLR-2255 Test excluding a filter Query --
@@ -2876,9 +2875,10 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
assertNotNull("MoreLikeThis response for id=" + id + " should not be null", mltResp);
assertTrue(
"MoreLikeThis response for id=" + id + " had numFound=0", mltResp.getNumFound() > 0);
- assertTrue(
+ assertEquals(
"MoreLikeThis response for id=" + id + " had not returned exactly 2 documents",
- mltResp.size() == 2);
+ 2,
+ mltResp.size());
}
// now test with multiple mlt.fl parameters
@@ -2898,9 +2898,10 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
assertNotNull("MoreLikeThis response for id=" + id + " should not be null", mltResp);
assertTrue(
"MoreLikeThis response for id=" + id + " had numFound=0", mltResp.getNumFound() > 0);
- assertTrue(
+ assertEquals(
"MoreLikeThis response for id=" + id + " had not returned exactly 2 documents",
- mltResp.size() == 2);
+ 2,
+ mltResp.size());
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
index aef8ca94e06..19c0c2407b4 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
@@ -31,7 +31,6 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.TimeSource;
import org.apache.solr.util.TimeOut;
-import org.junit.Assert;
import org.junit.Test;
public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
@@ -44,7 +43,7 @@ public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
client.deleteByQuery("*:*"); // delete everything!
client.commit();
QueryResponse rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(0, rsp.getResults().getNumFound());
+ assertEquals(0, rsp.getResults().getNumFound());
// Now try a timed commit...
SolrInputDocument doc3 = new SolrInputDocument();
@@ -58,7 +57,7 @@ public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
up.process(client);
rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(0, rsp.getResults().getNumFound());
+ assertEquals(0, rsp.getResults().getNumFound());
// TODO: not a great way to test this - timing is easily out
// of whack due to parallel tests and various computer specs/load
@@ -81,7 +80,7 @@ public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
rsp = client.query(new SolrQuery("id:id3"));
}
- Assert.assertEquals(1, rsp.getResults().getNumFound());
+ assertEquals(1, rsp.getResults().getNumFound());
// Now test the new convenience parameter on the add() for commitWithin
SolrInputDocument doc4 = new SolrInputDocument();
@@ -109,7 +108,7 @@ public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
rsp = client.query(new SolrQuery("id:id3"));
}
- Assert.assertEquals(1, rsp.getResults().getNumFound());
+ assertEquals(1, rsp.getResults().getNumFound());
}
@Test
@@ -119,7 +118,7 @@ public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
client.deleteByQuery("*:*"); // delete everything!
client.commit();
QueryResponse rsp = client.query(new SolrQuery("*:*"));
- Assert.assertEquals(0, rsp.getResults().getNumFound());
+ assertEquals(0, rsp.getResults().getNumFound());
// Now add one document...
SolrInputDocument doc3 = new SolrInputDocument();
@@ -131,7 +130,7 @@ public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
// now check that it comes out...
rsp = client.query(new SolrQuery("id:id3"));
- Assert.assertEquals(1, rsp.getResults().getNumFound());
+ assertEquals(1, rsp.getResults().getNumFound());
// now test commitWithin on a delete
UpdateRequest up = new UpdateRequest();
@@ -141,7 +140,7 @@ public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
// the document should still be there
rsp = client.query(new SolrQuery("id:id3"));
- Assert.assertEquals(1, rsp.getResults().getNumFound());
+ assertEquals(1, rsp.getResults().getNumFound());
// check if the doc has been deleted every 250 ms for 30 seconds
TimeOut timeout = new TimeOut(30, TimeUnit.SECONDS, TimeSource.NANO_TIME);
@@ -154,7 +153,7 @@ public abstract class SolrExampleTestsBase extends SolrJettyTestBase {
}
} while (!timeout.hasTimedOut());
- Assert.fail("commitWithin failed to commit");
+ fail("commitWithin failed to commit");
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
index 3199601d1e3..2786fd64385 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
@@ -29,7 +29,6 @@ import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.SolrQuery.SortClause;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.FacetParams;
-import org.junit.Assert;
/**
* @since solr 1.3
@@ -43,58 +42,58 @@ public class SolrQueryTest extends SolrTestCase {
q.setFacetLimit(10);
q.addFacetField("price");
q.addFacetField("state");
- Assert.assertEquals(q.getFacetFields().length, 2);
+ assertEquals(q.getFacetFields().length, 2);
q.addFacetQuery("instock:true");
q.addFacetQuery("instock:false");
q.addFacetQuery("a:b");
- Assert.assertEquals(q.getFacetQuery().length, 3);
+ assertEquals(q.getFacetQuery().length, 3);
b = q.removeFacetField("price");
- Assert.assertEquals(b, true);
+ assertTrue(b);
b = q.removeFacetField("price2");
- Assert.assertEquals(b, false);
+ assertFalse(b);
b = q.removeFacetField("state");
- Assert.assertEquals(b, true);
- Assert.assertNull(q.getFacetFields());
+ assertTrue(b);
+ assertNull(q.getFacetFields());
b = q.removeFacetQuery("instock:true");
- Assert.assertEquals(b, true);
+ assertTrue(b);
b = q.removeFacetQuery("instock:false");
b = q.removeFacetQuery("a:c");
- Assert.assertEquals(b, false);
+ assertFalse(b);
b = q.removeFacetQuery("a:b");
- Assert.assertNull(q.getFacetQuery());
+ assertNull(q.getFacetQuery());
q.addSort("price", SolrQuery.ORDER.asc);
q.addSort("date", SolrQuery.ORDER.desc);
q.addSort("qty", SolrQuery.ORDER.desc);
q.removeSort(new SortClause("date", SolrQuery.ORDER.desc));
- Assert.assertEquals(2, q.getSorts().size());
+ assertEquals(2, q.getSorts().size());
q.removeSort(new SortClause("price", SolrQuery.ORDER.asc));
q.removeSort(new SortClause("qty", SolrQuery.ORDER.desc));
- Assert.assertEquals(0, q.getSorts().size());
+ assertEquals(0, q.getSorts().size());
q.addHighlightField("hl1");
q.addHighlightField("hl2");
q.setHighlightSnippets(2);
- Assert.assertEquals(2, q.getHighlightFields().length);
- Assert.assertEquals(100, q.getHighlightFragsize());
- Assert.assertEquals(q.getHighlightSnippets(), 2);
+ assertEquals(2, q.getHighlightFields().length);
+ assertEquals(100, q.getHighlightFragsize());
+ assertEquals(q.getHighlightSnippets(), 2);
q.removeHighlightField("hl1");
q.removeHighlightField("hl3");
- Assert.assertEquals(1, q.getHighlightFields().length);
+ assertEquals(1, q.getHighlightFields().length);
q.removeHighlightField("hl2");
- Assert.assertNull(q.getHighlightFields());
+ assertNull(q.getHighlightFields());
// check to see that the removes are properly clearing the cgi params
- Assert.assertEquals(q.toString(), "q=dog");
+ assertEquals(q.toString(), "q=dog");
// Add time allowed param
q.setTimeAllowed(1000);
- Assert.assertEquals((Integer) 1000, q.getTimeAllowed());
+ assertEquals((Integer) 1000, q.getTimeAllowed());
// Adding a null should remove it
q.setTimeAllowed(null);
- Assert.assertEquals(null, q.getTimeAllowed());
+ assertNull(q.getTimeAllowed());
// System.out.println(q);
}
@@ -109,9 +108,9 @@ public class SolrQueryTest extends SolrTestCase {
q.addSort("date", SolrQuery.ORDER.desc);
q.addSort("qty", SolrQuery.ORDER.desc);
q.removeSort("date");
- Assert.assertEquals(2, q.getSorts().size());
+ assertEquals(2, q.getSorts().size());
q.removeSort("qty");
- Assert.assertEquals(1, q.getSorts().size());
+ assertEquals(1, q.getSorts().size());
}
/*
@@ -123,7 +122,7 @@ public class SolrQueryTest extends SolrTestCase {
q.addSort("date", SolrQuery.ORDER.desc);
q.addSort("qty", SolrQuery.ORDER.desc);
q.removeSort("qty");
- Assert.assertEquals("date desc", q.getSortField());
+ assertEquals("date desc", q.getSortField());
}
/*
@@ -163,16 +162,16 @@ public class SolrQueryTest extends SolrTestCase {
SolrQuery.SortClause sc1a = SolrQuery.SortClause.asc("sc1");
SolrQuery.SortClause sc1b = SolrQuery.SortClause.asc("sc1");
- Assert.assertEquals(sc1a, sc1b);
- Assert.assertEquals(sc1a.hashCode(), sc1b.hashCode());
+ assertEquals(sc1a, sc1b);
+ assertEquals(sc1a.hashCode(), sc1b.hashCode());
SolrQuery.SortClause sc2a = SolrQuery.SortClause.asc("sc2");
SolrQuery.SortClause sc2b = SolrQuery.SortClause.desc("sc2");
- Assert.assertFalse(sc2a.equals(sc2b));
+ assertNotEquals(sc2a, sc2b);
SolrQuery.SortClause sc3a = SolrQuery.SortClause.asc("sc2");
SolrQuery.SortClause sc3b = SolrQuery.SortClause.asc("not sc2");
- Assert.assertFalse(sc3a.equals(sc3b));
+ assertNotEquals(sc3a, sc3b);
}
/*
@@ -187,25 +186,25 @@ public class SolrQueryTest extends SolrTestCase {
q.addSort("price", SolrQuery.ORDER.asc);
q.addSort("date", SolrQuery.ORDER.desc);
q.addSort("qty", SolrQuery.ORDER.desc);
- Assert.assertEquals(3, q.getSorts().size());
- Assert.assertEquals("price asc,date desc,qty desc", q.get(CommonParams.SORT));
+ assertEquals(3, q.getSorts().size());
+ assertEquals("price asc,date desc,qty desc", q.get(CommonParams.SORT));
// Remove one (middle)
q.removeSort("date");
- Assert.assertEquals(2, q.getSorts().size());
- Assert.assertEquals("price asc,qty desc", q.get(CommonParams.SORT));
+ assertEquals(2, q.getSorts().size());
+ assertEquals("price asc,qty desc", q.get(CommonParams.SORT));
// Remove remaining (last, first)
q.removeSort("price");
q.removeSort("qty");
- Assert.assertTrue(q.getSorts().isEmpty());
- Assert.assertNull(q.get(CommonParams.SORT));
+ assertTrue(q.getSorts().isEmpty());
+ assertNull(q.get(CommonParams.SORT));
// Clear sort
q.addSort("price", SolrQuery.ORDER.asc);
q.clearSorts();
- Assert.assertTrue(q.getSorts().isEmpty());
- Assert.assertNull(q.get(CommonParams.SORT));
+ assertTrue(q.getSorts().isEmpty());
+ assertNull(q.get(CommonParams.SORT));
// Add vs update
q.clearSorts();
@@ -214,7 +213,7 @@ public class SolrQueryTest extends SolrTestCase {
q.addSort("3", SolrQuery.ORDER.asc);
q.addOrUpdateSort("2", SolrQuery.ORDER.desc);
q.addOrUpdateSort("4", SolrQuery.ORDER.desc);
- Assert.assertEquals("1 asc,2 desc,3 asc,4 desc", q.get(CommonParams.SORT));
+ assertEquals("1 asc,2 desc,3 asc,4 desc", q.get(CommonParams.SORT));
// Using SortClause
q.clearSorts();
@@ -223,12 +222,12 @@ public class SolrQueryTest extends SolrTestCase {
q.addSort(new SortClause("3", SolrQuery.ORDER.asc));
q.addOrUpdateSort(SortClause.desc("2"));
q.addOrUpdateSort(SortClause.asc("4"));
- Assert.assertEquals("1 asc,2 desc,3 asc,4 asc", q.get(CommonParams.SORT));
+ assertEquals("1 asc,2 desc,3 asc,4 asc", q.get(CommonParams.SORT));
q.setSort(SortClause.asc("A"));
q.addSort(SortClause.asc("B"));
q.addSort(SortClause.asc("C"));
q.addSort(SortClause.asc("D"));
- Assert.assertEquals("A asc,B asc,C asc,D asc", q.get(CommonParams.SORT));
+ assertEquals("A asc,B asc,C asc,D asc", q.get(CommonParams.SORT));
// removeSort should ignore the ORDER
q.setSort(SortClause.asc("A"));
@@ -238,7 +237,7 @@ public class SolrQueryTest extends SolrTestCase {
q.removeSort("A");
q.removeSort(SortClause.asc("C"));
q.removeSort(SortClause.desc("B"));
- Assert.assertEquals("D asc", q.get(CommonParams.SORT));
+ assertEquals("D asc", q.get(CommonParams.SORT));
// Verify that a query containing a SortClause is serializable
q.clearSorts();
@@ -316,10 +315,10 @@ public class SolrQueryTest extends SolrTestCase {
assertEquals("index", q.setFacetSort("index").getFacetSortString());
assertEquals(10, q.setHighlightSnippets(10).getHighlightSnippets());
assertEquals(10, q.setHighlightFragsize(10).getHighlightFragsize());
- assertEquals(true, q.setHighlightRequireFieldMatch(true).getHighlightRequireFieldMatch());
+ assertTrue(q.setHighlightRequireFieldMatch(true).getHighlightRequireFieldMatch());
assertEquals("foo", q.setHighlightSimplePre("foo").getHighlightSimplePre());
assertEquals("foo", q.setHighlightSimplePost("foo").getHighlightSimplePost());
- assertEquals(true, q.setHighlight(true).getHighlight());
+ assertTrue(q.setHighlight(true).getHighlight());
assertEquals("foo", q.setQuery("foo").getQuery());
assertEquals(10, q.setRows(10).getRows().intValue());
assertEquals(10, q.setStart(10).getStart().intValue());
@@ -352,24 +351,24 @@ public class SolrQueryTest extends SolrTestCase {
SolrQuery q = new SolrQuery();
// check getters
- assertEquals(false, q.getTerms());
+ assertFalse(q.getTerms());
assertArrayEquals(null, q.getTermsFields());
assertEquals("", q.getTermsLower());
assertEquals("", q.getTermsUpper());
- assertEquals(false, q.getTermsUpperInclusive());
- assertEquals(true, q.getTermsLowerInclusive());
+ assertFalse(q.getTermsUpperInclusive());
+ assertTrue(q.getTermsLowerInclusive());
assertEquals(10, q.getTermsLimit());
assertEquals(1, q.getTermsMinCount());
assertEquals(-1, q.getTermsMaxCount());
assertEquals("", q.getTermsPrefix());
- assertEquals(false, q.getTermsRaw());
+ assertFalse(q.getTermsRaw());
assertEquals("count", q.getTermsSortString());
- assertEquals(null, q.getTermsRegex());
+ assertNull(q.getTermsRegex());
assertArrayEquals(null, q.getTermsRegexFlags());
// check setters
q.setTerms(true);
- assertEquals(true, q.getTerms());
+ assertTrue(q.getTerms());
q.addTermsField("testfield");
assertEquals(1, q.getTermsFields().length);
assertEquals("testfield", q.getTermsFields()[0]);
@@ -378,9 +377,9 @@ public class SolrQueryTest extends SolrTestCase {
q.setTermsUpper("upper");
assertEquals("upper", q.getTermsUpper());
q.setTermsUpperInclusive(true);
- assertEquals(true, q.getTermsUpperInclusive());
+ assertTrue(q.getTermsUpperInclusive());
q.setTermsLowerInclusive(false);
- assertEquals(false, q.getTermsLowerInclusive());
+ assertFalse(q.getTermsLowerInclusive());
q.setTermsLimit(5);
assertEquals(5, q.getTermsLimit());
q.setTermsMinCount(2);
@@ -390,7 +389,7 @@ public class SolrQueryTest extends SolrTestCase {
q.setTermsPrefix("prefix");
assertEquals("prefix", q.getTermsPrefix());
q.setTermsRaw(true);
- assertEquals(true, q.getTermsRaw());
+ assertTrue(q.getTermsRaw());
q.setTermsSortString("index");
assertEquals("index", q.getTermsSortString());
q.setTermsRegex("a.*");
@@ -459,10 +458,10 @@ public class SolrQueryTest extends SolrTestCase {
solrQuery.addMoreLikeThisField("mlt4");
assertEquals(4, solrQuery.getMoreLikeThisFields().length);
solrQuery.setMoreLikeThisFields((String[]) null);
- assertTrue(null == solrQuery.getMoreLikeThisFields());
+ assertNull(solrQuery.getMoreLikeThisFields());
assertFalse(solrQuery.getMoreLikeThis());
- assertEquals(true, solrQuery.setMoreLikeThisBoost(true).getMoreLikeThisBoost());
+ assertTrue(solrQuery.setMoreLikeThisBoost(true).getMoreLikeThisBoost());
assertEquals("qf", solrQuery.setMoreLikeThisQF("qf").getMoreLikeThisQF());
assertEquals(10, solrQuery.setMoreLikeThisMaxTokensParsed(10).getMoreLikeThisMaxTokensParsed());
assertEquals(11, solrQuery.setMoreLikeThisMinTermFreq(11).getMoreLikeThisMinTermFreq());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
index 22cb8ef694e..5413f8d8193 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
@@ -39,7 +39,6 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.TimeSource;
import org.apache.solr.util.TimeOut;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -175,10 +174,10 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {
solr[0].jetty = null;
resp = client.query(solrQuery);
String name = resp.getResults().get(0).getFieldValue("name").toString();
- Assert.assertEquals("solr/collection11", name);
+ assertEquals("solr/collection11", name);
resp = client.query(solrQuery);
name = resp.getResults().get(0).getFieldValue("name").toString();
- Assert.assertEquals("solr/collection11", name);
+ assertEquals("solr/collection11", name);
solr[1].jetty.stop();
solr[1].jetty = null;
solr[0].startJetty();
@@ -191,7 +190,7 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {
resp = client.query(solrQuery);
}
name = resp.getResults().get(0).getFieldValue("name").toString();
- Assert.assertEquals("solr/collection10", name);
+ assertEquals("solr/collection10", name);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
index d18d8a00645..7fc86ea1e9e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -40,7 +40,6 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.TimeSource;
import org.apache.solr.util.TimeOut;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -172,10 +171,10 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
solr[0].jetty = null;
resp = client.query(solrQuery);
String name = resp.getResults().get(0).getFieldValue("name").toString();
- Assert.assertEquals("solr/collection11", name);
+ assertEquals("solr/collection11", name);
resp = client.query(solrQuery);
name = resp.getResults().get(0).getFieldValue("name").toString();
- Assert.assertEquals("solr/collection11", name);
+ assertEquals("solr/collection11", name);
solr[1].jetty.stop();
solr[1].jetty = null;
solr[0].startJetty();
@@ -188,7 +187,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
resp = client.query(solrQuery);
}
name = resp.getResults().get(0).getFieldValue("name").toString();
- Assert.assertEquals("solr/collection10", name);
+ assertEquals("solr/collection10", name);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java
index 6a18e3e5a7d..9a3b12aa61d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java
@@ -82,8 +82,7 @@ public class SolrExampleStreamingHttp2Test extends SolrExampleTests {
}
if (0 != failures.size()) {
- assertEquals(
- failures.size() + " Unexpected Exception, starting with...", null, failures.get(0));
+ assertNull(failures.size() + " Unexpected Exception, starting with...", failures.get(0));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
index 75ad41b9018..b445d763948 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
@@ -86,8 +86,7 @@ public class SolrExampleStreamingTest extends SolrExampleTests {
}
if (0 != failures.size()) {
- assertEquals(
- failures.size() + " Unexpected Exception, starting with...", null, failures.get(0));
+ assertNull(failures.size() + " Unexpected Exception, starting with...", failures.get(0));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
index 9ffdf024c94..3c8968dc37f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
@@ -22,7 +22,6 @@ import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import org.apache.solr.core.SolrCore;
-import org.junit.Assert;
import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
@@ -41,27 +40,27 @@ public class TestEmbeddedSolrServer extends AbstractEmbeddedSolrServerTestCase {
}
public void testGetCoreContainer() {
- Assert.assertEquals(cores, ((EmbeddedSolrServer) getSolrCore0()).getCoreContainer());
- Assert.assertEquals(cores, (getSolrCore1()).getCoreContainer());
+ assertEquals(cores, ((EmbeddedSolrServer) getSolrCore0()).getCoreContainer());
+ assertEquals(cores, (getSolrCore1()).getCoreContainer());
}
public void testClose() throws IOException {
EmbeddedSolrServer solrServer = (EmbeddedSolrServer) getSolrCore0();
- Assert.assertEquals(3, cores.getCores().size());
+ assertEquals(3, cores.getCores().size());
List<SolrCore> solrCores = new ArrayList<>();
for (SolrCore solrCore : cores.getCores()) {
- Assert.assertEquals(false, solrCore.isClosed());
+ assertFalse(solrCore.isClosed());
solrCores.add(solrCore);
}
solrServer.close();
- Assert.assertEquals(3, cores.getCores().size());
+ assertEquals(3, cores.getCores().size());
for (SolrCore solrCore : solrCores) {
- Assert.assertEquals(false, solrCore.isClosed());
+ assertFalse(solrCore.isClosed());
}
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
index b3c70e780cb..a25b6a07e7a 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
@@ -267,7 +267,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {
// keepalive
assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
// content-type
- assertEquals(null, DebugServlet.headers.get("Content-Type"));
+ assertNull(DebugServlet.headers.get("Content-Type"));
// param encoding
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
index e6776e16d6a..1e52d73627f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
@@ -936,7 +936,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {
public void testRetryUpdatesWhenClusterStateIsStale() throws Exception {
final String COL = "stale_state_test_col";
- assert cluster.getJettySolrRunners().size() >= 2;
+ assertTrue(cluster.getJettySolrRunners().size() >= 2);
final JettySolrRunner old_leader_node = cluster.getJettySolrRunners().get(0);
final JettySolrRunner new_leader_node = cluster.getJettySolrRunners().get(1);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index 29b8f5d46d7..85318bf5fff 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -945,7 +945,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
public void testRetryUpdatesWhenClusterStateIsStale() throws Exception {
final String COL = "stale_state_test_col";
- assert cluster.getJettySolrRunners().size() >= 2;
+ assertTrue(cluster.getJettySolrRunners().size() >= 2);
final JettySolrRunner old_leader_node = cluster.getJettySolrRunners().get(0);
final JettySolrRunner new_leader_node = cluster.getJettySolrRunners().get(1);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
index 65ada675bf1..8b9b4c367d9 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
@@ -98,20 +98,23 @@ public class ConcurrentUpdateHttp2SolrClientTest extends SolrJettyTestBase {
int expectedSuccesses = ConcurrentUpdateSolrClientTest.TestServlet.numReqsRcvd.get();
assertTrue(expectedSuccesses > 0); // at least one request must have been sent
- assertTrue(
+ assertEquals(
"Expected no errors but got " + errorCounter.get() + ", due to: " + errors.toString(),
- errorCounter.get() == 0);
- assertTrue(
+ 0,
+ errorCounter.get());
+ assertEquals(
"Expected " + expectedSuccesses + " successes, but got " + successCounter.get(),
- successCounter.get() == expectedSuccesses);
+ successCounter.get(),
+ expectedSuccesses);
int expectedDocs = numDocs * numRunnables;
- assertTrue(
+ assertEquals(
"Expected CUSS to send "
+ expectedDocs
+ " but got "
+ ConcurrentUpdateSolrClientTest.TestServlet.numDocsRcvd.get(),
- ConcurrentUpdateSolrClientTest.TestServlet.numDocsRcvd.get() == expectedDocs);
+ ConcurrentUpdateSolrClientTest.TestServlet.numDocsRcvd.get(),
+ expectedDocs);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
index d75b60891b9..4ab3cb51eaa 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
@@ -182,17 +182,20 @@ public class ConcurrentUpdateSolrClientTest extends SolrJettyTestBase {
int expectedSuccesses = TestServlet.numReqsRcvd.get();
assertTrue(expectedSuccesses > 0); // at least one request must have been sent
- assertTrue(
+ assertEquals(
"Expected no errors but got " + errorCounter.get() + ", due to: " + errors.toString(),
- errorCounter.get() == 0);
- assertTrue(
+ 0,
+ errorCounter.get());
+ assertEquals(
"Expected " + expectedSuccesses + " successes, but got " + successCounter.get(),
- successCounter.get() == expectedSuccesses);
+ successCounter.get(),
+ expectedSuccesses);
int expectedDocs = numDocs * numRunnables;
- assertTrue(
+ assertEquals(
"Expected CUSS to send " + expectedDocs + " but got " + TestServlet.numDocsRcvd.get(),
- TestServlet.numDocsRcvd.get() == expectedDocs);
+ TestServlet.numDocsRcvd.get(),
+ expectedDocs);
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
index 38d6158f061..e5435911550 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
@@ -297,7 +297,7 @@ public class Http2SolrClientTest extends SolrJettyTestBase {
// agent
assertEquals(EXPECTED_USER_AGENT, DebugServlet.headers.get("user-agent"));
// content-type
- assertEquals(null, DebugServlet.headers.get("content-type"));
+ assertNull(DebugServlet.headers.get("content-type"));
// param encoding
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java
index 7815c0e84ee..0de3c7617c6 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java
@@ -119,10 +119,10 @@ public class HttpClientUtilTest extends SolrTestCase {
assertEquals(Boolean.FALSE, HttpClientUtil.toBooleanObject("FALSE"));
assertEquals(Boolean.FALSE, HttpClientUtil.toBooleanObject("fALSE"));
- assertEquals(null, HttpClientUtil.toBooleanObject("t"));
- assertEquals(null, HttpClientUtil.toBooleanObject("f"));
- assertEquals(null, HttpClientUtil.toBooleanObject("foo"));
- assertEquals(null, HttpClientUtil.toBooleanObject(null));
+ assertNull(HttpClientUtil.toBooleanObject("t"));
+ assertNull(HttpClientUtil.toBooleanObject("f"));
+ assertNull(HttpClientUtil.toBooleanObject("foo"));
+ assertNull(HttpClientUtil.toBooleanObject(null));
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java
index 2c62f2fbdeb..dbe01b0be15 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java
@@ -39,7 +39,7 @@ public class HttpSolrClientBuilderTest extends SolrTestCase {
@Test
public void testProvidesBaseSolrUrlToClient() throws IOException {
try (HttpSolrClient createdClient = new HttpSolrClient.Builder(ANY_BASE_SOLR_URL).build()) {
- assertTrue(createdClient.getBaseURL().equals(ANY_BASE_SOLR_URL));
+ assertEquals(ANY_BASE_SOLR_URL, createdClient.getBaseURL());
}
}
@@ -47,7 +47,7 @@ public class HttpSolrClientBuilderTest extends SolrTestCase {
public void testProvidesHttpClientToClient() throws IOException {
try (HttpSolrClient createdClient =
new Builder(ANY_BASE_SOLR_URL).withHttpClient(ANY_HTTP_CLIENT).build()) {
- assertTrue(createdClient.getHttpClient().equals(ANY_HTTP_CLIENT));
+ assertEquals(createdClient.getHttpClient(), ANY_HTTP_CLIENT);
}
}
@@ -55,7 +55,7 @@ public class HttpSolrClientBuilderTest extends SolrTestCase {
public void testProvidesResponseParserToClient() throws IOException {
try (HttpSolrClient createdClient =
new Builder(ANY_BASE_SOLR_URL).withResponseParser(ANY_RESPONSE_PARSER).build()) {
- assertTrue(createdClient.getParser().equals(ANY_RESPONSE_PARSER));
+ assertEquals(createdClient.getParser(), ANY_RESPONSE_PARSER);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java
index 84e50e6848a..fda526b5298 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientSSLAuthConPoolTest.java
@@ -30,6 +30,6 @@ public class HttpSolrClientSSLAuthConPoolTest extends HttpSolrClientConPoolTest
for (URL u : urls) {
assertEquals("expect https urls ", "https", u.getProtocol());
}
- assertFalse("expect different urls " + Arrays.toString(urls), urls[0].equals(urls[1]));
+ assertNotEquals("expect different urls " + Arrays.toString(urls), urls[0], urls[1]);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttp2SolrClientTest.java
index fde2bfea382..4ac48c1918c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttp2SolrClientTest.java
@@ -16,19 +16,16 @@
*/
package org.apache.solr.client.solrj.impl;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.ResponseParser;
import org.apache.solr.client.solrj.request.RequestWriter;
import org.junit.Test;
/** Test the LBHttp2SolrClient. */
-public class LBHttp2SolrClientTest {
+public class LBHttp2SolrClientTest extends SolrTestCase {
/**
* Test method for {@link LBHttp2SolrClient#setParser(ResponseParser)}.
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java
index 4cb9cc3e554..e1c0fb55008 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java
@@ -34,7 +34,7 @@ public class LBHttpSolrClientBuilderTest extends SolrTestCase {
public void providesHttpClientToClient() {
try (LBHttpSolrClient createdClient =
new Builder().withBaseSolrUrl(ANY_BASE_SOLR_URL).withHttpClient(ANY_HTTP_CLIENT).build()) {
- assertTrue(createdClient.getHttpClient().equals(ANY_HTTP_CLIENT));
+ assertEquals(createdClient.getHttpClient(), ANY_HTTP_CLIENT);
}
}
@@ -45,7 +45,7 @@ public class LBHttpSolrClientBuilderTest extends SolrTestCase {
.withBaseSolrUrl(ANY_BASE_SOLR_URL)
.withResponseParser(ANY_RESPONSE_PARSER)
.build()) {
- assertTrue(createdClient.getParser().equals(ANY_RESPONSE_PARSER));
+ assertEquals(createdClient.getParser(), ANY_RESPONSE_PARSER);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java
index 32844bd460e..7a71a699ec8 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java
@@ -16,17 +16,15 @@
*/
package org.apache.solr.client.solrj.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
import java.io.IOException;
import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.ResponseParser;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.junit.Test;
/** Test the LBHttpSolrClient. */
-public class LBHttpSolrClientTest {
+public class LBHttpSolrClientTest extends SolrTestCase {
/**
* Test method for {@link LBHttpSolrClient.Builder}.
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.java
index a8cb94f23eb..c21cd44e297 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBSolrClientTest.java
@@ -17,22 +17,19 @@
package org.apache.solr.client.solrj.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.junit.Test;
-public class LBSolrClientTest {
+public class LBSolrClientTest extends SolrTestCase {
@Test
public void testServerIterator() throws SolrServerException {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java
index 1bbda3c0cd6..2f9b98d7cbd 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java
@@ -21,11 +21,10 @@ import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.impl.cookie.BasicClientCookie;
import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
// Test cases imported from TestNetscapeCookieAttribHandlers of HttpClient project
-public class SolrPortAwareCookieSpecTest {
+public class SolrPortAwareCookieSpecTest extends SolrTestCaseJ4 {
@Test
public void testDomainHostPortValidate() throws Exception {
@@ -50,19 +49,19 @@ public class SolrPortAwareCookieSpecTest {
SolrTestCaseJ4.expectThrows(IllegalArgumentException.class, () -> h.match(cookie, null));
cookie.setDomain(null);
- Assert.assertFalse(h.match(cookie, origin));
+ assertFalse(h.match(cookie, origin));
cookie.setDomain("otherhost");
- Assert.assertFalse(h.match(cookie, origin));
+ assertFalse(h.match(cookie, origin));
cookie.setDomain("myhost");
- Assert.assertTrue(h.match(cookie, origin));
+ assertTrue(h.match(cookie, origin));
cookie.setDomain("myhost:80");
- Assert.assertTrue(h.match(cookie, origin));
+ assertTrue(h.match(cookie, origin));
cookie.setDomain("myhost:8080");
- Assert.assertFalse(h.match(cookie, origin));
+ assertFalse(h.match(cookie, origin));
}
@Test
@@ -127,10 +126,10 @@ public class SolrPortAwareCookieSpecTest {
final CookieAttributeHandler h = new SolrPortAwareCookieSpecFactory.PortAwareDomainHandler();
cookie.setDomain(null);
- Assert.assertFalse(h.match(cookie, origin));
+ assertFalse(h.match(cookie, origin));
cookie.setDomain(".somedomain.com");
- Assert.assertTrue(h.match(cookie, origin));
+ assertTrue(h.match(cookie, origin));
}
@Test
@@ -140,7 +139,7 @@ public class SolrPortAwareCookieSpecTest {
final CookieAttributeHandler h = new SolrPortAwareCookieSpecFactory.PortAwareDomainHandler();
cookie.setDomain(".somedomain.com");
- Assert.assertTrue(h.match(cookie, origin));
+ assertTrue(h.match(cookie, origin));
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
index c885bde0bfa..20853430218 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
@@ -112,7 +112,7 @@ public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {
// but in the case of a reused StateZkReader,
// closing the provider must not have closed the ZkStateReader...
- assertEquals(false, reusedZkReader.isClosed());
+ assertFalse(reusedZkReader.isClosed());
} finally {
reusedZkReader.close();
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
index ee8597f5f38..60bc0b274ed 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrClient;
@@ -99,9 +100,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
}
@Test
- @SuppressWarnings({"unchecked"})
public void testShortestPathStream() throws Exception {
-
new UpdateRequest()
.add(id, "0", "from_s", "jim", "to_s", "mike", "predicate_s", "knows")
.add(id, "1", "from_s", "jim", "to_s", "dave", "predicate_s", "knows")
@@ -148,7 +147,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
paths = new HashSet<>();
tuples = getTuples(stream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
for (Tuple tuple : tuples) {
paths.add(tuple.getStrings("path").toString());
@@ -175,7 +174,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
paths = new HashSet<>();
tuples = getTuples(stream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
for (Tuple tuple : tuples) {
paths.add(tuple.getStrings("path").toString());
@@ -201,7 +200,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
// Test with depth 2
@@ -220,7 +219,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
// Take out alex
@@ -239,7 +238,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
paths = new HashSet<>();
tuples = getTuples(stream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
for (Tuple tuple : tuples) {
paths.add(tuple.getStrings("path").toString());
@@ -441,12 +440,12 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 4);
+ assertEquals(4, tuples.size());
- assertTrue(tuples.get(0).getString("node").equals("basket1"));
- assertTrue(tuples.get(1).getString("node").equals("basket2"));
- assertTrue(tuples.get(2).getString("node").equals("basket3"));
- assertTrue(tuples.get(3).getString("node").equals("basket4"));
+ assertEquals("basket1", tuples.get(0).getString("node"));
+ assertEquals("basket2", tuples.get(1).getString("node"));
+ assertEquals("basket3", tuples.get(2).getString("node"));
+ assertEquals("basket4", tuples.get(3).getString("node"));
// Test maxDocFreq param
String docFreqExpr =
@@ -460,8 +459,8 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 1);
- assertTrue(tuples.get(0).getString("node").equals("basket2"));
+ assertEquals(1, tuples.size());
+ assertEquals("basket2", tuples.get(0).getString("node"));
String expr2 =
"gatherNodes(collection1, "
@@ -481,24 +480,24 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 5);
+ assertEquals(5, tuples.size());
- assertTrue(tuples.get(0).getString("node").equals("product3"));
- assertTrue(tuples.get(0).getDouble("count(*)").equals(3.0D));
+ assertEquals("product3", tuples.get(0).getString("node"));
+ assertEquals(3.0D, tuples.get(0).getDouble("count(*)"), 0.0);
- assertTrue(tuples.get(1).getString("node").equals("product4"));
- assertTrue(tuples.get(1).getDouble("count(*)").equals(2.0D));
- assertTrue(tuples.get(1).getDouble("avg(price_f)").equals(30.0D));
- assertTrue(tuples.get(1).getDouble("sum(price_f)").equals(60.0D));
- assertTrue(tuples.get(1).getDouble("min(price_f)").equals(20.0D));
- assertTrue(tuples.get(1).getDouble("max(price_f)").equals(40.0D));
+ assertEquals("product4", tuples.get(1).getString("node"));
+ assertEquals(2.0D, tuples.get(1).getDouble("count(*)"), 0.0);
+ assertEquals(30.0D, tuples.get(1).getDouble("avg(price_f)"), 0.0);
+ assertEquals(60.0D, tuples.get(1).getDouble("sum(price_f)"), 0.0);
+ assertEquals(20.0D, tuples.get(1).getDouble("min(price_f)"), 0.0);
+ assertEquals(40.0D, tuples.get(1).getDouble("max(price_f)"), 0.0);
- assertTrue(tuples.get(2).getString("node").equals("product5"));
- assertTrue(tuples.get(2).getDouble("count(*)").equals(1.0D));
- assertTrue(tuples.get(3).getString("node").equals("product6"));
- assertTrue(tuples.get(3).getDouble("count(*)").equals(1.0D));
- assertTrue(tuples.get(4).getString("node").equals("product7"));
- assertTrue(tuples.get(4).getDouble("count(*)").equals(1.0D));
+ assertEquals("product5", tuples.get(2).getString("node"));
+ assertEquals(1.0D, tuples.get(2).getDouble("count(*)"), 0.0);
+ assertEquals("product6", tuples.get(3).getString("node"));
+ assertEquals(1.0D, tuples.get(3).getDouble("count(*)"), 0.0);
+ assertEquals("product7", tuples.get(4).getString("node"));
+ assertEquals(1.0D, tuples.get(4).getDouble("count(*)"), 0.0);
// Test list of root nodes
expr =
@@ -513,10 +512,10 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 3);
- assertTrue(tuples.get(0).getString("node").equals("basket2"));
- assertTrue(tuples.get(1).getString("node").equals("basket3"));
- assertTrue(tuples.get(2).getString("node").equals("basket4"));
+ assertEquals(3, tuples.size());
+ assertEquals("basket2", tuples.get(0).getString("node"));
+ assertEquals("basket3", tuples.get(1).getString("node"));
+ assertEquals("basket4", tuples.get(2).getString("node"));
// Test with negative filter query
@@ -533,9 +532,9 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 2);
- assertTrue(tuples.get(0).getString("node").equals("basket2"));
- assertTrue(tuples.get(1).getString("node").equals("basket3"));
+ assertEquals(2, tuples.size());
+ assertEquals("basket2", tuples.get(0).getString("node"));
+ assertEquals("basket3", tuples.get(1).getString("node"));
// Test the window without lag
@@ -550,11 +549,11 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 4);
- assertTrue(tuples.get(0).getString("node").equals("1"));
- assertTrue(tuples.get(1).getString("node").equals("2"));
- assertTrue(tuples.get(2).getString("node").equals("3"));
- assertTrue(tuples.get(3).getString("node").equals("4"));
+ assertEquals(4, tuples.size());
+ assertEquals("1", tuples.get(0).getString("node"));
+ assertEquals("2", tuples.get(1).getString("node"));
+ assertEquals("3", tuples.get(2).getString("node"));
+ assertEquals("4", tuples.get(3).getString("node"));
expr =
"nodes(collection1, random(collection1, q=\"id:(6)\", fl=\"time_ten_seconds_s\"), walk=\"time_ten_seconds_s->time_ten_seconds_s\", gather=\"id\", window=\"3\")";
@@ -567,10 +566,10 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 3);
- assertTrue(tuples.get(0).getString("node").equals("4"));
- assertTrue(tuples.get(1).getString("node").equals("5"));
- assertTrue(tuples.get(2).getString("node").equals("6"));
+ assertEquals(3, tuples.size());
+ assertEquals("4", tuples.get(0).getString("node"));
+ assertEquals("5", tuples.get(1).getString("node"));
+ assertEquals("6", tuples.get(2).getString("node"));
expr =
"nodes(collection1, random(collection1, q=\"id:(6)\", fl=\"time_ten_seconds_s\"), walk=\"time_ten_seconds_s->time_ten_seconds_s\", gather=\"id\", window=\"3\", lag=\"1\")";
@@ -583,10 +582,10 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 3);
- assertTrue(tuples.get(0).getString("node").equals("3"));
- assertTrue(tuples.get(1).getString("node").equals("4"));
- assertTrue(tuples.get(2).getString("node").equals("5"));
+ assertEquals(3, tuples.size());
+ assertEquals("3", tuples.get(0).getString("node"));
+ assertEquals("4", tuples.get(1).getString("node"));
+ assertEquals("5", tuples.get(2).getString("node"));
// Test window with lag
@@ -602,9 +601,9 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 2);
- assertTrue(tuples.get(0).getString("node").equals("3"));
- assertTrue(tuples.get(1).getString("node").equals("4"));
+ assertEquals(2, tuples.size());
+ assertEquals("3", tuples.get(0).getString("node"));
+ assertEquals("4", tuples.get(1).getString("node"));
// Test DAY window without lag
@@ -619,11 +618,11 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 4);
- assertTrue(tuples.get(0).getString("node").equals("1"));
- assertTrue(tuples.get(1).getString("node").equals("2"));
- assertTrue(tuples.get(2).getString("node").equals("3"));
- assertTrue(tuples.get(3).getString("node").equals("4"));
+ assertEquals(4, tuples.size());
+ assertEquals("1", tuples.get(0).getString("node"));
+ assertEquals("2", tuples.get(1).getString("node"));
+ assertEquals("3", tuples.get(2).getString("node"));
+ assertEquals("4", tuples.get(3).getString("node"));
// Test Day window with lag.
@@ -638,9 +637,9 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 2);
- assertTrue(tuples.get(0).getString("node").equals("3"));
- assertTrue(tuples.get(1).getString("node").equals("4"));
+ assertEquals(2, tuples.size());
+ assertEquals("3", tuples.get(0).getString("node"));
+ assertEquals("4", tuples.get(1).getString("node"));
// Test Week Day
@@ -656,9 +655,9 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 2);
- assertTrue(tuples.get(0).getString("node").equals("3"));
- assertTrue(tuples.get(1).getString("node").equals("6"));
+ assertEquals(2, tuples.size());
+ assertEquals("3", tuples.get(0).getString("node"));
+ assertEquals("6", tuples.get(1).getString("node"));
// Test Week Day with lag
@@ -674,9 +673,9 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 2);
- assertTrue(tuples.get(0).getString("node").equals("6"));
- assertTrue(tuples.get(1).getString("node").equals("7"));
+ assertEquals(2, tuples.size());
+ assertEquals("6", tuples.get(0).getString("node"));
+ assertEquals("7", tuples.get(1).getString("node"));
// Test positive week day
@@ -692,9 +691,9 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 2);
- assertTrue(tuples.get(0).getString("node").equals("3"));
- assertTrue(tuples.get(1).getString("node").equals("6"));
+ assertEquals(2, tuples.size());
+ assertEquals("3", tuples.get(0).getString("node"));
+ assertEquals("6", tuples.get(1).getString("node"));
// Test positive Week Day with lag
@@ -710,9 +709,9 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 2);
- assertTrue(tuples.get(0).getString("node").equals("2"));
- assertTrue(tuples.get(1).getString("node").equals("3"));
+ assertEquals(2, tuples.size());
+ assertEquals("2", tuples.get(0).getString("node"));
+ assertEquals("3", tuples.get(1).getString("node"));
cache.close();
}
@@ -785,19 +784,19 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
Tuple tuple0 = tuples.get(0);
- assert (tuple0.getString("node").equals("product4"));
- assert (tuple0.getLong("docFreq") == 2);
- assert (tuple0.getLong("count(*)") == 2);
+ assertEquals("product4", tuple0.getString("node"));
+ assertEquals(2, (long) tuple0.getLong("docFreq"));
+ assertEquals(2, (long) tuple0.getLong("count(*)"));
Tuple tuple1 = tuples.get(1);
- assert (tuple1.getString("node").equals("product1"));
- assert (tuple1.getLong("docFreq") == 8);
- assert (tuple1.getLong("count(*)") == 3);
+ assertEquals("product1", tuple1.getString("node"));
+ assertEquals(8, (long) tuple1.getLong("docFreq"));
+ assertEquals(3, (long) tuple1.getLong("count(*)"));
Tuple tuple2 = tuples.get(2);
- assert (tuple2.getString("node").equals("product5"));
- assert (tuple2.getLong("docFreq") == 1);
- assert (tuple2.getLong("count(*)") == 1);
+ assertEquals("product5", tuple2.getString("node"));
+ assertEquals(1, (long) tuple2.getLong("docFreq"));
+ assertEquals(1, (long) tuple2.getLong("count(*)"));
// Test using a different termFreq field then the default count(*)
expr2 =
@@ -823,19 +822,19 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuple0 = tuples.get(0);
- assert (tuple0.getString("node").equals("product5"));
- assert (tuple0.getLong("docFreq") == 1);
- assert (tuple0.getDouble("avg(price_f)") == 100);
+ assertEquals("product5", tuple0.getString("node"));
+ assertEquals(1, (long) tuple0.getLong("docFreq"));
+ assertEquals(100, tuple0.getDouble("avg(price_f)"), 0.0);
tuple1 = tuples.get(1);
- assert (tuple1.getString("node").equals("product4"));
- assert (tuple1.getLong("docFreq") == 2);
- assert (tuple1.getDouble("avg(price_f)") == 1);
+ assertEquals("product4", tuple1.getString("node"));
+ assertEquals(2, (long) tuple1.getLong("docFreq"));
+ assertEquals(1, tuple1.getDouble("avg(price_f)"), 0.0);
tuple2 = tuples.get(2);
- assert (tuple2.getString("node").equals("product1"));
- assert (tuple2.getLong("docFreq") == 8);
- assert (tuple2.getDouble("avg(price_f)") == 1);
+ assertEquals("product1", tuple2.getString("node"));
+ assertEquals(8, (long) tuple2.getLong("docFreq"));
+ assertEquals(1, tuple2.getDouble("avg(price_f)"), 0.0);
cache.close();
}
@@ -935,24 +934,24 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
Tuple tuple = tuples.get(0);
- assert (tuple.getString("node").equals("product3"));
- assert (tuple.getLong("docFreq") == 3);
- assert (tuple.getLong("count(*)") == 3);
+ assertEquals("product3", tuple.getString("node"));
+ assertEquals(3, (long) tuple.getLong("docFreq"));
+ assertEquals(3, (long) tuple.getLong("count(*)"));
Tuple tuple0 = tuples.get(1);
- assert (tuple0.getString("node").equals("product4"));
- assert (tuple0.getLong("docFreq") == 2);
- assert (tuple0.getLong("count(*)") == 2);
+ assertEquals("product4", tuple0.getString("node"));
+ assertEquals(2, (long) tuple0.getLong("docFreq"));
+ assertEquals(2, (long) tuple0.getLong("count(*)"));
Tuple tuple1 = tuples.get(2);
- assert (tuple1.getString("node").equals("product1"));
- assert (tuple1.getLong("docFreq") == 4);
- assert (tuple1.getLong("count(*)") == 3);
+ assertEquals("product1", tuple1.getString("node"));
+ assertEquals(4, (long) tuple1.getLong("docFreq"));
+ assertEquals(3, (long) tuple1.getLong("count(*)"));
Tuple tuple2 = tuples.get(3);
- assert (tuple2.getString("node").equals("product5"));
- assert (tuple2.getLong("docFreq") == 1);
- assert (tuple2.getLong("count(*)") == 1);
+ assertEquals("product5", tuple2.getString("node"));
+ assertEquals(1, (long) tuple2.getLong("docFreq"));
+ assertEquals(1, (long) tuple2.getLong("count(*)"));
cache.close();
}
@@ -995,10 +994,10 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 3);
- assertTrue(tuples.get(0).getString("node").equals("jim"));
- assertTrue(tuples.get(1).getString("node").equals("max"));
- assertTrue(tuples.get(2).getString("node").equals("sam"));
+ assertEquals(3, tuples.size());
+ assertEquals("jim", tuples.get(0).getString("node"));
+ assertEquals("max", tuples.get(1).getString("node"));
+ assertEquals("sam", tuples.get(2).getString("node"));
// Test scatter branches, leaves and trackTraversal
@@ -1016,27 +1015,27 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 4);
- assertTrue(tuples.get(0).getString("node").equals("bill"));
- assertTrue(tuples.get(0).getLong("level").equals(0L));
- assertTrue(tuples.get(0).getStrings("ancestors").size() == 0);
- assertTrue(tuples.get(1).getString("node").equals("jim"));
- assertTrue(tuples.get(1).getLong("level").equals(1L));
+ assertEquals(4, tuples.size());
+ assertEquals("bill", tuples.get(0).getString("node"));
+ assertEquals(0L, tuples.get(0).getLong("level").longValue());
+ assertEquals(0, tuples.get(0).getStrings("ancestors").size());
+ assertEquals("jim", tuples.get(1).getString("node"));
+ assertEquals(1L, tuples.get(1).getLong("level").longValue());
List<String> ancestors = tuples.get(1).getStrings("ancestors");
- assert (ancestors.size() == 1);
- assert (ancestors.get(0).equals("bill"));
+ assertEquals(1, ancestors.size());
+ assertEquals("bill", ancestors.get(0));
- assertTrue(tuples.get(2).getString("node").equals("max"));
- assertTrue(tuples.get(2).getLong("level").equals(1L));
+ assertEquals("max", tuples.get(2).getString("node"));
+ assertEquals(1L, tuples.get(2).getLong("level").longValue());
ancestors = tuples.get(2).getStrings("ancestors");
- assert (ancestors.size() == 1);
- assert (ancestors.get(0).equals("bill"));
+ assertEquals(1, ancestors.size());
+ assertEquals("bill", ancestors.get(0));
- assertTrue(tuples.get(3).getString("node").equals("sam"));
- assertTrue(tuples.get(3).getLong("level").equals(1L));
+ assertEquals("sam", tuples.get(3).getString("node"));
+ assertEquals(1L, tuples.get(3).getLong("level").longValue());
ancestors = tuples.get(3).getStrings("ancestors");
- assert (ancestors.size() == 1);
- assert (ancestors.get(0).equals("bill"));
+ assertEquals(1, ancestors.size());
+ assertEquals("bill", ancestors.get(0));
// Test query root
@@ -1054,10 +1053,10 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 3);
- assertTrue(tuples.get(0).getString("node").equals("jim"));
- assertTrue(tuples.get(1).getString("node").equals("max"));
- assertTrue(tuples.get(2).getString("node").equals("sam"));
+ assertEquals(3, tuples.size());
+ assertEquals("jim", tuples.get(0).getString("node"));
+ assertEquals("max", tuples.get(1).getString("node"));
+ assertEquals("sam", tuples.get(2).getString("node"));
// Test query root scatter branches
@@ -1075,15 +1074,15 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 4);
- assertTrue(tuples.get(0).getString("node").equals("bill"));
- assertTrue(tuples.get(0).getLong("level").equals(0L));
- assertTrue(tuples.get(1).getString("node").equals("jim"));
- assertTrue(tuples.get(1).getLong("level").equals(1L));
- assertTrue(tuples.get(2).getString("node").equals("max"));
- assertTrue(tuples.get(2).getLong("level").equals(1L));
- assertTrue(tuples.get(3).getString("node").equals("sam"));
- assertTrue(tuples.get(3).getLong("level").equals(1L));
+ assertEquals(4, tuples.size());
+ assertEquals("bill", tuples.get(0).getString("node"));
+ assertEquals(0L, tuples.get(0).getLong("level").longValue());
+ assertEquals("jim", tuples.get(1).getString("node"));
+ assertEquals(1L, tuples.get(1).getLong("level").longValue());
+ assertEquals("max", tuples.get(2).getString("node"));
+ assertEquals(1L, tuples.get(2).getLong("level").longValue());
+ assertEquals("sam", tuples.get(3).getString("node"));
+ assertEquals(1L, tuples.get(3).getLong("level").longValue());
expr =
"gatherNodes(collection1, "
@@ -1102,10 +1101,10 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 3);
- assertTrue(tuples.get(0).getString("node").equals("ann"));
- assertTrue(tuples.get(1).getString("node").equals("kip"));
- assertTrue(tuples.get(2).getString("node").equals("steve"));
+ assertEquals(3, tuples.size());
+ assertEquals("ann", tuples.get(0).getString("node"));
+ assertEquals("kip", tuples.get(1).getString("node"));
+ assertEquals("steve", tuples.get(2).getString("node"));
// Test two traversals in the same expression
String expr3 = "hashJoin(" + expr2 + ", hashed=" + expr2 + ", on=\"node\")";
@@ -1118,10 +1117,10 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(hstream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 3);
- assertTrue(tuples.get(0).getString("node").equals("ann"));
- assertTrue(tuples.get(1).getString("node").equals("kip"));
- assertTrue(tuples.get(2).getString("node").equals("steve"));
+ assertEquals(3, tuples.size());
+ assertEquals("ann", tuples.get(0).getString("node"));
+ assertEquals("kip", tuples.get(1).getString("node"));
+ assertEquals("steve", tuples.get(2).getString("node"));
// =================================
@@ -1146,21 +1145,21 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 7);
- assertTrue(tuples.get(0).getString("node").equals("ann"));
- assertTrue(tuples.get(0).getLong("level").equals(2L));
- assertTrue(tuples.get(1).getString("node").equals("bill"));
- assertTrue(tuples.get(1).getLong("level").equals(0L));
- assertTrue(tuples.get(2).getString("node").equals("jim"));
- assertTrue(tuples.get(2).getLong("level").equals(1L));
- assertTrue(tuples.get(3).getString("node").equals("kip"));
- assertTrue(tuples.get(3).getLong("level").equals(2L));
- assertTrue(tuples.get(4).getString("node").equals("max"));
- assertTrue(tuples.get(4).getLong("level").equals(1L));
- assertTrue(tuples.get(5).getString("node").equals("sam"));
- assertTrue(tuples.get(5).getLong("level").equals(1L));
- assertTrue(tuples.get(6).getString("node").equals("steve"));
- assertTrue(tuples.get(6).getLong("level").equals(2L));
+ assertEquals(7, tuples.size());
+ assertEquals("ann", tuples.get(0).getString("node"));
+ assertEquals(2L, tuples.get(0).getLong("level").longValue());
+ assertEquals("bill", tuples.get(1).getString("node"));
+ assertEquals(0L, tuples.get(1).getLong("level").longValue());
+ assertEquals("jim", tuples.get(2).getString("node"));
+ assertEquals(1L, tuples.get(2).getLong("level").longValue());
+ assertEquals("kip", tuples.get(3).getString("node"));
+ assertEquals(2L, tuples.get(3).getLong("level").longValue());
+ assertEquals("max", tuples.get(4).getString("node"));
+ assertEquals(1L, tuples.get(4).getLong("level").longValue());
+ assertEquals("sam", tuples.get(5).getString("node"));
+ assertEquals(1L, tuples.get(5).getLong("level").longValue());
+ assertEquals("steve", tuples.get(6).getString("node"));
+ assertEquals(2L, tuples.get(6).getLong("level").longValue());
// Add a cycle from jim to bill
new UpdateRequest()
@@ -1189,29 +1188,29 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
- assertTrue(tuples.size() == 7);
- assertTrue(tuples.get(0).getString("node").equals("ann"));
- assertTrue(tuples.get(0).getLong("level").equals(2L));
+ assertEquals(7, tuples.size());
+ assertEquals("ann", tuples.get(0).getString("node"));
+ assertEquals(2L, tuples.get(0).getLong("level").longValue());
// Bill should now have one ancestor
- assertTrue(tuples.get(1).getString("node").equals("bill"));
- assertTrue(tuples.get(1).getLong("level").equals(0L));
- assertTrue(tuples.get(1).getStrings("ancestors").size() == 2);
+ assertEquals("bill", tuples.get(1).getString("node"));
+ assertEquals(0L, tuples.get(1).getLong("level").longValue());
+ assertEquals(2, tuples.get(1).getStrings("ancestors").size());
List<String> anc = tuples.get(1).getStrings("ancestors");
Collections.sort(anc);
- assertTrue(anc.get(0).equals("jim"));
- assertTrue(anc.get(1).equals("sam"));
-
- assertTrue(tuples.get(2).getString("node").equals("jim"));
- assertTrue(tuples.get(2).getLong("level").equals(1L));
- assertTrue(tuples.get(3).getString("node").equals("kip"));
- assertTrue(tuples.get(3).getLong("level").equals(2L));
- assertTrue(tuples.get(4).getString("node").equals("max"));
- assertTrue(tuples.get(4).getLong("level").equals(1L));
- assertTrue(tuples.get(5).getString("node").equals("sam"));
- assertTrue(tuples.get(5).getLong("level").equals(1L));
- assertTrue(tuples.get(6).getString("node").equals("steve"));
- assertTrue(tuples.get(6).getLong("level").equals(2L));
+ assertEquals("jim", anc.get(0));
+ assertEquals("sam", anc.get(1));
+
+ assertEquals("jim", tuples.get(2).getString("node"));
+ assertEquals(1L, tuples.get(2).getLong("level").longValue());
+ assertEquals("kip", tuples.get(3).getString("node"));
+ assertEquals(2L, tuples.get(3).getLong("level").longValue());
+ assertEquals("max", tuples.get(4).getString("node"));
+ assertEquals(1L, tuples.get(4).getLong("level").longValue());
+ assertEquals("sam", tuples.get(5).getString("node"));
+ assertEquals(1L, tuples.get(5).getLong("level").longValue());
+ assertEquals("steve", tuples.get(6).getString("node"));
+ assertEquals(2L, tuples.get(6).getLong("level").longValue());
cache.close();
}
@@ -1329,9 +1328,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
public boolean assertString(Tuple tuple, String fieldName, String expected) throws Exception {
String actual = (String) tuple.get(fieldName);
- if ((null == expected && null != actual)
- || (null != expected && null == actual)
- || (null != expected && !expected.equals(actual))) {
+ if (!Objects.equals(expected, actual)) {
throw new Exception("Longs not equal:" + expected + " : " + actual);
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
index 660ff504bf2..6073c383b32 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
@@ -109,7 +109,7 @@ public class GraphTest extends SolrCloudTestCase {
paths = new HashSet<>();
tuples = getTuples(stream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
for (Tuple tuple : tuples) {
paths.add(tuple.getStrings("path").toString());
@@ -130,7 +130,7 @@ public class GraphTest extends SolrCloudTestCase {
paths = new HashSet<>();
tuples = getTuples(stream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
for (Tuple tuple : tuples) {
paths.add(tuple.getStrings("path").toString());
@@ -150,7 +150,7 @@ public class GraphTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
// Test with depth 2
@@ -163,7 +163,7 @@ public class GraphTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
// Take out alex
sParams = params("fq", "predicate_s:knows NOT to_s:alex");
@@ -175,7 +175,7 @@ public class GraphTest extends SolrCloudTestCase {
stream.setStreamContext(context);
paths = new HashSet<>();
tuples = getTuples(stream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
for (Tuple tuple : tuples) {
paths.add(tuple.getStrings("path").toString());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
index fef8335b377..a64cba4caf8 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
@@ -342,8 +342,8 @@ public class JdbcTest extends SolrCloudTestCase {
Properties p = ((ConnectionImpl) con).getProperties();
- assert (p.getProperty("aggregationMode").equals("map_reduce"));
- assert (p.getProperty("numWorkers").equals("2"));
+ assertEquals("map_reduce", p.getProperty("aggregationMode"));
+ assertEquals("2", p.getProperty("numWorkers"));
try (Statement stmt = con.createStatement()) {
try (ResultSet rs =
@@ -447,10 +447,10 @@ public class JdbcTest extends SolrCloudTestCase {
try (Connection con =
DriverManager.getConnection("jdbc:solr://" + zkHost, providedProperties)) {
Properties p = ((ConnectionImpl) con).getProperties();
- assert (p.getProperty("username").equals(""));
- assert (p.getProperty("password").equals(""));
- assert (p.getProperty("testKey1").equals("testValue"));
- assert (p.getProperty("testKey2").equals(""));
+ assertEquals("", p.getProperty("username"));
+ assertEquals("", p.getProperty("password"));
+ assertEquals("testValue", p.getProperty("testKey1"));
+ assertEquals("", p.getProperty("testKey2"));
try (Statement stmt = con.createStatement()) {
try (ResultSet rs =
@@ -599,9 +599,9 @@ public class JdbcTest extends SolrCloudTestCase {
con.setCatalog(zkHost);
assertEquals(zkHost, con.getCatalog());
- assertEquals(null, con.getSchema());
+ assertNull(con.getSchema());
con.setSchema("myschema");
- assertEquals(null, con.getSchema());
+ assertNull(con.getSchema());
DatabaseMetaData databaseMetaData = con.getMetaData();
assertNotNull(databaseMetaData);
@@ -971,13 +971,13 @@ public class JdbcTest extends SolrCloudTestCase {
assertEquals(9, rs.getByte(4));
assertFalse(rs.wasNull());
- assertEquals(null, rs.getObject("testnull_i"));
+ assertNull(rs.getObject("testnull_i"));
assertTrue(rs.wasNull());
- assertEquals(null, rs.getObject(5));
+ assertNull(rs.getObject(5));
assertTrue(rs.wasNull());
- assertEquals(null, rs.getString("testnull_i"));
+ assertNull(rs.getString("testnull_i"));
assertTrue(rs.wasNull());
- assertEquals(null, rs.getString(5));
+ assertNull(rs.getString(5));
assertTrue(rs.wasNull());
assertEquals(0D, rs.getDouble("testnull_i"), 0);
assertTrue(rs.wasNull());
@@ -1062,7 +1062,7 @@ public class JdbcTest extends SolrCloudTestCase {
+ " WHERE d_multi IS NOT NULL GROUP BY d_multi ORDER BY count(*) DESC")) {
assertTrue(rs.next());
assertEquals(2, rs.getLong("the_count"));
- assertTrue(3d == rs.getDouble("d_multi"));
+ assertEquals(3d, rs.getDouble("d_multi"), 0.0);
assertTrue(rs.next()); // 4 other values, all with count 1
assertTrue(rs.next());
assertTrue(rs.next());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
index b39c8d1fa6c..4b0e4546b17 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
@@ -74,7 +74,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
* @see SolrRequest#setBasicAuthCredentials
*/
private static <T extends SolrRequest<?>> T setBasicAuthCredentials(T req, String user) {
- assert null != user;
+ assertNotNull(user);
req.setBasicAuthCredentials(user, user);
return req;
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
index b4b85eea095..6f517e76275 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
@@ -168,7 +168,7 @@ public class JDBCStreamTest extends SolrCloudTestCase {
new FieldComparator("CODE", ComparatorOrder.ASCENDING));
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
assertOrderOf(tuples, "CODE", "NL", "NO", "NP", "US");
assertOrderOf(tuples, "COUNTRY_NAME", "Netherlands", "Norway", "Nepal", "United States");
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
index f0f97658b31..288f81e9128 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -120,27 +121,27 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 5);
+ assertEquals(5, tuples.size());
Tuple t = tuples.get(0);
- assertTrue(t.getString("test_t").equals("l"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("l", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
t = tuples.get(1);
- assertTrue(t.getString("test_t").equals("b"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("b", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
t = tuples.get(2);
- assertTrue(t.getString("test_t").equals("c"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("c", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
t = tuples.get(3);
- assertTrue(t.getString("test_t").equals("d"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("d", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
t = tuples.get(4);
- assertTrue(t.getString("test_t").equals("c"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("c", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
expr = "analyze(\"hello world\", test_t)";
paramsLoc = new ModifiableSolrParams();
@@ -153,8 +154,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
tuples = getTuples(solrStream);
assertEquals(tuples.size(), 1);
List<?> terms = (List<?>) tuples.get(0).get("return-value");
- assertTrue(terms.get(0).equals("hello"));
- assertTrue(terms.get(1).equals("world"));
+ assertEquals("hello", terms.get(0));
+ assertEquals("world", terms.get(1));
// Try with single param
expr =
@@ -170,27 +171,27 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 5);
+ assertEquals(5, tuples.size());
t = tuples.get(0);
- assertTrue(t.getString("test_t").equals("l"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("l", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
t = tuples.get(1);
- assertTrue(t.getString("test_t").equals("b"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("b", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
t = tuples.get(2);
- assertTrue(t.getString("test_t").equals("c"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("c", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
t = tuples.get(3);
- assertTrue(t.getString("test_t").equals("d"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("d", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
t = tuples.get(4);
- assertTrue(t.getString("test_t").equals("c"));
- assertTrue(t.getString("id").equals("1"));
+ assertEquals("c", t.getString("test_t"));
+ assertEquals("1", t.getString("id"));
// Try with null in the test_t field
expr =
@@ -206,7 +207,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
// Test annotating tuple
expr =
@@ -222,13 +223,13 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<?> l = (List<?>) tuples.get(0).get("test1_t");
- assertTrue(l.get(0).equals("l"));
- assertTrue(l.get(1).equals("b"));
- assertTrue(l.get(2).equals("c"));
- assertTrue(l.get(3).equals("d"));
- assertTrue(l.get(4).equals("c"));
+ assertEquals("l", l.get(0));
+ assertEquals("b", l.get(1));
+ assertEquals("c", l.get(2));
+ assertEquals("d", l.get(3));
+ assertEquals("c", l.get(4));
} finally {
cache.close();
}
@@ -482,9 +483,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
- Map<String, List<Number>> mem = (Map) tuples.get(0).get("return-value");
+ Map<String, List<Number>> mem = (Map<String, List<Number>>) tuples.get(0).get("return-value");
List<Number> array = mem.get("a");
assertEquals(array.get(0).intValue(), 100);
assertEquals(array.get(1).intValue(), 50);
@@ -530,7 +531,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> locVectors = (List<List<Number>>) tuples.get(0).get("b");
int v = 1;
@@ -560,13 +561,13 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 10);
+ assertEquals(10, tuples.size());
for (int i = 0; i < tuples.size(); i++) {
Tuple stats = tuples.get(i);
- assertTrue(((Number) stats.get("N")).intValue() == 10);
- assertTrue(((Number) stats.get("min")).intValue() == 10 * i);
- assertTrue(((Number) stats.get("var")).doubleValue() == 9.166666666666666);
- assertTrue(((Number) stats.get("stdev")).doubleValue() == 3.0276503540974917);
+ assertEquals(10, ((Number) stats.get("N")).intValue());
+ assertEquals(((Number) stats.get("min")).intValue(), 10 * i);
+ assertEquals(9.166666666666666, ((Number) stats.get("var")).doubleValue(), 0.0);
+ assertEquals(3.0276503540974917, ((Number) stats.get("stdev")).doubleValue(), 0.0);
}
expr = "hist(sequence(100, 0, 1), 5)";
@@ -577,14 +578,14 @@ public class MathExpressionTest extends SolrCloudTestCase {
solrStream = new SolrStream(url, paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 5);
+ assertEquals(5, tuples.size());
for (int i = 0; i < tuples.size(); i++) {
Tuple stats = tuples.get(i);
- assertTrue(((Number) stats.get("N")).intValue() == 20);
- assertTrue(((Number) stats.get("min")).intValue() == 20 * i);
- assertTrue(((Number) stats.get("var")).doubleValue() == 35);
- assertTrue(((Number) stats.get("stdev")).doubleValue() == 5.916079783099616);
+ assertEquals(20, ((Number) stats.get("N")).intValue());
+ assertEquals(((Number) stats.get("min")).intValue(), 20 * i);
+ assertEquals(35, ((Number) stats.get("var")).doubleValue(), 0.0);
+ assertEquals(5.916079783099616, ((Number) stats.get("stdev")).doubleValue(), 0.0);
}
}
@@ -612,10 +613,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> points = (List<List<Number>>) tuples.get(0).get("e");
- assertTrue(points.size() == 6);
+ assertEquals(6, points.size());
List<Number> point1 = points.get(0);
assertEquals(point1.size(), 2);
assertEquals(point1.get(0).doubleValue(), 82.8015657665458, 0.0);
@@ -686,7 +687,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> center = (List<Number>) tuples.get(0).get("e");
@@ -725,9 +726,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number number = (Number) tuples.get(0).get("return-value");
- assertTrue(number.doubleValue() == .5D);
+ assertEquals(.5D, number.doubleValue(), 0.0);
}
private String getDateString(String year, String month, String day) {
@@ -789,10 +790,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
- assertTrue(tuples.get(0).getDouble("corr").equals(-1.0D));
- assertTrue(tuples.get(0).getDouble("scorr").equals(-1.0D));
- assertTrue(tuples.get(0).getDouble("kcorr").equals(-1.0D));
+ assertEquals(1, tuples.size());
+ assertEquals(-1.0D, tuples.get(0).getDouble("corr"), 0.0);
+ assertEquals(-1.0D, tuples.get(0).getDouble("scorr"), 0.0);
+ assertEquals(-1.0D, tuples.get(0).getDouble("kcorr"), 0.0);
}
@Test
@@ -849,8 +850,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
- assertTrue(tuples.get(0).getDouble("cov").equals(-625.0D));
+ assertEquals(1, tuples.size());
+ assertEquals(-625.0D, tuples.get(0).getDouble("cov"), 0.0);
}
@Test
@@ -871,7 +872,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number d = (Number) tuples.get(0).get("c");
assertEquals(d.doubleValue(), 0.0017046159, 0.0001);
}
@@ -914,7 +915,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number d = (Number) tuples.get(0).get("d");
assertEquals(d.doubleValue(), 2.0, 0.0);
Number e = (Number) tuples.get(0).get("e");
@@ -1069,14 +1070,14 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> reverse = (List<Number>) tuples.get(0).get("reverse");
- assertTrue(reverse.size() == 4);
- assertTrue(reverse.get(0).doubleValue() == 400D);
- assertTrue(reverse.get(1).doubleValue() == 300D);
- assertTrue(reverse.get(2).doubleValue() == 500D);
- assertTrue(reverse.get(3).doubleValue() == 100D);
+ assertEquals(4, reverse.size());
+ assertEquals(400D, reverse.get(0).doubleValue(), 0.0);
+ assertEquals(300D, reverse.get(1).doubleValue(), 0.0);
+ assertEquals(500D, reverse.get(2).doubleValue(), 0.0);
+ assertEquals(100D, reverse.get(3).doubleValue(), 0.0);
}
@Test
@@ -1131,28 +1132,28 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> copy1 = (List<Number>) tuples.get(0).get("copy1");
- assertTrue(copy1.size() == 4);
- assertTrue(copy1.get(0).doubleValue() == 100D);
- assertTrue(copy1.get(1).doubleValue() == 500D);
- assertTrue(copy1.get(2).doubleValue() == 300D);
- assertTrue(copy1.get(3).doubleValue() == 400D);
+ assertEquals(4, copy1.size());
+ assertEquals(100D, copy1.get(0).doubleValue(), 0.0);
+ assertEquals(500D, copy1.get(1).doubleValue(), 0.0);
+ assertEquals(300D, copy1.get(2).doubleValue(), 0.0);
+ assertEquals(400D, copy1.get(3).doubleValue(), 0.0);
@SuppressWarnings({"unchecked"})
List<Number> copy2 = (List<Number>) tuples.get(0).get("copy2");
- assertTrue(copy2.size() == 4);
- assertTrue(copy2.get(0).doubleValue() == 100D);
- assertTrue(copy2.get(1).doubleValue() == 500D);
- assertTrue(copy2.get(2).doubleValue() == 300D);
- assertTrue(copy2.get(3).doubleValue() == 400D);
+ assertEquals(4, copy2.size());
+ assertEquals(100D, copy2.get(0).doubleValue(), 0.0);
+ assertEquals(500D, copy2.get(1).doubleValue(), 0.0);
+ assertEquals(300D, copy2.get(2).doubleValue(), 0.0);
+ assertEquals(400D, copy2.get(3).doubleValue(), 0.0);
@SuppressWarnings({"unchecked"})
List<Number> copy3 = (List<Number>) tuples.get(0).get("copy3");
- assertTrue(copy3.size() == 2);
- assertTrue(copy3.get(0).doubleValue() == 100D);
- assertTrue(copy3.get(1).doubleValue() == 500D);
+ assertEquals(2, copy3.size());
+ assertEquals(100D, copy3.get(0).doubleValue(), 0.0);
+ assertEquals(500D, copy3.get(1).doubleValue(), 0.0);
}
@Test
@@ -1207,21 +1208,21 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> copy1 = (List<Number>) tuples.get(0).get("copy");
- assertTrue(copy1.size() == 2);
- assertTrue(copy1.get(0).doubleValue() == 500D);
- assertTrue(copy1.get(1).doubleValue() == 300D);
+ assertEquals(2, copy1.size());
+ assertEquals(500D, copy1.get(0).doubleValue(), 0.0);
+ assertEquals(300D, copy1.get(1).doubleValue(), 0.0);
@SuppressWarnings({"unchecked"})
List<Number> copy2 = (List<Number>) tuples.get(0).get("copy2");
- assertTrue(copy2.size() == 2);
- assertTrue(copy2.get(0).doubleValue() == 300D);
- assertTrue(copy2.get(1).doubleValue() == 400D);
+ assertEquals(2, copy2.size());
+ assertEquals(300D, copy2.get(0).doubleValue(), 0.0);
+ assertEquals(400D, copy2.get(1).doubleValue(), 0.0);
long l = tuples.get(0).getLong("l");
- assertTrue(l == 4);
+ assertEquals(4, l);
}
@Test
@@ -1238,7 +1239,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
double p = tuple.getDouble("return-value");
assertEquals(p, 6, 0.0);
@@ -1253,7 +1254,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
p = tuple.getDouble("return-value");
assertEquals(p, 6, 0.0);
@@ -1268,7 +1269,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
p = tuple.getDouble("return-value");
assertEquals(p, 2.4, 0.001);
@@ -1283,7 +1284,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
@SuppressWarnings({"unchecked"})
List<Number> percentiles = (List<Number>) tuple.get("return-value");
@@ -1305,7 +1306,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
@SuppressWarnings({"unchecked"})
List<Number> asort = (List<Number>) tuple.get("return-value");
@@ -1334,7 +1335,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
long binomialCoefficient = tuple.getLong("return-value");
assertEquals(binomialCoefficient, 56);
@@ -1354,7 +1355,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
@SuppressWarnings({"unchecked"})
List<Number> asort = (List<Number>) tuple.get("return-value");
@@ -1417,22 +1418,22 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> reverse = (List<Number>) tuples.get(0).get("reverse");
- assertTrue(reverse.size() == 4);
- assertTrue(reverse.get(0).doubleValue() == 400D);
- assertTrue(reverse.get(1).doubleValue() == 300D);
- assertTrue(reverse.get(2).doubleValue() == 500D);
- assertTrue(reverse.get(3).doubleValue() == 100D);
+ assertEquals(4, reverse.size());
+ assertEquals(400D, reverse.get(0).doubleValue(), 0.0);
+ assertEquals(300D, reverse.get(1).doubleValue(), 0.0);
+ assertEquals(500D, reverse.get(2).doubleValue(), 0.0);
+ assertEquals(100D, reverse.get(3).doubleValue(), 0.0);
@SuppressWarnings({"unchecked"})
List<Number> ranked = (List<Number>) tuples.get(0).get("ranked");
- assertTrue(ranked.size() == 4);
- assertTrue(ranked.get(0).doubleValue() == 1D);
- assertTrue(ranked.get(1).doubleValue() == 4D);
- assertTrue(ranked.get(2).doubleValue() == 2D);
- assertTrue(ranked.get(3).doubleValue() == 3D);
+ assertEquals(4, ranked.size());
+ assertEquals(1D, ranked.get(0).doubleValue(), 0.0);
+ assertEquals(4D, ranked.get(1).doubleValue(), 0.0);
+ assertEquals(2D, ranked.get(2).doubleValue(), 0.0);
+ assertEquals(3D, ranked.get(3).doubleValue(), 0.0);
}
@Test
@@ -1448,15 +1449,15 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 6);
- assertTrue(out.get(0).intValue() == 1);
- assertTrue(out.get(1).intValue() == 2);
- assertTrue(out.get(2).intValue() == 3);
- assertTrue(out.get(3).intValue() == 300);
- assertTrue(out.get(4).intValue() == 2);
- assertTrue(out.get(5).intValue() == 500);
+ assertEquals(6, out.size());
+ assertEquals(1, out.get(0).intValue());
+ assertEquals(2, out.get(1).intValue());
+ assertEquals(3, out.get(2).intValue());
+ assertEquals(300, out.get(3).intValue());
+ assertEquals(2, out.get(4).intValue());
+ assertEquals(500, out.get(5).intValue());
cexpr = "array(1.122, 2.222, 3.333, 300.1, 2.13, 500.23)";
paramsLoc = new ModifiableSolrParams();
@@ -1465,15 +1466,15 @@ public class MathExpressionTest extends SolrCloudTestCase {
solrStream = new SolrStream(url, paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 6);
- assertTrue(out.get(0).doubleValue() == 1.122D);
- assertTrue(out.get(1).doubleValue() == 2.222D);
- assertTrue(out.get(2).doubleValue() == 3.333D);
- assertTrue(out.get(3).doubleValue() == 300.1D);
- assertTrue(out.get(4).doubleValue() == 2.13D);
- assertTrue(out.get(5).doubleValue() == 500.23D);
+ assertEquals(6, out.size());
+ assertEquals(1.122D, out.get(0).doubleValue(), 0.0);
+ assertEquals(2.222D, out.get(1).doubleValue(), 0.0);
+ assertEquals(3.333D, out.get(2).doubleValue(), 0.0);
+ assertEquals(300.1D, out.get(3).doubleValue(), 0.0);
+ assertEquals(2.13D, out.get(4).doubleValue(), 0.0);
+ assertEquals(500.23D, out.get(5).doubleValue(), 0.0);
}
@Test
@@ -1491,7 +1492,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> out = (List<List<Number>>) tuples.get(0).get("c");
assertEquals(out.size(), 2);
@@ -1522,7 +1523,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
assertEquals(out.size(), 6);
@@ -1546,7 +1547,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
assertEquals(out.size(), 6);
@@ -1570,7 +1571,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
assertEquals(out.size(), 6);
@@ -1594,7 +1595,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
assertEquals(out.size(), 4);
@@ -1616,7 +1617,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
assertEquals(out.size(), 4);
@@ -1638,7 +1639,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
assertEquals(out.size(), 6);
@@ -1674,7 +1675,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> out = (List<List<Number>>) tuples.get(0).get("a");
@@ -1719,10 +1720,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(features.get(0).get(0), "col3");
assertEquals(features.get(1).get(0), "col1");
- assertTrue(tuples.get(0).getLong("f") == 2);
- assertTrue(tuples.get(0).getLong("g") == 3);
- assertTrue(tuples.get(0).getLong("h") == 1);
- assertTrue(tuples.get(0).getLong("i") == 2);
+ assertEquals(2, tuples.get(0).getLong("f").longValue());
+ assertEquals(3, tuples.get(0).getLong("g").longValue());
+ assertEquals(1, tuples.get(0).getLong("h").longValue());
+ assertEquals(2, tuples.get(0).getLong("i").longValue());
}
@Test
@@ -1742,26 +1743,26 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 4);
+ assertEquals(4, tuples.size());
Tuple out = tuples.get(0);
- assertEquals(out.getDouble("x").doubleValue(), 1.0, 0.0);
- assertEquals(out.getDouble("y").doubleValue(), 10.0, 0.0);
+ assertEquals(out.getDouble("x"), 1.0, 0.0);
+ assertEquals(out.getDouble("y"), 10.0, 0.0);
out = tuples.get(1);
- assertEquals(out.getDouble("x").doubleValue(), 2.0, 0.0);
- assertEquals(out.getDouble("y").doubleValue(), 11.0, 0.0);
+ assertEquals(out.getDouble("x"), 2.0, 0.0);
+ assertEquals(out.getDouble("y"), 11.0, 0.0);
out = tuples.get(2);
- assertEquals(out.getDouble("x").doubleValue(), 3.0, 0.0);
- assertEquals(out.getDouble("y").doubleValue(), 12.0, 0.0);
+ assertEquals(out.getDouble("x"), 3.0, 0.0);
+ assertEquals(out.getDouble("y"), 12.0, 0.0);
out = tuples.get(3);
- assertEquals(out.getDouble("x").doubleValue(), 4.0, 0.0);
- assertEquals(out.getDouble("y").doubleValue(), 13.0, 0.0);
+ assertEquals(out.getDouble("x"), 4.0, 0.0);
+ assertEquals(out.getDouble("y"), 13.0, 0.0);
cexpr = "let(b=array(10,11,12,13)," + " zplot(y=b))";
@@ -1772,26 +1773,26 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 4);
+ assertEquals(4, tuples.size());
out = tuples.get(0);
- assertEquals(out.getDouble("x").doubleValue(), 0.0, 0.0);
- assertEquals(out.getDouble("y").doubleValue(), 10.0, 0.0);
+ assertEquals(out.getDouble("x"), 0.0, 0.0);
+ assertEquals(out.getDouble("y"), 10.0, 0.0);
out = tuples.get(1);
- assertEquals(out.getDouble("x").doubleValue(), 1.0, 0.0);
- assertEquals(out.getDouble("y").doubleValue(), 11.0, 0.0);
+ assertEquals(out.getDouble("x"), 1.0, 0.0);
+ assertEquals(out.getDouble("y"), 11.0, 0.0);
out = tuples.get(2);
- assertEquals(out.getDouble("x").doubleValue(), 2.0, 0.0);
- assertEquals(out.getDouble("y").doubleValue(), 12.0, 0.0);
+ assertEquals(out.getDouble("x"), 2.0, 0.0);
+ assertEquals(out.getDouble("y"), 12.0, 0.0);
out = tuples.get(3);
- assertEquals(out.getDouble("x").doubleValue(), 3.0, 0.0);
- assertEquals(out.getDouble("y").doubleValue(), 13.0, 0.0);
+ assertEquals(out.getDouble("x"), 3.0, 0.0);
+ assertEquals(out.getDouble("y"), 13.0, 0.0);
cexpr = "zplot(dist=binomialDistribution(10, .50))";
@@ -1858,7 +1859,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 700);
+ assertEquals(700, tuples.size());
Set clusters = new HashSet();
for (Tuple tup : tuples) {
@@ -1885,7 +1886,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 24);
+ assertEquals(24, tuples.size());
Tuple tuple = tuples.get(0);
String xLabel = tuple.getString("x");
String yLabel = tuple.getString("y");
@@ -1934,7 +1935,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 24);
+ assertEquals(24, tuples.size());
tuple = tuples.get(0);
xLabel = tuple.getString("x");
yLabel = tuple.getString("y");
@@ -1985,7 +1986,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 24);
+ assertEquals(24, tuples.size());
tuple = tuples.get(0);
xLabel = tuple.getString("x");
yLabel = tuple.getString("y");
@@ -2049,7 +2050,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
double grandSum = tuples.get(0).getDouble("b");
assertEquals(grandSum, 24, 0.0);
@@ -2150,7 +2151,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> out = (List<List<Number>>) tuples.get(0).get("b");
assertEquals(out.size(), 3);
@@ -2183,7 +2184,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> out = (List<List<Number>>) tuples.get(0).get("a");
assertEquals(out.size(), 2);
@@ -2223,7 +2224,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> out = (List<List<Number>>) tuples.get(0).get("a");
assertEquals(out.size(), 2);
@@ -2267,7 +2268,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> out = (List<List<Number>>) tuples.get(0).get("a");
assertEquals(out.size(), 2);
@@ -2316,7 +2317,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
Tuple bin0 = tuples.get(0);
double state0Pct = bin0.getDouble("pct");
@@ -2338,19 +2339,19 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 9);
- assertTrue(out.get(0).intValue() == 1);
- assertTrue(out.get(1).intValue() == 2);
- assertTrue(out.get(2).intValue() == 3);
- assertTrue(out.get(3).doubleValue() == 4.5D);
- assertTrue(out.get(4).doubleValue() == 5.5D);
- assertTrue(out.get(5).doubleValue() == 6.5D);
- assertTrue(out.get(6).intValue() == 7);
- assertTrue(out.get(7).intValue() == 8);
- assertTrue(out.get(8).intValue() == 9);
+ assertEquals(9, out.size());
+ assertEquals(1, out.get(0).intValue());
+ assertEquals(2, out.get(1).intValue());
+ assertEquals(3, out.get(2).intValue());
+ assertEquals(4.5D, out.get(3).doubleValue(), 0.0);
+ assertEquals(5.5D, out.get(4).doubleValue(), 0.0);
+ assertEquals(6.5D, out.get(5).doubleValue(), 0.0);
+ assertEquals(7, out.get(6).intValue());
+ assertEquals(8, out.get(7).intValue());
+ assertEquals(9, out.get(8).intValue());
}
@Test
@@ -2365,7 +2366,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number prob = (Number) tuples.get(0).get("b");
assertEquals(prob.doubleValue(), 0.09184805266259899, 0.0);
}
@@ -2409,7 +2410,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("sample");
@@ -2420,13 +2421,13 @@ public class MathExpressionTest extends SolrCloudTestCase {
@SuppressWarnings({"rawtypes"})
Map ks3 = (Map) tuples.get(0).get("ks3");
- assertTrue(out.size() == 250);
+ assertEquals(250, out.size());
Number pvalue = (Number) ks.get("p-value");
Number pvalue2 = (Number) ks2.get("p-value");
Number pvalue3 = (Number) ks3.get("p-value");
assertTrue(pvalue.doubleValue() > .05D);
- assertTrue(pvalue2.doubleValue() == 0);
+ assertEquals(0, pvalue2.doubleValue(), 0.0);
assertTrue(pvalue3.doubleValue() > .05D);
}
@@ -2442,7 +2443,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
double sd = tuples.get(0).getDouble("return-value");
assertEquals(sd, 21.0D, 0.0);
}
@@ -2459,7 +2460,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
double sd = tuples.get(0).getDouble("return-value");
assertEquals(sd, 3.5, 0.0);
}
@@ -2614,8 +2615,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(solrStream);
assertEquals(tuples.size(), 1);
Tuple tuple = tuples.get(0);
- assertEquals(tuple.getDouble("a").doubleValue(), 1.88888, 0.0);
- assertEquals(tuple.getDouble("b").doubleValue(), 8888888888.98, 0.0);
+ assertEquals(tuple.getDouble("a"), 1.88888, 0.0);
+ assertEquals(tuple.getDouble("b"), 8888888888.98, 0.0);
}
@Test
@@ -2729,7 +2730,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<List<Number>> termVectors = (List<List<Number>>) tuples.get(0).get("b");
assertEquals(termVectors.size(), 4);
@@ -2808,7 +2809,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
termVectors = (List<List<Number>>) tuples.get(0).get("b");
assertEquals(termVectors.size(), 4);
termVector = termVectors.get(0);
@@ -2881,7 +2882,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
termVectors = (List<List<Number>>) tuples.get(0).get("b");
assertEquals(termVectors.size(), 4);
termVector = termVectors.get(0);
@@ -2953,7 +2954,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
termVectors = (List<List<Number>>) tuples.get(0).get("b");
assertEquals(termVectors.size(), 4);
@@ -3008,7 +3009,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
termVectors = (List<List<Number>>) tuples.get(0).get("b");
assertEquals(termVectors.size(), 4);
assertEquals(termVectors.get(0).size(), 0);
@@ -3084,7 +3085,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("c");
assertEquals(out.size(), 6);
@@ -3140,7 +3141,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<List<Number>> matrix = (List<List<Number>>) tuples.get(0).get("c");
assertEquals(matrix.size(), 1);
List<Number> row = matrix.get(0);
@@ -3221,7 +3222,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> cluster1 = (List<List<Number>>) tuples.get(0).get("g");
@SuppressWarnings({"unchecked"})
@@ -3238,10 +3239,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(centroids.size(), 2);
// Assert that the docs are not in both clusters
- assertTrue(!(labels1.contains("doc1") && labels2.contains("doc1")));
- assertTrue(!(labels1.contains("doc2") && labels2.contains("doc2")));
- assertTrue(!(labels1.contains("doc3") && labels2.contains("doc3")));
- assertTrue(!(labels1.contains("doc4") && labels2.contains("doc4")));
+ assertFalse(labels1.contains("doc1") && labels2.contains("doc1"));
+ assertFalse(labels1.contains("doc2") && labels2.contains("doc2"));
+ assertFalse(labels1.contains("doc3") && labels2.contains("doc3"));
+ assertFalse(labels1.contains("doc4") && labels2.contains("doc4"));
// Assert that (doc1 and doc2) or (doc3 and doc4) are in labels1
assertTrue(
@@ -3301,7 +3302,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 6);
+ assertEquals(6, tuples.size());
Tuple tuple0 = tuples.get(0);
assertEquals(tuple0.getString("cluster"), "cluster1");
Tuple tuple1 = tuples.get(1);
@@ -3335,7 +3336,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 6);
+ assertEquals(6, tuples.size());
Tuple tuple0 = tuples.get(0);
assertEquals(tuple0.getString("cluster"), "cluster1");
Tuple tuple1 = tuples.get(1);
@@ -3369,7 +3370,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
}
@Test
@@ -3397,7 +3398,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> cluster1 = (List<List<Number>>) tuples.get(0).get("g");
@SuppressWarnings({"unchecked"})
@@ -3414,10 +3415,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(centroids.size(), 2);
// Assert that the docs are not in both clusters
- assertTrue(!(labels1.contains("doc1") && labels2.contains("doc1")));
- assertTrue(!(labels1.contains("doc2") && labels2.contains("doc2")));
- assertTrue(!(labels1.contains("doc3") && labels2.contains("doc3")));
- assertTrue(!(labels1.contains("doc4") && labels2.contains("doc4")));
+ assertFalse(labels1.contains("doc1") && labels2.contains("doc1"));
+ assertFalse(labels1.contains("doc2") && labels2.contains("doc2"));
+ assertFalse(labels1.contains("doc3") && labels2.contains("doc3"));
+ assertFalse(labels1.contains("doc4") && labels2.contains("doc4"));
// Assert that (doc1 and doc2) or (doc3 and doc4) are in labels1
assertTrue(
@@ -3486,7 +3487,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> cluster1 = (List<List<Number>>) tuples.get(0).get("g");
@SuppressWarnings({"unchecked"})
@@ -3506,10 +3507,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(centroids.size(), 2);
// Assert that the docs are not in both clusters
- assertTrue(!(labels1.contains("doc1") && labels2.contains("doc1")));
- assertTrue(!(labels1.contains("doc2") && labels2.contains("doc2")));
- assertTrue(!(labels1.contains("doc3") && labels2.contains("doc3")));
- assertTrue(!(labels1.contains("doc4") && labels2.contains("doc4")));
+ assertFalse(labels1.contains("doc1") && labels2.contains("doc1"));
+ assertFalse(labels1.contains("doc2") && labels2.contains("doc2"));
+ assertFalse(labels1.contains("doc3") && labels2.contains("doc3"));
+ assertFalse(labels1.contains("doc4") && labels2.contains("doc4"));
// Assert that (doc1 and doc2) or (doc3 and doc4) are in labels1
assertTrue(
@@ -3585,16 +3586,16 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 6);
- assertTrue(out.get(0).intValue() == 2);
- assertTrue(out.get(1).intValue() == 8);
- assertTrue(out.get(2).intValue() == 18);
- assertTrue(out.get(3).intValue() == 32);
- assertTrue(out.get(4).intValue() == 50);
- assertTrue(out.get(5).intValue() == 72);
+ assertEquals(6, out.size());
+ assertEquals(2, out.get(0).intValue());
+ assertEquals(8, out.get(1).intValue());
+ assertEquals(18, out.get(2).intValue());
+ assertEquals(32, out.get(3).intValue());
+ assertEquals(50, out.get(4).intValue());
+ assertEquals(72, out.get(5).intValue());
}
@Test
@@ -3619,7 +3620,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> wave = (List<Number>) tuples.get(0).get("a");
assertEquals(wave.size(), 128);
@@ -3668,7 +3669,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("c");
assertEquals(out.size(), 6);
@@ -3720,7 +3721,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number mean = (Number) tuples.get(0).get("b");
assertEquals(mean.doubleValue(), 3.3800151591412964, 0.0);
Number mean1 = (Number) tuples.get(0).get("d");
@@ -3745,16 +3746,16 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 6);
- assertTrue(out.get(0).intValue() == 2);
- assertTrue(out.get(1).intValue() == 2);
- assertTrue(out.get(2).intValue() == 2);
- assertTrue(out.get(3).intValue() == 2);
- assertTrue(out.get(4).intValue() == 2);
- assertTrue(out.get(5).intValue() == 2);
+ assertEquals(6, out.size());
+ assertEquals(2, out.get(0).intValue());
+ assertEquals(2, out.get(1).intValue());
+ assertEquals(2, out.get(2).intValue());
+ assertEquals(2, out.get(3).intValue());
+ assertEquals(2, out.get(4).intValue());
+ assertEquals(2, out.get(5).intValue());
}
@Test
@@ -3769,7 +3770,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 6);
+ assertEquals(6, tuples.size());
Tuple bucket = tuples.get(0);
assertEquals(bucket.getLong("value").longValue(), 2);
assertEquals(bucket.getLong("count").longValue(), 2);
@@ -3834,8 +3835,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(reals.get(15).doubleValue(), 0, 0.0);
List<Number> imaginary = fft.get(1);
- for (int i = 0; i < imaginary.size(); i++) {
- assertEquals(imaginary.get(i).doubleValue(), 0.0, 0.0);
+ for (Number number : imaginary) {
+ assertEquals(number.doubleValue(), 0.0, 0.0);
}
@SuppressWarnings({"unchecked"})
@@ -3870,7 +3871,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number cs = (Number) tuples.get(0).get("return-value");
assertEquals(cs.doubleValue(), 0.9838197164968291, .00000001);
}
@@ -3912,7 +3913,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map map = (Map) tuples.get(0).get("d");
Number mean = (Number) map.get("mean");
@@ -3948,7 +3949,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked", "rawtypes"})
List<Map> listg = (List<Map>) tuples.get(0).get("g");
@@ -3990,7 +3991,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number prob = (Number) tuples.get(0).get("p");
assertEquals(prob.doubleValue(), 0.07958923738717877, 0.0);
Number cprob = (Number) tuples.get(0).get("c");
@@ -4015,7 +4016,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map map = (Map) tuples.get(0).get("d");
Number N = (Number) map.get("N");
@@ -4038,11 +4039,11 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> counts = (List<Number>) tuples.get(0).get("c");
- assertTrue(counts.size() == 10);
+ assertEquals(10, counts.size());
int lastCount = Integer.MAX_VALUE;
for (Number number : counts) {
@@ -4073,7 +4074,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number value1 = (Number) tuples.get(0).get("d");
Number value2 = (Number) tuples.get(0).get("e");
assertEquals(value1.intValue(), 4);
@@ -4093,7 +4094,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<Number> counts = (List<Number>) tuples.get(0).get("c");
int lastCount = Integer.MAX_VALUE;
@@ -4114,7 +4115,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
counts = (List<Number>) tuples.get(0).get("c");
lastCount = Integer.MIN_VALUE;
@@ -4147,7 +4148,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map map = (Map) tuples.get(0).get("d");
Number N = (Number) map.get("N");
@@ -4170,7 +4171,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> freqs = (List<Number>) tuples.get(0).get("y");
assertEquals(freqs.get(0).doubleValue(), .40, .03);
@@ -4191,9 +4192,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number dotProduct = (Number) tuples.get(0).get("return-value");
- assertTrue(dotProduct.doubleValue() == 182);
+ assertEquals(182, dotProduct.doubleValue(), 0.0);
}
@Test
@@ -4208,11 +4209,11 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number variance = (Number) tuples.get(0).get("a");
- assertTrue(variance.doubleValue() == 2.5);
+ assertEquals(2.5, variance.doubleValue(), 0.0);
Number stddev = (Number) tuples.get(0).get("b");
- assertTrue(stddev.doubleValue() == 0);
+ assertEquals(0, stddev.doubleValue(), 0.0);
}
// NOTE: cache evaluators work only locally, on
@@ -4245,9 +4246,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number dotProduct = (Number) tuples.get(0).get("return-value");
- assertTrue(dotProduct.doubleValue() == 182);
+ assertEquals(182, dotProduct.doubleValue(), 0.0);
cexpr = "getCache(\"space1\", \"key1\")";
paramsLoc = new ModifiableSolrParams();
@@ -4257,9 +4258,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
dotProduct = (Number) tuples.get(0).get("return-value");
- assertTrue(dotProduct.doubleValue() == 182);
+ assertEquals(182, dotProduct.doubleValue(), 0.0);
cexpr = "listCache(\"space1\")";
paramsLoc = new ModifiableSolrParams();
@@ -4269,7 +4270,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<String> keys = (List<String>) tuples.get(0).get("return-value");
assertEquals(keys.size(), 1);
assertEquals(keys.get(0), "key1");
@@ -4282,7 +4283,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
keys = (List<String>) tuples.get(0).get("return-value");
assertEquals(keys.size(), 1);
assertEquals(keys.get(0), "space1");
@@ -4295,9 +4296,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
dotProduct = (Number) tuples.get(0).get("return-value");
- assertTrue(dotProduct.doubleValue() == 182);
+ assertEquals(182, dotProduct.doubleValue(), 0.0);
cexpr = "listCache(\"space1\")";
paramsLoc = new ModifiableSolrParams();
@@ -4307,7 +4308,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
keys = (List<String>) tuples.get(0).get("return-value");
assertEquals(keys.size(), 0);
}
@@ -4328,10 +4329,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 21);
+ assertEquals(21, out.size());
assertEquals((double) out.get(0), 22.22, 0.009);
assertEquals((double) out.get(1), 22.21, 0.009);
assertEquals((double) out.get(2), 22.24, 0.009);
@@ -4372,7 +4373,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> matrix = (List<List<Number>>) tuples.get(0).get("c");
@SuppressWarnings({"unchecked"})
@@ -4407,10 +4408,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 19);
+ assertEquals(19, out.size());
assertEquals(out.get(0).doubleValue(), -88.0, 0.01);
assertEquals(out.get(1).doubleValue(), 352.0, 0.01);
assertEquals(out.get(2).doubleValue(), -161.0, 0.01);
@@ -4445,10 +4446,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 8);
+ assertEquals(8, out.size());
assertEquals(out.get(0).doubleValue(), -94.0, 0.01);
assertEquals(out.get(1).doubleValue(), -64.0, 0.01);
assertEquals(out.get(2).doubleValue(), -82.0, 0.01);
@@ -4472,10 +4473,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 7);
+ assertEquals(7, out.size());
assertEquals(out.get(0).doubleValue(), 30.0, 0.01);
assertEquals(out.get(1).doubleValue(), -18.0, 0.01);
assertEquals(out.get(2).doubleValue(), 226.0, 0.01);
@@ -4502,28 +4503,28 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<Number> out = (List<Number>) tuples.get(0).get("fit");
- assertTrue(out.size() == 8);
- assertTrue(out.get(0).intValue() == 0);
- assertTrue(out.get(1).intValue() == 1);
- assertTrue(out.get(2).intValue() == 2);
- assertTrue(out.get(3).intValue() == 3);
- assertTrue(out.get(4).intValue() == 4);
- assertTrue(out.get(5).intValue() == 5);
- assertTrue(out.get(6).intValue() == 6);
- assertTrue(out.get(7).intValue() == 7);
+ assertEquals(8, out.size());
+ assertEquals(0, out.get(0).intValue());
+ assertEquals(1, out.get(1).intValue());
+ assertEquals(2, out.get(2).intValue());
+ assertEquals(3, out.get(3).intValue());
+ assertEquals(4, out.get(4).intValue());
+ assertEquals(5, out.get(5).intValue());
+ assertEquals(6, out.get(6).intValue());
+ assertEquals(7, out.get(7).intValue());
out = (List<Number>) tuples.get(0).get("predictions");
- assertTrue(out.size() == 8);
- assertTrue(out.get(0).intValue() == 0);
- assertTrue(out.get(1).intValue() == 1);
- assertTrue(out.get(2).intValue() == 2);
- assertTrue(out.get(3).intValue() == 3);
- assertTrue(out.get(4).intValue() == 4);
- assertTrue(out.get(5).intValue() == 5);
- assertTrue(out.get(6).intValue() == 6);
- assertTrue(out.get(7).intValue() == 7);
+ assertEquals(8, out.size());
+ assertEquals(0, out.get(0).intValue());
+ assertEquals(1, out.get(1).intValue());
+ assertEquals(2, out.get(2).intValue());
+ assertEquals(3, out.get(3).intValue());
+ assertEquals(4, out.get(4).intValue());
+ assertEquals(5, out.get(5).intValue());
+ assertEquals(6, out.get(6).intValue());
+ assertEquals(7, out.get(7).intValue());
}
@Test
@@ -4545,7 +4546,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map testResult = (Map) tuples.get(0).get("ttest");
Number tstat = (Number) testResult.get("t-statistic");
@@ -4585,7 +4586,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map testResult = (Map) tuples.get(0).get("chisquare");
Number tstat = (Number) testResult.get("chisquare-statistic");
@@ -4611,7 +4612,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map testResult = (Map) tuples.get(0).get("gtest");
Number gstat = (Number) testResult.get("G-statistic");
@@ -4644,7 +4645,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> cov = (List<List<Number>>) tuples.get(0).get("h");
assertEquals(cov.size(), 2);
@@ -4698,7 +4699,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<List<Number>> knnMatrix = (List<List<Number>>) tuples.get(0).get("c");
assertEquals(knnMatrix.size(), 2);
@@ -4722,9 +4723,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(row2.get(4).doubleValue(), 1.0, 0.0);
assertEquals(row2.get(5).doubleValue(), 1.0, 0.0);
- @SuppressWarnings({"rawtypes"})
- Map atts = (Map) tuples.get(0).get("e");
- List<Number> dists = (List<Number>) atts.get("distances");
+ Map<String, List<Number>> atts = (Map<String, List<Number>>) tuples.get(0).get("e");
+ List<Number> dists = atts.get("distances");
assertEquals(dists.size(), 2);
assertEquals(dists.get(0).doubleValue(), 0.0, 0.0);
assertEquals(dists.get(1).doubleValue(), 1.4142135623730951, 0.0);
@@ -4734,8 +4734,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(rowLabels.get(0), "row3");
assertEquals(rowLabels.get(1), "row2");
- atts = (Map) tuples.get(0).get("g");
- dists = (List<Number>) atts.get("distances");
+ atts = (Map<String, List<Number>>) tuples.get(0).get("g");
+ dists = atts.get("distances");
assertEquals(dists.size(), 2);
assertEquals(dists.get(0).doubleValue(), 0.0, 0.0);
assertEquals(dists.get(1).doubleValue(), 2.0, 0.0);
@@ -4760,7 +4760,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number integral = (Number) tuples.get(0).get("c");
assertEquals(integral.doubleValue(), 49, 0.0);
integral = (Number) tuples.get(0).get("d");
@@ -4790,10 +4790,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("fit");
- assertTrue(out.size() == 8);
+ assertEquals(8, out.size());
assertEquals(out.get(0).doubleValue(), 0.0, 0.0);
assertEquals(out.get(1).doubleValue(), 1.0, 0.0);
assertEquals(out.get(2).doubleValue(), 2.0, 0.0);
@@ -4805,7 +4805,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
@SuppressWarnings({"unchecked"})
List<Number> out1 = (List<Number>) tuples.get(0).get("der");
- assertTrue(out1.size() == 8);
+ assertEquals(8, out1.size());
assertEquals(out1.get(0).doubleValue(), 1.0, 0.0);
assertEquals(out1.get(1).doubleValue(), 1.0, 0.0);
assertEquals(out1.get(2).doubleValue(), 1.0, 0.0);
@@ -4834,10 +4834,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("fit");
- assertTrue(out.size() == 8);
+ assertEquals(8, out.size());
assertEquals(out.get(0).doubleValue(), 1.0, 0.0001);
assertEquals(out.get(1).doubleValue(), 70.0, 0.0001);
assertEquals(out.get(2).doubleValue(), 90.0, 0.0001);
@@ -4850,7 +4850,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
@SuppressWarnings({"unchecked"})
List<Number> out1 = (List<Number>) tuples.get(0).get("der");
- assertTrue(out1.size() == 8);
+ assertEquals(8, out1.size());
assertEquals(out1.get(0).doubleValue(), 72.06870491240123, 0.0001);
assertEquals(out1.get(1).doubleValue(), 62.86259017519753, 0.0001);
assertEquals(out1.get(2).doubleValue(), -56.519065613191344, 0.0001);
@@ -4888,7 +4888,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number p1 = (Number) tuples.get(0).get("p1");
assertEquals(p1.doubleValue(), 449.7837701612903, 0.0);
Number p2 = (Number) tuples.get(0).get("p2");
@@ -4920,10 +4920,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("fit");
- assertTrue(out.size() == 8);
+ assertEquals(8, out.size());
assertEquals(out.get(0).doubleValue(), 1.0, 0.0001);
assertEquals(out.get(1).doubleValue(), 70.0, 0.0001);
assertEquals(out.get(2).doubleValue(), 90.0, 0.0001);
@@ -4935,7 +4935,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
@SuppressWarnings({"unchecked"})
List<Number> out1 = (List<Number>) tuples.get(0).get("der");
- assertTrue(out1.size() == 8);
+ assertEquals(8, out1.size());
assertEquals(out1.get(0).doubleValue(), 93.5, 0.0001);
assertEquals(out1.get(1).doubleValue(), 44.5, 0.0001);
assertEquals(out1.get(2).doubleValue(), -4.873096446700508, 0.0001);
@@ -4965,13 +4965,13 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked", "rawtypes"})
List<Map> out = (List<Map>) tuples.get(0).get("e");
assertEquals(out.size(), 2);
@SuppressWarnings({"rawtypes"})
Map high = out.get(0);
- assertEquals(((String) high.get("id")), "1");
+ assertEquals(high.get("id"), "1");
assertEquals(
((Number) high.get("cumulativeProbablity_d")).doubleValue(), 0.9772498680518208, 0.0);
@@ -4979,7 +4979,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
@SuppressWarnings({"rawtypes"})
Map low = out.get(1);
- assertEquals(((String) low.get("id")), "2");
+ assertEquals(low.get("id"), "2");
assertEquals(
((Number) low.get("cumulativeProbablity_d")).doubleValue(), 0.022750131948179167, 0.0);
assertEquals(((Number) low.get("lowOutlierValue_d")).doubleValue(), 90, 0.0);
@@ -4989,14 +4989,14 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(out1.size(), 2);
@SuppressWarnings({"rawtypes"})
Map high1 = out1.get(0);
- assert (high1.get("id") == null);
+ assertNull(high1.get("id"));
assertEquals(
((Number) high1.get("cumulativeProbablity_d")).doubleValue(), 0.9772498680518208, 0.0);
assertEquals(((Number) high1.get("highOutlierValue_d")).doubleValue(), 110.0, 0.0);
@SuppressWarnings({"rawtypes"})
Map low1 = out1.get(1);
- assert (low1.get("id") == null);
+ assertNull(low1.get("id"));
assertEquals(
((Number) low1.get("cumulativeProbablity_d")).doubleValue(), 0.022750131948179167, 0.0);
assertEquals(((Number) low1.get("lowOutlierValue_d")).doubleValue(), 90, 0.0);
@@ -5020,10 +5020,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("fit");
- assertTrue(out.size() == 8);
+ assertEquals(8, out.size());
assertEquals(out.get(0).doubleValue(), 1.0, 0.0001);
assertEquals(out.get(1).doubleValue(), 70.0, 0.0001);
assertEquals(out.get(2).doubleValue(), 90.0, 0.0001);
@@ -5035,7 +5035,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
@SuppressWarnings({"unchecked"})
List<Number> out1 = (List<Number>) tuples.get(0).get("der");
- assertTrue(out1.size() == 8);
+ assertEquals(8, out1.size());
assertEquals(out1.get(0).doubleValue(), 69.0, 0.0001);
assertEquals(out1.get(1).doubleValue(), 20.0, 0.0001);
assertEquals(out1.get(2).doubleValue(), -80.0, 0.0001);
@@ -5059,10 +5059,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("s");
- assertTrue(out.size() == 100);
+ assertEquals(100, out.size());
for (Number n : out) {
assertEquals(n.doubleValue(), 0.0, .01);
}
@@ -5080,7 +5080,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple out = tuples.get(0);
assertEquals((double) out.get("p-value"), 0.788298D, .0001);
assertEquals((double) out.get("f-ratio"), 0.24169D, .0001);
@@ -5105,7 +5105,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map regression = (Map) tuples.get(0).get("f");
@@ -5156,7 +5156,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<Number> predictions = (List<Number>) tuples.get(0).get("g");
assertEquals(predictions.size(), 10);
// k=1 should bring back only one prediction for the exact match in the training set
@@ -5187,7 +5187,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number prediction = (Number) tuples.get(0).get("g");
assertEquals(prediction.doubleValue(), 85.09999847, 0);
@@ -5209,7 +5209,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
prediction = (Number) tuples.get(0).get("g");
assertEquals(prediction.doubleValue(), 89.30000305, 0);
@@ -5224,7 +5224,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
prediction = (Number) tuples.get(0).get("d");
assertEquals(prediction.doubleValue(), 3, 0);
@@ -5240,7 +5240,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
predictions = (List<Number>) tuples.get(0).get("d");
assertEquals(predictions.size(), 2);
assertEquals(predictions.get(0).doubleValue(), 3, 0);
@@ -5363,7 +5363,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> predictions = (List<Number>) tuples.get(0).get("g");
assertEquals(predictions.size(), 25);
@@ -5406,21 +5406,21 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
String plot = tuples.get(0).getString("plot");
- assertTrue(plot.equals("scatter"));
+ assertEquals("scatter", plot);
@SuppressWarnings({"unchecked"})
List<List<Number>> data = (List<List<Number>>) tuples.get(0).get("data");
- assertTrue(data.size() == 3);
+ assertEquals(3, data.size());
List<Number> pair1 = data.get(0);
- assertTrue(pair1.get(0).intValue() == 3);
- assertTrue(pair1.get(1).intValue() == 5);
+ assertEquals(3, pair1.get(0).intValue());
+ assertEquals(5, pair1.get(1).intValue());
List<Number> pair2 = data.get(1);
- assertTrue(pair2.get(0).intValue() == 2);
- assertTrue(pair2.get(1).intValue() == 6);
+ assertEquals(2, pair2.get(0).intValue());
+ assertEquals(6, pair2.get(1).intValue());
List<Number> pair3 = data.get(2);
- assertTrue(pair3.get(0).intValue() == 3);
- assertTrue(pair3.get(1).intValue() == 3);
+ assertEquals(3, pair3.get(0).intValue());
+ assertEquals(3, pair3.get(1).intValue());
}
@Test
@@ -5435,10 +5435,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 4);
+ assertEquals(4, out.size());
assertEquals((double) out.get(0), 2.5, .0);
assertEquals((double) out.get(1), 3.5, .0);
assertEquals((double) out.get(2), 4.5, .0);
@@ -5457,10 +5457,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 4);
+ assertEquals(4, out.size());
System.out.println("MAD:" + out);
assertEquals(out.get(0).doubleValue(), 1, .0);
assertEquals(out.get(1).doubleValue(), 1, .0);
@@ -5482,7 +5482,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple out = tuples.get(0);
assertEquals((double) out.get("u-statistic"), 52.5, .1);
assertEquals((double) out.get("p-value"), 0.7284, .001);
@@ -5500,10 +5500,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("return-value");
- assertTrue(out.size() == 3);
+ assertEquals(3, out.size());
assertEquals(out.get(0).doubleValue(), 6.0, .0);
assertEquals(out.get(1).doubleValue(), 9.0, .0);
assertEquals(out.get(2).doubleValue(), 10.0, .0);
@@ -5521,7 +5521,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number sumSq = (Number) tuples.get(0).get("return-value");
assertEquals(sumSq.doubleValue(), 115.25D, 0.0D);
}
@@ -5539,10 +5539,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("c");
- assertTrue(out.size() == 10);
+ assertEquals(10, out.size());
assertEquals(out.get(0).doubleValue(), 30.0, .0);
assertEquals(out.get(1).doubleValue(), 30.0, .0);
assertEquals(out.get(2).doubleValue(), 30.0, .0);
@@ -5573,10 +5573,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> out = (List<Number>) tuples.get(0).get("c");
- assertTrue(out.size() == 10);
+ assertEquals(10, out.size());
assertEquals(out.get(0).doubleValue(), 40.0, .0);
assertEquals(out.get(1).doubleValue(), 40.0, .0);
assertEquals(out.get(2).doubleValue(), 40.0, .0);
@@ -5610,7 +5610,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map a = (Map) tuples.get(0).get("a");
@SuppressWarnings({"rawtypes"})
@@ -5689,7 +5689,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map a = (Map) tuples.get(0).get("a");
@SuppressWarnings({"rawtypes"})
@@ -5727,7 +5727,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"rawtypes"})
Map a = (Map) tuples.get(0).get("a");
@SuppressWarnings({"rawtypes"})
@@ -5758,7 +5758,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> cm = (List<List<Number>>) tuples.get(0).get("f");
assertEquals(cm.size(), 3);
@@ -5805,7 +5805,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<List<Number>> cm = (List<List<Number>>) tuples.get(0).get("f");
assertEquals(cm.size(), 3);
List<Number> row1 = cm.get(0);
@@ -5912,11 +5912,11 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> nums = (List<Number>) tuples.get(0).get("a");
- assertTrue(nums.size() == 3);
+ assertEquals(3, nums.size());
assertEquals(nums.get(0).doubleValue(), 1.4445, 0.0);
assertEquals(nums.get(1).doubleValue(), 1, 0.0);
assertEquals(nums.get(2).doubleValue(), 2.0001, 0.0);
@@ -5938,18 +5938,18 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<List<Number>> rows = (List<List<Number>>) tuples.get(0).get("b");
- assertTrue(rows.size() == 2);
+ assertEquals(2, rows.size());
List<Number> row1 = rows.get(0);
- assertTrue(row1.size() == 2);
+ assertEquals(2, row1.size());
assertEquals(row1.get(0).doubleValue(), 1.3334, 0);
assertEquals(row1.get(1).doubleValue(), 2.4444, 0);
List<Number> row2 = rows.get(1);
- assertTrue(row2.size() == 2);
+ assertEquals(2, row2.size());
assertEquals(row2.get(0).doubleValue(), 2.3333, 0);
assertEquals(row2.get(1).doubleValue(), 10.1001, 0);
}
@@ -5971,7 +5971,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
List<List<Number>> matrix = (List<List<Number>>) tuples.get(0).get("a");
List<Number> row1 = matrix.get(0);
@@ -6030,7 +6030,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number mean = (Number) tuples.get(0).get("return-value");
assertEquals(mean.doubleValue(), 3.0D, 0.0D);
}
@@ -6054,7 +6054,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Number l1norm = (Number) tuples.get(0).get("b");
assertEquals(l1norm.doubleValue(), 21.0D, 0.0D);
@@ -6121,22 +6121,22 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> reverse = (List<Number>) tuples.get(0).get("reverse");
- assertTrue(reverse.size() == 4);
- assertTrue(reverse.get(0).doubleValue() == 400D);
- assertTrue(reverse.get(1).doubleValue() == 300D);
- assertTrue(reverse.get(2).doubleValue() == 500D);
- assertTrue(reverse.get(3).doubleValue() == 100D);
+ assertEquals(4, reverse.size());
+ assertEquals(400D, reverse.get(0).doubleValue(), 0.0);
+ assertEquals(300D, reverse.get(1).doubleValue(), 0.0);
+ assertEquals(500D, reverse.get(2).doubleValue(), 0.0);
+ assertEquals(100D, reverse.get(3).doubleValue(), 0.0);
@SuppressWarnings({"unchecked"})
List<Number> ranked = (List<Number>) tuples.get(0).get("scaled");
- assertTrue(ranked.size() == 4);
- assertTrue(ranked.get(0).doubleValue() == 200D);
- assertTrue(ranked.get(1).doubleValue() == 1000D);
- assertTrue(ranked.get(2).doubleValue() == 600D);
- assertTrue(ranked.get(3).doubleValue() == 800D);
+ assertEquals(4, ranked.size());
+ assertEquals(200D, ranked.get(0).doubleValue(), 0.0);
+ assertEquals(1000D, ranked.get(1).doubleValue(), 0.0);
+ assertEquals(600D, ranked.get(2).doubleValue(), 0.0);
+ assertEquals(800D, ranked.get(3).doubleValue(), 0.0);
}
@Test
@@ -6193,17 +6193,17 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked"})
List<Number> convolution = (List<Number>) (tuples.get(0)).get("conv");
- assertTrue(convolution.size() == 7);
- assertTrue(convolution.get(0).equals(20000D));
- assertTrue(convolution.get(1).equals(20000D));
- assertTrue(convolution.get(2).equals(25000D));
- assertTrue(convolution.get(3).equals(30000D));
- assertTrue(convolution.get(4).equals(15000D));
- assertTrue(convolution.get(5).equals(10000D));
- assertTrue(convolution.get(6).equals(5000D));
+ assertEquals(7, convolution.size());
+ assertEquals(20000D, convolution.get(0));
+ assertEquals(20000D, convolution.get(1));
+ assertEquals(25000D, convolution.get(2));
+ assertEquals(30000D, convolution.get(3));
+ assertEquals(15000D, convolution.get(4));
+ assertEquals(10000D, convolution.get(5));
+ assertEquals(5000D, convolution.get(6));
}
@Test
@@ -6254,18 +6254,18 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
@SuppressWarnings({"rawtypes"})
Map regression = (Map) tuple.get("regress");
double slope = (double) regression.get("slope");
double intercept = (double) regression.get("intercept");
double rSquare = (double) regression.get("RSquared");
- assertTrue(slope == 2.0D);
- assertTrue(intercept == 0.0D);
- assertTrue(rSquare == 1.0D);
+ assertEquals(2.0D, slope, 0.0);
+ assertEquals(0.0D, intercept, 0.0);
+ assertEquals(1.0D, rSquare, 0.0);
double prediction = tuple.getDouble("p");
- assertTrue(prediction == 600.0D);
+ assertEquals(600.0D, prediction, 0.0);
@SuppressWarnings({"unchecked"})
List<Number> predictions = (List<Number>) tuple.get("pl");
assertList(predictions, 200D, 400D, 600D, 200D, 400D, 800D, 1200D);
@@ -6331,10 +6331,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
long delay = tuple.getLong("delay");
- assert (delay == 3);
+ assertEquals(3, delay);
expr1 =
"search("
@@ -6360,10 +6360,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
delay = tuple.getLong("delay");
- assert (delay == 0);
+ assertEquals(0, delay);
// Test negative correlation.
expr1 =
@@ -6390,10 +6390,10 @@ public class MathExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
delay = tuple.getLong("delay");
- assert (delay == 2);
+ assertEquals(2, delay);
}
@Test
@@ -6428,7 +6428,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple stats = tuples.get(0);
Number min = (Number) stats.get("min");
Number max = (Number) stats.get("max");
@@ -6499,7 +6499,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
@SuppressWarnings({"rawtypes"})
Map regression = (Map) tuple.get("regress");
@@ -6507,11 +6507,11 @@ public class MathExpressionTest extends SolrCloudTestCase {
double intercept = (double) regression.get("intercept");
double length = tuple.getDouble("l");
- assertTrue(slope == 2.0D);
- assertTrue(intercept == 0.0D);
+ assertEquals(2.0D, slope, 0.0);
+ assertEquals(0.0D, intercept, 0.0);
double prediction = tuple.getDouble("p");
- assertTrue(prediction == 600.0D);
- assertTrue(length == 7);
+ assertEquals(600.0D, prediction, 0.0);
+ assertEquals(7, length, 0.0);
}
@Test
@@ -6536,9 +6536,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
double d = (double) tuples.get(0).get("kilometers");
- assertTrue(d == (10 * 1.61));
+ assertEquals((10 * 1.61), d, 0.0);
expr =
"select(search("
@@ -6552,11 +6552,11 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
d = (double) tuples.get(0).get("kilometers");
- assertTrue(d == (50 * 1.61));
+ assertEquals((50 * 1.61), d, 0.0);
d = (double) tuples.get(1).get("kilometers");
- assertTrue(d == (70 * 1.61));
+ assertEquals((70 * 1.61), d, 0.0);
expr =
"parallel("
@@ -6571,11 +6571,11 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
d = (double) tuples.get(0).get("kilometers");
- assertTrue(d == (50 * 1.61));
+ assertEquals((50 * 1.61), d, 0.0);
d = (double) tuples.get(1).get("kilometers");
- assertTrue(d == (70 * 1.61));
+ assertEquals((70 * 1.61), d, 0.0);
expr =
"select(stats("
@@ -6588,21 +6588,19 @@ public class MathExpressionTest extends SolrCloudTestCase {
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
d = (double) tuples.get(0).get("kilometers");
- assertTrue(d == (120 * 1.61));
+ assertEquals((120 * 1.61), d, 0.0);
}
protected List<Tuple> getTuples(TupleStream tupleStream) throws IOException {
- List<Tuple> tuples = new ArrayList<Tuple>();
+ List<Tuple> tuples = new ArrayList<>();
- try {
+ try (tupleStream) {
tupleStream.open();
for (Tuple t = tupleStream.read(); !t.EOF; t = tupleStream.read()) {
tuples.add(t);
}
- } finally {
- tupleStream.close();
}
return tuples;
}
@@ -6619,9 +6617,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
public boolean assertString(Tuple tuple, String fieldName, String expected) throws Exception {
String actual = (String) tuple.get(fieldName);
- if ((null == expected && null != actual)
- || (null != expected && null == actual)
- || (null != expected && !expected.equals(actual))) {
+ if (!Objects.equals(expected, actual)) {
throw new Exception("Longs not equal:" + expected + " : " + actual);
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
index 952d237e21b..135baacce2b 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
@@ -163,7 +164,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
assertOrder(tuples, 0, 1, 3, 4);
// Basic test desc
@@ -176,7 +177,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
assertOrder(tuples, 4, 3, 1, 2);
// Basic w/multi comp
@@ -189,7 +190,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
// full factory w/multi comp
@@ -201,7 +202,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
} finally {
solrClientCache.close();
@@ -241,7 +242,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc\"), by=\"a_i asc\")");
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
assertOrder(tuples, 0, 1, 5, 2, 3, 4);
// Basic test desc
@@ -252,7 +253,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc\"), by=\"a_i desc\")");
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
assertOrder(tuples, 4, 3, 2, 1, 5, 0);
// Basic w/multi comp
@@ -263,7 +264,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc\"), by=\"a_i asc, a_f desc\")");
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
assertOrder(tuples, 0, 5, 1, 2, 3, 4);
} finally {
solrClientCache.close();
@@ -303,8 +304,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc\"), by=\"a_i asc\")");
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assertTrue(tuples.size() == 1);
- assertTrue(tuples.get(0).getLong("nullCount") == 6);
+ assertEquals(1, tuples.size());
+ assertEquals(6, tuples.get(0).getLong("nullCount").longValue());
} finally {
solrClientCache.close();
}
@@ -348,7 +349,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc\", partitionKeys=id, qt=\"/export\"), by=\"a_i asc\"))");
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
long nullCount = 0;
for (Tuple t : tuples) {
nullCount += t.getLong("nullCount");
@@ -402,7 +403,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
assertOrder(tuples, 0, 1, 3, 4);
// Basic test desc
@@ -420,7 +421,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
assertOrder(tuples, 4, 3, 1, 0);
// Basic w/multi comp
@@ -438,7 +439,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
// full factory w/multi comp
@@ -455,7 +456,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
// full factory w/multi streams
@@ -475,7 +476,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
assertOrder(tuples, 0, 2, 1, 4);
} finally {
solrClientCache.close();
@@ -520,7 +521,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
assertOrder(tuples, 0, 2, 1);
// Basic test desc
@@ -538,7 +539,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
assertOrder(tuples, 4, 3);
// full factory
@@ -555,7 +556,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
assertOrder(tuples, 0, 1, 3, 4);
// full factory, switch order
@@ -572,7 +573,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
assertOrder(tuples, 2, 1, 3, 4);
} finally {
solrClientCache.close();
@@ -626,7 +627,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
t0 = tuples.get(0);
maps0 = t0.getMaps("group");
@@ -653,11 +654,11 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
t0 = tuples.get(0);
maps0 = t0.getMaps("group");
- assert (maps0.size() == 2);
+ assertEquals(2, maps0.size());
assertMaps(maps0, 0, 1);
@@ -720,9 +721,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple t = tuples.get(0);
- assertTrue(t.getString("id").equals("9"));
+ assertEquals("9", t.getString("id"));
stream =
factory.constructStream(
@@ -734,9 +735,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
t = tuples.get(0);
- assertTrue(t.getString("id").equals("9"));
+ assertEquals("9", t.getString("id"));
stream =
factory.constructStream(
@@ -748,12 +749,12 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
t = tuples.get(0);
- assertTrue(t.getString("id").equals("8"));
+ assertEquals("8", t.getString("id"));
t = tuples.get(1);
- assertTrue(t.getString("id").equals("9"));
+ assertEquals("9", t.getString("id"));
stream =
factory.constructStream(
@@ -765,7 +766,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 0);
+ assertEquals(0, tuples.size());
stream =
factory.constructStream(
@@ -777,13 +778,13 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
t = tuples.get(0);
- assertTrue(t.getString("id").equals("8"));
+ assertEquals("8", t.getString("id"));
t = tuples.get(1);
- assertTrue(t.getString("id").equals("9"));
+ assertEquals("9", t.getString("id"));
stream =
factory.constructStream(
@@ -795,9 +796,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
t = tuples.get(0);
- assertTrue(t.getDouble("a_f") == 10.0D);
+ assertEquals(10.0D, t.getDouble("a_f"), 0.0);
solrClientCache.close();
}
@@ -853,9 +854,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple t = tuples.get(0);
- assertTrue(t.getString("id").equals("9"));
+ assertEquals("9", t.getString("id"));
stream =
factory.constructStream(
@@ -869,9 +870,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
t = tuples.get(0);
- assertTrue(t.getString("id").equals("9"));
+ assertEquals("9", t.getString("id"));
stream =
factory.constructStream(
@@ -885,12 +886,12 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
t = tuples.get(0);
- assertTrue(t.getString("id").equals("8"));
+ assertEquals("8", t.getString("id"));
t = tuples.get(1);
- assertTrue(t.getString("id").equals("9"));
+ assertEquals("9", t.getString("id"));
stream =
factory.constructStream(
@@ -904,7 +905,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 0);
+ assertEquals(0, tuples.size());
stream =
factory.constructStream(
@@ -918,13 +919,13 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
t = tuples.get(0);
- assertTrue(t.getString("id").equals("8"));
+ assertEquals("8", t.getString("id"));
t = tuples.get(1);
- assertTrue(t.getString("id").equals("9"));
+ assertEquals("9", t.getString("id"));
stream =
factory.constructStream(
@@ -938,10 +939,10 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
t = tuples.get(0);
- assertTrue(t.getDouble("a_f") == 10.0D);
+ assertEquals(10.0D, t.getDouble("a_f"), 0.0);
solrClientCache.close();
}
@@ -986,27 +987,27 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
Tuple t = tuples.get(0);
- assertTrue("blah blah blah 0".equals(t.getString("subject")));
+ assertEquals("blah blah blah 0", t.getString("subject"));
t = tuples.get(1);
- assertTrue("blah blah blah 2".equals(t.getString("subject")));
+ assertEquals("blah blah blah 2", t.getString("subject"));
t = tuples.get(2);
- assertTrue("blah blah blah 3".equals(t.getString("subject")));
+ assertEquals("blah blah blah 3", t.getString("subject"));
t = tuples.get(3);
- assertTrue("blah blah blah 4".equals(t.getString("subject")));
+ assertEquals("blah blah blah 4", t.getString("subject"));
t = tuples.get(4);
- assertTrue("blah blah blah 1".equals(t.getString("subject")));
+ assertEquals("blah blah blah 1", t.getString("subject"));
t = tuples.get(5);
- assertTrue("blah blah blah 5".equals(t.getString("subject")));
+ assertEquals("blah blah blah 5", t.getString("subject"));
t = tuples.get(6);
- assertTrue("blah blah blah 6".equals(t.getString("subject")));
+ assertEquals("blah blah blah 6", t.getString("subject"));
t = tuples.get(7);
- assertTrue("blah blah blah 7".equals(t.getString("subject")));
+ assertEquals("blah blah blah 7", t.getString("subject"));
t = tuples.get(8);
- assertTrue("blah blah blah 8".equals(t.getString("subject")));
+ assertEquals("blah blah blah 8", t.getString("subject"));
t = tuples.get(9);
- assertTrue("blah blah blah 9".equals(t.getString("subject")));
+ assertEquals("blah blah blah 9", t.getString("subject"));
// Change the batch size
stream =
@@ -1021,27 +1022,27 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
t = tuples.get(0);
- assertTrue("blah blah blah 0".equals(t.getString("subject")));
+ assertEquals("blah blah blah 0", t.getString("subject"));
t = tuples.get(1);
- assertTrue("blah blah blah 2".equals(t.getString("subject")));
+ assertEquals("blah blah blah 2", t.getString("subject"));
t = tuples.get(2);
- assertTrue("blah blah blah 3".equals(t.getString("subject")));
+ assertEquals("blah blah blah 3", t.getString("subject"));
t = tuples.get(3);
- assertTrue("blah blah blah 4".equals(t.getString("subject")));
+ assertEquals("blah blah blah 4", t.getString("subject"));
t = tuples.get(4);
- assertTrue("blah blah blah 1".equals(t.getString("subject")));
+ assertEquals("blah blah blah 1", t.getString("subject"));
t = tuples.get(5);
- assertTrue("blah blah blah 5".equals(t.getString("subject")));
+ assertEquals("blah blah blah 5", t.getString("subject"));
t = tuples.get(6);
- assertTrue("blah blah blah 6".equals(t.getString("subject")));
+ assertEquals("blah blah blah 6", t.getString("subject"));
t = tuples.get(7);
- assertTrue("blah blah blah 7".equals(t.getString("subject")));
+ assertEquals("blah blah blah 7", t.getString("subject"));
t = tuples.get(8);
- assertTrue("blah blah blah 8".equals(t.getString("subject")));
+ assertEquals("blah blah blah 8", t.getString("subject"));
t = tuples.get(9);
- assertTrue("blah blah blah 9".equals(t.getString("subject")));
+ assertEquals("blah blah blah 9", t.getString("subject"));
// SOLR-10404 test that "hello 99" as a value gets escaped
new UpdateRequest()
@@ -1064,7 +1065,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
assertEquals(1, tuples.size());
t = tuples.get(0);
- assertTrue("blah blah blah 99".equals(t.getString("subject")));
+ assertEquals("blah blah blah 99", t.getString("subject"));
solrClientCache.close();
}
@@ -1113,27 +1114,27 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
Tuple t = tuples.get(0);
- assertTrue("blah blah blah 0".equals(t.getString("subject")));
+ assertEquals("blah blah blah 0", t.getString("subject"));
t = tuples.get(1);
- assertTrue("blah blah blah 2".equals(t.getString("subject")));
+ assertEquals("blah blah blah 2", t.getString("subject"));
t = tuples.get(2);
- assertTrue("blah blah blah 3".equals(t.getString("subject")));
+ assertEquals("blah blah blah 3", t.getString("subject"));
t = tuples.get(3);
- assertTrue("blah blah blah 4".equals(t.getString("subject")));
+ assertEquals("blah blah blah 4", t.getString("subject"));
t = tuples.get(4);
- assertTrue("blah blah blah 1".equals(t.getString("subject")));
+ assertEquals("blah blah blah 1", t.getString("subject"));
t = tuples.get(5);
- assertTrue("blah blah blah 5".equals(t.getString("subject")));
+ assertEquals("blah blah blah 5", t.getString("subject"));
t = tuples.get(6);
- assertTrue("blah blah blah 6".equals(t.getString("subject")));
+ assertEquals("blah blah blah 6", t.getString("subject"));
t = tuples.get(7);
- assertTrue("blah blah blah 7".equals(t.getString("subject")));
+ assertEquals("blah blah blah 7", t.getString("subject"));
t = tuples.get(8);
- assertTrue("blah blah blah 8".equals(t.getString("subject")));
+ assertEquals("blah blah blah 8", t.getString("subject"));
t = tuples.get(9);
- assertTrue("blah blah blah 9".equals(t.getString("subject")));
+ assertEquals("blah blah blah 9", t.getString("subject"));
stream =
factory.constructStream(
@@ -1147,27 +1148,27 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
t = tuples.get(0);
- assertTrue("blah blah blah 0".equals(t.getString("subject")));
+ assertEquals("blah blah blah 0", t.getString("subject"));
t = tuples.get(1);
- assertTrue("blah blah blah 2".equals(t.getString("subject")));
+ assertEquals("blah blah blah 2", t.getString("subject"));
t = tuples.get(2);
- assertTrue("blah blah blah 3".equals(t.getString("subject")));
+ assertEquals("blah blah blah 3", t.getString("subject"));
t = tuples.get(3);
- assertTrue("blah blah blah 4".equals(t.getString("subject")));
+ assertEquals("blah blah blah 4", t.getString("subject"));
t = tuples.get(4);
- assertTrue("blah blah blah 1".equals(t.getString("subject")));
+ assertEquals("blah blah blah 1", t.getString("subject"));
t = tuples.get(5);
- assertTrue("blah blah blah 5".equals(t.getString("subject")));
+ assertEquals("blah blah blah 5", t.getString("subject"));
t = tuples.get(6);
- assertTrue("blah blah blah 6".equals(t.getString("subject")));
+ assertEquals("blah blah blah 6", t.getString("subject"));
t = tuples.get(7);
- assertTrue("blah blah blah 7".equals(t.getString("subject")));
+ assertEquals("blah blah blah 7", t.getString("subject"));
t = tuples.get(8);
- assertTrue("blah blah blah 8".equals(t.getString("subject")));
+ assertEquals("blah blah blah 8", t.getString("subject"));
t = tuples.get(9);
- assertTrue("blah blah blah 9".equals(t.getString("subject")));
+ assertEquals("blah blah blah 9", t.getString("subject"));
} finally {
solrClientCache.close();
}
@@ -1229,23 +1230,23 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
Double sumi = tuple.getDouble("sum(a_i)");
// System.out.println("#################################### Bucket 1:"+bucket);
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
tuple = daemonStream.read();
bucket = tuple.getString("a_s");
sumi = tuple.getDouble("sum(a_i)");
// System.out.println("#################################### Bucket 2:"+bucket);
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
tuple = daemonStream.read();
bucket = tuple.getString("a_s");
sumi = tuple.getDouble("sum(a_i)");
// System.out.println("#################################### Bucket 3:"+bucket);
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
}
// Now lets wait until the internal queue fills up
@@ -1277,21 +1278,21 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
String bucket = tuple.getString("a_s");
Double sumi = tuple.getDouble("sum(a_i)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 18.0D);
+ assertEquals("hello0", bucket);
+ assertEquals(18.0D, sumi, 0.0);
tuple = daemonStream.read();
bucket = tuple.getString("a_s");
sumi = tuple.getDouble("sum(a_i)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
tuple = daemonStream.read();
bucket = tuple.getString("a_s");
sumi = tuple.getDouble("sum(a_i)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
}
} finally {
daemonStream.close(); // This should stop the daemon thread
@@ -1340,7 +1341,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
daemonStream.setStreamContext(context);
List<Tuple> tuples = getTuples(daemonStream);
- assertTrue(tuples.size() == 10);
+ assertEquals(10, tuples.size());
cache.close();
}
@@ -1399,7 +1400,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
// Test Long and Double Sums
@@ -1415,16 +1416,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
Double avgf = tuple.getDouble("avg(a_f)");
Double count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1438,16 +1439,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1461,16 +1462,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
} finally {
solrClientCache.close();
@@ -1533,7 +1534,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
// Test Long and Double Sums
@@ -1549,16 +1550,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
Double avgf = tuple.getDouble("avg(a_f)");
Double count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1574,16 +1575,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
System.out.println("################:bucket" + bucket);
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1597,16 +1598,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
} finally {
solrClientCache.close();
@@ -1653,13 +1654,13 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ "\", sort=\"a_f asc\")");
pstream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(pstream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 1, 3, 4, 6);
// Test the eofTuples
Map<String, Tuple> eofTuples = pstream.getEofTuples();
- assert (eofTuples.size() == 2); // There should be an EOF tuple for each worker.
+ assertEquals(2, eofTuples.size()); // There should be an EOF tuple for each worker.
} finally {
solrClientCache.close();
}
@@ -1752,14 +1753,14 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
pstream.setStreamFactory(streamFactory);
pstream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(pstream);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
assertOrder(tuples, 0, 1, 3, 4, 6, 56);
// Test the eofTuples
Map<String, Tuple> eofTuples = pstream.getEofTuples();
- assert (eofTuples.size() == 2); // There should be an EOF tuple for each worker.
- assert (pstream.toExpression(streamFactory).toString().contains("shuffle"));
+ assertEquals(2, eofTuples.size()); // There should be an EOF tuple for each worker.
+ assertTrue(pstream.toExpression(streamFactory).toString().contains("shuffle"));
} finally {
solrClientCache.close();
}
@@ -1815,7 +1816,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(pstream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
Tuple t0 = tuples.get(0);
List<Map<?, ?>> maps0 = t0.getMaps("group");
@@ -1848,7 +1849,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
pstream.setStreamContext(streamContext);
tuples = getTuples(pstream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
t0 = tuples.get(0);
maps0 = t0.getMaps("group");
@@ -1913,7 +1914,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
pstream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(pstream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 10, 9, 8, 7, 6, 5, 4, 3, 2, 0);
} finally {
solrClientCache.close();
@@ -1967,7 +1968,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
pstream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(pstream);
- assert (tuples.size() == 9);
+ assertEquals(9, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4, 7, 6, 8, 9);
// Test descending
@@ -1987,7 +1988,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
pstream.setStreamContext(streamContext);
tuples = getTuples(pstream);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
assertOrder(tuples, 9, 8, 6, 4, 3, 2, 1, 0);
} finally {
solrClientCache.close();
@@ -2059,7 +2060,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
// Test Long and Double Sums
@@ -2075,16 +2076,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
Double avgf = tuple.getDouble("avg(a_f)");
Double count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -2098,16 +2099,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -2121,16 +2122,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
} finally {
solrClientCache.close();
}
@@ -2202,7 +2203,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
// Test Long and Double Sums
@@ -2218,16 +2219,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
Double avgf = tuple.getDouble("avg(a_f)");
Double count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -2241,16 +2242,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -2264,16 +2265,16 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
} finally {
solrClientCache.close();
}
@@ -2343,7 +2344,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new InnerJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
assertOrder(tuples, 1, 1, 15, 15, 3, 4, 5, 7);
// Basic desc
@@ -2360,7 +2361,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new InnerJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
assertOrder(tuples, 7, 3, 4, 5, 1, 1, 15, 15);
// Results in both searches, no join matches
@@ -2377,7 +2378,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new InnerJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 0);
+ assertEquals(0, tuples.size());
// Differing field names
expression =
@@ -2394,7 +2395,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
assertOrder(tuples, 1, 1, 15, 15, 3, 4, 5, 7);
} finally {
solrClientCache.close();
@@ -2465,7 +2466,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new LeftOuterJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 1, 1, 15, 15, 2, 3, 4, 5, 6, 7);
// Basic desc
@@ -2482,7 +2483,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new LeftOuterJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 7, 6, 3, 4, 5, 1, 1, 15, 15, 2);
// Results in both searches, no join matches
@@ -2499,7 +2500,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new LeftOuterJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
assertOrder(tuples, 1, 15, 2, 3, 4, 5, 6, 7);
// Differing field names
@@ -2516,7 +2517,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new LeftOuterJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 1, 1, 15, 15, 2, 3, 4, 5, 6, 7);
} finally {
solrClientCache.close();
@@ -2582,7 +2583,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new HashJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
assertOrder(tuples, 1, 1, 15, 15, 3, 4, 5, 7);
// Basic desc
@@ -2595,7 +2596,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new HashJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
assertOrder(tuples, 7, 3, 4, 5, 1, 1, 15, 15);
// Results in both searches, no join matches
@@ -2608,7 +2609,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new HashJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 0);
+ assertEquals(0, tuples.size());
// Basic test with "on" mapping
expression =
@@ -2769,7 +2770,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new OuterHashJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 1, 1, 15, 15, 2, 3, 4, 5, 6, 7);
// Basic desc
@@ -2782,7 +2783,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new OuterHashJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 7, 6, 3, 4, 5, 1, 1, 15, 15, 2);
// Results in both searches, no join matches
@@ -2795,7 +2796,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new OuterHashJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 8);
+ assertEquals(8, tuples.size());
assertOrder(tuples, 1, 15, 2, 3, 4, 5, 6, 7);
// Basic test
@@ -2808,7 +2809,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream = new OuterHashJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 1, 1, 15, 15, 2, 3, 4, 5, 6, 7);
} finally {
solrClientCache.close();
@@ -3162,9 +3163,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
cluster.getSolrClient().commit("destinationCollection");
// Ensure that all UpdateStream tuples indicate the correct number of copied/indexed docs
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
t = tuples.get(0);
- assert (t.EOF == false);
+ assertFalse(t.EOF);
assertEquals(5, t.get("batchIndexed"));
// Ensure that destinationCollection actually has the new docs.
@@ -3177,42 +3178,42 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
assertEquals(5, tuples.size());
Tuple tuple = tuples.get(0);
- assert (tuple.getLong("id") == 0);
- assert (tuple.get("a_s").equals("hello0"));
- assert (tuple.getLong("a_i") == 0);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(0, (long) tuple.getLong("id"));
+ assertEquals("hello0", tuple.get("a_s"));
+ assertEquals(0, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa", "bbbb");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4"), Long.parseLong("7"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 1);
- assert (tuple.get("a_s").equals("hello1"));
- assert (tuple.getLong("a_i") == 1);
- assert (tuple.getDouble("a_f") == 1.0);
+ assertEquals(1, (long) tuple.getLong("id"));
+ assertEquals("hello1", tuple.get("a_s"));
+ assertEquals(1, (long) tuple.getLong("a_i"));
+ assertEquals(1.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa4", "bbbb4");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44444"), Long.parseLong("77777"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 2);
- assert (tuple.get("a_s").equals("hello2"));
- assert (tuple.getLong("a_i") == 2);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(2, (long) tuple.getLong("id"));
+ assertEquals("hello2", tuple.get("a_s"));
+ assertEquals(2, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa1", "bbbb1");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44"), Long.parseLong("77"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 3);
- assert (tuple.get("a_s").equals("hello3"));
- assert (tuple.getLong("a_i") == 3);
- assert (tuple.getDouble("a_f") == 3.0);
+ assertEquals(3, (long) tuple.getLong("id"));
+ assertEquals("hello3", tuple.get("a_s"));
+ assertEquals(3, (long) tuple.getLong("a_i"));
+ assertEquals(3.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa2", "bbbb2");
assertList(tuple.getLongs("i_multi"), Long.parseLong("444"), Long.parseLong("777"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 4);
- assert (tuple.get("a_s").equals("hello4"));
- assert (tuple.getLong("a_i") == 4);
- assert (tuple.getDouble("a_f") == 4.0);
+ assertEquals(4, (long) tuple.getLong("id"));
+ assertEquals("hello4", tuple.get("a_s"));
+ assertEquals(4, (long) tuple.getLong("a_i"));
+ assertEquals(4.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa3", "bbbb3");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4444"), Long.parseLong("7777"));
} finally {
@@ -3287,7 +3288,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
count += tuple.getLong("batchIndexed");
}
- assert (count == 5);
+ assertEquals(5, count);
// Ensure that destinationCollection actually has the new docs.
expression =
@@ -3299,42 +3300,42 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
assertEquals(5, tuples.size());
Tuple tuple = tuples.get(0);
- assert (tuple.getLong("id") == 0);
- assert (tuple.get("a_s").equals("hello0"));
- assert (tuple.getLong("a_i") == 0);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(0, (long) tuple.getLong("id"));
+ assertEquals("hello0", tuple.get("a_s"));
+ assertEquals(0, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa", "bbbb");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4"), Long.parseLong("7"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 1);
- assert (tuple.get("a_s").equals("hello1"));
- assert (tuple.getLong("a_i") == 1);
- assert (tuple.getDouble("a_f") == 1.0);
+ assertEquals(1, (long) tuple.getLong("id"));
+ assertEquals("hello1", tuple.get("a_s"));
+ assertEquals(1, (long) tuple.getLong("a_i"));
+ assertEquals(1.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa4", "bbbb4");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44444"), Long.parseLong("77777"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 2);
- assert (tuple.get("a_s").equals("hello2"));
- assert (tuple.getLong("a_i") == 2);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(2, (long) tuple.getLong("id"));
+ assertEquals("hello2", tuple.get("a_s"));
+ assertEquals(2, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa1", "bbbb1");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44"), Long.parseLong("77"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 3);
- assert (tuple.get("a_s").equals("hello3"));
- assert (tuple.getLong("a_i") == 3);
- assert (tuple.getDouble("a_f") == 3.0);
+ assertEquals(3, (long) tuple.getLong("id"));
+ assertEquals("hello3", tuple.get("a_s"));
+ assertEquals(3, (long) tuple.getLong("a_i"));
+ assertEquals(3.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa2", "bbbb2");
assertList(tuple.getLongs("i_multi"), Long.parseLong("444"), Long.parseLong("777"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 4);
- assert (tuple.get("a_s").equals("hello4"));
- assert (tuple.getLong("a_i") == 4);
- assert (tuple.getDouble("a_f") == 4.0);
+ assertEquals(4, (long) tuple.getLong("id"));
+ assertEquals("hello4", tuple.get("a_s"));
+ assertEquals(4, (long) tuple.getLong("a_i"));
+ assertEquals(4.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa3", "bbbb3");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4444"), Long.parseLong("7777"));
} finally {
@@ -3401,7 +3402,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ "\", sort=\"batchNumber asc\")");
parallelUpdateStream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(parallelUpdateStream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
// Lets sleep long enough for daemon updates to run.
// Lets stop the daemons
@@ -3498,42 +3499,42 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
assertEquals(5, tuples.size());
Tuple tuple = tuples.get(0);
- assert (tuple.getLong("id") == 0);
- assert (tuple.get("a_s").equals("hello0"));
- assert (tuple.getLong("a_i") == 0);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(0, (long) tuple.getLong("id"));
+ assertEquals("hello0", tuple.get("a_s"));
+ assertEquals(0, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa", "bbbb");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4"), Long.parseLong("7"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 1);
- assert (tuple.get("a_s").equals("hello1"));
- assert (tuple.getLong("a_i") == 1);
- assert (tuple.getDouble("a_f") == 1.0);
+ assertEquals(1, (long) tuple.getLong("id"));
+ assertEquals("hello1", tuple.get("a_s"));
+ assertEquals(1, (long) tuple.getLong("a_i"));
+ assertEquals(1.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa4", "bbbb4");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44444"), Long.parseLong("77777"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 2);
- assert (tuple.get("a_s").equals("hello2"));
- assert (tuple.getLong("a_i") == 2);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(2, (long) tuple.getLong("id"));
+ assertEquals("hello2", tuple.get("a_s"));
+ assertEquals(2, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa1", "bbbb1");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44"), Long.parseLong("77"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 3);
- assert (tuple.get("a_s").equals("hello3"));
- assert (tuple.getLong("a_i") == 3);
- assert (tuple.getDouble("a_f") == 3.0);
+ assertEquals(3, (long) tuple.getLong("id"));
+ assertEquals("hello3", tuple.get("a_s"));
+ assertEquals(3, (long) tuple.getLong("a_i"));
+ assertEquals(3.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa2", "bbbb2");
assertList(tuple.getLongs("i_multi"), Long.parseLong("444"), Long.parseLong("777"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 4);
- assert (tuple.get("a_s").equals("hello4"));
- assert (tuple.getLong("a_i") == 4);
- assert (tuple.getDouble("a_f") == 4.0);
+ assertEquals(4, (long) tuple.getLong("id"));
+ assertEquals("hello4", tuple.get("a_s"));
+ assertEquals(4, (long) tuple.getLong("a_i"));
+ assertEquals(4.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa3", "bbbb3");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4444"), Long.parseLong("7777"));
} finally {
@@ -3601,7 +3602,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ "\", sort=\"batchNumber asc\")");
parallelUpdateStream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(parallelUpdateStream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
ModifiableSolrParams sParams =
new ModifiableSolrParams(params(CommonParams.QT, "/stream", "action", "list"));
@@ -3643,42 +3644,42 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
assertEquals(5, tuples.size());
Tuple tuple = tuples.get(0);
- assert (tuple.getLong("id") == 0);
- assert (tuple.get("a_s").equals("hello"));
- assert (tuple.getLong("a_i") == 0);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(0, (long) tuple.getLong("id"));
+ assertEquals("hello", tuple.get("a_s"));
+ assertEquals(0, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa", "bbbb");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4"), Long.parseLong("7"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 1);
- assert (tuple.get("a_s").equals("hello"));
- assert (tuple.getLong("a_i") == 1);
- assert (tuple.getDouble("a_f") == 1.0);
+ assertEquals(1, (long) tuple.getLong("id"));
+ assertEquals("hello", tuple.get("a_s"));
+ assertEquals(1, (long) tuple.getLong("a_i"));
+ assertEquals(1.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa4", "bbbb4");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44444"), Long.parseLong("77777"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 2);
- assert (tuple.get("a_s").equals("hello"));
- assert (tuple.getLong("a_i") == 2);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(2, (long) tuple.getLong("id"));
+ assertEquals("hello", tuple.get("a_s"));
+ assertEquals(2, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa1", "bbbb1");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44"), Long.parseLong("77"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 3);
- assert (tuple.get("a_s").equals("hello"));
- assert (tuple.getLong("a_i") == 3);
- assert (tuple.getDouble("a_f") == 3.0);
+ assertEquals(3, (long) tuple.getLong("id"));
+ assertEquals("hello", tuple.get("a_s"));
+ assertEquals(3, (long) tuple.getLong("a_i"));
+ assertEquals(3.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa2", "bbbb2");
assertList(tuple.getLongs("i_multi"), Long.parseLong("444"), Long.parseLong("777"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 4);
- assert (tuple.get("a_s").equals("hello"));
- assert (tuple.getLong("a_i") == 4);
- assert (tuple.getDouble("a_f") == 4.0);
+ assertEquals(4, (long) tuple.getLong("id"));
+ assertEquals("hello", tuple.get("a_s"));
+ assertEquals(4, (long) tuple.getLong("a_i"));
+ assertEquals(4.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa3", "bbbb3");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4444"), Long.parseLong("7777"));
} finally {
@@ -3805,9 +3806,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(stream);
// Ensure that all CommitStream tuples indicate the correct number of copied/indexed docs
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
t = tuples.get(0);
- assert (t.EOF == false);
+ assertFalse(t.EOF);
assertEquals(5, t.get("batchIndexed"));
// Ensure that destinationCollection actually has the new docs.
@@ -3820,42 +3821,42 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
assertEquals(5, tuples.size());
Tuple tuple = tuples.get(0);
- assert (tuple.getLong("id") == 0);
- assert (tuple.get("a_s").equals("hello0"));
- assert (tuple.getLong("a_i") == 0);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(0, (long) tuple.getLong("id"));
+ assertEquals("hello0", tuple.get("a_s"));
+ assertEquals(0, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa", "bbbb");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4"), Long.parseLong("7"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 1);
- assert (tuple.get("a_s").equals("hello1"));
- assert (tuple.getLong("a_i") == 1);
- assert (tuple.getDouble("a_f") == 1.0);
+ assertEquals(1, (long) tuple.getLong("id"));
+ assertEquals("hello1", tuple.get("a_s"));
+ assertEquals(1, (long) tuple.getLong("a_i"));
+ assertEquals(1.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa4", "bbbb4");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44444"), Long.parseLong("77777"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 2);
- assert (tuple.get("a_s").equals("hello2"));
- assert (tuple.getLong("a_i") == 2);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(2, (long) tuple.getLong("id"));
+ assertEquals("hello2", tuple.get("a_s"));
+ assertEquals(2, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa1", "bbbb1");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44"), Long.parseLong("77"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 3);
- assert (tuple.get("a_s").equals("hello3"));
- assert (tuple.getLong("a_i") == 3);
- assert (tuple.getDouble("a_f") == 3.0);
+ assertEquals(3, (long) tuple.getLong("id"));
+ assertEquals("hello3", tuple.get("a_s"));
+ assertEquals(3, (long) tuple.getLong("a_i"));
+ assertEquals(3.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa2", "bbbb2");
assertList(tuple.getLongs("i_multi"), Long.parseLong("444"), Long.parseLong("777"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 4);
- assert (tuple.get("a_s").equals("hello4"));
- assert (tuple.getLong("a_i") == 4);
- assert (tuple.getDouble("a_f") == 4.0);
+ assertEquals(4, (long) tuple.getLong("id"));
+ assertEquals("hello4", tuple.get("a_s"));
+ assertEquals(4, (long) tuple.getLong("a_i"));
+ assertEquals(4.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa3", "bbbb3");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4444"), Long.parseLong("7777"));
} finally {
@@ -3932,7 +3933,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
count += tuple.getLong("batchIndexed");
}
- assert (count == 5);
+ assertEquals(5, count);
// Ensure that destinationCollection actually has the new docs.
expression =
@@ -3944,42 +3945,42 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
assertEquals(5, tuples.size());
Tuple tuple = tuples.get(0);
- assert (tuple.getLong("id") == 0);
- assert (tuple.get("a_s").equals("hello0"));
- assert (tuple.getLong("a_i") == 0);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(0, (long) tuple.getLong("id"));
+ assertEquals("hello0", tuple.get("a_s"));
+ assertEquals(0, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa", "bbbb");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4"), Long.parseLong("7"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 1);
- assert (tuple.get("a_s").equals("hello1"));
- assert (tuple.getLong("a_i") == 1);
- assert (tuple.getDouble("a_f") == 1.0);
+ assertEquals(1, (long) tuple.getLong("id"));
+ assertEquals("hello1", tuple.get("a_s"));
+ assertEquals(1, (long) tuple.getLong("a_i"));
+ assertEquals(1.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa4", "bbbb4");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44444"), Long.parseLong("77777"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 2);
- assert (tuple.get("a_s").equals("hello2"));
- assert (tuple.getLong("a_i") == 2);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(2, (long) tuple.getLong("id"));
+ assertEquals("hello2", tuple.get("a_s"));
+ assertEquals(2, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa1", "bbbb1");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44"), Long.parseLong("77"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 3);
- assert (tuple.get("a_s").equals("hello3"));
- assert (tuple.getLong("a_i") == 3);
- assert (tuple.getDouble("a_f") == 3.0);
+ assertEquals(3, (long) tuple.getLong("id"));
+ assertEquals("hello3", tuple.get("a_s"));
+ assertEquals(3, (long) tuple.getLong("a_i"));
+ assertEquals(3.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa2", "bbbb2");
assertList(tuple.getLongs("i_multi"), Long.parseLong("444"), Long.parseLong("777"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 4);
- assert (tuple.get("a_s").equals("hello4"));
- assert (tuple.getLong("a_i") == 4);
- assert (tuple.getDouble("a_f") == 4.0);
+ assertEquals(4, (long) tuple.getLong("id"));
+ assertEquals("hello4", tuple.get("a_s"));
+ assertEquals(4, (long) tuple.getLong("a_i"));
+ assertEquals(4.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa3", "bbbb3");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4444"), Long.parseLong("7777"));
} finally {
@@ -4049,7 +4050,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ "\", sort=\"batchNumber asc\")");
parallelUpdateStream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(parallelUpdateStream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
// Lets sleep long enough for daemon updates to run.
// Lets stop the daemons
@@ -4143,42 +4144,42 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
assertEquals(5, tuples.size());
Tuple tuple = tuples.get(0);
- assert (tuple.getLong("id") == 0);
- assert (tuple.get("a_s").equals("hello0"));
- assert (tuple.getLong("a_i") == 0);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(0, (long) tuple.getLong("id"));
+ assertEquals("hello0", tuple.get("a_s"));
+ assertEquals(0, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa", "bbbb");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4"), Long.parseLong("7"));
tuple = tuples.get(1);
- assert (tuple.getLong("id") == 1);
- assert (tuple.get("a_s").equals("hello1"));
- assert (tuple.getLong("a_i") == 1);
- assert (tuple.getDouble("a_f") == 1.0);
+ assertEquals(1, (long) tuple.getLong("id"));
+ assertEquals("hello1", tuple.get("a_s"));
+ assertEquals(1, (long) tuple.getLong("a_i"));
+ assertEquals(1.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa4", "bbbb4");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44444"), Long.parseLong("77777"));
tuple = tuples.get(2);
- assert (tuple.getLong("id") == 2);
- assert (tuple.get("a_s").equals("hello2"));
- assert (tuple.getLong("a_i") == 2);
- assert (tuple.getDouble("a_f") == 0.0);
+ assertEquals(2, (long) tuple.getLong("id"));
+ assertEquals("hello2", tuple.get("a_s"));
+ assertEquals(2, (long) tuple.getLong("a_i"));
+ assertEquals(0.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa1", "bbbb1");
assertList(tuple.getLongs("i_multi"), Long.parseLong("44"), Long.parseLong("77"));
tuple = tuples.get(3);
- assert (tuple.getLong("id") == 3);
- assert (tuple.get("a_s").equals("hello3"));
- assert (tuple.getLong("a_i") == 3);
- assert (tuple.getDouble("a_f") == 3.0);
+ assertEquals(3, (long) tuple.getLong("id"));
+ assertEquals("hello3", tuple.get("a_s"));
+ assertEquals(3, (long) tuple.getLong("a_i"));
+ assertEquals(3.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa2", "bbbb2");
assertList(tuple.getLongs("i_multi"), Long.parseLong("444"), Long.parseLong("777"));
tuple = tuples.get(4);
- assert (tuple.getLong("id") == 4);
- assert (tuple.get("a_s").equals("hello4"));
- assert (tuple.getLong("a_i") == 4);
- assert (tuple.getDouble("a_f") == 4.0);
+ assertEquals(4, (long) tuple.getLong("id"));
+ assertEquals("hello4", tuple.get("a_s"));
+ assertEquals(4, (long) tuple.getLong("a_i"));
+ assertEquals(4.0, tuple.getDouble("a_f"), 0.0);
assertList(tuple.getStrings("s_multi"), "aaaa3", "bbbb3");
assertList(tuple.getLongs("i_multi"), Long.parseLong("4444"), Long.parseLong("7777"));
} finally {
@@ -4227,7 +4228,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 7, 3, 4, 8);
} finally {
solrClientCache.close();
@@ -4419,19 +4420,19 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple1 = tuples.get(0);
@SuppressWarnings({"unchecked", "rawtypes"})
List<Map> results = (List<Map>) tuple1.get("results");
- assertTrue(results.size() == 2);
- assertTrue(results.get(0).get("id").equals("hello1"));
- assertTrue(results.get(0).get("test_t").equals("l b c d c"));
- assertTrue(results.get(1).get("id").equals("hello"));
- assertTrue(results.get(1).get("test_t").equals("l b c d c e"));
-
- assertTrue(tuple1.getLong("test").equals(2L));
- assertTrue(tuple1.getLong("test1").equals(4L));
- assertTrue(tuple1.getLong("test2").equals(9L));
+ assertEquals(2, results.size());
+ assertEquals("hello1", results.get(0).get("id"));
+ assertEquals("l b c d c", results.get(0).get("test_t"));
+ assertEquals("hello", results.get(1).get("id"));
+ assertEquals("l b c d c e", results.get(1).get("test_t"));
+
+ assertEquals(2L, tuple1.getLong("test").longValue());
+ assertEquals(4L, tuple1.getLong("test1").longValue());
+ assertEquals(9L, tuple1.getLong("test2").longValue());
}
@Test
@@ -4458,7 +4459,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
}
@Test
@@ -4485,7 +4486,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
}
@Test
@@ -4553,13 +4554,13 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
SolrStream solrStream = new SolrStream(url, paramsLoc);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 500);
+ assertEquals(500, tuples.size());
for (int i = 0; i < 500; i++) {
Tuple tuple = tuples.get(i);
long ivalue = tuple.getLong("field_i");
String body = tuple.getString("body_t");
- assertTrue(ivalue == i);
- assertTrue(body.equals("hello world " + i));
+ assertEquals(ivalue, i);
+ assertEquals(body, "hello world " + i);
}
solrStream.close();
@@ -4639,13 +4640,13 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
SolrStream solrStream = new SolrStream(url, paramsLoc);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == cnt);
+ assertEquals(tuples.size(), cnt);
for (int i = 0; i < cnt; i++) {
Tuple tuple = tuples.get(i);
long ivalue = tuple.getLong("field_i");
String body = tuple.getString("body_t");
- assertTrue(ivalue == i);
- assertTrue(body.equals("hello world " + i));
+ assertEquals(ivalue, i);
+ assertEquals(body, "hello world " + i);
}
solrStream.close();
@@ -4708,7 +4709,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
final List<Tuple> tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 7, 3, 4, 8);
} finally {
solrClientCache.close();
@@ -4755,7 +4756,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
assertOrder(tuples, 2);
} finally {
solrClientCache.close();
@@ -4959,7 +4960,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
final List<Tuple> tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
assertOrder(tuples, 2);
} finally {
solrClientCache.close();
@@ -5054,8 +5055,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
// to ensure that even if one "batch" fails it continues with other batches.
// See TODO in UpdateStream
- final long v13_ok = versions.get("doc_13").longValue();
- final long v10_bad = versions.get("doc_10").longValue() - 42L;
+ final long v13_ok = versions.get("doc_13");
+ final long v10_bad = versions.get("doc_10") - 42L;
final String expr =
"commit("
+ COLLECTIONORALIAS
@@ -5095,7 +5096,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
// constraints,
// and delete docs even if the stream we are wrapping returns _version_ values that are no
// longer valid...
- final long v10_bad = versions.get("doc_10").longValue() - 42L;
+ final long v10_bad = versions.get("doc_10") - 42L;
final String expr =
"commit("
+ COLLECTIONORALIAS
@@ -5157,15 +5158,13 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
}
protected List<Tuple> getTuples(TupleStream tupleStream) throws IOException {
- List<Tuple> tuples = new ArrayList<Tuple>();
+ List<Tuple> tuples = new ArrayList<>();
- try {
+ try (tupleStream) {
tupleStream.open();
for (Tuple t = tupleStream.read(); !t.EOF; t = tupleStream.read()) {
tuples.add(t);
}
- } finally {
- tupleStream.close();
}
return tuples;
}
@@ -5236,9 +5235,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
public boolean assertString(Tuple tuple, String fieldName, String expected) throws Exception {
String actual = (String) tuple.get(fieldName);
- if ((null == expected && null != actual)
- || (null != expected && null == actual)
- || (null != expected && !expected.equals(actual))) {
+ if (!Objects.equals(expected, actual)) {
throw new Exception("Longs not equal:" + expected + " : " + actual);
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
index 67ca87d29a7..db4e79d6b45 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
@@ -26,10 +26,12 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.zip.GZIPOutputStream;
@@ -159,7 +161,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
assertLong(tuples.get(0), "a_i", 0);
@@ -173,7 +175,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
assertLong(tuples.get(0), "alias.a_i", 0);
assertString(tuples.get(0), "name", "hello0");
@@ -188,7 +190,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
assertOrder(tuples, 0, 3, 4);
assertLong(tuples.get(1), "a_i", 3);
@@ -250,7 +252,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
assertLong(tuples.get(0), "a_i", 0);
@@ -273,7 +275,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
assertLong(tuples.get(0), "a_i", 0);
@@ -316,7 +318,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4);
assertLong(tuples.get(0), "a_i", 0);
assertDouble(tuples.get(0), "a_f", 0);
@@ -379,7 +381,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4);
// Test with using the default collection
@@ -389,7 +391,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream = new SolrStream(shardUrls.get(0), solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4);
} finally {
@@ -429,7 +431,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
assertLong(tuples.get(0), "a_i", 0);
@@ -445,7 +447,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
assertLong(tuples.get(0), "alias.a_i", 0);
assertString(tuples.get(0), "name", "hello0");
@@ -462,7 +464,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
assertOrder(tuples, 0, 3, 4);
assertLong(tuples.get(1), "a_i", 3);
@@ -594,11 +596,11 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 4, 0, 1, 2, 3);
tuple = tuples.get(0);
- assertTrue("hello4".equals(tuple.getString("a_s")));
+ assertEquals("hello4", tuple.getString("a_s"));
assertNull(tuple.get("s_multi"));
assertNull(tuple.get("i_multi"));
assertNull(tuple.getLong("a_i"));
@@ -622,7 +624,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4);
// test sort(desc) with null string field. Null should sort to the bottom.
@@ -635,7 +637,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 5);
+ assertEquals(5, tuples.size());
assertOrder(tuples, 4, 3, 2, 1, 0);
} finally {
solrClientCache.close();
@@ -671,7 +673,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(expression);
stream.setStreamContext(context);
List<Tuple> tuples1 = getTuples(stream);
- assert (tuples1.size() == 1000);
+ assertEquals(1000, tuples1.size());
expression =
StreamExpressionParser.parse(
@@ -679,7 +681,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(expression);
stream.setStreamContext(context);
List<Tuple> tuples2 = getTuples(stream);
- assert (tuples2.size() == 1000);
+ assertEquals(1000, tuples2.size());
boolean different = false;
for (int i = 0; i < tuples1.size(); i++) {
@@ -700,7 +702,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
Tuple tuple1 = tuples1.get(i);
Tuple tuple2 = tuples2.get(i);
if (!tuple1.get("id").equals(tuple2.get(id))) {
- assert (tuple1.getLong("id").equals(tuple2.get("a_i")));
+ assertEquals(tuple1.getLong("id"), tuple2.get("a_i"));
}
}
@@ -710,7 +712,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(expression);
stream.setStreamContext(context);
List<Tuple> tuples3 = getTuples(stream);
- assert (tuples3.size() == 1);
+ assertEquals(1, tuples3.size());
// Exercise the DeepRandomStream with higher rows
@@ -720,7 +722,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(expression);
stream.setStreamContext(context);
List<Tuple> tuples10 = getTuples(stream);
- assert (tuples10.size() == 1000);
+ assertEquals(1000, tuples10.size());
expression =
StreamExpressionParser.parse(
@@ -728,7 +730,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(expression);
stream.setStreamContext(context);
List<Tuple> tuples11 = getTuples(stream);
- assert (tuples11.size() == 1000);
+ assertEquals(1000, tuples11.size());
different = false;
for (int i = 0; i < tuples10.size(); i++) {
@@ -749,7 +751,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
Tuple tuple1 = tuples10.get(i);
Tuple tuple2 = tuples11.get(i);
if (!tuple1.get("id").equals(tuple2.get(id))) {
- assert (tuple1.getLong("id").equals(tuple2.get("a_i")));
+ assertEquals(tuple1.getLong("id"), tuple2.get("a_i"));
}
}
@@ -761,7 +763,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
SolrStream solrStream =
new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
List<Tuple> tuples4 = getTuples(solrStream);
- assert (tuples4.size() == 1);
+ assertEquals(1, tuples4.size());
// Assert no x-axis
assertNull(tuples4.get(0).get("x"));
@@ -770,13 +772,13 @@ public class StreamExpressionTest extends SolrCloudTestCase {
jetty = cluster.getJettySolrRunner(0);
solrStream = new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
tuples4 = getTuples(solrStream);
- assert (tuples4.size() == 500);
+ assertEquals(500, tuples4.size());
@SuppressWarnings({"rawtypes"})
Map fields = tuples4.get(0).getFields();
- assert (fields.containsKey("id"));
- assert (fields.containsKey("a_f"));
- assert (fields.containsKey("a_i"));
- assert (fields.containsKey("a_s"));
+ assertTrue(fields.containsKey("id"));
+ assertTrue(fields.containsKey("a_f"));
+ assertTrue(fields.containsKey("a_i"));
+ assertTrue(fields.containsKey("a_s"));
// Assert the x-axis:
for (int i = 0; i < tuples4.size(); i++) {
assertEquals(tuples4.get(i).getLong("x").longValue(), i);
@@ -811,7 +813,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
SolrStream solrStream =
new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 3);
+ assertEquals(3, tuples.size());
assertOrder(tuples, 2, 3, 4);
sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
@@ -822,7 +824,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ ", id=\"1\", qf=\"a_t\", k=\"2\", fl=\"id, score\", mintf=\"1\")");
solrStream = new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
assertOrder(tuples, 2, 3);
sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
@@ -833,7 +835,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ ", id=\"1\", qf=\"a_t\", rows=\"4\", fl=\"id, score\", mintf=\"1\", maxdf=\"0\")");
solrStream = new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
sParams.add(
@@ -843,7 +845,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ ", id=\"1\", qf=\"a_t\", rows=\"4\", fl=\"id, score\", mintf=\"1\", maxwl=\"1\")");
solrStream = new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
sParams.add(
@@ -853,7 +855,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ ", id=\"1\", qf=\"a_t\", rows=\"2\", fl=\"id, score\", mintf=\"1\", minwl=\"20\")");
solrStream = new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 0);
+ assertEquals(0, tuples.size());
} finally {
cache.close();
@@ -906,7 +908,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
// Test Long and Double Sums
@@ -927,19 +929,19 @@ public class StreamExpressionTest extends SolrCloudTestCase {
Double count = tuple.getDouble("count(*)");
Long countDist = tuple.getLong("countDist(a_s)");
- assertTrue(sumi.longValue() == 70);
- assertTrue(sumf.doubleValue() == 55.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 7.0D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(stdi.doubleValue() == 5.477225575051661D);
- assertTrue(stdf.doubleValue() == 3.0276503540974917D);
- assertTrue(peri.doubleValue() == 7.0D);
- assertTrue(perf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 10);
+ assertEquals(70, sumi.longValue());
+ assertEquals(55.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(7.0D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(5.477225575051661D, stdi, 0.0);
+ assertEquals(3.0276503540974917D, stdf, 0.0);
+ assertEquals(7.0D, peri, 0.0);
+ assertEquals(5.5D, perf, 0.0);
+ assertEquals(10, count, 0.0);
assertEquals(countDist.longValue(), 3L);
// Test without query
@@ -954,7 +956,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
// Test Long and Double Sums
@@ -974,19 +976,19 @@ public class StreamExpressionTest extends SolrCloudTestCase {
perf = tuple.getDouble("per(a_f,50)");
count = tuple.getDouble("count(*)");
- assertTrue(sumi.longValue() == 70);
- assertTrue(sumf.doubleValue() == 55.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 7.0D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(stdi.doubleValue() == 5.477225575051661D);
- assertTrue(stdf.doubleValue() == 3.0276503540974917D);
- assertTrue(peri.doubleValue() == 7.0D);
- assertTrue(perf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 10);
+ assertEquals(70, sumi.longValue());
+ assertEquals(55.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(7.0D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(5.477225575051661D, stdi, 0.0);
+ assertEquals(3.0276503540974917D, stdf, 0.0);
+ assertEquals(7.0D, peri, 0.0);
+ assertEquals(5.5D, perf, 0.0);
+ assertEquals(10, count, 0.0);
// Test with shards parameter
List<String> shardUrls =
@@ -1004,7 +1006,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
// Test Long and Double Sums
@@ -1024,19 +1026,19 @@ public class StreamExpressionTest extends SolrCloudTestCase {
perf = tuple.getDouble("per(a_f,50)");
count = tuple.getDouble("count(*)");
- assertTrue(sumi.longValue() == 70);
- assertTrue(sumf.doubleValue() == 55.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 7.0D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(stdi.doubleValue() == 5.477225575051661D);
- assertTrue(stdf.doubleValue() == 3.0276503540974917D);
- assertTrue(peri.doubleValue() == 7.0D);
- assertTrue(perf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 10);
+ assertEquals(70, sumi.longValue());
+ assertEquals(55.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(7.0D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(5.477225575051661D, stdi, 0.0);
+ assertEquals(3.0276503540974917D, stdf, 0.0);
+ assertEquals(7.0D, peri, 0.0);
+ assertEquals(5.5D, perf, 0.0);
+ assertEquals(10, count, 0.0);
// Execersise the /stream hander
@@ -1055,7 +1057,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrParams.add("myCollection.shards", buf.toString());
SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
tuples = getTuples(solrStream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
@@ -1069,15 +1071,15 @@ public class StreamExpressionTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(sumi.longValue() == 70);
- assertTrue(sumf.doubleValue() == 55.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 7.0D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 10);
+ assertEquals(70, sumi.longValue());
+ assertEquals(55.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(7.0D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(10, count, 0.0);
// Add a negative test to prove that it cannot find slices if shards parameter is removed
try {
@@ -1313,27 +1315,27 @@ public class StreamExpressionTest extends SolrCloudTestCase {
Double count = tuple.getDouble("sum(cnt)");
Double saf = tuple.getDouble("sum(saf)");
- assertTrue(bucket.equals("hello4"));
- assertEquals(count.doubleValue(), 2, 0);
- assertEquals(saf.doubleValue(), 11, 0);
+ assertEquals("hello4", bucket);
+ assertEquals(count, 2, 0);
+ assertEquals(saf, 11, 0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
count = tuple.getDouble("sum(cnt)");
saf = tuple.getDouble("sum(saf)");
- assertTrue(bucket.equals("hello3"));
- assertEquals(count.doubleValue(), 4, 0);
- assertEquals(saf.doubleValue(), 26, 0);
+ assertEquals("hello3", bucket);
+ assertEquals(count, 4, 0);
+ assertEquals(saf, 26, 0);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
count = tuple.getDouble("sum(cnt)");
saf = tuple.getDouble("sum(saf)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(count.doubleValue() == 4);
- assertEquals(saf.doubleValue(), 18, 0);
+ assertEquals("hello0", bucket);
+ assertEquals(4, count, 0.0);
+ assertEquals(saf, 18, 0);
}
@Test
@@ -1391,7 +1393,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(clause);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
Tuple tuple = tuples.get(0);
String bucket = tuple.getString("a_s");
@@ -1410,20 +1412,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
Long countDist = tuple.getLong("countDist(a_i)");
Double count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
- assertTrue(stdi.doubleValue() == 4.949747468305833D);
- assertTrue(stdf.doubleValue() == 2.1213203435596424D);
- assertTrue(peri.doubleValue() == 7.5D);
- assertTrue(perf.doubleValue() == 5.5D);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
+ assertEquals(4.949747468305833D, stdi, 0.0);
+ assertEquals(2.1213203435596424D, stdf, 0.0);
+ assertEquals(7.5D, peri, 0.0);
+ assertEquals(5.5D, perf, 0.0);
assertEquals(countDist.longValue(), 2);
tuple = tuples.get(1);
@@ -1443,20 +1445,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
perf = tuple.getDouble("per(a_f,50)");
countDist = tuple.getLong("countDist(a_i)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
- assertTrue(stdi.doubleValue() == 6.551081335677848D);
- assertTrue(stdf.doubleValue() == 4.041451884327381D);
- assertTrue(peri.doubleValue() == 1.5D);
- assertTrue(perf.doubleValue() == 3.5D);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
+ assertEquals(6.551081335677848D, stdi, 0.0);
+ assertEquals(4.041451884327381D, stdf, 0.0);
+ assertEquals(1.5D, peri, 0.0);
+ assertEquals(3.5D, perf, 0.0);
assertEquals(countDist.longValue(), 4);
tuple = tuples.get(2);
@@ -1476,20 +1478,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
perf = tuple.getDouble("per(a_f,50)");
countDist = tuple.getLong("countDist(a_i)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
- assertTrue(stdi.doubleValue() == 4.509249752822894D);
- assertTrue(stdf.doubleValue() == 2.6457513110645907D);
- assertTrue(peri.doubleValue() == 11.0D);
- assertTrue(perf.doubleValue() == 7.0D);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
+ assertEquals(4.509249752822894D, stdi, 0.0);
+ assertEquals(2.6457513110645907D, stdf, 0.0);
+ assertEquals(11.0D, peri, 0.0);
+ assertEquals(7.0D, perf, 0.0);
assertEquals(countDist.longValue(), 4);
// Reverse the Sort.
@@ -1533,20 +1535,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
peri = tuple.getDouble("per(a_i,50)");
perf = tuple.getDouble("per(a_f,50)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
- assertTrue(stdi.doubleValue() == 4.509249752822894D);
- assertTrue(stdf.doubleValue() == 2.6457513110645907D);
- assertTrue(peri.doubleValue() == 11.0D);
- assertTrue(perf.doubleValue() == 7.0D);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
+ assertEquals(4.509249752822894D, stdi, 0.0);
+ assertEquals(2.6457513110645907D, stdf, 0.0);
+ assertEquals(11.0D, peri, 0.0);
+ assertEquals(7.0D, perf, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1564,20 +1566,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
peri = tuple.getDouble("per(a_i,50)");
perf = tuple.getDouble("per(a_f,50)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
- assertTrue(stdi.doubleValue() == 6.551081335677848D);
- assertTrue(stdf.doubleValue() == 4.041451884327381D);
- assertTrue(peri.doubleValue() == 1.5D);
- assertTrue(perf.doubleValue() == 3.5D);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
+ assertEquals(6.551081335677848D, stdi, 0.0);
+ assertEquals(4.041451884327381D, stdf, 0.0);
+ assertEquals(1.5D, peri, 0.0);
+ assertEquals(3.5D, perf, 0.0);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1595,20 +1597,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
peri = tuple.getDouble("per(a_i,50)");
perf = tuple.getDouble("per(a_f,50)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
- assertTrue(stdi.doubleValue() == 4.949747468305833D);
- assertTrue(stdf.doubleValue() == 2.1213203435596424D);
- assertTrue(peri.doubleValue() == 7.5D);
- assertTrue(perf.doubleValue() == 5.5D);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
+ assertEquals(4.949747468305833D, stdi, 0.0);
+ assertEquals(2.1213203435596424D, stdf, 0.0);
+ assertEquals(7.5D, peri, 0.0);
+ assertEquals(5.5D, perf, 0.0);
clause =
"facet("
@@ -1645,16 +1647,16 @@ public class StreamExpressionTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1668,16 +1670,16 @@ public class StreamExpressionTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
clause =
"facet("
@@ -1715,16 +1717,16 @@ public class StreamExpressionTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1738,16 +1740,16 @@ public class StreamExpressionTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
// Test index sort
clause =
@@ -1771,7 +1773,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(clause);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
bucket = tuple.getString("a_s");
@@ -1789,20 +1791,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
peri = tuple.getDouble("per(a_i,50)");
perf = tuple.getDouble("per(a_f,50)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
- assertTrue(stdi.doubleValue() == 4.949747468305833D);
- assertTrue(stdf.doubleValue() == 2.1213203435596424D);
- assertTrue(peri.doubleValue() == 7.5D);
- assertTrue(perf.doubleValue() == 5.5D);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
+ assertEquals(4.949747468305833D, stdi, 0.0);
+ assertEquals(2.1213203435596424D, stdf, 0.0);
+ assertEquals(7.5D, peri, 0.0);
+ assertEquals(5.5D, perf, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1820,20 +1822,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
peri = tuple.getDouble("per(a_i,50)");
perf = tuple.getDouble("per(a_f,50)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
- assertTrue(stdi.doubleValue() == 4.509249752822894D);
- assertTrue(stdf.doubleValue() == 2.6457513110645907D);
- assertTrue(peri.doubleValue() == 11.0D);
- assertTrue(perf.doubleValue() == 7.0D);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
+ assertEquals(4.509249752822894D, stdi, 0.0);
+ assertEquals(2.6457513110645907D, stdf, 0.0);
+ assertEquals(11.0D, peri, 0.0);
+ assertEquals(7.0D, perf, 0.0);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1851,20 +1853,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
peri = tuple.getDouble("per(a_i,50)");
perf = tuple.getDouble("per(a_f,50)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
- assertTrue(stdi.doubleValue() == 6.551081335677848D);
- assertTrue(stdf.doubleValue() == 4.041451884327381D);
- assertTrue(peri.doubleValue() == 1.5D);
- assertTrue(perf.doubleValue() == 3.5D);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
+ assertEquals(6.551081335677848D, stdi, 0.0);
+ assertEquals(4.041451884327381D, stdf, 0.0);
+ assertEquals(1.5D, peri, 0.0);
+ assertEquals(3.5D, perf, 0.0);
// Test index sort
@@ -1887,7 +1889,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(clause);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
bucket = tuple.getString("a_s");
@@ -1901,16 +1903,16 @@ public class StreamExpressionTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello0"));
- assertTrue(sumi.doubleValue() == 17.0D);
- assertTrue(sumf.doubleValue() == 18.0D);
- assertTrue(mini.doubleValue() == 0.0D);
- assertTrue(minf.doubleValue() == 1.0D);
- assertTrue(maxi.doubleValue() == 14.0D);
- assertTrue(maxf.doubleValue() == 10.0D);
- assertTrue(avgi.doubleValue() == 4.25D);
- assertTrue(avgf.doubleValue() == 4.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello0", bucket);
+ assertEquals(17.0D, sumi, 0.0);
+ assertEquals(18.0D, sumf, 0.0);
+ assertEquals(0.0D, mini, 0.0);
+ assertEquals(1.0D, minf, 0.0);
+ assertEquals(14.0D, maxi, 0.0);
+ assertEquals(10.0D, maxf, 0.0);
+ assertEquals(4.25D, avgi, 0.0);
+ assertEquals(4.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1924,16 +1926,16 @@ public class StreamExpressionTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello3"));
- assertTrue(sumi.doubleValue() == 38.0D);
- assertTrue(sumf.doubleValue() == 26.0D);
- assertTrue(mini.doubleValue() == 3.0D);
- assertTrue(minf.doubleValue() == 3.0D);
- assertTrue(maxi.doubleValue() == 13.0D);
- assertTrue(maxf.doubleValue() == 9.0D);
- assertTrue(avgi.doubleValue() == 9.5D);
- assertTrue(avgf.doubleValue() == 6.5D);
- assertTrue(count.doubleValue() == 4);
+ assertEquals("hello3", bucket);
+ assertEquals(38.0D, sumi, 0.0);
+ assertEquals(26.0D, sumf, 0.0);
+ assertEquals(3.0D, mini, 0.0);
+ assertEquals(3.0D, minf, 0.0);
+ assertEquals(13.0D, maxi, 0.0);
+ assertEquals(9.0D, maxf, 0.0);
+ assertEquals(9.5D, avgi, 0.0);
+ assertEquals(6.5D, avgf, 0.0);
+ assertEquals(4, count, 0.0);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1947,16 +1949,16 @@ public class StreamExpressionTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket.equals("hello4"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(sumf.doubleValue() == 11.0D);
- assertTrue(mini.doubleValue() == 4.0D);
- assertTrue(minf.doubleValue() == 4.0D);
- assertTrue(maxi.doubleValue() == 11.0D);
- assertTrue(maxf.doubleValue() == 7.0D);
- assertTrue(avgi.doubleValue() == 7.5D);
- assertTrue(avgf.doubleValue() == 5.5D);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello4", bucket);
+ assertEquals(15, sumi.longValue());
+ assertEquals(11.0D, sumf, 0.0);
+ assertEquals(4.0D, mini, 0.0);
+ assertEquals(4.0D, minf, 0.0);
+ assertEquals(11.0D, maxi, 0.0);
+ assertEquals(7.0D, maxf, 0.0);
+ assertEquals(7.5D, avgi, 0.0);
+ assertEquals(5.5D, avgf, 0.0);
+ assertEquals(2, count, 0.0);
// Test zero result facets
clause =
@@ -1978,7 +1980,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(clause);
tuples = getTuples(stream);
- assert (tuples.size() == 0);
+ assertEquals(0, tuples.size());
}
@Test
@@ -2189,7 +2191,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4, 10, 11, 12, 13, 14);
// Test with export handler, different code path.
@@ -2202,7 +2204,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream = new SolrStream(shardUrls.get(0), solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4, 10, 11, 12, 13, 14);
solrParams = new ModifiableSolrParams();
@@ -2213,7 +2215,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream = new SolrStream(shardUrls.get(0), solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
assertEquals(tuple.getString("a_s"), "hello");
assertEquals(tuple.getLong("count(*)").longValue(), 10);
@@ -2233,7 +2235,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream = new SolrStream(shardUrls.get(0), solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
tuple = tuples.get(0);
assertEquals(tuple.getString("test_dt"), "2016");
assertEquals(tuple.getLong("count(*)").longValue(), 10);
@@ -2248,7 +2250,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream = new SolrStream(shardUrls.get(0), solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 10);
+ assertEquals(10, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4, 10, 11, 12, 13, 14);
} finally {
@@ -2303,7 +2305,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(clause);
tuples = getTuples(stream);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
Tuple tuple = tuples.get(0);
String bucket1 = tuple.getString("level1_s");
@@ -2311,10 +2313,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
Double sumi = tuple.getDouble("sum(a_i)");
Double count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello3"));
- assertTrue(bucket2.equals("b"));
- assertTrue(sumi.longValue() == 35);
- assertTrue(count.doubleValue() == 3);
+ assertEquals("hello3", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(35, sumi.longValue());
+ assertEquals(3, count, 0.0);
tuple = tuples.get(1);
bucket1 = tuple.getString("level1_s");
@@ -2322,10 +2324,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello0"));
- assertTrue(bucket2.equals("b"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello0", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(15, sumi.longValue());
+ assertEquals(2, count, 0.0);
tuple = tuples.get(2);
bucket1 = tuple.getString("level1_s");
@@ -2333,10 +2335,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello4"));
- assertTrue(bucket2.equals("b"));
- assertTrue(sumi.longValue() == 11);
- assertTrue(count.doubleValue() == 1);
+ assertEquals("hello4", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(11, sumi.longValue());
+ assertEquals(1, count, 0.0);
tuple = tuples.get(3);
bucket1 = tuple.getString("level1_s");
@@ -2344,10 +2346,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello4"));
- assertTrue(bucket2.equals("a"));
- assertTrue(sumi.longValue() == 4);
- assertTrue(count.doubleValue() == 1);
+ assertEquals("hello4", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(4, sumi.longValue());
+ assertEquals(1, count, 0.0);
tuple = tuples.get(4);
bucket1 = tuple.getString("level1_s");
@@ -2355,10 +2357,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello3"));
- assertTrue(bucket2.equals("a"));
- assertTrue(sumi.longValue() == 3);
- assertTrue(count.doubleValue() == 1);
+ assertEquals("hello3", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(3, sumi.longValue());
+ assertEquals(1, count, 0.0);
tuple = tuples.get(5);
bucket1 = tuple.getString("level1_s");
@@ -2366,10 +2368,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello0"));
- assertTrue(bucket2.equals("a"));
- assertTrue(sumi.longValue() == 2);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello0", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(2, sumi.longValue());
+ assertEquals(2, count, 0.0);
clause =
"facet("
@@ -2384,7 +2386,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(clause);
tuples = getTuples(stream);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
bucket1 = tuple.getString("level1_s");
@@ -2392,10 +2394,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello4"));
- assertTrue(bucket2.equals("b"));
- assertTrue(sumi.longValue() == 11);
- assertTrue(count.doubleValue() == 1);
+ assertEquals("hello4", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(11, sumi.longValue());
+ assertEquals(1, count, 0.0);
tuple = tuples.get(1);
bucket1 = tuple.getString("level1_s");
@@ -2403,10 +2405,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello4"));
- assertTrue(bucket2.equals("a"));
- assertTrue(sumi.longValue() == 4);
- assertTrue(count.doubleValue() == 1);
+ assertEquals("hello4", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(4, sumi.longValue());
+ assertEquals(1, count, 0.0);
tuple = tuples.get(2);
bucket1 = tuple.getString("level1_s");
@@ -2414,10 +2416,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello3"));
- assertTrue(bucket2.equals("b"));
- assertTrue(sumi.longValue() == 35);
- assertTrue(count.doubleValue() == 3);
+ assertEquals("hello3", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(35, sumi.longValue());
+ assertEquals(3, count, 0.0);
tuple = tuples.get(3);
bucket1 = tuple.getString("level1_s");
@@ -2425,10 +2427,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello3"));
- assertTrue(bucket2.equals("a"));
- assertTrue(sumi.longValue() == 3);
- assertTrue(count.doubleValue() == 1);
+ assertEquals("hello3", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(3, sumi.longValue());
+ assertEquals(1, count, 0.0);
tuple = tuples.get(4);
bucket1 = tuple.getString("level1_s");
@@ -2436,10 +2438,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello0"));
- assertTrue(bucket2.equals("b"));
- assertTrue(sumi.longValue() == 15);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello0", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(15, sumi.longValue());
+ assertEquals(2, count, 0.0);
tuple = tuples.get(5);
bucket1 = tuple.getString("level1_s");
@@ -2447,10 +2449,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
sumi = tuple.getDouble("sum(a_i)");
count = tuple.getDouble("count(*)");
- assertTrue(bucket1.equals("hello0"));
- assertTrue(bucket2.equals("a"));
- assertTrue(sumi.longValue() == 2);
- assertTrue(count.doubleValue() == 2);
+ assertEquals("hello0", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(2, sumi.longValue());
+ assertEquals(2, count, 0.0);
// Add sorts for percentile
@@ -2467,7 +2469,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(clause);
tuples = getTuples(stream);
- assert (tuples.size() == 6);
+ assertEquals(6, tuples.size());
tuple = tuples.get(0);
bucket1 = tuple.getString("level1_s");
@@ -2475,10 +2477,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
double stdi = tuple.getDouble("std(a_i)");
double peri = tuple.getDouble("per(a_i,50)");
- assertTrue(bucket1.equals("hello3"));
- assertTrue(bucket2.equals("b"));
- assertTrue(stdi == 1.5275252316519468D);
- assertTrue(peri == 12.0D);
+ assertEquals("hello3", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(1.5275252316519468D, stdi, 0.0);
+ assertEquals(12.0D, peri, 0.0);
tuple = tuples.get(1);
bucket1 = tuple.getString("level1_s");
@@ -2486,10 +2488,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stdi = tuple.getDouble("std(a_i)");
peri = tuple.getDouble("per(a_i,50)");
- assertTrue(bucket1.equals("hello4"));
- assertTrue(bucket2.equals("b"));
- assertTrue(stdi == 0.0D);
- assertTrue(peri == 11.0);
+ assertEquals("hello4", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(0.0D, stdi, 0.0);
+ assertEquals(11.0, peri, 0.0);
tuple = tuples.get(2);
bucket1 = tuple.getString("level1_s");
@@ -2497,10 +2499,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stdi = tuple.getDouble("std(a_i)");
peri = tuple.getDouble("per(a_i,50)");
- assertTrue(bucket1.equals("hello0"));
- assertTrue(bucket2.equals("b"));
- assertTrue(stdi == 9.192388155425117D);
- assertTrue(peri == 7.5D);
+ assertEquals("hello0", bucket1);
+ assertEquals("b", bucket2);
+ assertEquals(9.192388155425117D, stdi, 0.0);
+ assertEquals(7.5D, peri, 0.0);
tuple = tuples.get(3);
bucket1 = tuple.getString("level1_s");
@@ -2508,10 +2510,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stdi = tuple.getDouble("std(a_i)");
peri = tuple.getDouble("per(a_i,50)");
- assertTrue(bucket1.equals("hello4"));
- assertTrue(bucket2.equals("a"));
- assertTrue(stdi == 0.0D);
- assertTrue(peri == 4.0D);
+ assertEquals("hello4", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(0.0D, stdi, 0.0);
+ assertEquals(4.0D, peri, 0.0);
tuple = tuples.get(4);
bucket1 = tuple.getString("level1_s");
@@ -2519,10 +2521,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stdi = tuple.getDouble("std(a_i)");
peri = tuple.getDouble("per(a_i,50)");
- assertTrue(bucket1.equals("hello3"));
- assertTrue(bucket2.equals("a"));
- assertTrue(stdi == 0.0D);
- assertTrue(peri == 3.0D);
+ assertEquals("hello3", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(0.0D, stdi, 0.0);
+ assertEquals(3.0D, peri, 0.0);
tuple = tuples.get(5);
bucket1 = tuple.getString("level1_s");
@@ -2530,10 +2532,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stdi = tuple.getDouble("std(a_i)");
peri = tuple.getDouble("per(a_i,50)");
- assertTrue(bucket1.equals("hello0"));
- assertTrue(bucket2.equals("a"));
- assertTrue(stdi == 1.4142135623730951D);
- assertTrue(peri == 1.0D);
+ assertEquals("hello0", bucket1);
+ assertEquals("a", bucket2);
+ assertEquals(1.4142135623730951D, stdi, 0.0);
+ assertEquals(1.0D, peri, 0.0);
}
@Test
@@ -2615,7 +2617,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
try {
stream.open();
Tuple tuple1 = stream.read();
- assertEquals((long) tuple1.getLong("id"), 10l);
+ assertEquals(tuple1.getLong("id").longValue(), 10L);
cluster.getSolrClient().commit("collection1");
// Checkpoint should not have changed.
@@ -2636,7 +2638,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
Tuple tuple2 = stream.read();
cluster.getSolrClient().commit("collection1");
- assertEquals((long) tuple2.getLong("id"), 11l);
+ assertEquals(tuple2.getLong("id").longValue(), 11L);
// Checkpoint should have changed.
expression =
@@ -2683,9 +2685,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
dstream.open();
tuple = dstream.read();
- assertEquals(12, (long) tuple.getLong(id));
+ assertEquals(12, tuple.getLong(id).longValue());
tuple = dstream.read();
- assertEquals(13, (long) tuple.getLong(id));
+ assertEquals(13, tuple.getLong(id).longValue());
// We want to see if the version has been updated after reading two tuples
cluster.getSolrClient().commit("collection1");
@@ -2698,10 +2700,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
// Read from the same DaemonStream stream
tuple = dstream.read();
- assertEquals(14, (long) tuple.getLong(id));
+ assertEquals(14, tuple.getLong(id).longValue());
// This should trigger a checkpoint as it's the 4th read from the stream.
tuple = dstream.read();
- assertEquals(15, (long) tuple.getLong(id));
+ assertEquals(15, tuple.getLong(id).longValue());
dstream.shutdown();
tuple = dstream.read();
@@ -2786,8 +2788,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertEquals(checkpoints.size(), 2);
String id1 = tuples.get(0).getString("id");
String id2 = tuples.get(1).getString("id");
- assertTrue(id1.equals("1000000_0"));
- assertTrue(id2.equals("1000000_1"));
+ assertEquals("1000000_0", id1);
+ assertEquals("1000000_1", id2);
// Index a few more documents
new UpdateRequest()
@@ -2903,9 +2905,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
String s = (String) tuples.get(0).get("echo");
- assertTrue(s.equals("hello world"));
+ assertEquals("hello world", s);
expr = "echo(\"hello world\")";
paramsLoc = new ModifiableSolrParams();
@@ -2916,9 +2918,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
s = (String) tuples.get(0).get("echo");
- assertTrue(s.equals("hello world"));
+ assertEquals("hello world", s);
expr = "echo(\"hello, world\")";
paramsLoc = new ModifiableSolrParams();
@@ -2929,9 +2931,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
s = (String) tuples.get(0).get("echo");
- assertTrue(s.equals("hello, world"));
+ assertEquals("hello, world", s);
expr = "echo(\"hello, \\\"t\\\" world\")";
paramsLoc = new ModifiableSolrParams();
@@ -2942,10 +2944,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
s = (String) tuples.get(0).get("echo");
- assertTrue(s.equals("hello, \"t\" world"));
+ assertEquals("hello, \"t\" world", s);
expr =
"parallel("
@@ -2959,11 +2961,11 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 2);
+ assertEquals(2, tuples.size());
s = (String) tuples.get(0).get("echo");
- assertTrue(s.equals("hello, \"t\" world"));
+ assertEquals("hello, \"t\" world", s);
s = (String) tuples.get(1).get("echo");
- assertTrue(s.equals("hello, \"t\" world"));
+ assertEquals("hello, \"t\" world", s);
expr =
"echo(\"tuytuy iuyiuyi iuyiuyiu iuyiuyiuyiu iuyi iuyiyiuy iuyiuyiu iyiuyiu iyiuyiuyyiyiu yiuyiuyi"
@@ -2976,13 +2978,13 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
s = (String) tuples.get(0).get("echo");
- assertTrue(
- s.equals(
- "tuytuy iuyiuyi iuyiuyiu iuyiuyiuyiu iuyi iuyiyiuy iuyiuyiu iyiuyiu iyiuyiuyyiyiu yiuyiuyi yiuyiuyi "
- + "yiuyiuuyiu yiyiuyiyiu iyiuyiuyiuiuyiu yiuyiuyi yiuyiy yiuiyiuiuy"));
+ assertEquals(
+ "tuytuy iuyiuyi iuyiuyiu iuyiuyiuyiu iuyi iuyiyiuy iuyiuyiu iyiuyiu iyiuyiuyyiyiu yiuyiuyi yiuyiuyi "
+ + "yiuyiuuyiu yiyiuyiyiu iyiuyiuyiuiuyiu yiuyiuyi yiuyiy yiuiyiuiuy",
+ s);
}
@Test
@@ -3006,9 +3008,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
String s = (String) tuples.get(0).get("id");
- assertTrue(s.equals("hello"));
+ assertEquals("hello", s);
}
private String getDateString(String year, String month, String day) {
@@ -3017,8 +3019,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
private String getSplit(int seed, int index) {
String[] splits = {"one", "two", "three"};
- int splitIndex =
- ((Integer.toString(index) + Integer.toString(seed)).hashCode() * index) % splits.length;
+ int splitIndex = ((Integer.toString(index) + seed).hashCode() * index) % splits.length;
return splits[Math.abs(splitIndex)];
}
@@ -3113,57 +3114,57 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 5);
-
- assertTrue(tuples.get(0).get("test_dt").equals("2013-01-01T01:00:00Z"));
- assertTrue(tuples.get(0).getLong("count(*)").equals(100L));
- assertTrue(tuples.get(0).getDouble("sum(price_f)").equals(10000D));
- assertTrue(tuples.get(0).getDouble("max(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("min(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("avg(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(0).getDouble("per(price_f,50)").equals(100D));
- assertTrue(tuples.get(0).getLong("countDist(id)").equals(100L));
-
- assertTrue(tuples.get(1).get("test_dt").equals("2014-01-01T01:00:00Z"));
- assertTrue(tuples.get(1).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(1).getDouble("sum(price_f)").equals(25000D));
- assertTrue(tuples.get(1).getDouble("max(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("min(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("avg(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(1).getDouble("per(price_f,50)").equals(500D));
- assertTrue(tuples.get(1).getLong("countDist(id)").equals(50L));
-
- assertTrue(tuples.get(2).get("test_dt").equals("2015-01-01T01:00:00Z"));
- assertTrue(tuples.get(2).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(2).getDouble("sum(price_f)").equals(15000D));
- assertTrue(tuples.get(2).getDouble("max(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("min(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("avg(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(2).getDouble("per(price_f,50)").equals(300D));
- assertTrue(tuples.get(2).getLong("countDist(id)").equals(50L));
-
- assertTrue(tuples.get(3).get("test_dt").equals("2016-01-01T01:00:00Z"));
- assertTrue(tuples.get(3).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(3).getDouble("sum(price_f)").equals(20000D));
- assertTrue(tuples.get(3).getDouble("max(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("min(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("avg(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(3).getDouble("per(price_f,50)").equals(400D));
- assertTrue(tuples.get(3).getLong("countDist(id)").equals(50L));
-
- assertTrue(tuples.get(4).get("test_dt").equals("2017-01-01T01:00:00Z"));
- assertEquals((long) tuples.get(4).getLong("count(*)"), 0L);
+ assertEquals(5, tuples.size());
+
+ assertEquals("2013-01-01T01:00:00Z", tuples.get(0).get("test_dt"));
+ assertEquals(100L, tuples.get(0).getLong("count(*)").longValue());
+ assertEquals(10000D, tuples.get(0).getDouble("sum(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("max(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("min(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(0).getDouble("std(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("per(price_f,50)"), 0.0);
+ assertEquals(100L, tuples.get(0).getLong("countDist(id)").longValue());
+
+ assertEquals("2014-01-01T01:00:00Z", tuples.get(1).get("test_dt"));
+ assertEquals(50L, tuples.get(1).getLong("count(*)").longValue());
+ assertEquals(25000D, tuples.get(1).getDouble("sum(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("max(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("min(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(1).getDouble("std(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("per(price_f,50)"), 0.0);
+ assertEquals(50L, tuples.get(1).getLong("countDist(id)").longValue());
+
+ assertEquals("2015-01-01T01:00:00Z", tuples.get(2).get("test_dt"));
+ assertEquals(50L, tuples.get(2).getLong("count(*)").longValue());
+ assertEquals(15000D, tuples.get(2).getDouble("sum(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("max(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("min(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(2).getDouble("std(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("per(price_f,50)"), 0.0);
+ assertEquals(50L, tuples.get(2).getLong("countDist(id)").longValue());
+
+ assertEquals("2016-01-01T01:00:00Z", tuples.get(3).get("test_dt"));
+ assertEquals(50L, tuples.get(3).getLong("count(*)").longValue());
+ assertEquals(20000D, tuples.get(3).getDouble("sum(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("max(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("min(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(3).getDouble("std(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("per(price_f,50)"), 0.0);
+ assertEquals(50L, tuples.get(3).getLong("countDist(id)").longValue());
+
+ assertEquals("2017-01-01T01:00:00Z", tuples.get(4).get("test_dt"));
+ assertEquals(tuples.get(4).getLong("count(*)").longValue(), 0L);
assertEquals(tuples.get(4).getDouble("sum(price_f)"), 0D, 0);
assertEquals(tuples.get(4).getDouble("max(price_f)"), 0D, 0);
assertEquals(tuples.get(4).getDouble("min(price_f)"), 0D, 0);
- assertTrue(tuples.get(4).getDouble("avg(price_f)").equals(0D));
- assertTrue(tuples.get(4).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(4).getDouble("per(price_f,50)").equals(0D));
- assertTrue(tuples.get(4).getLong("countDist(id)").equals(0L));
+ assertEquals(0D, tuples.get(4).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(4).getDouble("std(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(4).getDouble("per(price_f,50)"), 0.0);
+ assertEquals(0L, tuples.get(4).getLong("countDist(id)").longValue());
expr =
"timeseries("
@@ -3182,43 +3183,43 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 4);
-
- assertTrue(tuples.get(0).get("test_dt").equals("2013"));
- assertTrue(tuples.get(0).getLong("count(*)").equals(100L));
- assertTrue(tuples.get(0).getDouble("sum(price_f)").equals(10000D));
- assertTrue(tuples.get(0).getDouble("max(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("min(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("avg(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(0).getDouble("per(price_f,50)").equals(100D));
-
- assertTrue(tuples.get(1).get("test_dt").equals("2014"));
- assertTrue(tuples.get(1).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(1).getDouble("sum(price_f)").equals(25000D));
- assertTrue(tuples.get(1).getDouble("max(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("min(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("avg(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(1).getDouble("per(price_f,50)").equals(500D));
-
- assertTrue(tuples.get(2).get("test_dt").equals("2015"));
- assertTrue(tuples.get(2).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(2).getDouble("sum(price_f)").equals(15000D));
- assertTrue(tuples.get(2).getDouble("max(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("min(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("avg(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(2).getDouble("per(price_f,50)").equals(300D));
-
- assertTrue(tuples.get(3).get("test_dt").equals("2016"));
- assertTrue(tuples.get(3).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(3).getDouble("sum(price_f)").equals(20000D));
- assertTrue(tuples.get(3).getDouble("max(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("min(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("avg(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(3).getDouble("per(price_f,50)").equals(400D));
+ assertEquals(4, tuples.size());
+
+ assertEquals("2013", tuples.get(0).get("test_dt"));
+ assertEquals(100L, tuples.get(0).getLong("count(*)").longValue());
+ assertEquals(10000D, tuples.get(0).getDouble("sum(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("max(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("min(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(0).getDouble("std(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2014", tuples.get(1).get("test_dt"));
+ assertEquals(50L, tuples.get(1).getLong("count(*)").longValue());
+ assertEquals(25000D, tuples.get(1).getDouble("sum(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("max(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("min(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(1).getDouble("std(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2015", tuples.get(2).get("test_dt"));
+ assertEquals(50L, tuples.get(2).getLong("count(*)").longValue());
+ assertEquals(15000D, tuples.get(2).getDouble("sum(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("max(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("min(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(2).getDouble("std(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2016", tuples.get(3).get("test_dt"));
+ assertEquals(50L, tuples.get(3).getLong("count(*)").longValue());
+ assertEquals(20000D, tuples.get(3).getDouble("sum(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("max(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("min(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(3).getDouble("std(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("per(price_f,50)"), 0.0);
expr =
"timeseries("
@@ -3237,43 +3238,43 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 4);
-
- assertTrue(tuples.get(0).get("test_dt").equals("2013-01"));
- assertTrue(tuples.get(0).getLong("count(*)").equals(100L));
- assertTrue(tuples.get(0).getDouble("sum(price_f)").equals(10000D));
- assertTrue(tuples.get(0).getDouble("max(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("min(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("avg(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(0).getDouble("per(price_f,50)").equals(100D));
-
- assertTrue(tuples.get(1).get("test_dt").equals("2014-01"));
- assertTrue(tuples.get(1).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(1).getDouble("sum(price_f)").equals(25000D));
- assertTrue(tuples.get(1).getDouble("max(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("min(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("avg(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(1).getDouble("per(price_f,50)").equals(500D));
-
- assertTrue(tuples.get(2).get("test_dt").equals("2015-01"));
- assertTrue(tuples.get(2).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(2).getDouble("sum(price_f)").equals(15000D));
- assertTrue(tuples.get(2).getDouble("max(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("min(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("avg(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(2).getDouble("per(price_f,50)").equals(300D));
-
- assertTrue(tuples.get(3).get("test_dt").equals("2016-01"));
- assertTrue(tuples.get(3).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(3).getDouble("sum(price_f)").equals(20000D));
- assertTrue(tuples.get(3).getDouble("max(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("min(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("avg(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(3).getDouble("per(price_f,50)").equals(400D));
+ assertEquals(4, tuples.size());
+
+ assertEquals("2013-01", tuples.get(0).get("test_dt"));
+ assertEquals(100L, tuples.get(0).getLong("count(*)").longValue());
+ assertEquals(10000D, tuples.get(0).getDouble("sum(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("max(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("min(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(0).getDouble("std(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2014-01", tuples.get(1).get("test_dt"));
+ assertEquals(50L, tuples.get(1).getLong("count(*)").longValue());
+ assertEquals(25000D, tuples.get(1).getDouble("sum(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("max(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("min(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(1).getDouble("std(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2015-01", tuples.get(2).get("test_dt"));
+ assertEquals(50L, tuples.get(2).getLong("count(*)").longValue());
+ assertEquals(15000D, tuples.get(2).getDouble("sum(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("max(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("min(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(2).getDouble("std(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2016-01", tuples.get(3).get("test_dt"));
+ assertEquals(50L, tuples.get(3).getLong("count(*)").longValue());
+ assertEquals(20000D, tuples.get(3).getDouble("sum(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("max(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("min(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(3).getDouble("std(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("per(price_f,50)"), 0.0);
expr =
"timeseries("
@@ -3292,51 +3293,51 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 5);
- assertTrue(tuples.get(0).get("test_dt").equals("2012-01"));
- assertTrue(tuples.get(0).getLong("count(*)").equals(0L));
- assertTrue(tuples.get(0).getDouble("sum(price_f)") == 0);
- assertTrue(tuples.get(0).getDouble("max(price_f)") == 0);
- assertTrue(tuples.get(0).getDouble("min(price_f)") == 0);
- assertTrue(tuples.get(0).getDouble("avg(price_f)").equals(0D));
- assertTrue(tuples.get(0).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(0).getDouble("per(price_f,50)").equals(0D));
-
- assertTrue(tuples.get(1).get("test_dt").equals("2013-01"));
- assertTrue(tuples.get(1).getLong("count(*)").equals(100L));
- assertTrue(tuples.get(1).getDouble("sum(price_f)").equals(10000D));
- assertTrue(tuples.get(1).getDouble("max(price_f)").equals(100D));
- assertTrue(tuples.get(1).getDouble("min(price_f)").equals(100D));
- assertTrue(tuples.get(1).getDouble("avg(price_f)").equals(100D));
- assertTrue(tuples.get(1).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(1).getDouble("per(price_f,50)").equals(100D));
-
- assertTrue(tuples.get(2).get("test_dt").equals("2014-01"));
- assertTrue(tuples.get(2).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(2).getDouble("sum(price_f)").equals(25000D));
- assertTrue(tuples.get(2).getDouble("max(price_f)").equals(500D));
- assertTrue(tuples.get(2).getDouble("min(price_f)").equals(500D));
- assertTrue(tuples.get(2).getDouble("avg(price_f)").equals(500D));
- assertTrue(tuples.get(2).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(2).getDouble("per(price_f,50)").equals(500D));
-
- assertTrue(tuples.get(3).get("test_dt").equals("2015-01"));
- assertTrue(tuples.get(3).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(3).getDouble("sum(price_f)").equals(15000D));
- assertTrue(tuples.get(3).getDouble("max(price_f)").equals(300D));
- assertTrue(tuples.get(3).getDouble("min(price_f)").equals(300D));
- assertTrue(tuples.get(3).getDouble("avg(price_f)").equals(300D));
- assertTrue(tuples.get(3).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(3).getDouble("per(price_f,50)").equals(300D));
-
- assertTrue(tuples.get(4).get("test_dt").equals("2016-01"));
- assertTrue(tuples.get(4).getLong("count(*)").equals(50L));
- assertTrue(tuples.get(4).getDouble("sum(price_f)").equals(20000D));
- assertTrue(tuples.get(4).getDouble("max(price_f)").equals(400D));
- assertTrue(tuples.get(4).getDouble("min(price_f)").equals(400D));
- assertTrue(tuples.get(4).getDouble("avg(price_f)").equals(400D));
- assertTrue(tuples.get(4).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(4).getDouble("per(price_f,50)").equals(400D));
+ assertEquals(5, tuples.size());
+ assertEquals("2012-01", tuples.get(0).get("test_dt"));
+ assertEquals(0L, tuples.get(0).getLong("count(*)").longValue());
+ assertEquals(0, tuples.get(0).getDouble("sum(price_f)"), 0.0);
+ assertEquals(0, tuples.get(0).getDouble("max(price_f)"), 0.0);
+ assertEquals(0, tuples.get(0).getDouble("min(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(0).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(0).getDouble("std(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(0).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2013-01", tuples.get(1).get("test_dt"));
+ assertEquals(100L, tuples.get(1).getLong("count(*)").longValue());
+ assertEquals(10000D, tuples.get(1).getDouble("sum(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(1).getDouble("max(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(1).getDouble("min(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(1).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(1).getDouble("std(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(1).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2014-01", tuples.get(2).get("test_dt"));
+ assertEquals(50L, tuples.get(2).getLong("count(*)").longValue());
+ assertEquals(25000D, tuples.get(2).getDouble("sum(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(2).getDouble("max(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(2).getDouble("min(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(2).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(2).getDouble("std(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(2).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2015-01", tuples.get(3).get("test_dt"));
+ assertEquals(50L, tuples.get(3).getLong("count(*)").longValue());
+ assertEquals(15000D, tuples.get(3).getDouble("sum(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(3).getDouble("max(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(3).getDouble("min(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(3).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(3).getDouble("std(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(3).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2016-01", tuples.get(4).get("test_dt"));
+ assertEquals(50L, tuples.get(4).getLong("count(*)").longValue());
+ assertEquals(20000D, tuples.get(4).getDouble("sum(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(4).getDouble("max(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(4).getDouble("min(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(4).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(4).getDouble("std(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(4).getDouble("per(price_f,50)"), 0.0);
expr =
"timeseries("
@@ -3362,159 +3363,159 @@ public class StreamExpressionTest extends SolrCloudTestCase {
long splitCount = counts.get(year + "_" + split);
assertEquals(tuples.size(), 12);
- assertTrue(tuples.get(0).get("test_dt").equals("2013"));
- assertTrue(tuples.get(0).get("split_s").equals("three"));
- assertTrue(tuples.get(0).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(0).getDouble("sum(price_f)").equals(splitCount * 100D));
- assertTrue(tuples.get(0).getDouble("max(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("min(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("avg(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(0).getDouble("per(price_f,50)").equals(100D));
+ assertEquals("2013", tuples.get(0).get("test_dt"));
+ assertEquals("three", tuples.get(0).get("split_s"));
+ assertEquals(tuples.get(0).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(0).getDouble("sum(price_f)"), splitCount * 100D, 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("max(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("min(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(0).getDouble("std(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(1).getString("test_dt");
split = tuples.get(1).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(1).get("test_dt").equals("2013"));
- assertTrue(tuples.get(1).get("split_s").equals("two"));
- assertTrue(tuples.get(1).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(1).getDouble("sum(price_f)").equals(splitCount * 100D));
- assertTrue(tuples.get(1).getDouble("max(price_f)").equals(100D));
- assertTrue(tuples.get(1).getDouble("min(price_f)").equals(100D));
- assertTrue(tuples.get(1).getDouble("avg(price_f)").equals(100D));
- assertTrue(tuples.get(1).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(1).getDouble("per(price_f,50)").equals(100D));
+ assertEquals("2013", tuples.get(1).get("test_dt"));
+ assertEquals("two", tuples.get(1).get("split_s"));
+ assertEquals(tuples.get(1).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(1).getDouble("sum(price_f)"), splitCount * 100D, 0.0);
+ assertEquals(100D, tuples.get(1).getDouble("max(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(1).getDouble("min(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(1).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(1).getDouble("std(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(1).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(2).getString("test_dt");
split = tuples.get(2).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(2).get("test_dt").equals("2013"));
- assertTrue(tuples.get(2).get("split_s").equals("one"));
- assertTrue(tuples.get(2).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(2).getDouble("sum(price_f)").equals(splitCount * 100D));
- assertTrue(tuples.get(2).getDouble("max(price_f)").equals(100D));
- assertTrue(tuples.get(2).getDouble("min(price_f)").equals(100D));
- assertTrue(tuples.get(2).getDouble("avg(price_f)").equals(100D));
- assertTrue(tuples.get(2).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(2).getDouble("per(price_f,50)").equals(100D));
+ assertEquals("2013", tuples.get(2).get("test_dt"));
+ assertEquals("one", tuples.get(2).get("split_s"));
+ assertEquals(tuples.get(2).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(2).getDouble("sum(price_f)"), splitCount * 100D, 0.0);
+ assertEquals(100D, tuples.get(2).getDouble("max(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(2).getDouble("min(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(2).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(2).getDouble("std(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(2).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(3).getString("test_dt");
split = tuples.get(3).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(3).get("test_dt").equals("2014"));
- assertTrue(tuples.get(3).get("split_s").equals("two"));
- assertTrue(tuples.get(3).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(3).getDouble("sum(price_f)").equals(splitCount * 500D));
- assertTrue(tuples.get(3).getDouble("max(price_f)").equals(500D));
- assertTrue(tuples.get(3).getDouble("min(price_f)").equals(500D));
- assertTrue(tuples.get(3).getDouble("avg(price_f)").equals(500D));
- assertTrue(tuples.get(3).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(3).getDouble("per(price_f,50)").equals(500D));
+ assertEquals("2014", tuples.get(3).get("test_dt"));
+ assertEquals("two", tuples.get(3).get("split_s"));
+ assertEquals(tuples.get(3).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(3).getDouble("sum(price_f)"), splitCount * 500D, 0.0);
+ assertEquals(500D, tuples.get(3).getDouble("max(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(3).getDouble("min(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(3).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(3).getDouble("std(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(3).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(4).getString("test_dt");
split = tuples.get(4).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(4).get("test_dt").equals("2014"));
- assertTrue(tuples.get(4).get("split_s").equals("three"));
- assertTrue(tuples.get(4).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(4).getDouble("sum(price_f)").equals(splitCount * 500D));
- assertTrue(tuples.get(4).getDouble("max(price_f)").equals(500D));
- assertTrue(tuples.get(4).getDouble("min(price_f)").equals(500D));
- assertTrue(tuples.get(4).getDouble("avg(price_f)").equals(500D));
- assertTrue(tuples.get(4).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(4).getDouble("per(price_f,50)").equals(500D));
+ assertEquals("2014", tuples.get(4).get("test_dt"));
+ assertEquals("three", tuples.get(4).get("split_s"));
+ assertEquals(tuples.get(4).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(4).getDouble("sum(price_f)"), splitCount * 500D, 0.0);
+ assertEquals(500D, tuples.get(4).getDouble("max(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(4).getDouble("min(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(4).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(4).getDouble("std(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(4).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(5).getString("test_dt");
split = tuples.get(5).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(5).get("test_dt").equals("2014"));
- assertTrue(tuples.get(5).get("split_s").equals("one"));
- assertTrue(tuples.get(5).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(5).getDouble("sum(price_f)").equals(splitCount * 500D));
- assertTrue(tuples.get(5).getDouble("max(price_f)").equals(500D));
- assertTrue(tuples.get(5).getDouble("min(price_f)").equals(500D));
- assertTrue(tuples.get(5).getDouble("avg(price_f)").equals(500D));
- assertTrue(tuples.get(5).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(5).getDouble("per(price_f,50)").equals(500D));
+ assertEquals("2014", tuples.get(5).get("test_dt"));
+ assertEquals("one", tuples.get(5).get("split_s"));
+ assertEquals(tuples.get(5).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(5).getDouble("sum(price_f)"), splitCount * 500D, 0.0);
+ assertEquals(500D, tuples.get(5).getDouble("max(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(5).getDouble("min(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(5).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(5).getDouble("std(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(5).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(6).getString("test_dt");
split = tuples.get(6).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(6).get("test_dt").equals("2015"));
- assertTrue(tuples.get(6).get("split_s").equals("three"));
- assertTrue(tuples.get(6).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(6).getDouble("sum(price_f)").equals(splitCount * 300D));
- assertTrue(tuples.get(6).getDouble("max(price_f)").equals(300D));
- assertTrue(tuples.get(6).getDouble("min(price_f)").equals(300D));
- assertTrue(tuples.get(6).getDouble("avg(price_f)").equals(300D));
- assertTrue(tuples.get(6).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(6).getDouble("per(price_f,50)").equals(300D));
+ assertEquals("2015", tuples.get(6).get("test_dt"));
+ assertEquals("three", tuples.get(6).get("split_s"));
+ assertEquals(tuples.get(6).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(6).getDouble("sum(price_f)"), splitCount * 300D, 0.0);
+ assertEquals(300D, tuples.get(6).getDouble("max(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(6).getDouble("min(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(6).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(6).getDouble("std(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(6).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(7).getString("test_dt");
split = tuples.get(7).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(7).get("test_dt").equals("2015"));
- assertTrue(tuples.get(7).get("split_s").equals("two"));
- assertTrue(tuples.get(7).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(7).getDouble("sum(price_f)").equals(splitCount * 300D));
- assertTrue(tuples.get(7).getDouble("max(price_f)").equals(300D));
- assertTrue(tuples.get(7).getDouble("min(price_f)").equals(300D));
- assertTrue(tuples.get(7).getDouble("avg(price_f)").equals(300D));
- assertTrue(tuples.get(7).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(7).getDouble("per(price_f,50)").equals(300D));
+ assertEquals("2015", tuples.get(7).get("test_dt"));
+ assertEquals("two", tuples.get(7).get("split_s"));
+ assertEquals(tuples.get(7).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(7).getDouble("sum(price_f)"), splitCount * 300D, 0.0);
+ assertEquals(300D, tuples.get(7).getDouble("max(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(7).getDouble("min(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(7).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(7).getDouble("std(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(7).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(8).getString("test_dt");
split = tuples.get(8).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(8).get("test_dt").equals("2015"));
- assertTrue(tuples.get(8).get("split_s").equals("one"));
- assertTrue(tuples.get(8).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(8).getDouble("sum(price_f)").equals(splitCount * 300D));
- assertTrue(tuples.get(8).getDouble("max(price_f)").equals(300D));
- assertTrue(tuples.get(8).getDouble("min(price_f)").equals(300D));
- assertTrue(tuples.get(8).getDouble("avg(price_f)").equals(300D));
- assertTrue(tuples.get(8).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(8).getDouble("per(price_f,50)").equals(300D));
+ assertEquals("2015", tuples.get(8).get("test_dt"));
+ assertEquals("one", tuples.get(8).get("split_s"));
+ assertEquals(tuples.get(8).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(8).getDouble("sum(price_f)"), splitCount * 300D, 0.0);
+ assertEquals(300D, tuples.get(8).getDouble("max(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(8).getDouble("min(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(8).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(8).getDouble("std(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(8).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(9).getString("test_dt");
split = tuples.get(9).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(9).get("test_dt").equals("2016"));
- assertTrue(tuples.get(9).get("split_s").equals("two"));
- assertTrue(tuples.get(9).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(9).getDouble("sum(price_f)").equals(splitCount * 400D));
- assertTrue(tuples.get(9).getDouble("max(price_f)").equals(400D));
- assertTrue(tuples.get(9).getDouble("min(price_f)").equals(400D));
- assertTrue(tuples.get(9).getDouble("avg(price_f)").equals(400D));
- assertTrue(tuples.get(9).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(9).getDouble("per(price_f,50)").equals(400D));
+ assertEquals("2016", tuples.get(9).get("test_dt"));
+ assertEquals("two", tuples.get(9).get("split_s"));
+ assertEquals(tuples.get(9).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(9).getDouble("sum(price_f)"), splitCount * 400D, 0.0);
+ assertEquals(400D, tuples.get(9).getDouble("max(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(9).getDouble("min(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(9).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(9).getDouble("std(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(9).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(10).getString("test_dt");
split = tuples.get(10).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(10).get("test_dt").equals("2016"));
- assertTrue(tuples.get(10).get("split_s").equals("one"));
- assertTrue(tuples.get(10).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(10).getDouble("sum(price_f)").equals(splitCount * 400D));
- assertTrue(tuples.get(10).getDouble("max(price_f)").equals(400D));
- assertTrue(tuples.get(10).getDouble("min(price_f)").equals(400D));
- assertTrue(tuples.get(10).getDouble("avg(price_f)").equals(400D));
- assertTrue(tuples.get(10).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(10).getDouble("per(price_f,50)").equals(400D));
+ assertEquals("2016", tuples.get(10).get("test_dt"));
+ assertEquals("one", tuples.get(10).get("split_s"));
+ assertEquals(tuples.get(10).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(10).getDouble("sum(price_f)"), splitCount * 400D, 0.0);
+ assertEquals(400D, tuples.get(10).getDouble("max(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(10).getDouble("min(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(10).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(10).getDouble("std(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(10).getDouble("per(price_f,50)"), 0.0);
year = tuples.get(11).getString("test_dt");
split = tuples.get(11).getString("split_s");
splitCount = counts.get(year + "_" + split);
- assertTrue(tuples.get(11).get("test_dt").equals("2016"));
- assertTrue(tuples.get(11).get("split_s").equals("three"));
- assertTrue(tuples.get(11).getLong("count(*)").equals(splitCount));
- assertTrue(tuples.get(11).getDouble("sum(price_f)").equals(splitCount * 400D));
- assertTrue(tuples.get(11).getDouble("max(price_f)").equals(400D));
- assertTrue(tuples.get(11).getDouble("min(price_f)").equals(400D));
- assertTrue(tuples.get(11).getDouble("avg(price_f)").equals(400D));
- assertTrue(tuples.get(11).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(11).getDouble("per(price_f,50)").equals(400D));
+ assertEquals("2016", tuples.get(11).get("test_dt"));
+ assertEquals("three", tuples.get(11).get("split_s"));
+ assertEquals(tuples.get(11).getLong("count(*)").longValue(), splitCount);
+ assertEquals(tuples.get(11).getDouble("sum(price_f)"), splitCount * 400D, 0.0);
+ assertEquals(400D, tuples.get(11).getDouble("max(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(11).getDouble("min(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(11).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(11).getDouble("std(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(11).getDouble("per(price_f,50)"), 0.0);
expr =
"timeseries("
@@ -3537,45 +3538,45 @@ public class StreamExpressionTest extends SolrCloudTestCase {
tuples = getTuples(solrStream);
assertEquals(tuples.size(), 4);
- assertTrue(tuples.get(0).get("test_dt").equals("2013"));
- assertTrue(tuples.get(0).get("split_s").equals("three"));
- assertTrue(tuples.get(0).getLong("count(*)").equals(37L));
- assertTrue(tuples.get(0).getDouble("sum(price_f)").equals(3700D));
- assertTrue(tuples.get(0).getDouble("max(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("min(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("avg(price_f)").equals(100D));
- assertTrue(tuples.get(0).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(0).getDouble("per(price_f,50)").equals(100D));
-
- assertTrue(tuples.get(1).get("test_dt").equals("2014"));
- assertTrue(tuples.get(1).get("split_s").equals("two"));
- assertTrue(tuples.get(1).getLong("count(*)").equals(20L));
- assertTrue(tuples.get(1).getDouble("sum(price_f)").equals(10000D));
- assertTrue(tuples.get(1).getDouble("max(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("min(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("avg(price_f)").equals(500D));
- assertTrue(tuples.get(1).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(1).getDouble("per(price_f,50)").equals(500D));
-
- assertTrue(tuples.get(2).get("test_dt").equals("2015"));
- assertTrue(tuples.get(2).get("split_s").equals("three"));
- assertTrue(tuples.get(2).getLong("count(*)").equals(22L));
- assertTrue(tuples.get(2).getDouble("sum(price_f)").equals(6600D));
- assertTrue(tuples.get(2).getDouble("max(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("min(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("avg(price_f)").equals(300D));
- assertTrue(tuples.get(2).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(2).getDouble("per(price_f,50)").equals(300D));
-
- assertTrue(tuples.get(3).get("test_dt").equals("2016"));
- assertTrue(tuples.get(3).get("split_s").equals("two"));
- assertTrue(tuples.get(3).getLong("count(*)").equals(20L));
- assertTrue(tuples.get(3).getDouble("sum(price_f)").equals(8000D));
- assertTrue(tuples.get(3).getDouble("max(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("min(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("avg(price_f)").equals(400D));
- assertTrue(tuples.get(3).getDouble("std(price_f)").equals(0D));
- assertTrue(tuples.get(3).getDouble("per(price_f,50)").equals(400D));
+ assertEquals("2013", tuples.get(0).get("test_dt"));
+ assertEquals("three", tuples.get(0).get("split_s"));
+ assertEquals(37L, tuples.get(0).getLong("count(*)").longValue());
+ assertEquals(3700D, tuples.get(0).getDouble("sum(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("max(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("min(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(0).getDouble("std(price_f)"), 0.0);
+ assertEquals(100D, tuples.get(0).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2014", tuples.get(1).get("test_dt"));
+ assertEquals("two", tuples.get(1).get("split_s"));
+ assertEquals(20L, tuples.get(1).getLong("count(*)").longValue());
+ assertEquals(10000D, tuples.get(1).getDouble("sum(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("max(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("min(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(1).getDouble("std(price_f)"), 0.0);
+ assertEquals(500D, tuples.get(1).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2015", tuples.get(2).get("test_dt"));
+ assertEquals("three", tuples.get(2).get("split_s"));
+ assertEquals(22L, tuples.get(2).getLong("count(*)").longValue());
+ assertEquals(6600D, tuples.get(2).getDouble("sum(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("max(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("min(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(2).getDouble("std(price_f)"), 0.0);
+ assertEquals(300D, tuples.get(2).getDouble("per(price_f,50)"), 0.0);
+
+ assertEquals("2016", tuples.get(3).get("test_dt"));
+ assertEquals("two", tuples.get(3).get("split_s"));
+ assertEquals(20L, tuples.get(3).getLong("count(*)").longValue());
+ assertEquals(8000D, tuples.get(3).getDouble("sum(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("max(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("min(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("avg(price_f)"), 0.0);
+ assertEquals(0D, tuples.get(3).getDouble("std(price_f)"), 0.0);
+ assertEquals(400D, tuples.get(3).getDouble("per(price_f,50)"), 0.0);
}
@Test
@@ -3601,15 +3602,15 @@ public class StreamExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
@SuppressWarnings({"unchecked", "rawtypes"})
List<Map> results = (List<Map>) tuples.get(0).get("results");
- assertTrue(results.get(0).get("id").equals("hello1"));
- assertTrue(results.get(0).get("test_t").equals("l b c d c"));
- assertTrue(results.get(1).get("id").equals("hello"));
- assertTrue(results.get(1).get("test_t").equals("l b c d c e"));
+ assertEquals("hello1", results.get(0).get("id"));
+ assertEquals("l b c d c", results.get(0).get("test_t"));
+ assertEquals("hello", results.get(1).get("id"));
+ assertEquals("l b c d c e", results.get(1).get("test_t"));
- assertTrue(tuples.get(0).getLong("sum").equals(2L));
+ assertEquals(2L, tuples.get(0).getLong("sum").longValue());
}
@Test
@@ -3633,10 +3634,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
- assertTrue(tuples.size() == 1);
+ assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
- assertTrue(tuple.get("id").equals("hello"));
- assertTrue(tuple.get("test_t").equals("l b c d c e"));
+ assertEquals("hello", tuple.get("id"));
+ assertEquals("l b c d c e", tuple.get("test_t"));
}
private Map<String, Double> getIdToLabel(TupleStream stream, String outField) throws IOException {
@@ -3686,7 +3687,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
HashSet<String> terms = new HashSet<>();
for (Tuple tuple : tuples) {
terms.add((String) tuple.get("term_s"));
@@ -3710,7 +3711,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
Tuple lastTuple = tuples.get(tuples.size() - 1);
List<Double> lastWeights = lastTuple.getDoubles("weights_ds");
- Double[] lastWeightsArray = lastWeights.toArray(new Double[lastWeights.size()]);
+ Double[] lastWeightsArray = lastWeights.toArray(new Double[0]);
// first feature is bias value
Double[] testRecord = {1.0, 1.17, 0.691, 0.0, 0.0};
@@ -3746,7 +3747,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertEquals(Math.log(5000.0 / (2500 + 1)), lastModel.getDoubles("idfs_ds").get(0), 0.0001);
// make sure the tuples is retrieved in correct order
Tuple firstTuple = tuples.get(99);
- assertEquals(1L, (long) firstTuple.getLong("iteration_i"));
+ assertEquals(1L, firstTuple.getLong("iteration_i").longValue());
} finally {
CollectionAdminRequest.deleteCollection("destinationCollection")
.process(cluster.getSolrClient());
@@ -3755,9 +3756,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
private double sigmoid(double in) {
-
- double d = 1.0 / (1 + Math.exp(-in));
- return d;
+ return 1.0 / (1 + Math.exp(-in));
}
private double[] multiply(Double[] vec1, Double[] vec2) {
@@ -3818,12 +3817,12 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 4);
+ assertEquals(4, tuples.size());
- assertTrue(tuples.get(0).get("term_s").equals("c"));
- assertTrue(tuples.get(1).get("term_s").equals("d"));
- assertTrue(tuples.get(2).get("term_s").equals("e"));
- assertTrue(tuples.get(3).get("term_s").equals("f"));
+ assertEquals("c", tuples.get(0).get("term_s"));
+ assertEquals("d", tuples.get(1).get("term_s"));
+ assertEquals("e", tuples.get(2).get("term_s"));
+ assertEquals("f", tuples.get(3).get("term_s"));
// update
expression =
@@ -3840,10 +3839,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
assertEquals(4, tuples.size());
- assertTrue(tuples.get(0).get("term_s").equals("c"));
- assertTrue(tuples.get(1).get("term_s").equals("d"));
- assertTrue(tuples.get(2).get("term_s").equals("e"));
- assertTrue(tuples.get(3).get("term_s").equals("f"));
+ assertEquals("c", tuples.get(0).get("term_s"));
+ assertEquals("d", tuples.get(1).get("term_s"));
+ assertEquals("e", tuples.get(2).get("term_s"));
+ assertEquals("f", tuples.get(3).get("term_s"));
} finally {
CollectionAdminRequest.deleteCollection("destinationCollection")
.process(cluster.getSolrClient());
@@ -3897,18 +3896,18 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
- assertTrue(tuples.get(0).get("term").equals("l"));
- assertTrue(tuples.get(0).getLong("background") == 5000);
- assertTrue(tuples.get(0).getLong("foreground") == 5000);
+ assertEquals(3, tuples.size());
+ assertEquals("l", tuples.get(0).get("term"));
+ assertEquals(5000, tuples.get(0).getLong("background").longValue());
+ assertEquals(5000, tuples.get(0).getLong("foreground").longValue());
- assertTrue(tuples.get(1).get("term").equals("m"));
- assertTrue(tuples.get(1).getLong("background") == 5500);
- assertTrue(tuples.get(1).getLong("foreground") == 5000);
+ assertEquals("m", tuples.get(1).get("term"));
+ assertEquals(5500, tuples.get(1).getLong("background").longValue());
+ assertEquals(5000, tuples.get(1).getLong("foreground").longValue());
- assertTrue(tuples.get(2).get("term").equals("d"));
- assertTrue(tuples.get(2).getLong("background") == 5600);
- assertTrue(tuples.get(2).getLong("foreground") == 5000);
+ assertEquals("d", tuples.get(2).get("term"));
+ assertEquals(5600, tuples.get(2).getLong("background").longValue());
+ assertEquals(5000, tuples.get(2).getLong("foreground").longValue());
// Test maxDocFreq
significantTerms =
@@ -3917,10 +3916,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
- assertTrue(tuples.get(0).get("term").equals("l"));
- assertTrue(tuples.get(0).getLong("background") == 5000);
- assertTrue(tuples.get(0).getLong("foreground") == 5000);
+ assertEquals(1, tuples.size());
+ assertEquals("l", tuples.get(0).get("term"));
+ assertEquals(5000, tuples.get(0).getLong("background").longValue());
+ assertEquals(5000, tuples.get(0).getLong("foreground").longValue());
// Test maxDocFreq percentage
@@ -3929,10 +3928,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(significantTerms);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
- assertTrue(tuples.get(0).get("term").equals("l"));
- assertTrue(tuples.get(0).getLong("background") == 5000);
- assertTrue(tuples.get(0).getLong("foreground") == 5000);
+ assertEquals(1, tuples.size());
+ assertEquals("l", tuples.get(0).get("term"));
+ assertEquals(5000, tuples.get(0).getLong("background").longValue());
+ assertEquals(5000, tuples.get(0).getLong("foreground").longValue());
// Test min doc freq
significantTerms =
@@ -3941,19 +3940,19 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
- assertTrue(tuples.get(0).get("term").equals("m"));
- assertTrue(tuples.get(0).getLong("background") == 5500);
- assertTrue(tuples.get(0).getLong("foreground") == 5000);
+ assertEquals("m", tuples.get(0).get("term"));
+ assertEquals(5500, tuples.get(0).getLong("background").longValue());
+ assertEquals(5000, tuples.get(0).getLong("foreground").longValue());
- assertTrue(tuples.get(1).get("term").equals("d"));
- assertTrue(tuples.get(1).getLong("background") == 5600);
- assertTrue(tuples.get(1).getLong("foreground") == 5000);
+ assertEquals("d", tuples.get(1).get("term"));
+ assertEquals(5600, tuples.get(1).getLong("background").longValue());
+ assertEquals(5000, tuples.get(1).getLong("foreground").longValue());
- assertTrue(tuples.get(2).get("term").equals("c"));
- assertTrue(tuples.get(2).getLong("background") == 5900);
- assertTrue(tuples.get(2).getLong("foreground") == 5000);
+ assertEquals("c", tuples.get(2).get("term"));
+ assertEquals(5900, tuples.get(2).getLong("background").longValue());
+ assertEquals(5000, tuples.get(2).getLong("foreground").longValue());
// Test min doc freq percent
significantTerms =
@@ -3962,11 +3961,11 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 1);
+ assertEquals(1, tuples.size());
- assertTrue(tuples.get(0).get("term").equals("c"));
- assertTrue(tuples.get(0).getLong("background") == 5900);
- assertTrue(tuples.get(0).getLong("foreground") == 5000);
+ assertEquals("c", tuples.get(0).get("term"));
+ assertEquals(5900, tuples.get(0).getLong("background").longValue());
+ assertEquals(5000, tuples.get(0).getLong("foreground").longValue());
// Test limit
@@ -3976,15 +3975,15 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
- assertTrue(tuples.get(0).get("term").equals("m"));
- assertTrue(tuples.get(0).getLong("background") == 5500);
- assertTrue(tuples.get(0).getLong("foreground") == 5000);
+ assertEquals("m", tuples.get(0).get("term"));
+ assertEquals(5500, tuples.get(0).getLong("background").longValue());
+ assertEquals(5000, tuples.get(0).getLong("foreground").longValue());
- assertTrue(tuples.get(1).get("term").equals("d"));
- assertTrue(tuples.get(1).getLong("background") == 5600);
- assertTrue(tuples.get(1).getLong("foreground") == 5000);
+ assertEquals("d", tuples.get(1).get("term"));
+ assertEquals(5600, tuples.get(1).getLong("background").longValue());
+ assertEquals(5000, tuples.get(1).getLong("foreground").longValue());
// Test term length
@@ -3993,7 +3992,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream = factory.constructStream(significantTerms);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assert (tuples.size() == 0);
+ assertEquals(0, tuples.size());
// Test with shards parameter
List<String> shardUrls =
@@ -4011,15 +4010,15 @@ public class StreamExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
- assertTrue(tuples.get(0).get("term").equals("m"));
- assertTrue(tuples.get(0).getLong("background") == 5500);
- assertTrue(tuples.get(0).getLong("foreground") == 5000);
+ assertEquals("m", tuples.get(0).get("term"));
+ assertEquals(5500, tuples.get(0).getLong("background").longValue());
+ assertEquals(5000, tuples.get(0).getLong("foreground").longValue());
- assertTrue(tuples.get(1).get("term").equals("d"));
- assertTrue(tuples.get(1).getLong("background") == 5600);
- assertTrue(tuples.get(1).getLong("foreground") == 5000);
+ assertEquals("d", tuples.get(1).get("term"));
+ assertEquals(5600, tuples.get(1).getLong("background").longValue());
+ assertEquals(5000, tuples.get(1).getLong("foreground").longValue());
// Execersise the /stream hander
@@ -4038,15 +4037,15 @@ public class StreamExpressionTest extends SolrCloudTestCase {
solrParams.add("myCollection.shards", buf.toString());
SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
tuples = getTuples(solrStream);
- assert (tuples.size() == 2);
+ assertEquals(2, tuples.size());
- assertTrue(tuples.get(0).get("term").equals("m"));
- assertTrue(tuples.get(0).getLong("background") == 5500);
- assertTrue(tuples.get(0).getLong("foreground") == 5000);
+ assertEquals("m", tuples.get(0).get("term"));
+ assertEquals(5500, tuples.get(0).getLong("background").longValue());
+ assertEquals(5000, tuples.get(0).getLong("foreground").longValue());
- assertTrue(tuples.get(1).get("term").equals("d"));
- assertTrue(tuples.get(1).getLong("background") == 5600);
- assertTrue(tuples.get(1).getLong("foreground") == 5000);
+ assertEquals("d", tuples.get(1).get("term"));
+ assertEquals(5600, tuples.get(1).getLong("background").longValue());
+ assertEquals(5000, tuples.get(1).getLong("foreground").longValue());
// Add a negative test to prove that it cannot find slices if shards parameter is removed
@@ -4166,7 +4165,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
for (int i = 0; i < 4; i++) {
Tuple t = tuples.get(i);
- assertEquals("topLevel1.txt line " + String.valueOf(i + 1), t.get("line"));
+ assertEquals("topLevel1.txt line " + (i + 1), t.get("line"));
assertEquals("topLevel1.txt", t.get("file"));
}
}
@@ -4189,7 +4188,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
for (int i = 0; i < 4; i++) {
Tuple t = tuples.get(i);
- assertEquals("topLevel1.txt.gz line " + String.valueOf(i + 1), t.get("line"));
+ assertEquals("topLevel1.txt.gz line " + (i + 1), t.get("line"));
assertEquals("topLevel1.txt.gz", t.get("file"));
}
}
@@ -4231,7 +4230,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
for (int i = 0; i < 4; i++) {
Tuple t = tuples.get(i);
- assertEquals("topLevel1.txt line " + String.valueOf(i + 1), t.get("line"));
+ assertEquals("topLevel1.txt line " + (i + 1), t.get("line"));
assertEquals("topLevel1.txt", t.get("file"));
}
}
@@ -4254,7 +4253,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
for (int i = 0; i < 2; i++) {
Tuple t = tuples.get(i);
- assertEquals("topLevel1.txt line " + String.valueOf(i + 1), t.get("line"));
+ assertEquals("topLevel1.txt line " + (i + 1), t.get("line"));
assertEquals("topLevel1.txt", t.get("file"));
}
}
@@ -4278,14 +4277,14 @@ public class StreamExpressionTest extends SolrCloudTestCase {
final String expectedSecondLevel1Path = "directory1" + File.separator + "secondLevel1.txt";
for (int i = 0; i < 4; i++) {
Tuple t = tuples.get(i);
- assertEquals("secondLevel1.txt line " + String.valueOf(i + 1), t.get("line"));
+ assertEquals("secondLevel1.txt line " + (i + 1), t.get("line"));
assertEquals(expectedSecondLevel1Path, t.get("file"));
}
final String expectedSecondLevel2Path = "directory1" + File.separator + "secondLevel2.txt";
for (int i = 4; i < 8; i++) {
Tuple t = tuples.get(i);
- assertEquals("secondLevel2.txt line " + String.valueOf(i - 3), t.get("line"));
+ assertEquals("secondLevel2.txt line " + (i - 3), t.get("line"));
assertEquals(expectedSecondLevel2Path, t.get("file"));
}
}
@@ -4309,14 +4308,14 @@ public class StreamExpressionTest extends SolrCloudTestCase {
for (int i = 0; i < 4; i++) {
Tuple t = tuples.get(i);
- assertEquals("topLevel1.txt line " + String.valueOf(i + 1), t.get("line"));
+ assertEquals("topLevel1.txt line " + (i + 1), t.get("line"));
assertEquals("topLevel1.txt", t.get("file"));
}
final String expectedSecondLevel2Path = "directory1" + File.separator + "secondLevel2.txt";
for (int i = 4; i < 8; i++) {
Tuple t = tuples.get(i);
- assertEquals("secondLevel2.txt line " + String.valueOf(i - 3), t.get("line"));
+ assertEquals("secondLevel2.txt line " + (i - 3), t.get("line"));
assertEquals(expectedSecondLevel2Path, t.get("file"));
}
}
@@ -4399,15 +4398,13 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
protected List<Tuple> getTuples(TupleStream tupleStream) throws IOException {
- List<Tuple> tuples = new ArrayList<Tuple>();
+ List<Tuple> tuples = new ArrayList<>();
- try {
+ try (tupleStream) {
tupleStream.open();
for (Tuple t = tupleStream.read(); !t.EOF; t = tupleStream.read()) {
tuples.add(t);
}
- } finally {
- tupleStream.close();
}
return tuples;
}
@@ -4442,9 +4439,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
public boolean assertString(Tuple tuple, String fieldName, String expected) throws Exception {
String actual = (String) tuple.get(fieldName);
- if ((null == expected && null != actual)
- || (null != expected && null == actual)
- || (null != expected && !expected.equals(actual))) {
+ if (!Objects.equals(expected, actual)) {
throw new Exception("Longs not equal:" + expected + " : " + actual);
}
@@ -4463,12 +4458,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
private void assertTopicRun(TupleStream stream, String... idArray) throws Exception {
long version = -1;
int count = 0;
- List<String> ids = new ArrayList<>();
- for (String id : idArray) {
- ids.add(id);
- }
+ List<String> ids = new ArrayList<>(Arrays.asList(idArray));
- try {
+ try (stream) {
stream.open();
while (true) {
Tuple tuple = stream.read();
@@ -4487,8 +4479,6 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
}
}
- } finally {
- stream.close();
}
if (count != ids.size()) {
@@ -4497,29 +4487,21 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
private void assertTopicSubject(TupleStream stream, String... textArray) throws Exception {
- long version = -1;
- int count = 0;
- List<String> texts = new ArrayList<>();
- for (String text : textArray) {
- texts.add(text);
- }
+ List<String> texts = new ArrayList<>(Arrays.asList(textArray));
- try {
+ try (stream) {
stream.open();
while (true) {
Tuple tuple = stream.read();
if (tuple.EOF) {
break;
} else {
- ++count;
String subject = tuple.getString("subject");
if (!texts.contains(subject)) {
throw new Exception("Expecting subject in topic run not found:" + subject);
}
}
}
- } finally {
- stream.close();
}
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java
index 81565ace967..4069b671b32 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java
@@ -382,7 +382,7 @@ public class StreamExpressionToExpessionTest extends SolrTestCase {
assertTrue(expressionString.contains("q=\"*:*\""));
assertTrue(expressionString.contains("buckets=a_s"));
assertTrue(expressionString.contains("bucketSorts=\"sum(a_i) asc\""));
- assertTrue(!expressionString.contains("bucketSizeLimit"));
+ assertFalse(expressionString.contains("bucketSizeLimit"));
assertTrue(expressionString.contains("rows=10"));
assertTrue(expressionString.contains("offset=0"));
assertTrue(expressionString.contains("overfetch=250"));
@@ -423,7 +423,7 @@ public class StreamExpressionToExpessionTest extends SolrTestCase {
assertTrue(expressionString.contains("q=\"*:*\""));
assertTrue(expressionString.contains("buckets=a_s"));
assertTrue(expressionString.contains("bucketSorts=\"sum(a_i) asc\""));
- assertTrue(!expressionString.contains("bucketSizeLimit"));
+ assertFalse(expressionString.contains("bucketSizeLimit"));
assertTrue(expressionString.contains("rows=10"));
assertTrue(expressionString.contains("offset=100"));
assertTrue(expressionString.contains("overfetch=30"));
@@ -464,7 +464,7 @@ public class StreamExpressionToExpessionTest extends SolrTestCase {
assertTrue(expressionString.contains("q=\"*:*\""));
assertTrue(expressionString.contains("buckets=a_s"));
assertTrue(expressionString.contains("bucketSorts=\"sum(a_i) asc\""));
- assertTrue(!expressionString.contains("bucketSizeLimit"));
+ assertFalse(expressionString.contains("bucketSizeLimit"));
assertTrue(expressionString.contains("rows=-1"));
assertTrue(expressionString.contains("offset=100"));
assertTrue(expressionString.contains("overfetch=-1"));
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExplanationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExplanationTest.java
index acd63484b7a..178f7e08ee6 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExplanationTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExplanationTest.java
@@ -28,7 +28,6 @@ import org.apache.solr.client.solrj.io.stream.metrics.MaxMetric;
import org.apache.solr.client.solrj.io.stream.metrics.MeanMetric;
import org.apache.solr.client.solrj.io.stream.metrics.MinMetric;
import org.apache.solr.client.solrj.io.stream.metrics.SumMetric;
-import org.junit.Assert;
import org.junit.Test;
/** */
@@ -74,8 +73,8 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
"search(collection1, q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i asc\")"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("search", explanation.getFunctionName());
- Assert.assertEquals(CloudSolrStream.class.getName(), explanation.getImplementingClass());
+ assertEquals("search", explanation.getFunctionName());
+ assertEquals(CloudSolrStream.class.getName(), explanation.getImplementingClass());
}
}
@@ -88,8 +87,8 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
"select(\"a_s as fieldA\", search(collection1, q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i asc\"))"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("select", explanation.getFunctionName());
- Assert.assertEquals(SelectStream.class.getName(), explanation.getImplementingClass());
+ assertEquals("select", explanation.getFunctionName());
+ assertEquals(SelectStream.class.getName(), explanation.getImplementingClass());
}
}
@@ -102,8 +101,8 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
"daemon(search(collection1, q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i asc\"), id=\"blah\", runInterval=\"1000\", queueSize=\"100\")"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("daemon", explanation.getFunctionName());
- Assert.assertEquals(DaemonStream.class.getName(), explanation.getImplementingClass());
+ assertEquals("daemon", explanation.getFunctionName());
+ assertEquals(DaemonStream.class.getName(), explanation.getImplementingClass());
}
}
@@ -116,8 +115,8 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
"topic(collection2, collection1, q=*:*, fl=\"id,a_s,a_i,a_f\", id=\"blah\", checkpointEvery=1000)"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("topic", explanation.getFunctionName());
- Assert.assertEquals(TopicStream.class.getName(), explanation.getImplementingClass());
+ assertEquals("topic", explanation.getFunctionName());
+ assertEquals(TopicStream.class.getName(), explanation.getImplementingClass());
}
}
@@ -130,8 +129,8 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
"stats(collection1, q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i asc\", sum(a_i), avg(a_i), count(*), min(a_i), max(a_i))"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("stats", explanation.getFunctionName());
- Assert.assertEquals(StatsStream.class.getName(), explanation.getImplementingClass());
+ assertEquals("stats", explanation.getFunctionName());
+ assertEquals(StatsStream.class.getName(), explanation.getImplementingClass());
}
}
@@ -144,8 +143,8 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
"unique(search(collection1, q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i asc\"), over=\"a_f\")"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("unique", explanation.getFunctionName());
- Assert.assertEquals(UniqueStream.class.getName(), explanation.getImplementingClass());
+ assertEquals("unique", explanation.getFunctionName());
+ assertEquals(UniqueStream.class.getName(), explanation.getImplementingClass());
}
}
@@ -161,9 +160,9 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
+ "on=\"a_f asc, a_s asc\")"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("merge", explanation.getFunctionName());
- Assert.assertEquals(MergeStream.class.getName(), explanation.getImplementingClass());
- Assert.assertEquals(2, ((StreamExplanation) explanation).getChildren().size());
+ assertEquals("merge", explanation.getFunctionName());
+ assertEquals(MergeStream.class.getName(), explanation.getImplementingClass());
+ assertEquals(2, ((StreamExplanation) explanation).getChildren().size());
}
}
@@ -181,9 +180,9 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
+ "sort=\"a_f asc, a_i asc\")"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("top", explanation.getFunctionName());
- Assert.assertEquals(RankStream.class.getName(), explanation.getImplementingClass());
- Assert.assertEquals(1, ((StreamExplanation) explanation).getChildren().size());
+ assertEquals("top", explanation.getFunctionName());
+ assertEquals(RankStream.class.getName(), explanation.getImplementingClass());
+ assertEquals(1, ((StreamExplanation) explanation).getChildren().size());
}
}
@@ -200,9 +199,9 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
+ "by=\"a_s\", group(sort=\"a_i desc\", n=\"5\"))"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("reduce", explanation.getFunctionName());
- Assert.assertEquals(ReducerStream.class.getName(), explanation.getImplementingClass());
- Assert.assertEquals(1, ((StreamExplanation) explanation).getChildren().size());
+ assertEquals("reduce", explanation.getFunctionName());
+ assertEquals(ReducerStream.class.getName(), explanation.getImplementingClass());
+ assertEquals(1, ((StreamExplanation) explanation).getChildren().size());
}
}
@@ -221,13 +220,13 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
try (UpdateStream updateStream = new UpdateStream(expression, factory)) {
Explanation explanation = updateStream.toExplanation(factory);
- Assert.assertEquals("solr (collection2)", explanation.getFunctionName());
- Assert.assertEquals("Solr/Lucene", explanation.getImplementingClass());
+ assertEquals("solr (collection2)", explanation.getFunctionName());
+ assertEquals("Solr/Lucene", explanation.getImplementingClass());
StreamExplanation updateExplanation = (StreamExplanation) explanation;
- Assert.assertEquals(1, updateExplanation.getChildren().size());
- Assert.assertEquals("update", updateExplanation.getChildren().get(0).getFunctionName());
- Assert.assertEquals(
+ assertEquals(1, updateExplanation.getChildren().size());
+ assertEquals("update", updateExplanation.getChildren().get(0).getFunctionName());
+ assertEquals(
UpdateStream.class.getName(),
updateExplanation.getChildren().get(0).getImplementingClass());
}
@@ -256,9 +255,9 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
factory)) {
expressionString = stream.toExpression(factory).toString();
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("facet", explanation.getFunctionName());
- Assert.assertEquals(FacetStream.class.getName(), explanation.getImplementingClass());
- Assert.assertEquals(1, ((StreamExplanation) explanation).getChildren().size());
+ assertEquals("facet", explanation.getFunctionName());
+ assertEquals(FacetStream.class.getName(), explanation.getImplementingClass());
+ assertEquals(1, ((StreamExplanation) explanation).getChildren().size());
}
}
@@ -273,9 +272,9 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
"jdbc(connection=\"jdbc:hsqldb:mem:.\", sql=\"select PEOPLE.ID, PEOPLE.NAME, COUNTRIES.COUNTRY_NAME from PEOPLE inner join COUNTRIES on PEOPLE.COUNTRY_CODE = COUNTRIES.CODE order by PEOPLE.ID\", sort=\"ID asc\")"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("jdbc", explanation.getFunctionName());
- Assert.assertEquals(JDBCStream.class.getName(), explanation.getImplementingClass());
- Assert.assertEquals(1, ((StreamExplanation) explanation).getChildren().size());
+ assertEquals("jdbc", explanation.getFunctionName());
+ assertEquals(JDBCStream.class.getName(), explanation.getImplementingClass());
+ assertEquals(1, ((StreamExplanation) explanation).getChildren().size());
}
}
@@ -293,9 +292,9 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
+ "on=\"a_f, a_s\")"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("intersect", explanation.getFunctionName());
- Assert.assertEquals(IntersectStream.class.getName(), explanation.getImplementingClass());
- Assert.assertEquals(2, ((StreamExplanation) explanation).getChildren().size());
+ assertEquals("intersect", explanation.getFunctionName());
+ assertEquals(IntersectStream.class.getName(), explanation.getImplementingClass());
+ assertEquals(2, ((StreamExplanation) explanation).getChildren().size());
}
}
@@ -313,9 +312,9 @@ public class StreamExpressionToExplanationTest extends SolrTestCase {
+ "on=\"a_f, a_s\")"),
factory)) {
Explanation explanation = stream.toExplanation(factory);
- Assert.assertEquals("complement", explanation.getFunctionName());
- Assert.assertEquals(ComplementStream.class.getName(), explanation.getImplementingClass());
- Assert.assertEquals(2, ((StreamExplanation) explanation).getChildren().size());
+ assertEquals("complement", explanation.getFunctionName());
+ assertEquals(ComplementStream.class.getName(), explanation.getImplementingClass());
+ assertEquals(2, ((StreamExplanation) explanation).getChildren().size());
}
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
index e1f80b659bc..ad5050cfb2c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
@@ -231,7 +231,7 @@ public class StreamingTest extends SolrCloudTestCase {
pstream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(pstream);
- assert (tuples.size() == (10 * numWorkers)); // Each tuple will be double counted.
+ assertEquals(tuples.size(), (10 * numWorkers)); // Each tuple will be double counted.
} finally {
solrClientCache.close();
}
@@ -859,14 +859,14 @@ public class StreamingTest extends SolrCloudTestCase {
Double count = tuple.getDouble("count(*)");
assertEquals(70, sumi.longValue());
- assertEquals(55.0, sumf.doubleValue(), 0.01);
- assertEquals(0.0, mini.doubleValue(), 0.01);
- assertEquals(1.0, minf.doubleValue(), 0.01);
- assertEquals(14.0, maxi.doubleValue(), 0.01);
- assertEquals(10.0, maxf.doubleValue(), 0.01);
- assertEquals(7.0, avgi.doubleValue(), .01);
- assertEquals(5.5, avgf.doubleValue(), .001);
- assertEquals(10, count.doubleValue(), .01);
+ assertEquals(55.0, sumf, 0.01);
+ assertEquals(0.0, mini, 0.01);
+ assertEquals(1.0, minf, 0.01);
+ assertEquals(14.0, maxi, 0.01);
+ assertEquals(10.0, maxf, 0.01);
+ assertEquals(7.0, avgi, .01);
+ assertEquals(5.5, avgf, .001);
+ assertEquals(10, count, .01);
} finally {
solrClientCache.close();
}
@@ -916,7 +916,7 @@ public class StreamingTest extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(facetStream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
// Test Long and Double Sums
@@ -934,14 +934,14 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket);
assertEquals(15, sumi.longValue());
- assertEquals(11.0, sumf.doubleValue(), 0.01);
- assertEquals(4.0, mini.doubleValue(), 0.01);
- assertEquals(4.0, minf.doubleValue(), 0.01);
- assertEquals(11.0, maxi.doubleValue(), 0.01);
- assertEquals(7.0, maxf.doubleValue(), 0.01);
- assertEquals(7.5, avgi.doubleValue(), 0.01);
- assertEquals(5.5, avgf.doubleValue(), 0.01);
- assertEquals(2, count.doubleValue(), 0.01);
+ assertEquals(11.0, sumf, 0.01);
+ assertEquals(4.0, mini, 0.01);
+ assertEquals(4.0, minf, 0.01);
+ assertEquals(11.0, maxi, 0.01);
+ assertEquals(7.0, maxf, 0.01);
+ assertEquals(7.5, avgi, 0.01);
+ assertEquals(5.5, avgf, 0.01);
+ assertEquals(2, count, 0.01);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -956,15 +956,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello0", bucket);
- assertEquals(17, sumi.doubleValue(), .01);
- assertEquals(18, sumf.doubleValue(), .01);
- assertEquals(0.0, mini.doubleValue(), .01);
- assertEquals(1.0, minf.doubleValue(), .01);
- assertEquals(14.0, maxi.doubleValue(), .01);
- assertEquals(10.0, maxf.doubleValue(), .01);
- assertEquals(4.25, avgi.doubleValue(), .01);
- assertEquals(4.5, avgf.doubleValue(), .01);
- assertEquals(4, count.doubleValue(), .01);
+ assertEquals(17, sumi, .01);
+ assertEquals(18, sumf, .01);
+ assertEquals(0.0, mini, .01);
+ assertEquals(1.0, minf, .01);
+ assertEquals(14.0, maxi, .01);
+ assertEquals(10.0, maxf, .01);
+ assertEquals(4.25, avgi, .01);
+ assertEquals(4.5, avgf, .01);
+ assertEquals(4, count, .01);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -979,15 +979,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello3", bucket);
- assertEquals(38.0, sumi.doubleValue(), 0.01);
- assertEquals(26.0, sumf.doubleValue(), 0.01);
- assertEquals(3.0, mini.doubleValue(), 0.01);
- assertEquals(3.0, minf.doubleValue(), 0.01);
- assertEquals(13.0, maxi.doubleValue(), 0.01);
- assertEquals(9.0, maxf.doubleValue(), 0.01);
- assertEquals(9.5, avgi.doubleValue(), 0.01);
- assertEquals(6.5, avgf.doubleValue(), 0.01);
- assertEquals(4, count.doubleValue(), 0.01);
+ assertEquals(38.0, sumi, 0.01);
+ assertEquals(26.0, sumf, 0.01);
+ assertEquals(3.0, mini, 0.01);
+ assertEquals(3.0, minf, 0.01);
+ assertEquals(13.0, maxi, 0.01);
+ assertEquals(9.0, maxf, 0.01);
+ assertEquals(9.5, avgi, 0.01);
+ assertEquals(6.5, avgf, 0.01);
+ assertEquals(4, count, 0.01);
// Reverse the Sort.
@@ -1015,15 +1015,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello3", bucket);
- assertEquals(38, sumi.doubleValue(), 0.1);
- assertEquals(26, sumf.doubleValue(), 0.1);
- assertEquals(3, mini.doubleValue(), 0.1);
- assertEquals(3, minf.doubleValue(), 0.1);
- assertEquals(13, maxi.doubleValue(), 0.1);
- assertEquals(9, maxf.doubleValue(), 0.1);
- assertEquals(9.5, avgi.doubleValue(), 0.1);
- assertEquals(6.5, avgf.doubleValue(), 0.1);
- assertEquals(4, count.doubleValue(), 0.1);
+ assertEquals(38, sumi, 0.1);
+ assertEquals(26, sumf, 0.1);
+ assertEquals(3, mini, 0.1);
+ assertEquals(3, minf, 0.1);
+ assertEquals(13, maxi, 0.1);
+ assertEquals(9, maxf, 0.1);
+ assertEquals(9.5, avgi, 0.1);
+ assertEquals(6.5, avgf, 0.1);
+ assertEquals(4, count, 0.1);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1038,15 +1038,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello0", bucket);
- assertEquals(17, sumi.doubleValue(), 0.01);
- assertEquals(18, sumf.doubleValue(), 0.01);
- assertEquals(0, mini.doubleValue(), 0.01);
- assertEquals(1, minf.doubleValue(), 0.01);
- assertEquals(14, maxi.doubleValue(), 0.01);
- assertEquals(10, maxf.doubleValue(), 0.01);
- assertEquals(4.25, avgi.doubleValue(), 0.01);
- assertEquals(4.5, avgf.doubleValue(), 0.01);
- assertEquals(4, count.doubleValue(), 0.01);
+ assertEquals(17, sumi, 0.01);
+ assertEquals(18, sumf, 0.01);
+ assertEquals(0, mini, 0.01);
+ assertEquals(1, minf, 0.01);
+ assertEquals(14, maxi, 0.01);
+ assertEquals(10, maxf, 0.01);
+ assertEquals(4.25, avgi, 0.01);
+ assertEquals(4.5, avgf, 0.01);
+ assertEquals(4, count, 0.01);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1062,14 +1062,14 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket);
assertEquals(15, sumi.longValue());
- assertEquals(11, sumf.doubleValue(), 0.01);
- assertEquals(4.0, mini.doubleValue(), 0.01);
- assertEquals(4.0, minf.doubleValue(), 0.01);
- assertEquals(11.0, maxi.doubleValue(), 0.01);
- assertEquals(7.0, maxf.doubleValue(), 0.01);
- assertEquals(7.5, avgi.doubleValue(), 0.01);
- assertEquals(5.5, avgf.doubleValue(), 0.01);
- assertEquals(2, count.doubleValue(), 0.01);
+ assertEquals(11, sumf, 0.01);
+ assertEquals(4.0, mini, 0.01);
+ assertEquals(4.0, minf, 0.01);
+ assertEquals(11.0, maxi, 0.01);
+ assertEquals(7.0, maxf, 0.01);
+ assertEquals(7.5, avgi, 0.01);
+ assertEquals(5.5, avgf, 0.01);
+ assertEquals(2, count, 0.01);
// Test index sort
@@ -1097,14 +1097,14 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket);
assertEquals(15, sumi.longValue());
- assertEquals(11, sumf.doubleValue(), 0.01);
- assertEquals(4, mini.doubleValue(), 0.01);
- assertEquals(4, minf.doubleValue(), 0.01);
- assertEquals(11, maxi.doubleValue(), 0.01);
- assertEquals(7, maxf.doubleValue(), 0.01);
- assertEquals(7.5, avgi.doubleValue(), 0.01);
- assertEquals(5.5, avgf.doubleValue(), 0.01);
- assertEquals(2, count.doubleValue(), 0.01);
+ assertEquals(11, sumf, 0.01);
+ assertEquals(4, mini, 0.01);
+ assertEquals(4, minf, 0.01);
+ assertEquals(11, maxi, 0.01);
+ assertEquals(7, maxf, 0.01);
+ assertEquals(7.5, avgi, 0.01);
+ assertEquals(5.5, avgf, 0.01);
+ assertEquals(2, count, 0.01);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1119,15 +1119,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello3", bucket);
- assertEquals(38.0D, sumi.doubleValue(), 0.01);
- assertEquals(26.0D, sumf.doubleValue(), 0.01);
- assertEquals(3.0D, mini.doubleValue(), 0.01);
- assertEquals(3.0D, minf.doubleValue(), 0.01);
- assertEquals(13.0D, maxi.doubleValue(), 0.01);
- assertEquals(9.0D, maxf.doubleValue(), 0.01);
- assertEquals(9.5D, avgi.doubleValue(), 0.01);
- assertEquals(6.5D, avgf.doubleValue(), 0.01);
- assertEquals(4, count.doubleValue(), 0.01);
+ assertEquals(38.0D, sumi, 0.01);
+ assertEquals(26.0D, sumf, 0.01);
+ assertEquals(3.0D, mini, 0.01);
+ assertEquals(3.0D, minf, 0.01);
+ assertEquals(13.0D, maxi, 0.01);
+ assertEquals(9.0D, maxf, 0.01);
+ assertEquals(9.5D, avgi, 0.01);
+ assertEquals(6.5D, avgf, 0.01);
+ assertEquals(4, count, 0.01);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1142,15 +1142,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello0", bucket);
- assertEquals(17, sumi.doubleValue(), 0.01);
- assertEquals(18, sumf.doubleValue(), 0.01);
- assertEquals(0, mini.doubleValue(), 0.01);
- assertEquals(1, minf.doubleValue(), 0.01);
- assertEquals(14, maxi.doubleValue(), 0.01);
- assertEquals(10, maxf.doubleValue(), 0.01);
- assertEquals(4.25, avgi.doubleValue(), 0.01);
- assertEquals(4.5, avgf.doubleValue(), 0.01);
- assertEquals(4, count.doubleValue(), 0.01);
+ assertEquals(17, sumi, 0.01);
+ assertEquals(18, sumf, 0.01);
+ assertEquals(0, mini, 0.01);
+ assertEquals(1, minf, 0.01);
+ assertEquals(14, maxi, 0.01);
+ assertEquals(10, maxf, 0.01);
+ assertEquals(4.25, avgi, 0.01);
+ assertEquals(4.5, avgf, 0.01);
+ assertEquals(4, count, 0.01);
// Test index sort
@@ -1176,15 +1176,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello0", bucket);
- assertEquals(17, sumi.doubleValue(), 0.01);
- assertEquals(18, sumf.doubleValue(), 0.01);
- assertEquals(0, mini.doubleValue(), 0.01);
- assertEquals(1, minf.doubleValue(), 0.01);
- assertEquals(14, maxi.doubleValue(), 0.01);
- assertEquals(10, maxf.doubleValue(), 0.01);
- assertEquals(4.25, avgi.doubleValue(), 0.0001);
- assertEquals(4.5, avgf.doubleValue(), 0.001);
- assertEquals(4, count.doubleValue(), 0.01);
+ assertEquals(17, sumi, 0.01);
+ assertEquals(18, sumf, 0.01);
+ assertEquals(0, mini, 0.01);
+ assertEquals(1, minf, 0.01);
+ assertEquals(14, maxi, 0.01);
+ assertEquals(10, maxf, 0.01);
+ assertEquals(4.25, avgi, 0.0001);
+ assertEquals(4.5, avgf, 0.001);
+ assertEquals(4, count, 0.01);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1199,15 +1199,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello3", bucket);
- assertEquals(38, sumi.doubleValue(), 0.01);
- assertEquals(26, sumf.doubleValue(), 0.01);
- assertEquals(3, mini.doubleValue(), 0.01);
- assertEquals(3, minf.doubleValue(), 0.01);
- assertEquals(13, maxi.doubleValue(), 0.01);
- assertEquals(9, maxf.doubleValue(), 0.01);
- assertEquals(9.5, avgi.doubleValue(), 0.01);
- assertEquals(6.5, avgf.doubleValue(), 0.01);
- assertEquals(4, count.doubleValue(), 0.01);
+ assertEquals(38, sumi, 0.01);
+ assertEquals(26, sumf, 0.01);
+ assertEquals(3, mini, 0.01);
+ assertEquals(3, minf, 0.01);
+ assertEquals(13, maxi, 0.01);
+ assertEquals(9, maxf, 0.01);
+ assertEquals(9.5, avgi, 0.01);
+ assertEquals(6.5, avgf, 0.01);
+ assertEquals(4, count, 0.01);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1223,14 +1223,14 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket);
assertEquals(15, sumi.longValue());
- assertEquals(11.0, sumf.doubleValue(), 0.1);
- assertEquals(4.0, mini.doubleValue(), 0.1);
- assertEquals(4.0, minf.doubleValue(), 0.1);
- assertEquals(11.0, maxi.doubleValue(), 0.1);
- assertEquals(7.0, maxf.doubleValue(), 0.1);
- assertEquals(7.5, avgi.doubleValue(), 0.1);
- assertEquals(5.5, avgf.doubleValue(), 0.1);
- assertEquals(2, count.doubleValue(), 0.1);
+ assertEquals(11.0, sumf, 0.1);
+ assertEquals(4.0, mini, 0.1);
+ assertEquals(4.0, minf, 0.1);
+ assertEquals(11.0, maxi, 0.1);
+ assertEquals(7.0, maxf, 0.1);
+ assertEquals(7.5, avgi, 0.1);
+ assertEquals(5.5, avgf, 0.1);
+ assertEquals(2, count, 0.1);
sorts[0] = new FieldComparator("a_s", ComparatorOrder.ASCENDING);
@@ -1273,9 +1273,9 @@ public class StreamingTest extends SolrCloudTestCase {
// Select and export should be identical sort orders I think.
private void checkSort(JettySolrRunner jetty, String field, String sortDir, String[] fields)
- throws IOException, SolrServerException {
+ throws IOException {
- // Comes back after after LUCENE-7548
+ // Comes back after LUCENE-7548
// SolrQuery query = new SolrQuery("*:*");
// query.addSort(field, ("asc".equals(sortDir) ? SolrQuery.ORDER.asc :
// SolrQuery.ORDER.desc));
@@ -1584,7 +1584,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket1);
assertEquals("b", bucket2);
assertEquals(11, sumi.longValue());
- assertEquals(1, count.doubleValue(), 0.1);
+ assertEquals(1, count, 0.1);
tuple = tuples.get(3);
bucket1 = tuple.getString("level1_s");
@@ -1595,7 +1595,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket1);
assertEquals("a", bucket2);
assertEquals(4, sumi.longValue());
- assertEquals(1, count.doubleValue(), 0.1);
+ assertEquals(1, count, 0.1);
tuple = tuples.get(4);
bucket1 = tuple.getString("level1_s");
@@ -1606,7 +1606,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello3", bucket1);
assertEquals("a", bucket2);
assertEquals(3, sumi.longValue());
- assertEquals(1, count.doubleValue(), 0.1);
+ assertEquals(1, count, 0.1);
tuple = tuples.get(5);
bucket1 = tuple.getString("level1_s");
@@ -1617,7 +1617,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello0", bucket1);
assertEquals("a", bucket2);
assertEquals(2, sumi.longValue());
- assertEquals(2, count.doubleValue(), 0.1);
+ assertEquals(2, count, 0.1);
sorts[0] = new FieldComparator("level1_s", ComparatorOrder.DESCENDING);
sorts[1] = new FieldComparator("level2_s", ComparatorOrder.DESCENDING);
@@ -1647,7 +1647,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket1);
assertEquals("a", bucket2);
assertEquals(4, sumi.longValue());
- assertEquals(1, count.doubleValue(), 0.1);
+ assertEquals(1, count, 0.1);
tuple = tuples.get(2);
bucket1 = tuple.getString("level1_s");
@@ -1658,7 +1658,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello3", bucket1);
assertEquals("b", bucket2);
assertEquals(35, sumi.longValue());
- assertEquals(3, count.doubleValue(), 0.1);
+ assertEquals(3, count, 0.1);
tuple = tuples.get(3);
bucket1 = tuple.getString("level1_s");
@@ -1669,7 +1669,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello3", bucket1);
assertEquals("a", bucket2);
assertEquals(3, sumi.longValue());
- assertEquals(1, count.doubleValue(), 0.1);
+ assertEquals(1, count, 0.1);
tuple = tuples.get(4);
bucket1 = tuple.getString("level1_s");
@@ -1680,7 +1680,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello0", bucket1);
assertEquals("b", bucket2);
assertEquals(15, sumi.longValue());
- assertEquals(2, count.doubleValue(), 0.1);
+ assertEquals(2, count, 0.1);
tuple = tuples.get(5);
bucket1 = tuple.getString("level1_s");
@@ -1691,7 +1691,7 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello0", bucket1);
assertEquals("a", bucket2);
assertEquals(2, sumi.longValue());
- assertEquals(2, count.doubleValue(), 0.1);
+ assertEquals(2, count, 0.1);
} finally {
solrClientCache.close();
}
@@ -1738,7 +1738,7 @@ public class StreamingTest extends SolrCloudTestCase {
rollupStream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(rollupStream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
// Test Long and Double Sums
@@ -1755,15 +1755,15 @@ public class StreamingTest extends SolrCloudTestCase {
Double count = tuple.getDouble("count(*)");
assertEquals("hello0", bucket);
- assertEquals(17, sumi.doubleValue(), 0.001);
- assertEquals(18, sumf.doubleValue(), 0.001);
- assertEquals(0, mini.doubleValue(), 0.001);
- assertEquals(1, minf.doubleValue(), 0.001);
- assertEquals(14, maxi.doubleValue(), 0.001);
- assertEquals(10, maxf.doubleValue(), 0.001);
- assertEquals(4.25, avgi.doubleValue(), 0.001);
- assertEquals(4.5, avgf.doubleValue(), 0.001);
- assertEquals(4, count.doubleValue(), 0.001);
+ assertEquals(17, sumi, 0.001);
+ assertEquals(18, sumf, 0.001);
+ assertEquals(0, mini, 0.001);
+ assertEquals(1, minf, 0.001);
+ assertEquals(14, maxi, 0.001);
+ assertEquals(10, maxf, 0.001);
+ assertEquals(4.25, avgi, 0.001);
+ assertEquals(4.5, avgf, 0.001);
+ assertEquals(4, count, 0.001);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -1778,15 +1778,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello3", bucket);
- assertEquals(38, sumi.doubleValue(), 0.001);
- assertEquals(26, sumf.doubleValue(), 0.001);
- assertEquals(3, mini.doubleValue(), 0.001);
- assertEquals(3, minf.doubleValue(), 0.001);
- assertEquals(13, maxi.doubleValue(), 0.001);
- assertEquals(9, maxf.doubleValue(), 0.001);
- assertEquals(9.5, avgi.doubleValue(), 0.001);
- assertEquals(6.5, avgf.doubleValue(), 0.001);
- assertEquals(4, count.doubleValue(), 0.001);
+ assertEquals(38, sumi, 0.001);
+ assertEquals(26, sumf, 0.001);
+ assertEquals(3, mini, 0.001);
+ assertEquals(3, minf, 0.001);
+ assertEquals(13, maxi, 0.001);
+ assertEquals(9, maxf, 0.001);
+ assertEquals(9.5, avgi, 0.001);
+ assertEquals(6.5, avgf, 0.001);
+ assertEquals(4, count, 0.001);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -1802,21 +1802,21 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket);
assertEquals(15, sumi.longValue());
- assertEquals(11, sumf.doubleValue(), 0.01);
- assertEquals(4, mini.doubleValue(), 0.01);
- assertEquals(4, minf.doubleValue(), 0.01);
- assertEquals(11, maxi.doubleValue(), 0.01);
- assertEquals(7, maxf.doubleValue(), 0.01);
- assertEquals(7.5, avgi.doubleValue(), 0.01);
- assertEquals(5.5, avgf.doubleValue(), 0.01);
- assertEquals(2, count.doubleValue(), 0.01);
+ assertEquals(11, sumf, 0.01);
+ assertEquals(4, mini, 0.01);
+ assertEquals(4, minf, 0.01);
+ assertEquals(11, maxi, 0.01);
+ assertEquals(7, maxf, 0.01);
+ assertEquals(7.5, avgi, 0.01);
+ assertEquals(5.5, avgf, 0.01);
+ assertEquals(2, count, 0.01);
// Test will null metrics
rollupStream = new RollupStream(stream, buckets, metrics);
rollupStream.setStreamContext(streamContext);
tuples = getTuples(rollupStream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
tuple = tuples.get(0);
bucket = tuple.getString("a_s");
assertEquals("hello0", bucket);
@@ -1868,15 +1868,15 @@ public class StreamingTest extends SolrCloudTestCase {
avgf = tuple.getDouble("avg(a_f)");
count = tuple.getDouble("count(*)");
- assertEquals(14, sumi.doubleValue(), 0.01);
- assertEquals(10, sumf.doubleValue(), 0.01);
- assertEquals(14, mini.doubleValue(), 0.01);
- assertEquals(10, minf.doubleValue(), 0.01);
- assertEquals(14, maxi.doubleValue(), 0.01);
- assertEquals(10, maxf.doubleValue(), 0.01);
- assertEquals(14, avgi.doubleValue(), 0.01);
- assertEquals(10, avgf.doubleValue(), 0.01);
- assertEquals(1, count.doubleValue(), 0.01);
+ assertEquals(14, sumi, 0.01);
+ assertEquals(10, sumf, 0.01);
+ assertEquals(14, mini, 0.01);
+ assertEquals(10, minf, 0.01);
+ assertEquals(14, maxi, 0.01);
+ assertEquals(10, maxf, 0.01);
+ assertEquals(14, avgi, 0.01);
+ assertEquals(10, avgf, 0.01);
+ assertEquals(1, count, 0.01);
} finally {
solrClientCache.close();
}
@@ -1940,7 +1940,7 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuples.size();
if (count > 0) {
Tuple t = tuples.get(0);
- assertEquals(50000000, (long) t.getLong("id"));
+ assertEquals(50000000, t.getLong("id").longValue());
} else {
System.out.println("###### Waiting for checkpoint #######:" + count);
}
@@ -2043,7 +2043,7 @@ public class StreamingTest extends SolrCloudTestCase {
streamContext = new StreamContext();
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
- assert (tuples.size() == 3);
+ assertEquals(3, tuples.size());
} finally {
solrClientCache.close();
}
@@ -2122,15 +2122,15 @@ public class StreamingTest extends SolrCloudTestCase {
Double count = tuple.getDouble("count(*)");
assertEquals("hello0", bucket);
- assertEquals(17, sumi.doubleValue(), 0.001);
- assertEquals(18, sumf.doubleValue(), 0.001);
- assertEquals(0, mini.doubleValue(), 0.001);
- assertEquals(1, minf.doubleValue(), 0.001);
- assertEquals(14, maxi.doubleValue(), 0.001);
- assertEquals(10, maxf.doubleValue(), 0.001);
- assertEquals(4.25, avgi.doubleValue(), 0.001);
- assertEquals(4.5, avgf.doubleValue(), 0.001);
- assertEquals(4, count.doubleValue(), 0.001);
+ assertEquals(17, sumi, 0.001);
+ assertEquals(18, sumf, 0.001);
+ assertEquals(0, mini, 0.001);
+ assertEquals(1, minf, 0.001);
+ assertEquals(14, maxi, 0.001);
+ assertEquals(10, maxf, 0.001);
+ assertEquals(4.25, avgi, 0.001);
+ assertEquals(4.5, avgf, 0.001);
+ assertEquals(4, count, 0.001);
tuple = tuples.get(1);
bucket = tuple.getString("a_s");
@@ -2145,15 +2145,15 @@ public class StreamingTest extends SolrCloudTestCase {
count = tuple.getDouble("count(*)");
assertEquals("hello3", bucket);
- assertEquals(38, sumi.doubleValue(), 0.001);
- assertEquals(26, sumf.doubleValue(), 0.001);
- assertEquals(3, mini.doubleValue(), 0.001);
- assertEquals(3, minf.doubleValue(), 0.001);
- assertEquals(13, maxi.doubleValue(), 0.001);
- assertEquals(9, maxf.doubleValue(), 0.001);
- assertEquals(9.5, avgi.doubleValue(), 0.001);
- assertEquals(6.5, avgf.doubleValue(), 0.001);
- assertEquals(4, count.doubleValue(), 0.001);
+ assertEquals(38, sumi, 0.001);
+ assertEquals(26, sumf, 0.001);
+ assertEquals(3, mini, 0.001);
+ assertEquals(3, minf, 0.001);
+ assertEquals(13, maxi, 0.001);
+ assertEquals(9, maxf, 0.001);
+ assertEquals(9.5, avgi, 0.001);
+ assertEquals(6.5, avgf, 0.001);
+ assertEquals(4, count, 0.001);
tuple = tuples.get(2);
bucket = tuple.getString("a_s");
@@ -2169,14 +2169,14 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals("hello4", bucket);
assertEquals(15, sumi.longValue());
- assertEquals(11, sumf.doubleValue(), 0.001);
- assertEquals(4, mini.doubleValue(), 0.001);
- assertEquals(4, minf.doubleValue(), 0.001);
- assertEquals(11, maxi.doubleValue(), 0.001);
- assertEquals(7, maxf.doubleValue(), 0.001);
- assertEquals(7.5, avgi.doubleValue(), 0.001);
- assertEquals(5.5, avgf.doubleValue(), 0.001);
- assertEquals(2, count.doubleValue(), 0.001);
+ assertEquals(11, sumf, 0.001);
+ assertEquals(4, mini, 0.001);
+ assertEquals(4, minf, 0.001);
+ assertEquals(11, maxi, 0.001);
+ assertEquals(7, maxf, 0.001);
+ assertEquals(7.5, avgi, 0.001);
+ assertEquals(5.5, avgf, 0.001);
+ assertEquals(2, count, 0.001);
} finally {
solrClientCache.close();
}
@@ -2225,7 +2225,7 @@ public class StreamingTest extends SolrCloudTestCase {
attachStreamFactory(pstream);
pstream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(pstream);
- assert (tuples.size() == 0);
+ assertEquals(0, tuples.size());
} finally {
solrClientCache.close();
}
@@ -2270,8 +2270,8 @@ public class StreamingTest extends SolrCloudTestCase {
assertEquals(2, longList.get(1).longValue());
List<Double> doubleList = tuple.getDoubles("f_multi");
- assertEquals(1.2, doubleList.get(0).doubleValue(), 0.001);
- assertEquals(1.3, doubleList.get(1).doubleValue(), 0.001);
+ assertEquals(1.2, doubleList.get(0), 0.001);
+ assertEquals(1.3, doubleList.get(1), 0.001);
} finally {
solrClientCache.close();
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
index 92c1eff4a01..f4a6798018b 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
@@ -26,7 +26,6 @@ import org.apache.solr.client.solrj.io.eval.AddEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.StreamContext;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class AbsoluteValueEvaluatorTest extends SolrTestCase {
@@ -52,19 +51,19 @@ public class AbsoluteValueEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1D, result);
+ assertEquals(1D, result);
values.clear();
values.put("a", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(1.1D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(1.1D, result);
values.clear();
values.put("a", -1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(1.1D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(1.1D, result);
}
@Test
@@ -76,21 +75,21 @@ public class AbsoluteValueEvaluatorTest extends SolrTestCase {
context.getLets().put("a", 1);
result = evaluator.evaluate(new Tuple());
- Assert.assertEquals(1D, result);
+ assertEquals(1D, result);
context.getLets().put("a", 1.1);
result = evaluator.evaluate(new Tuple());
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(1.1D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(1.1D, result);
context.getLets().put("a", -1.1);
result = evaluator.evaluate(new Tuple());
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(1.1D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(1.1D, result);
context.getLets().put("a", factory.constructEvaluator("add(4,-6,34,-56)"));
result = evaluator.evaluate(new Tuple());
- Assert.assertEquals(24D, result);
+ assertEquals(24D, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
index bbcd2ffba04..9804417f4ee 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.AddEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class AddEvaluatorTest extends SolrTestCase {
@@ -47,21 +46,21 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(3D, result);
+ assertEquals(3D, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(3.1D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(3.1D, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(3.2D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(3.2D, result);
}
@Test // (expected = NumberFormatException.class)
@@ -71,7 +70,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.clear();
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test // (expected = NumberFormatException.class)
@@ -83,19 +82,19 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", 1.1);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", null);
values.put("b", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test // (expected = NumberFormatException.class)
@@ -106,17 +105,17 @@ public class AddEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("b", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test
@@ -130,7 +129,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(10D, result);
+ assertEquals(10D, result);
values.clear();
values.put("a", 1.1);
@@ -138,8 +137,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(10.1D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(10.1D, result);
values.clear();
values.put("a", 1.1);
@@ -147,8 +146,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3.1);
values.put("d", 4.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(10.4D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(10.4D, result);
}
@Test
@@ -162,7 +161,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(10D, result);
+ assertEquals(10D, result);
values.clear();
values.put("a", 1.1);
@@ -170,8 +169,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(10.1D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(10.1D, result);
values.clear();
values.put("a", 1.1);
@@ -179,8 +178,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3.1);
values.put("d", 4.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(10.4D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(10.4D, result);
values.clear();
values.put("a", 1.1);
@@ -188,8 +187,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3.1);
values.put("d", 4.123456789123456);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(10.423456789123456, result);
+ assertTrue(result instanceof Double);
+ assertEquals(10.423456789123456, result);
values.clear();
values.put("a", 123456789123456789L);
@@ -197,7 +196,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 123456789123456789L);
values.put("d", 123456789123456789L);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(4 * 123456789123456789D, result);
+ assertEquals(4 * 123456789123456789D, result);
}
@Test
@@ -211,7 +210,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(14D, result);
+ assertEquals(14D, result);
values.clear();
values.put("a", 1.1);
@@ -219,8 +218,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(14.2D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(14.2D, result);
values.clear();
values.put("a", 1.1);
@@ -228,8 +227,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3.1);
values.put("d", 4.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(14.6D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(14.6D, result);
values.clear();
values.put("a", 1.1);
@@ -237,8 +236,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3.1);
values.put("d", 4.123456789123456);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(14.623456789123456, (Double) result, 0.000000001);
+ assertTrue(result instanceof Double);
+ assertEquals(14.623456789123456, (Double) result, 0.000000001);
values.clear();
values.put("a", 123456789123456789L);
@@ -246,7 +245,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 123456789123456789L);
values.put("d", 123456789123456789L);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(6 * 123456789123456789D, result);
+ assertEquals(6 * 123456789123456789D, result);
values.clear();
values.put("a", 4.12345678);
@@ -254,8 +253,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 4.12345678);
values.put("d", 4.12345678);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(6 * 4.12345678, result);
+ assertTrue(result instanceof Double);
+ assertEquals(6 * 4.12345678, result);
}
@Test
@@ -269,7 +268,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(10D, result);
+ assertEquals(10D, result);
values.clear();
values.put("a", 1.1);
@@ -277,8 +276,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", -3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(2.2D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(2.2D, result);
values.clear();
values.put("a", 1.1);
@@ -286,8 +285,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", -3.1);
values.put("d", 4.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(2.2D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(2.2D, result);
values.clear();
values.put("a", 1.1);
@@ -295,8 +294,8 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", -3.1);
values.put("d", 5.223456789123456);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(3.323456789123456, result);
+ assertTrue(result instanceof Double);
+ assertEquals(3.323456789123456, result);
values.clear();
values.put("a", 123456789123456789L);
@@ -304,7 +303,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", 123456789123456789L);
values.put("d", 123456789123456789L);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(4 * 123456789123456789D, result);
+ assertEquals(4 * 123456789123456789D, result);
values.clear();
values.put("a", -4.12345678);
@@ -312,7 +311,7 @@ public class AddEvaluatorTest extends SolrTestCase {
values.put("c", -4.12345678);
values.put("d", -4.12345678);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(6 * -4.12345678, result);
+ assertTrue(result instanceof Double);
+ assertEquals(6 * -4.12345678, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AndEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AndEvaluatorTest.java
index 1cb4dd0c82a..a237aec1b78 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AndEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AndEvaluatorTest.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.AndEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class AndEvaluatorTest extends SolrTestCase {
@@ -47,29 +46,29 @@ public class AndEvaluatorTest extends SolrTestCase {
values.put("a", true);
values.put("b", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", true);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", false);
values.put("b", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", false);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test
@@ -82,39 +81,39 @@ public class AndEvaluatorTest extends SolrTestCase {
values.put("b", true);
values.put("c", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", true);
values.put("b", true);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", true);
values.put("b", false);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", false);
values.put("b", true);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", false);
values.put("b", false);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
index 4dc6d22a357..4a6262d3b07 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
@@ -25,7 +25,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.AppendEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class AppendEvaluatorTest extends SolrTestCase {
@@ -49,10 +48,10 @@ public class AppendEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", Arrays.asList("foo", "bar", "baz"));
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof List);
- Assert.assertEquals(1D, ((List) result).get(0));
- Assert.assertEquals("foo", ((List) result).get(1));
- Assert.assertEquals("bar", ((List) result).get(2));
- Assert.assertEquals("baz", ((List) result).get(3));
+ assertTrue(result instanceof List);
+ assertEquals(1D, ((List) result).get(0));
+ assertEquals("foo", ((List) result).get(1));
+ assertEquals("bar", ((List) result).get(2));
+ assertEquals("baz", ((List) result).get(3));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
index e6c41f24384..4007899bf7e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.ArcCosineEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class ArcCosineEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class ArcCosineEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.acos(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.acos(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
index a9b64a9f272..c953facacfb 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.ArcSineEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class ArcSineEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class ArcSineEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.asin(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.asin(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
index 9748f8453c4..a7020465e83 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.ArcTangentEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class ArcTangentEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class ArcTangentEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.atan(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.atan(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArrayEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArrayEvaluatorTest.java
index d27f7c2210a..7db7dcbead0 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArrayEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArrayEvaluatorTest.java
@@ -26,7 +26,6 @@ import org.apache.solr.client.solrj.io.eval.ArrayEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.StreamContext;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class ArrayEvaluatorTest extends SolrTestCase {
@@ -46,20 +45,19 @@ public class ArrayEvaluatorTest extends SolrTestCase {
StreamEvaluator evaluator = factory.constructEvaluator("array(a,b,c, sort=asc)");
StreamContext context = new StreamContext();
evaluator.setStreamContext(context);
- Object result;
values.put("a", 1L);
values.put("b", 3L);
values.put("c", 2L);
- result = evaluator.evaluate(new Tuple(values));
+ Object tempResult = evaluator.evaluate(new Tuple(values));
+ assertTrue(tempResult instanceof List<?>);
- Assert.assertTrue(result instanceof List<?>);
-
- Assert.assertEquals(3, ((List<?>) result).size());
- Assert.assertEquals(1D, ((List<?>) result).get(0));
- Assert.assertEquals(2D, ((List<?>) result).get(1));
- Assert.assertEquals(3D, ((List<?>) result).get(2));
+ List<?> result = (List<?>) tempResult;
+ assertEquals(3, result.size());
+ assertEquals(1D, result.get(0));
+ assertEquals(2D, result.get(1));
+ assertEquals(3D, result.get(2));
}
@Test
@@ -67,20 +65,19 @@ public class ArrayEvaluatorTest extends SolrTestCase {
StreamEvaluator evaluator = factory.constructEvaluator("array(a,b,c, sort=desc)");
StreamContext context = new StreamContext();
evaluator.setStreamContext(context);
- Object result;
values.put("a", 1L);
values.put("b", 3L);
values.put("c", 2L);
- result = evaluator.evaluate(new Tuple(values));
-
- Assert.assertTrue(result instanceof List<?>);
+ Object tempResult = evaluator.evaluate(new Tuple(values));
+ assertTrue(tempResult instanceof List<?>);
- Assert.assertEquals(3, ((List<?>) result).size());
- Assert.assertEquals(3D, ((List<?>) result).get(0));
- Assert.assertEquals(2D, ((List<?>) result).get(1));
- Assert.assertEquals(1D, ((List<?>) result).get(2));
+ List<?> result = (List<?>) tempResult;
+ assertEquals(3, result.size());
+ assertEquals(3D, result.get(0));
+ assertEquals(2D, result.get(1));
+ assertEquals(1D, result.get(2));
}
@Test
@@ -88,20 +85,19 @@ public class ArrayEvaluatorTest extends SolrTestCase {
StreamEvaluator evaluator = factory.constructEvaluator("array(a,b,c, sort=asc)");
StreamContext context = new StreamContext();
evaluator.setStreamContext(context);
- Object result;
values.put("a", "a");
values.put("b", "c");
values.put("c", "b");
- result = evaluator.evaluate(new Tuple(values));
-
- Assert.assertTrue(result instanceof List<?>);
+ Object tempResult = evaluator.evaluate(new Tuple(values));
+ assertTrue(tempResult instanceof List<?>);
- Assert.assertEquals(3, ((List<?>) result).size());
- Assert.assertEquals("a", ((List<?>) result).get(0));
- Assert.assertEquals("b", ((List<?>) result).get(1));
- Assert.assertEquals("c", ((List<?>) result).get(2));
+ List<?> result = (List<?>) tempResult;
+ assertEquals(3, result.size());
+ assertEquals("a", result.get(0));
+ assertEquals("b", result.get(1));
+ assertEquals("c", result.get(2));
}
@Test
@@ -109,20 +105,19 @@ public class ArrayEvaluatorTest extends SolrTestCase {
StreamEvaluator evaluator = factory.constructEvaluator("array(a,b,c, sort=desc)");
StreamContext context = new StreamContext();
evaluator.setStreamContext(context);
- Object result;
values.put("a", "a");
values.put("b", "c");
values.put("c", "b");
- result = evaluator.evaluate(new Tuple(values));
+ Object tempResult = evaluator.evaluate(new Tuple(values));
+ assertTrue(tempResult instanceof List<?>);
- Assert.assertTrue(result instanceof List<?>);
-
- Assert.assertEquals(3, ((List<?>) result).size());
- Assert.assertEquals("c", ((List<?>) result).get(0));
- Assert.assertEquals("b", ((List<?>) result).get(1));
- Assert.assertEquals("a", ((List<?>) result).get(2));
+ List<?> result = (List<?>) tempResult;
+ assertEquals(3, result.size());
+ assertEquals("c", result.get(0));
+ assertEquals("b", result.get(1));
+ assertEquals("a", result.get(2));
}
@Test
@@ -130,19 +125,18 @@ public class ArrayEvaluatorTest extends SolrTestCase {
StreamEvaluator evaluator = factory.constructEvaluator("array(a,b,c)");
StreamContext context = new StreamContext();
evaluator.setStreamContext(context);
- Object result;
values.put("a", "a");
values.put("b", "c");
values.put("c", "b");
- result = evaluator.evaluate(new Tuple(values));
-
- Assert.assertTrue(result instanceof List<?>);
+ Object tempResult = evaluator.evaluate(new Tuple(values));
+ assertTrue(tempResult instanceof List<?>);
- Assert.assertEquals(3, ((List<?>) result).size());
- Assert.assertEquals("a", ((List<?>) result).get(0));
- Assert.assertEquals("c", ((List<?>) result).get(1));
- Assert.assertEquals("b", ((List<?>) result).get(2));
+ List<?> result = (List<?>) tempResult;
+ assertEquals(3, result.size());
+ assertEquals("a", result.get(0));
+ assertEquals("c", result.get(1));
+ assertEquals("b", result.get(2));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
index 715ee136c51..47a75be9397 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.CeilingEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class CeilingEvaluatorTest extends SolrTestCase {
@@ -47,17 +46,17 @@ public class CeilingEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1D, result);
+ assertEquals(1D, result);
values.clear();
values.put("a", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(2D, result);
+ assertEquals(2D, result);
values.clear();
values.put("a", -1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(-1D, result);
+ assertEquals(-1D, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
index 60e11d6e5d3..539e0a1ce2e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.CoalesceEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class CoalesceEvaluatorTest extends SolrTestCase {
@@ -47,38 +46,38 @@ public class CoalesceEvaluatorTest extends SolrTestCase {
values.put("a", null);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(2L, result);
+ assertEquals(2L, result);
values.clear();
values.put("a", 1.1);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1.1D, result);
+ assertEquals(1.1D, result);
values.clear();
values.put("a", "foo");
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals("foo", result);
+ assertEquals("foo", result);
values.clear();
values.put("a", true);
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(true, result);
+ assertEquals(true, result);
values.clear();
values.put("a", null);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(false, result);
+ assertEquals(false, result);
values.clear();
values.put("a", null);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@@ -89,7 +88,7 @@ public class CoalesceEvaluatorTest extends SolrTestCase {
values.clear();
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
*/
@@ -104,6 +103,6 @@ public class CoalesceEvaluatorTest extends SolrTestCase {
values.put("c", null);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1D, result);
+ assertEquals(1D, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
index b494a9a507b..60f42b7d155 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
@@ -17,12 +17,10 @@
package org.apache.solr.client.solrj.io.stream.eval;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.ConversionEvaluator;
import org.apache.solr.client.solrj.io.eval.RawValueEvaluator;
@@ -32,7 +30,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
import org.junit.Test;
/** Test ConversionEvaluators */
-public class ConversionEvaluatorsTest {
+public class ConversionEvaluatorsTest extends SolrTestCase {
StreamFactory factory;
Map<String, Object> values;
@@ -57,7 +55,7 @@ public class ConversionEvaluatorsTest {
evaluator = factory.constructEvaluator("convert(inches)");
StreamContext streamContext = new StreamContext();
evaluator.setStreamContext(streamContext);
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertEquals(
"Invalid expression convert(inches) - expecting exactly 3 parameters but found 1",
@@ -70,7 +68,7 @@ public class ConversionEvaluatorsTest {
evaluator.setStreamContext(streamContext);
Tuple tuple = new Tuple(new HashMap<>());
evaluator.evaluate(tuple);
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertTrue(
e.getCause()
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
index f892bf5cd20..3b890858630 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.CorrelationEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class CorrelationEvaluatorTest extends SolrTestCase {
@@ -47,7 +46,7 @@ public class CorrelationEvaluatorTest extends SolrTestCase {
values.put("l1", l1);
values.put("l2", l2);
- Assert.assertEquals(
+ assertEquals(
new PearsonsCorrelation().correlation(l1, l2),
factory.constructEvaluator("corr(l1,l2)").evaluate(new Tuple(values)));
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
index e56588a4eec..154cdbaba4b 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.CosineEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class CosineEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class CosineEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.cos(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.cos(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
index 0c1efb00730..9a45a26ba38 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.CubedRootEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class CubedRootEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class CubedRootEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.cbrt(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.cbrt(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
index ca79d8097e2..6e05d31e2ce 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
@@ -25,7 +25,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.CumulativeProbabilityEvaluator;
import org.apache.solr.client.solrj.io.eval.NormalDistributionEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class CumulativeProbabilityEvaluatorTest extends SolrTestCase {
@@ -49,7 +48,7 @@ public class CumulativeProbabilityEvaluatorTest extends SolrTestCase {
values.put("l2", 7);
NormalDistribution actual = new NormalDistribution(3, 7);
- Assert.assertEquals(
+ assertEquals(
actual.cumulativeProbability(2),
factory.constructEvaluator("prob(norm(l1,l2),2)").evaluate(new Tuple(values)));
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/DivideEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/DivideEvaluatorTest.java
index f126412ec7a..935175f144a 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/DivideEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/DivideEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.DivideEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class DivideEvaluatorTest extends SolrTestCase {
@@ -48,22 +47,22 @@ public class DivideEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(1.0 / 2, result);
+ assertTrue(result instanceof Double);
+ assertEquals(1.0 / 2, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(1.1 / 2, result);
+ assertTrue(result instanceof Double);
+ assertEquals(1.1 / 2, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(1.1 / 2.1, result);
+ assertTrue(result instanceof Double);
+ assertEquals(1.1 / 2.1, result);
}
@Test(expected = IOException.class)
@@ -130,8 +129,8 @@ public class DivideEvaluatorTest extends SolrTestCase {
values.put("b", 2);
values.put("c", 3);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals((1.0 / (2.0 / 3)), result);
+ assertTrue(result instanceof Double);
+ assertEquals((1.0 / (2.0 / 3)), result);
}
@Test(expected = IOException.class)
@@ -153,6 +152,6 @@ public class DivideEvaluatorTest extends SolrTestCase {
values.put("a", 0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(0D, result);
+ assertEquals(0D, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
index 0dc20ced504..3d728077d49 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
@@ -25,7 +25,6 @@ import org.apache.solr.client.solrj.io.eval.EqualToEvaluator;
import org.apache.solr.client.solrj.io.eval.RawValueEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class EqualToEvaluatorTest extends SolrTestCase {
@@ -51,8 +50,8 @@ public class EqualToEvaluatorTest extends SolrTestCase {
values.clear();
values.put("sum(a)", 9);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
}
@Test
@@ -64,50 +63,50 @@ public class EqualToEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", -1);
values.put("b", -1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test
@@ -121,43 +120,43 @@ public class EqualToEvaluatorTest extends SolrTestCase {
values.put("a", "foo");
values.put("b", "foo");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", "foo");
values.put("b", "bar");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, false);
+ assertTrue(result instanceof Boolean);
+ assertFalse(false);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar baz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar jaz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", foo);
values.put("b", foo);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", foo);
values.put("b", bar);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test
@@ -171,50 +170,50 @@ public class EqualToEvaluatorTest extends SolrTestCase {
values.put("a", true);
values.put("b", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", true);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, false);
+ assertTrue(result instanceof Boolean);
+ assertFalse(false);
values.clear();
values.put("a", false);
values.put("b", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", t);
values.put("b", f);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", t);
values.put("b", t);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", f);
values.put("b", f);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ExclusiveOrEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ExclusiveOrEvaluatorTest.java
index 2edc79424fe..07c699ff160 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ExclusiveOrEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ExclusiveOrEvaluatorTest.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.ExclusiveOrEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class ExclusiveOrEvaluatorTest extends SolrTestCase {
@@ -47,29 +46,29 @@ public class ExclusiveOrEvaluatorTest extends SolrTestCase {
values.put("a", true);
values.put("b", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", true);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test
@@ -82,39 +81,39 @@ public class ExclusiveOrEvaluatorTest extends SolrTestCase {
values.put("b", true);
values.put("c", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", true);
values.put("b", true);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", true);
values.put("b", false);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", true);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", false);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FieldValueEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FieldValueEvaluatorTest.java
index 99536d32060..33b467e5747 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FieldValueEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FieldValueEvaluatorTest.java
@@ -24,7 +24,6 @@ import java.util.PriorityQueue;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.FieldValueEvaluator;
-import org.junit.Assert;
import org.junit.Test;
public class FieldValueEvaluatorTest extends SolrTestCase {
@@ -85,20 +84,16 @@ public class FieldValueEvaluatorTest extends SolrTestCase {
Tuple tuple = new Tuple(values);
for (String fieldName : new String[] {"a", "b", "c", "d", "e"}) {
- Assert.assertTrue(new FieldValueEvaluator(fieldName).evaluate(tuple) instanceof Collection);
- Assert.assertEquals(
- 2, ((Collection<?>) new FieldValueEvaluator(fieldName).evaluate(tuple)).size());
+ assertTrue(new FieldValueEvaluator(fieldName).evaluate(tuple) instanceof Collection);
+ assertEquals(2, ((Collection<?>) new FieldValueEvaluator(fieldName).evaluate(tuple)).size());
}
- Assert.assertEquals(
+ assertEquals(
false, ((Collection<?>) new FieldValueEvaluator("a").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1.1, ((Collection<?>) new FieldValueEvaluator("b").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1, ((Collection<?>) new FieldValueEvaluator("c").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1L, ((Collection<?>) new FieldValueEvaluator("d").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
+ assertEquals(1.1, ((Collection<?>) new FieldValueEvaluator("b").evaluate(tuple)).toArray()[1]);
+ assertEquals(1, ((Collection<?>) new FieldValueEvaluator("c").evaluate(tuple)).toArray()[1]);
+ assertEquals(1L, ((Collection<?>) new FieldValueEvaluator("d").evaluate(tuple)).toArray()[1]);
+ assertEquals(
"second", ((Collection<?>) new FieldValueEvaluator("e").evaluate(tuple)).toArray()[1]);
}
@@ -114,20 +109,16 @@ public class FieldValueEvaluatorTest extends SolrTestCase {
Tuple tuple = new Tuple(values);
for (String fieldName : new String[] {"a", "b", "c", "d", "e"}) {
- Assert.assertTrue(new FieldValueEvaluator(fieldName).evaluate(tuple) instanceof Collection);
- Assert.assertEquals(
- 2, ((Collection<?>) new FieldValueEvaluator(fieldName).evaluate(tuple)).size());
+ assertTrue(new FieldValueEvaluator(fieldName).evaluate(tuple) instanceof Collection);
+ assertEquals(2, ((Collection<?>) new FieldValueEvaluator(fieldName).evaluate(tuple)).size());
}
- Assert.assertEquals(
+ assertEquals(
false, ((Collection<?>) new FieldValueEvaluator("a").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1.1, ((Collection<?>) new FieldValueEvaluator("b").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1, ((Collection<?>) new FieldValueEvaluator("c").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1L, ((Collection<?>) new FieldValueEvaluator("d").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
+ assertEquals(1.1, ((Collection<?>) new FieldValueEvaluator("b").evaluate(tuple)).toArray()[1]);
+ assertEquals(1, ((Collection<?>) new FieldValueEvaluator("c").evaluate(tuple)).toArray()[1]);
+ assertEquals(1L, ((Collection<?>) new FieldValueEvaluator("d").evaluate(tuple)).toArray()[1]);
+ assertEquals(
"second", ((Collection<?>) new FieldValueEvaluator("e").evaluate(tuple)).toArray()[1]);
}
@@ -180,21 +171,16 @@ public class FieldValueEvaluatorTest extends SolrTestCase {
Tuple tuple = new Tuple(values);
for (String fieldName : new String[] {"a", "b", "c", "d", "e"}) {
- Assert.assertTrue(new FieldValueEvaluator(fieldName).evaluate(tuple) instanceof Collection);
- Assert.assertEquals(
- 2, ((Collection<?>) new FieldValueEvaluator(fieldName).evaluate(tuple)).size());
+ assertTrue(new FieldValueEvaluator(fieldName).evaluate(tuple) instanceof Collection);
+ assertEquals(2, ((Collection<?>) new FieldValueEvaluator(fieldName).evaluate(tuple)).size());
}
// the priority queue is doing natural ordering, so false is first
- Assert.assertEquals(
- true, ((Collection<?>) new FieldValueEvaluator("a").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1.1, ((Collection<?>) new FieldValueEvaluator("b").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1, ((Collection<?>) new FieldValueEvaluator("c").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
- 1L, ((Collection<?>) new FieldValueEvaluator("d").evaluate(tuple)).toArray()[1]);
- Assert.assertEquals(
+ assertEquals(true, ((Collection<?>) new FieldValueEvaluator("a").evaluate(tuple)).toArray()[1]);
+ assertEquals(1.1, ((Collection<?>) new FieldValueEvaluator("b").evaluate(tuple)).toArray()[1]);
+ assertEquals(1, ((Collection<?>) new FieldValueEvaluator("c").evaluate(tuple)).toArray()[1]);
+ assertEquals(1L, ((Collection<?>) new FieldValueEvaluator("d").evaluate(tuple)).toArray()[1]);
+ assertEquals(
"second", ((Collection<?>) new FieldValueEvaluator("e").evaluate(tuple)).toArray()[1]);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
index def4a2c37e2..13f6ef4cce9 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.FloorEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class FloorEvaluatorTest extends SolrTestCase {
@@ -47,17 +46,17 @@ public class FloorEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1D, result);
+ assertEquals(1D, result);
values.clear();
values.put("a", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1D, result);
+ assertEquals(1D, result);
values.clear();
values.put("a", -1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(-2D, result);
+ assertEquals(-2D, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEqualToEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEqualToEvaluatorTest.java
index f08f666baa8..9fbdc724e14 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEqualToEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEqualToEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.GreaterThanEqualToEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class GreaterThanEqualToEvaluatorTest extends SolrTestCase {
@@ -48,99 +47,99 @@ public class GreaterThanEqualToEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", -1);
values.put("b", -1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 2);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 2);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 2.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 3);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", -1);
values.put("b", -2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 3);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 3.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
}
@Test
@@ -154,43 +153,43 @@ public class GreaterThanEqualToEvaluatorTest extends SolrTestCase {
values.put("a", "foo");
values.put("b", "foo");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", "foo");
values.put("b", "bar");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar baz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar jaz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", foo);
values.put("b", foo);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", foo);
values.put("b", bar);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEvaluatorTest.java
index c7d14bfd618..3182f25ad0f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.GreaterThanEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class GreaterThanEvaluatorTest extends SolrTestCase {
@@ -48,99 +47,99 @@ public class GreaterThanEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", -1);
values.put("b", -1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 2);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 2);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 2.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 3);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", -1);
values.put("b", -2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 3);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 3.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
}
@Test
@@ -154,43 +153,43 @@ public class GreaterThanEvaluatorTest extends SolrTestCase {
values.put("a", "foo");
values.put("b", "foo");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", "foo");
values.put("b", "bar");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar baz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar jaz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", foo);
values.put("b", foo);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", foo);
values.put("b", bar);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
index 494e350096f..796da1664b3 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.HyperbolicCosineEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class HyperbolicCosineEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class HyperbolicCosineEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.cosh(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.cosh(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
index 2ebdf5f8be8..07aac9da223 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.HyperbolicSineEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class HyperbolicSineEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class HyperbolicSineEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.sinh(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.sinh(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LengthEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LengthEvaluatorTest.java
index 24260427207..be4b8775a93 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LengthEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LengthEvaluatorTest.java
@@ -26,7 +26,6 @@ import org.apache.solr.client.solrj.io.eval.LengthEvaluator;
import org.apache.solr.client.solrj.io.eval.SequenceEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class LengthEvaluatorTest extends SolrTestCase {
@@ -60,8 +59,8 @@ public class LengthEvaluatorTest extends SolrTestCase {
}
});
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Long);
- Assert.assertEquals(3L, result);
+ assertTrue(result instanceof Long);
+ assertEquals(3L, result);
values.clear();
values.put(
@@ -73,8 +72,8 @@ public class LengthEvaluatorTest extends SolrTestCase {
}
});
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Long);
- Assert.assertEquals(2L, result);
+ assertTrue(result instanceof Long);
+ assertEquals(2L, result);
values.clear();
values.put(
@@ -84,8 +83,8 @@ public class LengthEvaluatorTest extends SolrTestCase {
}
});
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Long);
- Assert.assertEquals(0L, result);
+ assertTrue(result instanceof Long);
+ assertEquals(0L, result);
}
@Test
@@ -95,8 +94,8 @@ public class LengthEvaluatorTest extends SolrTestCase {
values.clear();
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Long);
- Assert.assertEquals(3L, result);
+ assertTrue(result instanceof Long);
+ assertEquals(3L, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEqualToEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEqualToEvaluatorTest.java
index c926964cddc..6a3f4e51984 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEqualToEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEqualToEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.LessThanEqualToEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class LessThanEqualToEvaluatorTest extends SolrTestCase {
@@ -48,106 +47,106 @@ public class LessThanEqualToEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", -1);
values.put("b", -1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 2);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 2);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 2.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 3);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", -1);
values.put("b", -2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", -2);
values.put("b", -1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 3);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 3.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test
@@ -161,43 +160,43 @@ public class LessThanEqualToEvaluatorTest extends SolrTestCase {
values.put("a", "foo");
values.put("b", "foo");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", "foo");
values.put("b", "bar");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar baz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar jaz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", foo);
values.put("b", foo);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", foo);
values.put("b", bar);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEvaluatorTest.java
index 76aae6ee8bd..76bb1b03778 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.LessThanEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class LessThanEvaluatorTest extends SolrTestCase {
@@ -48,99 +47,99 @@ public class LessThanEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", -1);
values.put("b", -1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 1);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 1.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", 2);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 2);
values.put("b", 1.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 2.0);
values.put("b", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 3);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", -1);
values.put("b", -2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 3);
values.put("b", 2.0);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", 3.0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test
@@ -154,43 +153,43 @@ public class LessThanEvaluatorTest extends SolrTestCase {
values.put("a", "foo");
values.put("b", "foo");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", "foo");
values.put("b", "bar");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar baz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", "foo bar baz");
values.put("b", "foo bar jaz");
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", foo);
values.put("b", foo);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", foo);
values.put("b", bar);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ModuloEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ModuloEvaluatorTest.java
index 4bf749c6f30..d61be7821a8 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ModuloEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ModuloEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.ModuloEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class ModuloEvaluatorTest extends SolrTestCase {
@@ -48,19 +47,19 @@ public class ModuloEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1 % 2, ((Number) result).doubleValue(), 0.0);
+ assertEquals(1 % 2, ((Number) result).doubleValue(), 0.0);
values.clear();
values.put("a", 1.1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1.1 % 2, result);
+ assertEquals(1.1 % 2, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1.1 % 2.1, result);
+ assertEquals(1.1 % 2.1, result);
}
@Test(expected = IOException.class)
@@ -127,7 +126,7 @@ public class ModuloEvaluatorTest extends SolrTestCase {
values.put("b", 2);
values.put("c", 9);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1 % (2 % 9), ((Number) result).doubleValue(), 0.0);
+ assertEquals(1 % (2 % 9), ((Number) result).doubleValue(), 0.0);
}
@Test(expected = IOException.class)
@@ -149,6 +148,6 @@ public class ModuloEvaluatorTest extends SolrTestCase {
values.put("a", 0);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(0D, result);
+ assertEquals(0D, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
index 0dcf3a61275..b363ab4cc0c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.MultiplyEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class MultiplyEvaluatorTest extends SolrTestCase {
@@ -47,21 +46,21 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(2D, result);
+ assertEquals(2D, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(2.2D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(2.2D, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(2.31D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(2.31D, result);
}
@Test
@@ -72,13 +71,13 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", 6);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(6D, result);
+ assertEquals(6D, result);
values.clear();
values.put("a", 6.5);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(6.5D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(6.5D, result);
}
@Test // (expected = NumberFormatException.class)
@@ -88,7 +87,7 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.clear();
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test // (expected = NumberFormatException.class)
@@ -100,19 +99,19 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", null);
values.put("b", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", 1.1);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test // (expected = NumberFormatException.class)
@@ -123,17 +122,17 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("b", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test
@@ -147,7 +146,7 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(24D, result);
+ assertEquals(24D, result);
values.clear();
values.put("a", 1.1);
@@ -155,8 +154,8 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(26.4D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(26.4D, result);
values.clear();
values.put("a", 10.1);
@@ -164,8 +163,8 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.put("c", 3.1);
values.put("d", 4.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(269.5791D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(269.5791D, result);
}
@Test
@@ -179,6 +178,6 @@ public class MultiplyEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(24D, result);
+ assertEquals(24D, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
index ee96d63360f..ae9fd7cbe2f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
@@ -25,7 +25,6 @@ import org.apache.solr.client.solrj.io.eval.AddEvaluator;
import org.apache.solr.client.solrj.io.eval.NaturalLogEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class NaturalLogEvaluatorTest extends SolrTestCase {
@@ -51,8 +50,8 @@ public class NaturalLogEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", 100);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertTrue(result.equals(Math.log(100)));
+ assertTrue(result instanceof Double);
+ assertEquals(result, Math.log(100));
}
@Test
@@ -62,8 +61,8 @@ public class NaturalLogEvaluatorTest extends SolrTestCase {
values.clear();
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertTrue(result.equals(Math.log(100)));
+ assertTrue(result instanceof Double);
+ assertEquals(result, Math.log(100));
}
@Test(expected = IOException.class)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
index c3ee2f17c75..91faed22490 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
@@ -26,7 +26,6 @@ import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.NormalizeEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class NormalizeEvaluatorTest extends SolrTestCase {
@@ -74,6 +73,6 @@ public class NormalizeEvaluatorTest extends SolrTestCase {
double[] actualD =
((List<?>) actual).stream().mapToDouble(value -> ((Number) value).doubleValue()).toArray();
- Assert.assertTrue(Arrays.equals(expected, actualD));
+ assertArrayEquals(expected, actualD, 0.0);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NotEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NotEvaluatorTest.java
index 60170147acb..2d9aca9708c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NotEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NotEvaluatorTest.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.NotEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class NotEvaluatorTest extends SolrTestCase {
@@ -46,14 +45,14 @@ public class NotEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
values.clear();
values.put("a", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
}
@Test
@@ -64,13 +63,13 @@ public class NotEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/OrEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/OrEvaluatorTest.java
index ec563a4675c..b95abb4d77c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/OrEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/OrEvaluatorTest.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.OrEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class OrEvaluatorTest extends SolrTestCase {
@@ -47,29 +46,29 @@ public class OrEvaluatorTest extends SolrTestCase {
values.put("a", true);
values.put("b", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", true);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
@Test
@@ -82,39 +81,39 @@ public class OrEvaluatorTest extends SolrTestCase {
values.put("b", true);
values.put("c", true);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", true);
values.put("b", true);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", true);
values.put("b", false);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", true);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(true, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(true, result);
values.clear();
values.put("a", false);
values.put("b", false);
values.put("c", false);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Boolean);
- Assert.assertEquals(false, result);
+ assertTrue(result instanceof Boolean);
+ assertEquals(false, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
index 66df6f869aa..817b04c86f9 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
@@ -25,7 +25,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.PowerEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class PowerEvaluatorTest extends SolrTestCase {
@@ -49,8 +48,8 @@ public class PowerEvaluatorTest extends SolrTestCase {
values.put("a", 2);
values.put("b", 5);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Number);
- Assert.assertEquals(
+ assertTrue(result instanceof Number);
+ assertEquals(
BigDecimal.valueOf(Math.pow(2, 5)),
BigDecimal.valueOf(result instanceof Long ? (long) result : (double) result));
@@ -58,34 +57,34 @@ public class PowerEvaluatorTest extends SolrTestCase {
values.put("a", 1.1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Number);
- Assert.assertEquals(Math.pow(1.1, 2), result);
+ assertTrue(result instanceof Number);
+ assertEquals(Math.pow(1.1, 2), result);
values.clear();
values.put("a", 1.1);
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Number);
- Assert.assertEquals(Math.pow(1.1, 2.1), result);
+ assertTrue(result instanceof Number);
+ assertEquals(Math.pow(1.1, 2.1), result);
values.clear();
values.put("a", -1.1);
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(Double.isNaN((double) result));
+ assertTrue(Double.isNaN((double) result));
values.clear();
values.put("a", 1.1);
values.put("b", -2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Number);
- Assert.assertEquals(Math.pow(1.1, -2.1), result);
+ assertTrue(result instanceof Number);
+ assertEquals(Math.pow(1.1, -2.1), result);
values.clear();
values.put("a", -1.1);
values.put("b", -2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(Double.isNaN((double) result));
+ assertTrue(Double.isNaN((double) result));
}
@Test(expected = IOException.class)
@@ -98,7 +97,7 @@ public class PowerEvaluatorTest extends SolrTestCase {
StreamEvaluator evaluator = factory.constructEvaluator("pow(a,b)");
values.clear();
- Assert.assertNull(evaluator.evaluate(new Tuple(values)));
+ assertNull(evaluator.evaluate(new Tuple(values)));
}
@Test
@@ -111,8 +110,8 @@ public class PowerEvaluatorTest extends SolrTestCase {
values.put("b", 2);
values.put("c", 3);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Number);
- Assert.assertEquals(
+ assertTrue(result instanceof Number);
+ assertEquals(
BigDecimal.valueOf(Math.pow(8, Math.pow(2, 3))),
BigDecimal.valueOf(result instanceof Long ? (long) result : (double) result));
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RawValueEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RawValueEvaluatorTest.java
index 8d00d682d9a..c80a2799e54 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RawValueEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RawValueEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.eval.AddEvaluator;
import org.apache.solr.client.solrj.io.eval.AndEvaluator;
import org.apache.solr.client.solrj.io.eval.RawValueEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class RawValueEvaluatorTest extends SolrTestCase {
@@ -47,23 +46,21 @@ public class RawValueEvaluatorTest extends SolrTestCase {
public void rawTypes() throws Exception {
Tuple tuple = new Tuple(values);
- Assert.assertEquals(10L, factory.constructEvaluator("val(10)").evaluate(tuple));
- Assert.assertEquals(-10L, factory.constructEvaluator("val(-10)").evaluate(tuple));
- Assert.assertEquals(0L, factory.constructEvaluator("val(0)").evaluate(tuple));
- Assert.assertEquals(10.5, factory.constructEvaluator("val(10.5)").evaluate(tuple));
- Assert.assertEquals(-10.5, factory.constructEvaluator("val(-10.5)").evaluate(tuple));
- Assert.assertEquals(true, factory.constructEvaluator("val(true)").evaluate(tuple));
- Assert.assertEquals(false, factory.constructEvaluator("val(false)").evaluate(tuple));
- Assert.assertNull(factory.constructEvaluator("val(null)").evaluate(tuple));
+ assertEquals(10L, factory.constructEvaluator("val(10)").evaluate(tuple));
+ assertEquals(-10L, factory.constructEvaluator("val(-10)").evaluate(tuple));
+ assertEquals(0L, factory.constructEvaluator("val(0)").evaluate(tuple));
+ assertEquals(10.5, factory.constructEvaluator("val(10.5)").evaluate(tuple));
+ assertEquals(-10.5, factory.constructEvaluator("val(-10.5)").evaluate(tuple));
+ assertEquals(true, factory.constructEvaluator("val(true)").evaluate(tuple));
+ assertEquals(false, factory.constructEvaluator("val(false)").evaluate(tuple));
+ assertNull(factory.constructEvaluator("val(null)").evaluate(tuple));
}
public void rawTypesAsPartOfOther() throws Exception {
Tuple tuple = new Tuple(values);
- Assert.assertEquals(15L, factory.constructEvaluator("add(val(10),val(5))").evaluate(tuple));
- Assert.assertEquals(
- true, factory.constructEvaluator("and(val(true),val(true))").evaluate(tuple));
- Assert.assertEquals(
- false, factory.constructEvaluator("and(val(false),val(false))").evaluate(tuple));
+ assertEquals(15L, factory.constructEvaluator("add(val(10),val(5))").evaluate(tuple));
+ assertEquals(true, factory.constructEvaluator("and(val(true),val(true))").evaluate(tuple));
+ assertEquals(false, factory.constructEvaluator("and(val(false),val(false))").evaluate(tuple));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RecursiveEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RecursiveEvaluatorTest.java
index 975639a0fa8..bc7aee5e356 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RecursiveEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RecursiveEvaluatorTest.java
@@ -29,7 +29,6 @@ import org.apache.solr.client.solrj.io.eval.MultiplyEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.eval.SubtractEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class RecursiveEvaluatorTest extends SolrTestCase {
@@ -66,7 +65,7 @@ public class RecursiveEvaluatorTest extends SolrTestCase {
values.put("f", 2);
values.put("g", 5);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(-16D, result);
+ assertEquals(-16D, result);
values.clear();
values.put("a", .1);
@@ -77,7 +76,7 @@ public class RecursiveEvaluatorTest extends SolrTestCase {
values.put("f", 2);
values.put("g", 5);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(13.7, result);
+ assertTrue(result instanceof Double);
+ assertEquals(13.7, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ReverseEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ReverseEvaluatorTest.java
index 83307fd6013..a59d77aa00f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ReverseEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ReverseEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.ReverseEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class ReverseEvaluatorTest extends SolrTestCase {
@@ -48,8 +47,8 @@ public class ReverseEvaluatorTest extends SolrTestCase {
List<?> result =
((List<?>) factory.constructEvaluator("reverse(l1)").evaluate(new Tuple(values)));
- Assert.assertEquals(4.5, result.get(0));
- Assert.assertEquals(6.7, result.get(1));
- Assert.assertEquals(3.4, result.get(2));
+ assertEquals(4.5, result.get(0));
+ assertEquals(6.7, result.get(1));
+ assertEquals(3.4, result.get(2));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
index 4ef2a26a38c..577753b62b3 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.RoundEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class RoundEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class RoundEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Long);
- Assert.assertEquals(Math.round(value), result);
+ assertTrue(result instanceof Long);
+ assertEquals(Math.round(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
index e1d39ae0d45..1f93ea4a2a0 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.SineEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class SineEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class SineEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.sin(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.sin(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
index b01a1f52f9e..690759c1cf2 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.SquareRootEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class SquareRootEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class SquareRootEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.sqrt(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.sqrt(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
index dad760eaaf1..0ca2eeaf3cb 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.eval.SubtractEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class SubtractEvaluatorTest extends SolrTestCase {
@@ -48,20 +47,20 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(-1D, result);
+ assertEquals(-1D, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(-.9D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(-.9D, result);
values.clear();
values.put("a", 1.1);
values.put("b", 2.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(-1D, result);
+ assertEquals(-1D, result);
}
@Test(expected = IOException.class)
@@ -76,7 +75,7 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.clear();
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test // (expected = NumberFormatException.class)
@@ -88,19 +87,19 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.put("a", 1);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", 1.1);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", 1.1);
values.put("b", null);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test // (expected = NumberFormatException.class)
@@ -111,17 +110,17 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.clear();
values.put("a", 1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
values.clear();
values.put("a", 1.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertNull(result);
+ assertNull(result);
}
@Test
@@ -135,7 +134,7 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(-8D, result);
+ assertEquals(-8D, result);
values.clear();
values.put("a", 1.1);
@@ -143,8 +142,8 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(-7.9D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(-7.9D, result);
values.clear();
values.put("a", 10.1);
@@ -152,8 +151,8 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.put("c", 3.1);
values.put("d", 4.1);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(.8D, result);
+ assertTrue(result instanceof Double);
+ assertEquals(.8D, result);
}
@Test
@@ -167,7 +166,7 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.put("c", 3);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(0D, result);
+ assertEquals(0D, result);
values.clear();
values.put("a", 123456789123456789L);
@@ -175,6 +174,6 @@ public class SubtractEvaluatorTest extends SolrTestCase {
values.put("c", 123456789123456789L);
values.put("d", 123456789123456789L);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(0D, result);
+ assertEquals(0D, result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
index 492583dfc86..ae07089e434 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.eval.TangentEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class TangentEvaluatorTest extends SolrTestCase {
@@ -47,10 +46,10 @@ public class TangentEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(Math.tan(value), result);
+ assertTrue(result instanceof Double);
+ assertEquals(Math.tan(value), result);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
index 3d3341add99..ade96428b16 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
@@ -17,9 +17,6 @@
package org.apache.solr.client.solrj.io.stream.eval;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.time.Instant;
import java.time.LocalDateTime;
@@ -33,6 +30,7 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.eval.TemporalEvaluatorDay;
@@ -54,7 +52,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
import org.junit.Test;
/** Tests numeric Date/Time stream evaluators */
-public class TemporalEvaluatorsTest {
+public class TemporalEvaluatorsTest extends SolrTestCase {
StreamFactory factory;
Map<String, Object> values;
@@ -91,7 +89,7 @@ public class TemporalEvaluatorsTest {
evaluator = factory.constructEvaluator("week()");
StreamContext streamContext = new StreamContext();
evaluator.setStreamContext(streamContext);
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertTrue(e.getCause().getCause().getMessage().contains("Invalid expression week()"));
}
@@ -100,7 +98,7 @@ public class TemporalEvaluatorsTest {
evaluator = factory.constructEvaluator("week(a, b)");
StreamContext streamContext = new StreamContext();
evaluator.setStreamContext(streamContext);
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertTrue(e.getCause().getCause().getMessage().contains("expecting one value but found 2"));
}
@@ -109,7 +107,7 @@ public class TemporalEvaluatorsTest {
evaluator = factory.constructEvaluator("Week()");
StreamContext streamContext = new StreamContext();
evaluator.setStreamContext(streamContext);
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertTrue(
e.getMessage()
@@ -127,7 +125,7 @@ public class TemporalEvaluatorsTest {
StreamContext streamContext = new StreamContext();
evaluator.setStreamContext(streamContext);
Object result = evaluator.evaluate(new Tuple(values));
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertEquals(
"Invalid parameter 12 - The parameter must be a string formatted ISO_INSTANT or of type Long,Instant,Date,LocalDateTime or TemporalAccessor.",
@@ -140,7 +138,7 @@ public class TemporalEvaluatorsTest {
StreamContext streamContext = new StreamContext();
evaluator.setStreamContext(streamContext);
Object result = evaluator.evaluate(new Tuple(values));
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertEquals(
"Invalid parameter 1995-12-31 - The String must be formatted in the ISO_INSTANT date format.",
@@ -153,7 +151,7 @@ public class TemporalEvaluatorsTest {
StreamContext streamContext = new StreamContext();
evaluator.setStreamContext(streamContext);
Object result = evaluator.evaluate(new Tuple(values));
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertEquals(
"Invalid parameter - The parameter must be a string formatted ISO_INSTANT or of type Long,Instant,Date,LocalDateTime or TemporalAccessor.",
@@ -260,7 +258,7 @@ public class TemporalEvaluatorsTest {
try {
testFunction("year(a)", monthDay, 2017);
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertEquals(
"It is not possible to call 'year' function on java.time.MonthDay", e.getMessage());
@@ -272,7 +270,7 @@ public class TemporalEvaluatorsTest {
try {
testFunction("day(a)", yearMonth, 5);
- assertTrue(false);
+ fail();
} catch (IOException e) {
assertEquals(
"It is not possible to call 'day' function on java.time.YearMonth", e.getMessage());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UuidEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UuidEvaluatorTest.java
index e00da06def8..c59569b231f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UuidEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UuidEvaluatorTest.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.eval.UuidEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
public class UuidEvaluatorTest extends SolrTestCase {
@@ -41,7 +40,7 @@ public class UuidEvaluatorTest extends SolrTestCase {
@Test
public void testUuid() throws Exception {
StreamEvaluator evaluator = factory.constructEvaluator("uuid()");
- Assert.assertTrue(evaluator.evaluate(null) instanceof String);
+ assertTrue(evaluator.evaluate(null) instanceof String);
String uuid = (String) evaluator.evaluate(null);
assertEquals(uuid.split("-").length, 5);
String uuid1 = (String) evaluator.evaluate(new Tuple(values));
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java
index 2edf0846c2a..25ea0d49a35 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java
@@ -17,12 +17,10 @@
package org.apache.solr.client.solrj.io.stream.expr;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import org.apache.solr.SolrTestCase;
import org.junit.Test;
-public class InjectionDefenseTest {
+public class InjectionDefenseTest extends SolrTestCase {
private static final String EXPLOITABLE =
"let(a=search(foo,q=\"time_dt:[?$? TO ?$?]\",fl=\"id,time_dt\",sort=\"time_dt asc\"))";
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetricTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetricTest.java
index 8466037e851..b2849317514 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetricTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetricTest.java
@@ -17,11 +17,7 @@
package org.apache.solr.client.solrj.io.stream.metrics;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter;
@@ -29,7 +25,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
import org.apache.solr.handler.SolrDefaultStreamFactory;
import org.junit.Test;
-public class WeightedSumMetricTest {
+public class WeightedSumMetricTest extends SolrTestCase {
final long[] counts = new long[] {10, 20, 30, 40};
final double[] avg = new double[] {2, 4, 6, 8};
@@ -54,13 +50,13 @@ public class WeightedSumMetricTest {
Number weightedSum = updateMetric(wsum);
assertNotNull(weightedSum);
assertTrue(weightedSum instanceof Double);
- assertTrue(weightedSum.doubleValue() == expectedSum);
+ assertEquals(weightedSum.doubleValue(), expectedSum, 0.0);
wsum = new WeightedSumMetric("avg", "count", true);
assertEquals("wsum(avg, count, true)", wsum.getIdentifier());
weightedSum = updateMetric(wsum);
assertNotNull(weightedSum);
- assertTrue(weightedSum.longValue() == expectedSumLong);
+ assertEquals(weightedSum.longValue(), expectedSumLong);
}
private Number updateMetric(WeightedSumMetric wsum) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java
index a30836336c5..029176c75fb 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.ops.ConcatOperation;
import org.apache.solr.client.solrj.io.ops.StreamOperation;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParser;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
/** */
@@ -52,11 +51,11 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldAConcat"));
- Assert.assertEquals("bar", tuple.get("fieldAConcat"));
+ assertNotNull(tuple.get("fieldAConcat"));
+ assertEquals("bar", tuple.get("fieldAConcat"));
}
@Test
@@ -71,28 +70,28 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldB"));
- Assert.assertEquals("baz", tuple.get("fieldB"));
+ assertNotNull(tuple.get("fieldB"));
+ assertEquals("baz", tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("bar-baz", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("bar-baz", tuple.get("fieldABConcat"));
// do the same in oposite order
operation = new ConcatOperation(new String[] {"fieldB", "fieldA"}, "fieldABConcat", "-");
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldB"));
- Assert.assertEquals("baz", tuple.get("fieldB"));
+ assertNotNull(tuple.get("fieldB"));
+ assertEquals("baz", tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("baz-bar", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("baz-bar", tuple.get("fieldABConcat"));
}
@Test
@@ -109,34 +108,34 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldB"));
- Assert.assertEquals("baz", tuple.get("fieldB"));
+ assertNotNull(tuple.get("fieldB"));
+ assertEquals("baz", tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldC"));
- Assert.assertEquals("bab", tuple.get("fieldC"));
+ assertNotNull(tuple.get("fieldC"));
+ assertEquals("bab", tuple.get("fieldC"));
- Assert.assertNotNull(tuple.get("fieldD"));
- Assert.assertEquals("bat", tuple.get("fieldD"));
+ assertNotNull(tuple.get("fieldD"));
+ assertEquals("bat", tuple.get("fieldD"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("bar-baz", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("bar-baz", tuple.get("fieldABConcat"));
// do the same in oposite order
operation = new ConcatOperation(new String[] {"fieldB", "fieldA"}, "fieldABConcat", "-");
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldB"));
- Assert.assertEquals("baz", tuple.get("fieldB"));
+ assertNotNull(tuple.get("fieldB"));
+ assertEquals("baz", tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("baz-bar", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("baz-bar", tuple.get("fieldABConcat"));
}
@Test
@@ -150,13 +149,13 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNull(tuple.get("fieldB"));
+ assertNull(tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("bar-null", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("bar-null", tuple.get("fieldABConcat"));
}
///////////////////////////
@@ -176,11 +175,11 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldAConcat"));
- Assert.assertEquals("bar", tuple.get("fieldAConcat"));
+ assertNotNull(tuple.get("fieldAConcat"));
+ assertEquals("bar", tuple.get("fieldAConcat"));
}
@Test
@@ -199,14 +198,14 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldB"));
- Assert.assertEquals("baz", tuple.get("fieldB"));
+ assertNotNull(tuple.get("fieldB"));
+ assertEquals("baz", tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("bar-baz", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("bar-baz", tuple.get("fieldABConcat"));
// do the same in oposite order
operation =
@@ -217,14 +216,14 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldB"));
- Assert.assertEquals("baz", tuple.get("fieldB"));
+ assertNotNull(tuple.get("fieldB"));
+ assertEquals("baz", tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("baz-bar", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("baz-bar", tuple.get("fieldABConcat"));
}
@Test
@@ -245,20 +244,20 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldB"));
- Assert.assertEquals("baz", tuple.get("fieldB"));
+ assertNotNull(tuple.get("fieldB"));
+ assertEquals("baz", tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldC"));
- Assert.assertEquals("bab", tuple.get("fieldC"));
+ assertNotNull(tuple.get("fieldC"));
+ assertEquals("bab", tuple.get("fieldC"));
- Assert.assertNotNull(tuple.get("fieldD"));
- Assert.assertEquals("bat", tuple.get("fieldD"));
+ assertNotNull(tuple.get("fieldD"));
+ assertEquals("bat", tuple.get("fieldD"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("bar-baz", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("bar-baz", tuple.get("fieldABConcat"));
// do the same in oposite order
operation =
@@ -269,14 +268,14 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNotNull(tuple.get("fieldB"));
- Assert.assertEquals("baz", tuple.get("fieldB"));
+ assertNotNull(tuple.get("fieldB"));
+ assertEquals("baz", tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("baz-bar", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("baz-bar", tuple.get("fieldABConcat"));
}
@Test
@@ -294,12 +293,12 @@ public class ConcatOperationTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
- Assert.assertNull(tuple.get("fieldB"));
+ assertNull(tuple.get("fieldB"));
- Assert.assertNotNull(tuple.get("fieldABConcat"));
- Assert.assertEquals("bar-null", tuple.get("fieldABConcat"));
+ assertNotNull(tuple.get("fieldABConcat"));
+ assertEquals("bar-null", tuple.get("fieldABConcat"));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
index c6e6df34415..fc854cf8baa 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.io.ops.ReplaceOperation;
import org.apache.solr.client.solrj.io.ops.StreamOperation;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParser;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Assert;
import org.junit.Test;
/** */
@@ -56,8 +55,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("foo", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("foo", tuple.get("fieldA"));
// don't replace
values.clear();
@@ -67,8 +66,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("exists", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("exists", tuple.get("fieldA"));
}
@Test
@@ -87,8 +86,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals((long) 123, tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals((long) 123, tuple.get("fieldA"));
// don't replace
values.clear();
@@ -98,8 +97,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("exists", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("exists", tuple.get("fieldA"));
}
@Test
@@ -118,8 +117,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals(123.45678, tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals(123.45678, tuple.get("fieldA"));
// don't replace
values.clear();
@@ -129,8 +128,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("exists", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("exists", tuple.get("fieldA"));
}
@Test
@@ -151,8 +150,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals(123.45678912345, tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals(123.45678912345, tuple.get("fieldA"));
// don't replace
values.clear();
@@ -162,8 +161,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("exists", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("exists", tuple.get("fieldA"));
}
@Test
@@ -182,8 +181,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("bar", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("bar", tuple.get("fieldA"));
// don't replace
values.clear();
@@ -193,8 +192,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("exists", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("exists", tuple.get("fieldA"));
}
@Test
@@ -213,8 +212,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals(123, tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals(123, tuple.get("fieldA"));
// don't replace
values.clear();
@@ -224,8 +223,8 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("exists", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("exists", tuple.get("fieldA"));
}
@Test
@@ -244,7 +243,7 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNull(tuple.get("fieldA"));
+ assertNull(tuple.get("fieldA"));
// don't replace
values.clear();
@@ -254,7 +253,7 @@ public class OperationsTest extends SolrTestCase {
tuple = new Tuple(values);
operation.operate(tuple);
- Assert.assertNotNull(tuple.get("fieldA"));
- Assert.assertEquals("exists", tuple.get("fieldA"));
+ assertNotNull(tuple.get("fieldA"));
+ assertEquals("exists", tuple.get("fieldA"));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
index 4c8f68e34ff..0b87c7d6ef5 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
@@ -851,7 +851,7 @@ public class SchemaTest extends RestTestBase {
createStoredStringField(destFieldName1, getSolrClient());
createStoredStringField(destFieldName2, getSolrClient());
- Integer maxChars = 200;
+ int maxChars = 200;
SchemaRequest.AddCopyField addCopyFieldRequest =
new SchemaRequest.AddCopyField(
srcFieldName, Arrays.asList(destFieldName1, destFieldName2), maxChars);
@@ -869,7 +869,7 @@ public class SchemaTest extends RestTestBase {
int currentMaxChars = (Integer) currentCopyField.get("maxChars");
MatcherAssert.assertThat(
currentDestFieldName, anyOf(is(equalTo(destFieldName1)), is(equalTo(destFieldName2))));
- assertTrue(maxChars == currentMaxChars);
+ assertEquals(maxChars, currentMaxChars);
}
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java
index f5cde4d38ec..40fdf457279 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java
@@ -22,7 +22,6 @@ import org.apache.solr.EmbeddedSolrServerTestBase;
import org.apache.solr.client.solrj.response.SolrPingResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -59,7 +58,7 @@ public class SolrPingTest extends EmbeddedSolrServerTestBase {
ping.process(getSolrClient());
ping.removeAction();
rsp = ping.process(getSolrClient());
- Assert.assertNotNull(rsp);
+ assertNotNull(rsp);
}
@Test(expected = SolrException.class)
@@ -75,6 +74,6 @@ public class SolrPingTest extends EmbeddedSolrServerTestBase {
ping.setActionPing();
rsp = ping.process(getSolrClient());
// the above line should fail with a 503 SolrException.
- Assert.assertNotNull(rsp);
+ assertNotNull(rsp);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestLukeRequest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestLukeRequest.java
index 1fd57a94f24..1246f4e674f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestLukeRequest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestLukeRequest.java
@@ -27,9 +27,9 @@ public class TestLukeRequest extends SolrTestCaseJ4 {
final LukeRequest req = new LukeRequest();
final SolrParams params = req.getParams();
- assertTrue(
+ assertNull(
"Expected the request to omit the 'includeIndexFieldFlags' param",
- params.get("includeIndexFieldFlags") == null);
+ params.get("includeIndexFieldFlags"));
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequest.java
index bba08fe4ded..bc8c313f47f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequest.java
@@ -17,19 +17,19 @@
package org.apache.solr.client.solrj.request;
import java.util.Arrays;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.common.SolrInputDocument;
-import org.junit.Assert;
import org.junit.Test;
-public class TestUpdateRequest {
+public class TestUpdateRequest extends SolrTestCase {
@Test
public void testCannotAddNullSolrInputDocument() {
UpdateRequest req = new UpdateRequest();
NullPointerException thrown =
- Assert.assertThrows(NullPointerException.class, () -> req.add((SolrInputDocument) null));
- Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
+ assertThrows(NullPointerException.class, () -> req.add((SolrInputDocument) null));
+ assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
@Test
@@ -37,17 +37,16 @@ public class TestUpdateRequest {
UpdateRequest req = new UpdateRequest();
NullPointerException thrown =
- Assert.assertThrows(NullPointerException.class, () -> req.add(null, true));
- Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
+ assertThrows(NullPointerException.class, () -> req.add(null, true));
+ assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
@Test
public void testCannotAddNullDocumentWithCommitWithin() {
UpdateRequest req = new UpdateRequest();
- NullPointerException thrown =
- Assert.assertThrows(NullPointerException.class, () -> req.add(null, 1));
- Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
+ NullPointerException thrown = assertThrows(NullPointerException.class, () -> req.add(null, 1));
+ assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
@Test
@@ -55,8 +54,8 @@ public class TestUpdateRequest {
UpdateRequest req = new UpdateRequest();
NullPointerException thrown =
- Assert.assertThrows(NullPointerException.class, () -> req.add(null, 1, true));
- Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
+ assertThrows(NullPointerException.class, () -> req.add(null, 1, true));
+ assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
@Test
@@ -64,9 +63,9 @@ public class TestUpdateRequest {
UpdateRequest req = new UpdateRequest();
NullPointerException thrown =
- Assert.assertThrows(
+ assertThrows(
NullPointerException.class,
() -> req.add(Arrays.asList(new SolrInputDocument(), new SolrInputDocument(), null)));
- Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
+ assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
index 6fffc0b33da..9fa69a52281 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
@@ -37,7 +37,6 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
import org.apache.solr.common.util.JavaBinCodec;
import org.apache.solr.common.util.Utils;
-import org.junit.Assert;
import org.junit.Test;
/**
@@ -90,7 +89,7 @@ public class TestUpdateRequestCodec extends SolrTestCase {
final List<SolrInputDocument> docs = new ArrayList<>();
JavaBinUpdateRequestCodec.StreamingUpdateHandler handler =
(document, req, commitWithin, overwrite) -> {
- Assert.assertNotNull(req.getParams());
+ assertNotNull(req.getParams());
docs.add(document);
};
@@ -105,10 +104,8 @@ public class TestUpdateRequestCodec extends SolrTestCase {
SolrInputDocument outDoc = updateUnmarshalled.getDocuments().get(i);
compareDocs("doc#" + i, inDoc, outDoc);
}
- Assert.assertEquals(
- updateUnmarshalled.getDeleteById().get(0), updateRequest.getDeleteById().get(0));
- Assert.assertEquals(
- updateUnmarshalled.getDeleteQuery().get(0), updateRequest.getDeleteQuery().get(0));
+ assertEquals(updateUnmarshalled.getDeleteById().get(0), updateRequest.getDeleteById().get(0));
+ assertEquals(updateUnmarshalled.getDeleteQuery().get(0), updateRequest.getDeleteQuery().get(0));
assertEquals("b", updateUnmarshalled.getParams().get("a"));
}
@@ -137,7 +134,7 @@ public class TestUpdateRequestCodec extends SolrTestCase {
final List<SolrInputDocument> docs = new ArrayList<>();
JavaBinUpdateRequestCodec.StreamingUpdateHandler handler =
(document, req, commitWithin, overwrite) -> {
- Assert.assertNotNull(req.getParams());
+ assertNotNull(req.getParams());
docs.add(document);
};
@@ -150,10 +147,10 @@ public class TestUpdateRequestCodec extends SolrTestCase {
SolrInputDocument outDoc = updateUnmarshalled.getDocuments().get(0);
SolrInputField iter = outDoc.getField("iter");
- Assert.assertNotNull("iter field is null", iter);
+ assertNotNull("iter field is null", iter);
Object iterVal = iter.getValue();
- Assert.assertTrue("iterVal is not a Collection", iterVal instanceof Collection);
- Assert.assertEquals("iterVal contents", values, iterVal);
+ assertTrue("iterVal is not a Collection", iterVal instanceof Collection);
+ assertEquals("iterVal contents", values, iterVal);
}
// this format accepts a 1:1 mapping of the json format and javabin format
@@ -272,10 +269,8 @@ public class TestUpdateRequestCodec extends SolrTestCase {
SolrInputDocument outDoc = updateUnmarshalled.getDocuments().get(i);
compareDocs("doc#" + i, inDoc, outDoc);
}
- Assert.assertEquals(
- updateUnmarshalled.getDeleteById().get(0), updateRequest.getDeleteById().get(0));
- Assert.assertEquals(
- updateUnmarshalled.getDeleteQuery().get(0), updateRequest.getDeleteQuery().get(0));
+ assertEquals(updateUnmarshalled.getDeleteById().get(0), updateRequest.getDeleteById().get(0));
+ assertEquals(updateUnmarshalled.getDeleteQuery().get(0), updateRequest.getDeleteQuery().get(0));
assertEquals("b", updateUnmarshalled.getParams().get("a"));
is.close();
@@ -297,7 +292,7 @@ public class TestUpdateRequestCodec extends SolrTestCase {
m += " (Set comparison)";
}
- Assert.assertEquals(m + " diff values for field: " + s, expectedVal, actualVal);
+ assertEquals(m + " diff values for field: " + s, expectedVal, actualVal);
}
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.java
index 4c3f5dd5086..af4a76a865c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingEmbeddedTest.java
@@ -645,9 +645,9 @@ public class DirectJsonQueryRequestFacetingEmbeddedTest extends EmbeddedSolrServ
private void assertHasFacetWithBucketValues(
NestableJsonFacet response, String expectedFacetName, FacetBucket... expectedBuckets) {
- assertTrue(
+ assertNotNull(
"Expected response to have facet with name " + expectedFacetName,
- response.getBucketBasedFacets(expectedFacetName) != null);
+ response.getBucketBasedFacets(expectedFacetName));
final List<BucketJsonFacet> buckets =
response.getBucketBasedFacets(expectedFacetName).getBuckets();
assertEquals(expectedBuckets.length, buckets.size());
@@ -661,9 +661,9 @@ public class DirectJsonQueryRequestFacetingEmbeddedTest extends EmbeddedSolrServ
private void assertHasStatFacetWithValue(
NestableJsonFacet response, String expectedFacetName, Double expectedStatValue) {
- assertTrue(
+ assertNotNull(
"Expected response to have stat facet named '" + expectedFacetName + "'",
- response.getStatValue(expectedFacetName) != null);
+ response.getStatValue(expectedFacetName));
assertEquals(expectedStatValue, response.getStatValue(expectedFacetName));
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java
index 19d004c05d0..4ad699afd2c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java
@@ -624,9 +624,9 @@ public class DirectJsonQueryRequestFacetingIntegrationTest extends SolrCloudTest
private void assertHasFacetWithBucketValues(
NestableJsonFacet response, String expectedFacetName, FacetBucket... expectedBuckets) {
- assertTrue(
+ assertNotNull(
"Expected response to have facet with name " + expectedFacetName,
- response.getBucketBasedFacets(expectedFacetName) != null);
+ response.getBucketBasedFacets(expectedFacetName));
final List<BucketJsonFacet> buckets =
response.getBucketBasedFacets(expectedFacetName).getBuckets();
assertEquals(expectedBuckets.length, buckets.size());
@@ -640,9 +640,9 @@ public class DirectJsonQueryRequestFacetingIntegrationTest extends SolrCloudTest
private void assertHasStatFacetWithValue(
NestableJsonFacet response, String expectedFacetName, Double expectedStatValue) {
- assertTrue(
+ assertNotNull(
"Expected response to have stat facet named '" + expectedFacetName + "'",
- response.getStatValue(expectedFacetName) != null);
+ response.getStatValue(expectedFacetName));
assertEquals(expectedStatValue, response.getStatValue(expectedFacetName));
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java
index a0e47e30104..58c684c92ee 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java
@@ -612,9 +612,9 @@ public class JsonQueryRequestFacetingIntegrationTest extends SolrCloudTestCase {
private void assertHasFacetWithBucketValues(
NestableJsonFacet response, String expectedFacetName, FacetBucket... expectedBuckets) {
- assertTrue(
+ assertNotNull(
"Expected response to have facet with name " + expectedFacetName,
- response.getBucketBasedFacets(expectedFacetName) != null);
+ response.getBucketBasedFacets(expectedFacetName));
final List<BucketJsonFacet> buckets =
response.getBucketBasedFacets(expectedFacetName).getBuckets();
assertEquals(expectedBuckets.length, buckets.size());
@@ -628,9 +628,9 @@ public class JsonQueryRequestFacetingIntegrationTest extends SolrCloudTestCase {
private void assertHasStatFacetWithValue(
NestableJsonFacet response, String expectedFacetName, Double expectedStatValue) {
- assertTrue(
+ assertNotNull(
"Expected response to have stat facet named '" + expectedFacetName + "'",
- response.getStatValue(expectedFacetName) != null);
+ response.getStatValue(expectedFacetName));
assertEquals(expectedStatValue, response.getStatValue(expectedFacetName));
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java
index c47bde4409e..35e8f88893b 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java
@@ -47,7 +47,7 @@ public class AnlysisResponseBaseTest extends SolrTestCase {
AnalysisResponseBase.TokenInfo tokenInfo = response.buildTokenInfo(tokenNL);
assertEquals("JUMPING", tokenInfo.getText());
- assertEquals(null, tokenInfo.getRawText());
+ assertNull(tokenInfo.getRawText());
assertEquals("word", tokenInfo.getType());
assertEquals(0, tokenInfo.getStart());
assertEquals(7, tokenInfo.getEnd());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java
index 67ed6548562..31441fa412d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java
@@ -22,7 +22,6 @@ import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.TermsResponse.Term;
import org.apache.solr.common.SolrInputDocument;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -64,11 +63,11 @@ public class TermsResponseTest extends EmbeddedSolrServerTestBase {
QueryRequest request = new QueryRequest(query);
List<Term> terms = request.process(getSolrClient()).getTermsResponse().getTerms("terms_s");
- Assert.assertNotNull(terms);
- Assert.assertEquals(terms.size(), 1);
+ assertNotNull(terms);
+ assertEquals(terms.size(), 1);
Term term = terms.get(0);
- Assert.assertEquals(term.getTerm(), "samsung");
- Assert.assertEquals(term.getFrequency(), 1);
+ assertEquals(term.getTerm(), "samsung");
+ assertEquals(term.getFrequency(), 1);
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java
index e84dcf62122..8e1a2631e59 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java
@@ -27,7 +27,6 @@ import org.apache.solr.SolrJettyTestBase;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrResourceLoader;
-import org.junit.Assert;
import org.junit.Test;
/** Test for ClusteringComponent's response in Solrj */
@@ -49,7 +48,7 @@ public class TestClusteringResponse extends SolrJettyTestBase {
QueryResponse qr = new QueryResponse(response, null);
ClusteringResponse clusteringResponse = qr.getClusteringResponse();
List<Cluster> clusters = clusteringResponse.getClusters();
- Assert.assertEquals(4, clusters.size());
+ assertEquals(4, clusters.size());
checkCluster(
clusters.get(0), Arrays.asList("label1"), Arrays.asList("id1", "id2", "id3"), 0.6d, false);
@@ -72,9 +71,9 @@ public class TestClusteringResponse extends SolrJettyTestBase {
List<String> docRefs,
double score,
boolean otherTopics) {
- Assert.assertEquals(cluster.getLabels(), labels);
- Assert.assertEquals(cluster.getDocs(), docRefs);
- Assert.assertTrue(Double.compare(cluster.getScore(), score) == 0);
- Assert.assertEquals(otherTopics, cluster.isOtherTopics());
+ assertEquals(cluster.getLabels(), labels);
+ assertEquals(cluster.getDocs(), docRefs);
+ assertEquals(0, Double.compare(cluster.getScore(), score));
+ assertEquals(otherTopics, cluster.isOtherTopics());
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
index dc2b4092f1e..3aa536a1386 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
@@ -25,7 +25,6 @@ import org.apache.solr.client.solrj.response.SpellCheckResponse.Correction;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SpellingParams;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -60,7 +59,7 @@ public class TestSpellCheckResponse extends EmbeddedSolrServerTestBase {
query.set(SpellingParams.SPELLCHECK_Q, "samsang");
QueryRequest request = new QueryRequest(query);
SpellCheckResponse response = request.process(client).getSpellCheckResponse();
- Assert.assertEquals("samsung", response.getFirstSuggestion("samsang"));
+ assertEquals("samsung", response.getFirstSuggestion("samsang"));
}
@Test
@@ -139,7 +138,7 @@ public class TestSpellCheckResponse extends EmbeddedSolrServerTestBase {
QueryRequest request = new QueryRequest(query);
SpellCheckResponse response = request.process(client).getSpellCheckResponse();
response = request.process(client).getSpellCheckResponse();
- assertTrue("name:(+faith +hope +loaves)".equals(response.getCollatedResult()));
+ assertEquals("name:(+faith +hope +loaves)", response.getCollatedResult());
// Test Expanded Collation Results
query.set(SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS, true);
@@ -157,15 +156,15 @@ public class TestSpellCheckResponse extends EmbeddedSolrServerTestBase {
assertTrue(
"name:(+faith +hope +love)".equals(collation.getCollationQueryString())
|| "name:(+faith +hope +loaves)".equals(collation.getCollationQueryString()));
- assertTrue(collation.getNumberOfHits() == 1);
+ assertEquals(1, collation.getNumberOfHits());
List<Correction> misspellingsAndCorrections = collation.getMisspellingsAndCorrections();
- assertTrue(misspellingsAndCorrections.size() == 3);
+ assertEquals(3, misspellingsAndCorrections.size());
for (Correction correction : misspellingsAndCorrections) {
if ("fauth".equals(correction.getOriginal())) {
- assertTrue("faith".equals(correction.getCorrection()));
+ assertEquals("faith", correction.getCorrection());
} else if ("home".equals(correction.getOriginal())) {
- assertTrue("hope".equals(correction.getCorrection()));
+ assertEquals("hope", correction.getCorrection());
} else if ("loane".equals(correction.getOriginal())) {
assertTrue(
"love".equals(correction.getCorrection())
@@ -183,7 +182,7 @@ public class TestSpellCheckResponse extends EmbeddedSolrServerTestBase {
assertEquals(2, collations.size());
String collation1 = collations.get(0).getCollationQueryString();
String collation2 = collations.get(1).getCollationQueryString();
- assertFalse(collation1 + " equals " + collation2, collation1.equals(collation2));
+ assertNotEquals(collation1 + " equals " + collation2, collation1, collation2);
for (Collation collation : collations) {
assertTrue(
"name:(+faith +hope +love)".equals(collation.getCollationQueryString())
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ShufflingReplicaListTransformerTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ShufflingReplicaListTransformerTest.java
index 39ffeef8242..467a2408bb9 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ShufflingReplicaListTransformerTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ShufflingReplicaListTransformerTest.java
@@ -65,7 +65,7 @@ public class ShufflingReplicaListTransformerTest extends SolrTestCase {
final Set<TYPE> inputSet = new HashSet<>(inputs);
final Set<TYPE> transformedSet = new HashSet<>(transformedInputs);
- assertTrue(inputSet.equals(transformedSet));
+ assertEquals(inputSet, transformedSet);
}
private final List<String> createRandomUrls() throws Exception {
diff --git a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java
index 5c58cd7c548..eafc86e516f 100644
--- a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java
@@ -63,11 +63,11 @@ public class SolrDocumentTest extends SolrTestCase {
assertEquals(fval, doc.getFieldValue("f"));
doc.setField("n", null);
- assertEquals(null, doc.getFieldValue("n"));
+ assertNull(doc.getFieldValue("n"));
// now remove some fields
- assertEquals(true, doc.removeFields("f"));
- assertEquals(false, doc.removeFields("asdgsadgas"));
+ assertTrue(doc.removeFields("f"));
+ assertFalse(doc.removeFields("asdgsadgas"));
assertNull(doc.getFieldValue("f"));
assertNull(doc.getFieldValues("f"));
}
@@ -148,7 +148,7 @@ public class SolrDocumentTest extends SolrTestCase {
} catch (UnsupportedOperationException ex) {
}
- assertEquals(null, doc.getFieldValueMap().get("aaa"));
+ assertNull(doc.getFieldValueMap().get("aaa"));
doc.setField("aaa", "bbb");
assertEquals("bbb", doc.getFieldValueMap().get("aaa"));
}
diff --git a/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java b/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java
index 020ff6a1398..4fc462021d3 100644
--- a/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java
+++ b/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java
@@ -30,15 +30,15 @@ public class TestToleratedUpdateError extends SolrTestCase {
public void testBasics() {
- assertFalse(
- (new ToleratedUpdateError(CmdType.ADD, "doc1", "some error"))
- .equals(new ToleratedUpdateError(CmdType.ADD, "doc2", "some error")));
- assertFalse(
- (new ToleratedUpdateError(CmdType.ADD, "doc1", "some error"))
- .equals(new ToleratedUpdateError(CmdType.ADD, "doc1", "some errorxx")));
- assertFalse(
- (new ToleratedUpdateError(CmdType.ADD, "doc1", "some error"))
- .equals(new ToleratedUpdateError(CmdType.DELID, "doc1", "some error")));
+ assertNotEquals(
+ (new ToleratedUpdateError(CmdType.ADD, "doc1", "some error")),
+ new ToleratedUpdateError(CmdType.ADD, "doc2", "some error"));
+ assertNotEquals(
+ (new ToleratedUpdateError(CmdType.ADD, "doc1", "some error")),
+ new ToleratedUpdateError(CmdType.ADD, "doc1", "some errorxx"));
+ assertNotEquals(
+ (new ToleratedUpdateError(CmdType.ADD, "doc1", "some error")),
+ new ToleratedUpdateError(CmdType.DELID, "doc1", "some error"));
}
public void testParseMetadataErrorHandling() {
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java
index 6f4cf84e9a3..1a62cafd3ac 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java
@@ -209,7 +209,7 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
if (unmarshaledObj.get(i) instanceof byte[] && matchObj.get(i) instanceof byte[]) {
byte[] b1 = (byte[]) unmarshaledObj.get(i);
byte[] b2 = (byte[]) matchObj.get(i);
- assertTrue(Arrays.equals(b1, b2));
+ assertArrayEquals(b1, b2);
} else if (unmarshaledObj.get(i) instanceof SolrDocument
&& matchObj.get(i) instanceof SolrDocument) {
assertTrue(compareSolrDocument(unmarshaledObj.get(i), matchObj.get(i)));
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestNamedListCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestNamedListCodec.java
index f9b6b3c3dc4..e72d0cbb35f 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/TestNamedListCodec.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestNamedListCodec.java
@@ -154,21 +154,21 @@ public class TestNamedListCodec extends SolrTestCase {
try (JavaBinCodec jbc = new JavaBinCodec();
ByteArrayInputStream bais = new ByteArrayInputStream(arr)) {
NamedList<?> result = (NamedList<?>) jbc.unmarshal(bais);
- assertTrue("result is null and it shouldn't be", result != null);
+ assertNotNull("result is null and it shouldn't be", result);
List<?> keys = (List<?>) result.get("keys");
- assertTrue("keys is null and it shouldn't be", keys != null);
- assertTrue("keys Size: " + keys.size() + " is not: " + 3, keys.size() == 3);
+ assertNotNull("keys is null and it shouldn't be", keys);
+ assertEquals("keys Size: " + keys.size() + " is not: " + 3, 3, keys.size());
String less = (String) result.get("more");
- assertTrue("less is null and it shouldn't be", less != null);
- assertTrue(less + " is not equal to " + "less", less.equals("less") == true);
+ assertNotNull("less is null and it shouldn't be", less);
+ assertEquals(less + " is not equal to " + "less", "less", less);
List<?> values = (List<?>) result.get("values");
- assertTrue("values is null and it shouldn't be", values != null);
- assertTrue("values Size: " + values.size() + " is not: " + 3, values.size() == 3);
+ assertNotNull("values is null and it shouldn't be", values);
+ assertEquals("values Size: " + values.size() + " is not: " + 3, 3, values.size());
String theEnd = (String) result.get("finally");
- assertTrue("theEnd is null and it shouldn't be", theEnd != null);
- assertTrue(theEnd + " is not equal to " + "the end", theEnd.equals("the end") == true);
+ assertNotNull("theEnd is null and it shouldn't be", theEnd);
+ assertEquals(theEnd + " is not equal to " + "the end", "the end", theEnd);
} catch (ClassCastException e) {
- assertTrue("Received a CCE and we shouldn't have", false);
+ fail("Received a CCE and we shouldn't have");
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestPathTrie.java b/solr/solrj/src/test/org/apache/solr/common/util/TestPathTrie.java
index 3d285b6375f..ad7e9066ad3 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/TestPathTrie.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestPathTrie.java
@@ -62,7 +62,7 @@ public class TestPathTrie extends SolrTestCaseJ4 {
templateValues.clear();
assertEquals("W", pathTrie.lookup("/aa/bb/somepart/tt", templateValues));
- assertEquals(templateValues.get("*"), null);
+ assertNull(templateValues.get("*"));
templateValues.clear();
assertEquals("W", pathTrie.lookup("/aa/bb/somepart/tt/hello/world/from/solr", templateValues));
@@ -74,6 +74,6 @@ public class TestPathTrie extends SolrTestCaseJ4 {
assertEquals("a", pathTrie.lookup("/1/2/3/4", templateValues));
assertEquals(templateValues.get("x"), "3");
pathTrie.remove(PathTrie.getPathSegments("/1/2/3/4"));
- assertEquals(null, pathTrie.lookup("/1/2/3/4", null));
+ assertNull(pathTrie.lookup("/1/2/3/4", null));
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/URLUtilTest.java b/solr/solrj/src/test/org/apache/solr/common/util/URLUtilTest.java
index 43d4956b8df..c7560a4b60d 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/URLUtilTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/URLUtilTest.java
@@ -16,13 +16,10 @@
*/
package org.apache.solr.common.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.apache.solr.SolrTestCase;
import org.junit.Test;
-public class URLUtilTest {
+public class URLUtilTest extends SolrTestCase {
@Test
public void test() {
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/Utf8CharSequenceTest.java b/solr/solrj/src/test/org/apache/solr/common/util/Utf8CharSequenceTest.java
index fe974c6da74..da30d6c17e8 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/Utf8CharSequenceTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/Utf8CharSequenceTest.java
@@ -40,12 +40,12 @@ public class Utf8CharSequenceTest extends SolrTestCaseJ4 {
}
byte[] result = baos.toByteArray();
ByteArrayUtf8CharSequence utf81 = new ByteArrayUtf8CharSequence(result, 0, result.length);
- assertTrue(utf81.equals(utf8));
+ assertEquals(utf81, utf8);
baos.reset();
utf8.write(baos);
result = baos.toByteArray();
utf81 = new ByteArrayUtf8CharSequence(result, 0, result.length);
- assertTrue(utf81.equals(utf8));
+ assertEquals(utf81, utf8);
Map<String, Object> m0 = new HashMap<>();
m0.put("str", utf8);
@@ -58,7 +58,7 @@ public class Utf8CharSequenceTest extends SolrTestCaseJ4 {
Map<?, ?> m1 =
(Map<?, ?>) jbc.setReadStringAsCharSeq(true).unmarshal(new ByteArrayInputStream(result));
utf81 = (ByteArrayUtf8CharSequence) m1.get("str");
- assertTrue(utf81.equals(utf8));
+ assertEquals(utf81, utf8);
}
}
@@ -95,7 +95,7 @@ public class Utf8CharSequenceTest extends SolrTestCaseJ4 {
}
byte[] buf = ((ByteArrayUtf8CharSequence) nl1.getVal(0)).getBuf();
ByteArrayUtf8CharSequence valLong = (ByteArrayUtf8CharSequence) nl1.get("key_long");
- assertFalse(valLong.getBuf() == buf);
+ assertNotSame(valLong.getBuf(), buf);
for (int i = 1; i < 6; i++) {
ByteArrayUtf8CharSequence val = (ByteArrayUtf8CharSequence) nl1.get("key" + i);
diff --git a/solr/solrj/src/test/org/noggit/TestJSONParser.java b/solr/solrj/src/test/org/noggit/TestJSONParser.java
index fa61e43361b..246c4a59c56 100644
--- a/solr/solrj/src/test/org/noggit/TestJSONParser.java
+++ b/solr/solrj/src/test/org/noggit/TestJSONParser.java
@@ -674,7 +674,7 @@ public class TestJSONParser extends SolrTestCaseJ4 {
String sval = Long.toString(val);
JSONParser parser = getParser("[" + val + "]");
parser.nextEvent();
- assertTrue(parser.nextEvent() == JSONParser.LONG);
+ assertEquals(JSONParser.LONG, parser.nextEvent());
if (random().nextBoolean()) {
assertEquals(val, parser.getLong());
} else {
diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
index c0c7e631119..d4d8be41023 100644
--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -67,7 +67,6 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestRule;
@@ -1076,7 +1075,7 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
String cmp = compare(a.getResponse(), b.getResponse(), flags, handle);
if (cmp != null) {
log.error("Mismatched responses:\n{}\n{}", a, b);
- Assert.fail(cmp);
+ fail(cmp);
}
}
@@ -1132,14 +1131,14 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
public void evaluate() throws Throwable {
distribSetUp();
if (!distribSetUpCalled) {
- Assert.fail("One of the overrides of distribSetUp does not propagate the call.");
+ fail("One of the overrides of distribSetUp does not propagate the call.");
}
try {
callStatement();
} finally {
distribTearDown();
if (!distribTearDownCalled) {
- Assert.fail("One of the overrides of distribTearDown does not propagate the call.");
+ fail("One of the overrides of distribTearDown does not propagate the call.");
}
}
}
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index 0fb2f012fa6..35166e5b432 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@ -2461,7 +2461,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
ClusterState cs = zkr.getClusterState();
Collection<Slice> slices = cs.getCollection(testCollectionName).getActiveSlices();
- assertTrue(slices.size() == shards);
+ assertEquals(slices.size(), shards);
boolean allReplicasUp = false;
long waitMs = 0L;
long maxWaitMs = maxWaitSecs * 1000L;
@@ -2478,9 +2478,10 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
assertNotNull("No Slice for " + shardId, shard);
allReplicasUp = true; // assume true
Collection<Replica> replicas = shard.getReplicas();
- assertTrue(
+ assertEquals(
"Did not find correct number of replicas. Expected:" + rf + " Found:" + replicas.size(),
- replicas.size() == rf);
+ replicas.size(),
+ rf);
leader = shard.getLeader();
assertNotNull(leader);