Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16300: migrate assert to non deprecated version (#947)

Eric Pugh8789520fb13a
diff --git a/gradle/validation/forbidden-apis/junit.junit.all.txt b/gradle/validation/forbidden-apis/junit.junit.all.txt
new file mode 100644
index 00000000000..2f3d3b0745d
--- /dev/null
+++ b/gradle/validation/forbidden-apis/junit.junit.all.txt
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+junit.framework.TestCase @ All classes should derive from LuceneTestCase
+junit.framework.Assert @ Use org.junit.Assert
+junit.framework.** @ Use org.junit
+org.junit.Assert#assertThat(**) @ Use org.hamcrest.MatcherAssert.assertThat()
+org.junit.matchers.JUnitMatchers @ Use org.hamcrest.CoreMatchers
+org.junit.rules.ExpectedException @ Use Assert.assertThrows
diff --git a/gradle/validation/forbidden-apis/junit.junit.lucene.txt b/gradle/validation/forbidden-apis/junit.junit.lucene.txt
deleted file mode 100644
index fc8d20a63cc..00000000000
--- a/gradle/validation/forbidden-apis/junit.junit.lucene.txt
+++ /dev/null
@@ -1 +0,0 @@
-junit.framework.TestCase @ All classes should derive from LuceneTestCase
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
index ae55c613c26..7413aa88cd2 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
@@ -30,6 +30,7 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
/**
@@ -887,7 +888,7 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
"group.offset",
"-1"));
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, exception.code());
- assertThat(
+ MatcherAssert.assertThat(
exception.getMessage(), containsString("'group.offset' parameter cannot be negative"));
resetExceptionIgnores();
diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
index 5671a8fc41b..12affe3b0da 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
@@ -29,6 +29,7 @@ import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.response.RequestStatusState;
import org.apache.solr.common.params.CoreAdminParams;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -76,7 +77,8 @@ public class CreateCollectionCleanupTest extends SolrCloudTestCase {
public void testCreateCollectionCleanup() throws Exception {
final CloudSolrClient cloudClient = cluster.getSolrClient();
String collectionName = "foo";
- assertThat(CollectionAdminRequest.listCollections(cloudClient), not(hasItem(collectionName)));
+ MatcherAssert.assertThat(
+ CollectionAdminRequest.listCollections(cloudClient), not(hasItem(collectionName)));
// Create a collection that would fail
CollectionAdminRequest.Create create =
CollectionAdminRequest.createCollection(collectionName, "conf1", 1, 1);
@@ -94,7 +96,7 @@ public class CreateCollectionCleanupTest extends SolrCloudTestCase {
});
// Confirm using LIST that the collection does not exist
- assertThat(
+ MatcherAssert.assertThat(
"Failed collection is still in the clusterstate: "
+ cluster.getSolrClient().getClusterState().getCollectionOrNull(collectionName),
CollectionAdminRequest.listCollections(cloudClient),
@@ -105,7 +107,8 @@ public class CreateCollectionCleanupTest extends SolrCloudTestCase {
public void testAsyncCreateCollectionCleanup() throws Exception {
final CloudSolrClient cloudClient = cluster.getSolrClient();
String collectionName = "foo2";
- assertThat(CollectionAdminRequest.listCollections(cloudClient), not(hasItem(collectionName)));
+ MatcherAssert.assertThat(
+ CollectionAdminRequest.listCollections(cloudClient), not(hasItem(collectionName)));
// Create a collection that would fail
CollectionAdminRequest.Create create =
@@ -123,10 +126,10 @@ public class CreateCollectionCleanupTest extends SolrCloudTestCase {
RequestStatusState state =
AbstractFullDistribZkTestBase.getRequestStateAfterCompletion(
"testAsyncCreateCollectionCleanup", 30, cloudClient);
- assertThat(state.getKey(), is("failed"));
+ MatcherAssert.assertThat(state.getKey(), is("failed"));
// Confirm using LIST that the collection does not exist
- assertThat(
+ MatcherAssert.assertThat(
"Failed collection is still in the clusterstate: "
+ cluster.getSolrClient().getClusterState().getCollectionOrNull(collectionName),
CollectionAdminRequest.listCollections(cloudClient),
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 cdacf4daa11..a577ff021de 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
@@ -40,6 +40,7 @@ import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -203,7 +204,7 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase {
private void assertScore(boolean isScoresTest, SolrDocument doc) {
if (isScoresTest) {
- assertThat(
+ MatcherAssert.assertThat(
"score join doesn't return 1.0", doc.getFirstValue("score").toString(), not("1.0"));
} else {
assertEquals("Solr join has constant score", "1.0", doc.getFirstValue("score").toString());
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.java
index 06deacc0bd9..0fd64f1306c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.java
@@ -32,6 +32,7 @@ import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.zookeeper.KeeperException;
import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -114,11 +115,11 @@ public class LeaderElectionContextKeyTest extends SolrCloudTestCase {
}
assertTrue(found);
// There are no leader election was kicked off on testCollection2
- assertThat(
+ MatcherAssert.assertThat(
collection2Shard1Nodes,
CoreMatchers.is(
getElectionNodes(TEST_COLLECTION_2, "shard1", stateReader.getZkClient())));
- assertThat(
+ MatcherAssert.assertThat(
collection2Shard2Nodes,
CoreMatchers.is(
getElectionNodes(TEST_COLLECTION_2, "shard2", stateReader.getZkClient())));
diff --git a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
index 8b9f1ad5c85..47f848bde5a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
@@ -23,6 +23,7 @@ import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -50,7 +51,7 @@ public class RemoteQueryErrorTest extends SolrCloudTestCase {
() -> {
client.add("collection", new SolrInputDocument());
});
- assertThat(
+ MatcherAssert.assertThat(
e.getMessage(), containsString("Document is missing mandatory uniqueKey field: id"));
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
index 0664ebf419a..e57de5b0bbe 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
@@ -17,6 +17,8 @@
package org.apache.solr.cloud;
+import static org.hamcrest.core.StringContains.containsString;
+
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
@@ -39,6 +41,7 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -122,20 +125,17 @@ public class SplitShardTest extends SolrCloudTestCase {
}
@Test
- public void multipleOptionsSplitTest() throws IOException, SolrServerException {
+ public void multipleOptionsSplitTest() {
CollectionAdminRequest.SplitShard splitShard =
CollectionAdminRequest.splitShard(COLLECTION_NAME)
.setNumSubShards(5)
.setRanges("0-c,d-7fffffff")
.setShardName("shard1");
- boolean expectedException = false;
- try {
- splitShard.process(cluster.getSolrClient());
- fail("An exception should have been thrown");
- } catch (SolrException ex) {
- expectedException = true;
- }
- assertTrue("Expected SolrException but it didn't happen", expectedException);
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> splitShard.process(cluster.getSolrClient()));
+ MatcherAssert.assertThat(
+ thrown.getMessage(),
+ containsString("numSubShards can not be specified with split.key or ranges parameters"));
}
@Test
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 8c39507e18e..61b291fd9c3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
@@ -19,7 +19,7 @@ package org.apache.solr.cloud;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.solr.common.params.CommonParams.NAME;
import static org.apache.solr.core.ConfigSetProperties.DEFAULT_FILENAME;
-import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.hamcrest.CoreMatchers.containsString;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -104,6 +104,7 @@ import org.apache.solr.util.ExternalPaths;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assume;
@@ -1275,7 +1276,8 @@ public class TestConfigSetsAPI extends SolrCloudTestCase {
});
unIgnoreException("uploaded without any authentication in place");
- assertThat(thrown.getMessage(), containsString("Underlying core creation failed"));
+ MatcherAssert.assertThat(
+ thrown.getMessage(), containsString("Underlying core creation failed"));
// Authorization on
final String trustedSuffix = "-trusted";
@@ -1310,7 +1312,8 @@ public class TestConfigSetsAPI extends SolrCloudTestCase {
});
unIgnoreException("without any authentication in place");
- assertThat(thrown.getMessage(), containsString("Underlying core creation failed"));
+ MatcherAssert.assertThat(
+ thrown.getMessage(), containsString("Underlying core creation failed"));
// Authorization on
final String trustedSuffix = "-trusted";
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
index 75e8070e4fe..66b893e545d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
@@ -25,6 +25,7 @@ import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.ShardParams;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -53,8 +54,8 @@ public class TestDownShardTolerantSearch extends SolrCloudTestCase {
QueryResponse response =
cluster.getSolrClient().query("tolerant", new SolrQuery("*:*").setRows(1));
- assertThat(response.getStatus(), is(0));
- assertThat(response.getResults().getNumFound(), is(100L));
+ MatcherAssert.assertThat(response.getStatus(), is(0));
+ MatcherAssert.assertThat(response.getResults().getNumFound(), is(100L));
JettySolrRunner stoppedServer = cluster.stopJettySolrRunner(0);
@@ -66,7 +67,7 @@ public class TestDownShardTolerantSearch extends SolrCloudTestCase {
.query(
"tolerant",
new SolrQuery("*:*").setRows(1).setParam(ShardParams.SHARDS_TOLERANT, true));
- assertThat(response.getStatus(), is(0));
+ MatcherAssert.assertThat(response.getStatus(), is(0));
assertTrue(response.getResults().getNumFound() > 0);
SolrServerException e =
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDynamicFieldNamesIndexCorrectly.java b/solr/core/src/test/org/apache/solr/cloud/TestDynamicFieldNamesIndexCorrectly.java
index ac914e1852c..3ab47673e93 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDynamicFieldNamesIndexCorrectly.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDynamicFieldNamesIndexCorrectly.java
@@ -36,8 +36,9 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrInputDocument;
-import org.hamcrest.core.IsCollectionContaining;
+import org.hamcrest.MatcherAssert;
import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsIterableContaining;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,7 +97,7 @@ public class TestDynamicFieldNamesIndexCorrectly extends AbstractFullDistribZkTe
.getFieldNames()
.forEach(
fieldName -> {
- assertThat(
+ MatcherAssert.assertThat(
String.format(
Locale.ROOT,
"Doc %s does not have field %s, it has %s",
@@ -104,7 +105,7 @@ public class TestDynamicFieldNamesIndexCorrectly extends AbstractFullDistribZkTe
fieldName,
resultFieldNames),
resultFieldNames,
- new IsCollectionContaining<>(new IsEqual<>(fieldName)));
+ new IsIterableContaining<>(new IsEqual<>(fieldName)));
});
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRSAKeyPair.java b/solr/core/src/test/org/apache/solr/cloud/TestRSAKeyPair.java
index 5b41cbac1d0..0fc0c87ad6b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRSAKeyPair.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRSAKeyPair.java
@@ -23,6 +23,7 @@ import java.net.URL;
import java.nio.ByteBuffer;
import org.apache.solr.SolrTestCase;
import org.apache.solr.util.CryptoKeys;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
public class TestRSAKeyPair extends SolrTestCase {
@@ -44,7 +45,7 @@ public class TestRSAKeyPair extends SolrTestCase {
random().nextBytes(plaintext);
byte[] encrypted = kp.encrypt(ByteBuffer.wrap(plaintext));
- assertThat(plaintext, not(equalTo(encrypted)));
+ MatcherAssert.assertThat(plaintext, not(equalTo(encrypted)));
byte[] decrypted = CryptoKeys.decryptRSA(encrypted, kp.getPublicKey());
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java
index 4504dcbd2a3..68599125f38 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java
@@ -36,6 +36,7 @@ import org.apache.solr.core.backup.ShardBackupId;
import org.apache.solr.core.backup.ShardBackupMetadata;
import org.apache.solr.core.backup.repository.BackupRepository;
import org.apache.solr.core.backup.repository.LocalFileSystemRepository;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Test;
@@ -122,13 +123,13 @@ public class PurgeGraphTest extends SolrTestCaseJ4 {
// All files associated with backup '0' should be flagged for deletion since the required file
// 'uniqName3' is missing.
assertEquals(1, purgeGraph.backupIdDeletes.size());
- assertThat(purgeGraph.backupIdDeletes, containsInAnyOrder("backup_0.properties"));
+ MatcherAssert.assertThat(purgeGraph.backupIdDeletes, containsInAnyOrder("backup_0.properties"));
assertEquals(2, purgeGraph.shardBackupMetadataDeletes.size());
- assertThat(
+ MatcherAssert.assertThat(
purgeGraph.shardBackupMetadataDeletes,
containsInAnyOrder("md_shard1_0.json", "md_shard2_0.json"));
assertEquals(3, purgeGraph.indexFileDeletes.size());
- assertThat(
+ MatcherAssert.assertThat(
purgeGraph.indexFileDeletes, containsInAnyOrder("uniqName1", "uniqName2", "uniqName4"));
// If a subsequent backup relies on an index file (uniqName4) that was previously only used by
@@ -140,13 +141,15 @@ public class PurgeGraphTest extends SolrTestCaseJ4 {
// createUniquelyNamedIndexFile("uniqName5", "uniqName6");
//
// assertEquals(1, purgeGraph.backupIdDeletes.size());
- // assertThat(purgeGraph.backupIdDeletes, containsInAnyOrder("backup_0.properties"));
+ // MatcherAssert.assertThat(purgeGraph.backupIdDeletes,
+ // containsInAnyOrder("backup_0.properties"));
// assertEquals(2, purgeGraph.shardBackupMetadataDeletes.size());
- // assertThat(purgeGraph.shardBackupMetadataDeletes,
+ // MatcherAssert.assertThat(purgeGraph.shardBackupMetadataDeletes,
// containsInAnyOrder("md_shard1_0.json", "md_shard2_0.json"));
// // NOTE that 'uniqName4' is NOT marked for deletion
// assertEquals(2, purgeGraph.indexFileDeletes.size());
- // assertThat(purgeGraph.indexFileDeletes, containsInAnyOrder("uniqName1", "uniqName2"));
+ // MatcherAssert.assertThat(purgeGraph.indexFileDeletes, containsInAnyOrder("uniqName1",
+ // "uniqName2"));
}
@Test
@@ -168,9 +171,11 @@ public class PurgeGraphTest extends SolrTestCaseJ4 {
assertEquals(0, purgeGraph.backupIdDeletes.size());
assertEquals(1, purgeGraph.shardBackupMetadataDeletes.size());
- assertThat(purgeGraph.shardBackupMetadataDeletes, containsInAnyOrder("md_shard3_0.json"));
+ MatcherAssert.assertThat(
+ purgeGraph.shardBackupMetadataDeletes, containsInAnyOrder("md_shard3_0.json"));
assertEquals(2, purgeGraph.indexFileDeletes.size());
- assertThat(purgeGraph.indexFileDeletes, containsInAnyOrder("uniqName5", "uniqName6"));
+ MatcherAssert.assertThat(
+ purgeGraph.indexFileDeletes, containsInAnyOrder("uniqName5", "uniqName6"));
// If a subsequent backup relies on an index file (uniqName5) that was previously only used by
// the orphaned 'shard3' metadata file, that file should no longer be flagged for deletion
@@ -184,10 +189,11 @@ public class PurgeGraphTest extends SolrTestCaseJ4 {
//
// assertEquals(0, purgeGraph.backupIdDeletes.size());
// assertEquals(1, purgeGraph.shardBackupMetadataDeletes.size());
- // assertThat(purgeGraph.shardBackupMetadataDeletes,
+ // MatcherAssert.assertThat(purgeGraph.shardBackupMetadataDeletes,
// containsInAnyOrder("md_shard3_0.json"));
// assertEquals(1, purgeGraph.indexFileDeletes.size());
- // assertThat(purgeGraph.indexFileDeletes, containsInAnyOrder("uniqName6"));
+ // MatcherAssert.assertThat(purgeGraph.indexFileDeletes,
+ // containsInAnyOrder("uniqName6"));
}
private void createBackupIdFile(int backupId, String... shardNames) throws Exception {
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 6b29c5df3ee..9a49035e796 100644
--- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
@@ -46,6 +46,7 @@ import org.apache.solr.handler.admin.LukeRequestHandler;
import org.apache.solr.handler.component.FacetComponent;
import org.apache.solr.response.JSONResponseWriter;
import org.apache.solr.util.plugin.SolrCoreAware;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
public class ResourceLoaderTest extends SolrTestCaseJ4 {
@@ -59,7 +60,7 @@ public class ResourceLoaderTest extends SolrTestCaseJ4 {
public void testInstanceDir() throws Exception {
final Path dir = createTempDir();
try (SolrResourceLoader loader = new SolrResourceLoader(dir.toAbsolutePath())) {
- assertThat(loader.getInstancePath(), is(dir.toAbsolutePath()));
+ MatcherAssert.assertThat(loader.getInstancePath(), is(dir.toAbsolutePath()));
}
}
diff --git a/solr/core/src/test/org/apache/solr/core/TestBackupRepositoryFactory.java b/solr/core/src/test/org/apache/solr/core/TestBackupRepositoryFactory.java
index ab3ed2903ca..7417ccb0c2f 100644
--- a/solr/core/src/test/org/apache/solr/core/TestBackupRepositoryFactory.java
+++ b/solr/core/src/test/org/apache/solr/core/TestBackupRepositoryFactory.java
@@ -33,13 +33,11 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
public class TestBackupRepositoryFactory extends SolrTestCaseJ4 {
@Rule public TestRule solrTestRules = RuleChain.outerRule(new SystemPropertiesRestoreRule());
- @Rule public ExpectedException expectedException = ExpectedException.none();
// tmp dir, cleaned up automatically.
private static File solrHome = null;
@@ -77,9 +75,9 @@ public class TestBackupRepositoryFactory extends SolrTestCaseJ4 {
plugins[1] = new PluginInfo("repository", attrs);
}
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("More than one backup repository is configured as default");
- new BackupRepositoryFactory(plugins);
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> new BackupRepositoryFactory(plugins));
+ assertEquals("More than one backup repository is configured as default", thrown.getMessage());
}
@Test
@@ -101,9 +99,10 @@ public class TestBackupRepositoryFactory extends SolrTestCaseJ4 {
plugins[1] = new PluginInfo("repository", attrs);
}
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("Duplicate backup repository with name repo1");
- new BackupRepositoryFactory(plugins);
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> new BackupRepositoryFactory(plugins));
+
+ assertEquals("Duplicate backup repository with name repo1", thrown.getMessage());
}
@Test
@@ -111,9 +110,10 @@ public class TestBackupRepositoryFactory extends SolrTestCaseJ4 {
PluginInfo[] plugins = new PluginInfo[0];
BackupRepositoryFactory f = new BackupRepositoryFactory(plugins);
- expectedException.expect(NullPointerException.class);
- expectedException.expectMessage("Could not find a backup repository with name repo1");
- f.newInstance(loader, "repo1");
+ NullPointerException thrown =
+ assertThrows(NullPointerException.class, () -> f.newInstance(loader, "repo1"));
+
+ assertEquals("Could not find a backup repository with name repo1", thrown.getMessage());
}
@Test
@@ -147,12 +147,9 @@ public class TestBackupRepositoryFactory extends SolrTestCaseJ4 {
assertEquals("/tmp", repo.getConfigProperty("location"));
}
- {
- try {
- BackupRepository repo = f.newInstance(loader, "boom");
- fail();
- } catch (Exception e) {
- }
- }
+ NullPointerException thrown =
+ assertThrows(NullPointerException.class, () -> f.newInstance(loader, "boom"));
+
+ assertEquals("Could not find a backup repository with name boom", thrown.getMessage());
}
}
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSets.java b/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
index fe55fa43dec..cedd92b40c8 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
@@ -29,6 +29,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
+import org.hamcrest.MatcherAssert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
@@ -59,14 +60,14 @@ public class TestConfigSets extends SolrTestCaseJ4 {
NodeConfig config =
SolrXmlConfig.fromString(
solrHome, "<solr><str name=\"configSetBaseDir\">configsets</str></solr>");
- assertThat(
+ MatcherAssert.assertThat(
config.getConfigSetBaseDirectory().toAbsolutePath(),
is(Paths.get("/path/to/solr/home/configsets").toAbsolutePath()));
NodeConfig absConfig =
SolrXmlConfig.fromString(
solrHome, "<solr><str name=\"configSetBaseDir\">/path/to/configsets</str></solr>");
- assertThat(
+ MatcherAssert.assertThat(
absConfig.getConfigSetBaseDirectory().toAbsolutePath(),
is(Paths.get("/path/to/configsets").toAbsolutePath()));
}
@@ -79,8 +80,8 @@ public class TestConfigSets extends SolrTestCaseJ4 {
Path solrHome = Paths.get(container.getSolrHome());
SolrCore core1 = container.create("core1", ImmutableMap.of("configSet", "configset-2"));
- assertThat(core1.getCoreDescriptor().getName(), is("core1"));
- assertThat(
+ MatcherAssert.assertThat(core1.getCoreDescriptor().getName(), is("core1"));
+ MatcherAssert.assertThat(
Paths.get(core1.getDataDir()).toString(),
is(solrHome.resolve("core1").resolve("data").toString()));
} finally {
@@ -100,7 +101,7 @@ public class TestConfigSets extends SolrTestCaseJ4 {
container.create("core1", ImmutableMap.of("configSet", "nonexistent"));
});
Throwable wrappedException = getWrappedException(thrown);
- assertThat(wrappedException.getMessage(), containsString("nonexistent"));
+ MatcherAssert.assertThat(wrappedException.getMessage(), containsString("nonexistent"));
} finally {
if (container != null) container.shutdown();
}
@@ -121,7 +122,7 @@ public class TestConfigSets extends SolrTestCaseJ4 {
// We initially don't have a /dump handler defined
SolrCore core = container.create("core1", ImmutableMap.of("configSet", "configset-2"));
- assertThat(
+ MatcherAssert.assertThat(
"No /dump handler should be defined in the initial configuration",
core.getRequestHandler("/dump"),
is(nullValue()));
@@ -133,7 +134,7 @@ public class TestConfigSets extends SolrTestCaseJ4 {
container.reload("core1");
core = container.getCore("core1");
- assertThat(
+ MatcherAssert.assertThat(
"A /dump handler should be defined in the reloaded configuration",
core.getRequestHandler("/dump"),
is(notNullValue()));
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 fa0b99c96e4..d27bff8fbd8 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
@@ -17,11 +17,11 @@
package org.apache.solr.core;
import static org.apache.solr.servlet.SolrDispatchFilter.SOLR_INSTALL_DIR_ATTRIBUTE;
+import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.matchers.JUnitMatchers.containsString;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
@@ -49,6 +49,7 @@ import org.apache.solr.handler.admin.CoreAdminHandler;
import org.apache.solr.handler.admin.InfoHandler;
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;
@@ -291,7 +292,7 @@ public class TestCoreContainer extends SolrTestCaseJ4 {
() -> {
cores.unload("non_existent_core");
});
- assertThat(
+ MatcherAssert.assertThat(
thrown.getMessage(),
containsString("Cannot unload non-existent core [non_existent_core]"));
@@ -302,7 +303,8 @@ public class TestCoreContainer extends SolrTestCaseJ4 {
() -> {
cores.unload(null);
});
- assertThat(thrown.getMessage(), containsString("Cannot unload non-existent core [null]"));
+ MatcherAssert.assertThat(
+ thrown.getMessage(), containsString("Cannot unload non-existent core [null]"));
} finally {
cores.shutdown();
}
@@ -336,16 +338,16 @@ public class TestCoreContainer extends SolrTestCaseJ4 {
try {
cc.load();
- assertThat(cc.getCoreInitFailures().size(), is(1));
- assertThat(
+ MatcherAssert.assertThat(cc.getCoreInitFailures().size(), is(1));
+ MatcherAssert.assertThat(
cc.getCoreInitFailures().get("badcore").exception.getMessage(),
containsString("nosuchconfigset"));
cc.unload("badcore", true, true, true);
- assertThat(cc.getCoreInitFailures().size(), is(0));
+ MatcherAssert.assertThat(cc.getCoreInitFailures().size(), is(0));
// can we create the core now with a good config?
SolrCore core = cc.create("badcore", ImmutableMap.of("configSet", "minimal"));
- assertThat(core, not(nullValue()));
+ MatcherAssert.assertThat(core, not(nullValue()));
} finally {
cc.shutdown();
@@ -753,9 +755,11 @@ public class TestCoreContainer extends SolrTestCaseJ4 {
CoreContainer cc = init(CUSTOM_HANDLERS_SOLR_XML);
try {
- assertThat(cc.getCollectionsHandler(), is(instanceOf(CustomCollectionsHandler.class)));
- assertThat(cc.getInfoHandler(), is(instanceOf(CustomInfoHandler.class)));
- assertThat(cc.getMultiCoreHandler(), is(instanceOf(CustomCoreAdminHandler.class)));
+ MatcherAssert.assertThat(
+ cc.getCollectionsHandler(), is(instanceOf(CustomCollectionsHandler.class)));
+ MatcherAssert.assertThat(cc.getInfoHandler(), is(instanceOf(CustomInfoHandler.class)));
+ MatcherAssert.assertThat(
+ cc.getMultiCoreHandler(), is(instanceOf(CustomCoreAdminHandler.class)));
} finally {
cc.shutdown();
}
@@ -765,7 +769,8 @@ public class TestCoreContainer extends SolrTestCaseJ4 {
public void testCustomConfigSetService() throws Exception {
CoreContainer cc = init(CUSTOM_CONFIG_SET_SERVICE_SOLR_XML);
try {
- assertThat(cc.getConfigSetService(), is(instanceOf(CustomConfigSetService.class)));
+ MatcherAssert.assertThat(
+ cc.getConfigSetService(), is(instanceOf(CustomConfigSetService.class)));
} finally {
cc.shutdown();
}
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 c332ed6c29f..5c357d7e6c4 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
@@ -41,6 +41,7 @@ import org.apache.lucene.util.IOUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.RetryUtil;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -451,7 +452,8 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
assertNull(cc.getCore("core0"));
SolrCore core3 = cc.create("core3", ImmutableMap.of("configSet", "minimal"));
- assertThat(core3.getCoreDescriptor().getInstanceDir().toString(), containsString("relative"));
+ MatcherAssert.assertThat(
+ core3.getCoreDescriptor().getInstanceDir().toString(), containsString("relative"));
} finally {
cc.shutdown();
@@ -604,7 +606,8 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
if (cc != null) cc.shutdown();
}
});
- assertThat(thrown.getMessage(), containsString("Error reading core root directory"));
+ MatcherAssert.assertThat(
+ thrown.getMessage(), containsString("Error reading core root directory"));
// So things can be cleaned up by the framework!
homeDir.setReadable(true, false);
}
@@ -629,14 +632,14 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
NodeConfig config =
SolrXmlConfig.fromString(
solrHomeDirectory, "<solr><str name=\"coreRootDirectory\">relative</str></solr>");
- assertThat(
+ MatcherAssert.assertThat(
config.getCoreRootDirectory().toString(),
containsString(solrHomeDirectory.toAbsolutePath().toString()));
NodeConfig absConfig =
SolrXmlConfig.fromString(
solrHomeDirectory, "<solr><str name=\"coreRootDirectory\">/absolute</str></solr>");
- assertThat(
+ MatcherAssert.assertThat(
absConfig.getCoreRootDirectory().toString(),
not(containsString(solrHomeDirectory.toAbsolutePath().toString())));
}
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
index 473861c33cb..00391178bd0 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
@@ -33,17 +33,16 @@ import org.apache.lucene.tests.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.update.UpdateShardHandlerConfig;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
-import org.junit.rules.ExpectedException;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
public class TestSolrXml extends SolrTestCaseJ4 {
@Rule public TestRule solrTestRules = RuleChain.outerRule(new SystemPropertiesRestoreRule());
- @Rule public ExpectedException expectedException = ExpectedException.none();
// tmp dir, cleaned up automatically.
private Path solrHome;
@@ -83,7 +82,7 @@ public class TestSolrXml extends SolrTestCaseJ4 {
"config set handler class", "testConfigSetsHandler", cfg.getConfigSetsHandlerClass());
assertEquals("core load threads", 11, cfg.getCoreLoadThreadCount(false));
assertEquals("replay update threads", 100, cfg.getReplayUpdatesThreads());
- assertThat(
+ MatcherAssert.assertThat(
"core root dir",
cfg.getCoreRootDirectory().toString(),
containsString("testCoreRootDirectory"));
@@ -109,12 +108,12 @@ public class TestSolrXml extends SolrTestCaseJ4 {
assertEquals("solr host port", 44, ccfg.getSolrHostPort());
assertEquals("leader vote wait", 55, ccfg.getLeaderVoteWait());
assertEquals("logging class", "testLoggingClass", cfg.getLogWatcherConfig().getLoggingClass());
- assertEquals("log watcher", true, cfg.getLogWatcherConfig().isEnabled());
+ assertTrue("log watcher", cfg.getLogWatcherConfig().isEnabled());
assertEquals("log watcher size", 88, cfg.getLogWatcherConfig().getWatcherSize());
assertEquals("log watcher thresh", "99", cfg.getLogWatcherConfig().getWatcherThreshold());
assertEquals("manage path", "testManagementPath", cfg.getManagementPath());
assertEquals("shardLib", "testSharedLib", cfg.getSharedLibDirectory());
- assertEquals("schema cache", true, cfg.hasSchemaCache());
+ assertTrue("schema cache", cfg.hasSchemaCache());
assertEquals("trans cache size", 66, cfg.getTransientCacheSize());
assertEquals("zk client timeout", 77, ccfg.getZkClientTimeout());
assertEquals("zk host", "testZkHost", ccfg.getZkHost());
@@ -155,9 +154,9 @@ public class TestSolrXml extends SolrTestCaseJ4 {
Files.copy(testSrcRoot.resolve("solr-50-all.xml"), solrHome.resolve("solr.xml"));
NodeConfig cfg = SolrXmlConfig.fromSolrHome(solrHome, new Properties());
- assertThat(cfg.getCoreRootDirectory().toString(), containsString("myCoreRoot"));
+ MatcherAssert.assertThat(cfg.getCoreRootDirectory().toString(), containsString("myCoreRoot"));
assertEquals("solr host port", 8888, cfg.getCloudConfig().getSolrHostPort());
- assertEquals("schema cache", false, cfg.hasSchemaCache());
+ assertFalse("schema cache", cfg.hasSchemaCache());
}
public void testExplicitNullGivesDefaults() {
@@ -182,9 +181,11 @@ public class TestSolrXml extends SolrTestCaseJ4 {
String bad = "" + TestUtil.nextLong(random(), Integer.MAX_VALUE, Long.MAX_VALUE);
String solrXml = "<solr><long name=\"transientCacheSize\">" + bad + "</long></solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("transientCacheSize");
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "Error parsing 'transientCacheSize', value '" + bad + "' cannot be parsed",
+ thrown.getMessage());
}
public void testIntAsLongOk() {
@@ -200,9 +201,10 @@ public class TestSolrXml extends SolrTestCaseJ4 {
+ "<solrcloud><bool name=\"genericCoreNodeNames\">true</bool></solrcloud>"
+ "<solrcloud><bool name=\"genericCoreNodeNames\">false</bool></solrcloud>"
+ "</solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("Multiple instances of solrcloud section found in solr.xml");
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals("Multiple instances of solrcloud section found in solr.xml", thrown.getMessage());
}
public void testMultiLoggingSectionError() {
@@ -211,9 +213,10 @@ public class TestSolrXml extends SolrTestCaseJ4 {
+ "<logging><str name=\"class\">foo</str></logging>"
+ "<logging><str name=\"class\">foo</str></logging>"
+ "</solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("Multiple instances of logging section found in solr.xml");
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals("Multiple instances of logging section found in solr.xml", thrown.getMessage());
}
public void testMultiLoggingWatcherSectionError() {
@@ -224,10 +227,10 @@ public class TestSolrXml extends SolrTestCaseJ4 {
+ "<watcher><int name=\"threshold\">42</int></watcher>"
+ "</logging></solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage(
- "Multiple instances of logging/watcher section found in solr.xml");
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "Multiple instances of logging/watcher section found in solr.xml", thrown.getMessage());
}
public void testMultiCoreAdminHandlerActionsSectionError() {
@@ -236,10 +239,12 @@ public class TestSolrXml extends SolrTestCaseJ4 {
+ "<coreAdminHandlerActions><str name=\"action1\">testCoreAdminHandlerAction1</str></coreAdminHandlerActions>"
+ "<coreAdminHandlerActions><str name=\"action2\">testCoreAdminHandlerAction2</str></coreAdminHandlerActions>"
+ "</solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage(
- "Multiple instances of coreAdminHandlerActions section found in solr.xml");
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "Multiple instances of coreAdminHandlerActions section found in solr.xml",
+ thrown.getMessage());
}
public void testValidStringValueWhenBoolTypeIsExpected() {
@@ -273,18 +278,20 @@ public class TestSolrXml extends SolrTestCaseJ4 {
"<solr><solrcloud><long name=\"maxUpdateConnections\">%d</long></solrcloud></solr>",
val);
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("Error parsing 'maxUpdateConnections'");
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "Error parsing 'maxUpdateConnections', value '" + val + "' cannot be parsed as int",
+ thrown.getMessage());
}
public void testFailAtConfigParseTimeWhenBoolTypeIsExpectedAndValueIsInvalidString() {
String solrXml =
"<solr><solrcloud><bool name=\"genericCoreNodeNames\">NOT_A_BOOLEAN</bool></solrcloud></solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("invalid boolean value: NOT_A_BOOLEAN");
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals("invalid boolean value: NOT_A_BOOLEAN", thrown.getMessage());
}
public void testFailAtConfigParseTimeWhenIntTypeIsExpectedAndBoolTypeIsGiven() {
@@ -296,34 +303,34 @@ public class TestSolrXml extends SolrTestCaseJ4 {
"<solr><logging><int name=\"unknown-option\">%s</int></logging></solr>",
randomBoolean);
- expectedException.expect(SolrException.class);
- expectedException.expectMessage(
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
String.format(
Locale.ROOT,
"Value of 'unknown-option' can not be parsed as 'int': \"%s\"",
- randomBoolean));
-
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ randomBoolean),
+ thrown.getMessage());
}
public void testFailAtConfigParseTimeWhenUnrecognizedSolrCloudOptionWasFound() {
String solrXml =
"<solr><solrcloud><str name=\"host\">host</str><int name=\"hostPort\">8983</int><str name=\"hostContext\"></str><bool name=\"unknown-option\">true</bool></solrcloud></solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage(
- "Unknown configuration parameter in <solrcloud> section of solr.xml: unknown-option");
-
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "Unknown configuration parameter in <solrcloud> section of solr.xml: unknown-option",
+ thrown.getMessage());
}
public void testFailAtConfigParseTimeWhenUnrecognizedSolrOptionWasFound() {
String solrXml = "<solr><bool name=\"unknown-bool-option\">true</bool></solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("Unknown configuration value in solr.xml: unknown-bool-option");
-
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "Unknown configuration value in solr.xml: unknown-bool-option", thrown.getMessage());
}
public void testFailAtConfigParseTimeWhenUnrecognizedLoggingOptionWasFound() {
@@ -333,10 +340,9 @@ public class TestSolrXml extends SolrTestCaseJ4 {
"<solr><logging><bool name=\"unknown-option\">%s</bool></logging></solr>",
random().nextBoolean());
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("Unknown value in logwatcher config: unknown-option");
-
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals("Unknown value in logwatcher config: unknown-option", thrown.getMessage());
}
public void testFailAtConfigParseTimeWhenLoggingConfigParamsAreDuplicated() {
@@ -352,10 +358,9 @@ public class TestSolrXml extends SolrTestCaseJ4 {
v1,
v2);
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("<logging> section of solr.xml contains duplicated 'class'");
-
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals("<logging> section of solr.xml contains duplicated 'class'", thrown.getMessage());
}
public void testFailAtConfigParseTimeWhenSolrCloudConfigParamsAreDuplicated() {
@@ -376,11 +381,11 @@ public class TestSolrXml extends SolrTestCaseJ4 {
v2,
v3);
- expectedException.expect(SolrException.class);
- expectedException.expectMessage(
- "<solrcloud> section of solr.xml contains duplicated 'zkClientTimeout'");
-
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "<solrcloud> section of solr.xml contains duplicated 'zkClientTimeout'",
+ thrown.getMessage());
}
@Ignore
@@ -396,12 +401,10 @@ public class TestSolrXml extends SolrTestCaseJ4 {
+ "</solr>",
v1,
v2);
-
- expectedException.expect(SolrException.class);
- expectedException.expectMessage(
- "Main section of solr.xml contains duplicated 'coreLoadThreads'");
-
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "Main section of solr.xml contains duplicated 'coreLoadThreads'", thrown.getMessage());
}
public void testFailAtConfigParseTimeWhenCoreAdminHandlerActionsConfigParamsAreDuplicated() {
@@ -417,48 +420,44 @@ public class TestSolrXml extends SolrTestCaseJ4 {
v1,
v2);
- expectedException.expect(SolrException.class);
- expectedException.expectMessage(
- "<coreAdminHandlerActions> section of solr.xml contains duplicated 'action'");
-
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals(
+ "<coreAdminHandlerActions> section of solr.xml contains duplicated 'action'",
+ thrown.getMessage());
}
public void testCloudConfigRequiresHostPort() {
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("solrcloud section missing required entry 'hostPort'");
-
- SolrXmlConfig.fromString(solrHome, "<solr><solrcloud></solrcloud></solr>");
- }
-
- public void testCloudConfigDefaultHostPort() {
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("solrcloud section missing required entry 'hostPort'");
-
- SolrXmlConfig.fromString(solrHome, "<solr><solrcloud></solrcloud></solr>");
+ SolrException thrown =
+ assertThrows(
+ SolrException.class,
+ () -> SolrXmlConfig.fromString(solrHome, "<solr><solrcloud></solrcloud></solr>"));
+ assertEquals("solrcloud section missing required entry 'hostPort'", thrown.getMessage());
}
public void testCloudConfigRequiresHost() {
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("solrcloud section missing required entry 'host'");
-
- SolrXmlConfig.fromString(
- solrHome, "<solr><solrcloud><int name=\"hostPort\">8983</int></solrcloud></solr>");
+ SolrException thrown =
+ assertThrows(
+ SolrException.class,
+ () ->
+ SolrXmlConfig.fromString(
+ solrHome,
+ "<solr><solrcloud><int name=\"hostPort\">8983</int></solrcloud></solr>"));
+ assertEquals("solrcloud section missing required entry 'host'", thrown.getMessage());
}
public void testCloudConfigRequiresHostContext() {
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("solrcloud section missing required entry 'hostContext'");
-
- SolrXmlConfig.fromString(
- solrHome,
- "<solr><solrcloud><str name=\"host\">host</str><int name=\"hostPort\">8983</int></solrcloud></solr>");
+ String solrXml =
+ "<solr><solrcloud><str name=\"host\">host</str><int name=\"hostPort\">8983</int></solrcloud></solr>";
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals("solrcloud section missing required entry 'hostContext'", thrown.getMessage());
}
public void testMultiBackupSectionError() {
String solrXml = "<solr><backup></backup><backup></backup></solr>";
- expectedException.expect(SolrException.class);
- expectedException.expectMessage("Multiple instances of backup section found in solr.xml");
- SolrXmlConfig.fromString(solrHome, solrXml); // return not used, only for validation
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> SolrXmlConfig.fromString(solrHome, solrXml));
+ assertEquals("Multiple instances of backup section found in solr.xml", thrown.getMessage());
}
}
diff --git a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
index 47756af3f9b..b2a6aa8f2bf 100644
--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
@@ -54,6 +54,7 @@ import org.apache.solr.common.util.Utils;
import org.apache.solr.packagemanager.PackageUtils;
import org.apache.solr.util.LogLevel;
import org.apache.zookeeper.server.ByteBufferInputStream;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -95,7 +96,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
"j+Rflxi64tXdqosIhbusqi6GTwZq8znunC/dzwcWW0/dHlFGKDurOaE1Nz9FSPJuXbHkVLj638yZ0Lp1ssnoYA==");
fail("should have failed because of wrong signature ");
} catch (RemoteExecutionException e) {
- assertThat(e.getMessage(), containsString("Signature does not match"));
+ MatcherAssert.assertThat(e.getMessage(), containsString("Signature does not match"));
}
postFile(
diff --git a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
index 0263abb34c5..a170cefb37a 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
@@ -64,6 +64,7 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.security.PermissionNameProvider;
import org.apache.solr.util.ErrorLogMuter;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -217,7 +218,7 @@ public class TestContainerPlugin extends SolrCloudTestCase {
() -> getPlugin("/my-random-prefix/their/plugin").call());
assertEquals(404, e.code());
final String msg = (String) ((Map<String, Object>) (e.getMetaData().get("error"))).get("msg");
- assertThat(msg, containsString("Cannot find API for the path"));
+ MatcherAssert.assertThat(msg, containsString("Cannot find API for the path"));
// test ClusterSingleton plugin
plugin.name = "clusterSingleton";
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 7c751b7b78a..4a894b25052 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -21,7 +21,7 @@ import static org.apache.solr.handler.ReplicationTestHelper.SolrInstance;
import static org.apache.solr.handler.ReplicationTestHelper.assertVersions;
import static org.apache.solr.handler.ReplicationTestHelper.createNewSolrClient;
import static org.apache.solr.handler.ReplicationTestHelper.invokeReplicationCommand;
-import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.hamcrest.CoreMatchers.containsString;
import java.io.File;
import java.io.FilenameFilter;
@@ -79,6 +79,7 @@ import org.apache.solr.security.AllowListUrlChecker;
import org.apache.solr.util.FileUtils;
import org.apache.solr.util.TestInjection;
import org.apache.solr.util.TimeOut;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -1604,7 +1605,8 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
followerClient.query(q);
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, thrown.code());
- assertThat(thrown.getMessage(), containsString("Missing required parameter: command"));
+ MatcherAssert.assertThat(
+ thrown.getMessage(), containsString("Missing required parameter: command"));
}
@Test
@@ -1618,7 +1620,8 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
followerClient.query(q);
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, thrown.code());
- assertThat(thrown.getMessage(), containsString("Missing required parameter: name"));
+ MatcherAssert.assertThat(
+ thrown.getMessage(), containsString("Missing required parameter: name"));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/TestRequestId.java b/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
index e8692ce1d38..bd94182719c 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
@@ -25,6 +25,7 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.SuppressForbidden;
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.LogListener;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.slf4j.MDC;
@@ -75,7 +76,7 @@ public class TestRequestId extends SolrTestCaseJ4 {
var reqEvent = reqLog.getQueue().poll();
assertNotNull(reqEvent);
assertEquals("yyy", reqEvent.getContextData().getValue("rid"));
- assertThat(
+ MatcherAssert.assertThat(
reqEvent.getMessage().getFormattedMessage(),
containsString("status=" + ErrorCode.BAD_REQUEST.code));
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetExistsSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetExistsSmallTest.java
index 5b7d2025687..2f4212b7d88 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetExistsSmallTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetExistsSmallTest.java
@@ -26,6 +26,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
public class DistributedFacetExistsSmallTest extends BaseDistributedSearchTestCase {
@@ -220,13 +221,13 @@ public class DistributedFacetExistsSmallTest extends BaseDistributedSearchTestCa
private void assertResponse(QueryResponse rsp) {
final FacetField facetField = rsp.getFacetField(FLD);
- assertThat(facetField.getValueCount(), is(6));
+ MatcherAssert.assertThat(facetField.getValueCount(), is(6));
final List<FacetField.Count> counts = facetField.getValues();
for (FacetField.Count count : counts) {
- assertThat("Count for: " + count.getName(), count.getCount(), is(1L));
+ MatcherAssert.assertThat("Count for: " + count.getName(), count.getCount(), is(1L));
}
- assertThat(counts.get(0).getName(), is("AAA"));
- assertThat(counts.get(1).getName(), is("B"));
- assertThat(counts.get(2).getName(), is("BB"));
+ MatcherAssert.assertThat(counts.get(0).getName(), is("AAA"));
+ MatcherAssert.assertThat(counts.get(1).getName(), is("B"));
+ MatcherAssert.assertThat(counts.get(2).getName(), is("BB"));
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
index 10b7e5272a8..9ce0684fdf0 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import junit.framework.AssertionFailedError;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
@@ -181,31 +180,27 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas
"facet.pivot", "place_s,company_t"),
variableParams);
- try {
- rsp = query(p);
- pivots = rsp.getFacetPivot().get("place_s,company_t");
- assertEquals(20, pivots.size()); // limit
- for (int i = 0; i < 10; i++) {
- PivotField place = pivots.get(i);
- assertTrue(place.toString(), place.getValue().toString().endsWith("placeholder"));
- assertEquals(3, place.getPivot().size());
- assertPivot("company_t", "bbc", 6, place.getPivot().get(0));
- assertPivot("company_t", "microsoft", 6, place.getPivot().get(1));
- assertPivot("company_t", "polecat", 6, place.getPivot().get(2));
- }
- assertPivot("place_s", "cardiff", 257, pivots.get(10));
- assertPivot("place_s", "krakaw", 1, pivots.get(11));
- assertPivot("place_s", "medical staffing network holdings, inc.", 51, pivots.get(12));
- for (int i = 13; i < 20; i++) {
- PivotField place = pivots.get(i);
- assertTrue(place.toString(), place.getValue().toString().startsWith("placeholder"));
- assertEquals(1, place.getPivot().size());
- PivotField company = place.getPivot().get(0);
- assertTrue(company.toString(), company.getValue().toString().startsWith("compholder"));
- assertEquals(company.toString(), 1, company.getCount());
- }
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
+ rsp = query(p);
+ pivots = rsp.getFacetPivot().get("place_s,company_t");
+ assertEquals(20, pivots.size()); // limit
+ for (int i = 0; i < 10; i++) {
+ PivotField place = pivots.get(i);
+ assertTrue(place.toString(), place.getValue().toString().endsWith("placeholder"));
+ assertEquals(3, place.getPivot().size());
+ assertPivot("company_t", "bbc", 6, place.getPivot().get(0));
+ assertPivot("company_t", "microsoft", 6, place.getPivot().get(1));
+ assertPivot("company_t", "polecat", 6, place.getPivot().get(2));
+ }
+ assertPivot("place_s", "cardiff", 257, pivots.get(10));
+ assertPivot("place_s", "krakaw", 1, pivots.get(11));
+ assertPivot("place_s", "medical staffing network holdings, inc.", 51, pivots.get(12));
+ for (int i = 13; i < 20; i++) {
+ PivotField place = pivots.get(i);
+ assertTrue(place.toString(), place.getValue().toString().startsWith("placeholder"));
+ assertEquals(1, place.getPivot().size());
+ PivotField company = place.getPivot().get(0);
+ assertTrue(company.toString(), company.getValue().toString().startsWith("compholder"));
+ assertEquals(company.toString(), 1, company.getCount());
}
}
@@ -267,16 +262,11 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas
"facet.pivot.mincount", "" + mincount,
"facet.sort", facetSort);
- try {
- rsp = query(p);
- pivots = rsp.getFacetPivot().get("real_b");
- assertEquals(2, pivots.size()); // false, missing - in that order, regardless of sort
- assertPivot("real_b", false, 300, pivots.get(0));
- assertPivot("real_b", null, expectedNumDocsMissingBool, pivots.get(1));
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ rsp = query(p);
+ pivots = rsp.getFacetPivot().get("real_b");
+ assertEquals(2, pivots.size()); // false, missing - in that order, regardless of sort
+ assertPivot("real_b", false, 300, pivots.get(0));
+ assertPivot("real_b", null, expectedNumDocsMissingBool, pivots.get(1));
}
}
@@ -303,17 +293,13 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas
"rows", "0",
"facet", "true"),
facetParams);
- try {
- rsp = query(p);
- pivots = rsp.getFacetPivot().get("place_s,company_t");
- assertEquals(4, pivots.size());
- firstPlace = pivots.get(0);
- assertPivot("place_s", "0placeholder", 6, firstPlace);
- firstCompany = firstPlace.getPivot().get(0);
- assertPivot("company_t", "bbc", 6, firstCompany);
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ rsp = query(p);
+ pivots = rsp.getFacetPivot().get("place_s,company_t");
+ assertEquals(4, pivots.size());
+ firstPlace = pivots.get(0);
+ assertPivot("place_s", "0placeholder", 6, firstPlace);
+ firstCompany = firstPlace.getPivot().get(0);
+ assertPivot("company_t", "bbc", 6, firstCompany);
}
// check of a single level pivot using sort=index w/mincount big enough
@@ -782,18 +768,14 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas
"facet", "true",
"facet.sort", "count"),
facetParams);
- try {
- rsp = query(p);
- pivots = rsp.getFacetPivot().get("place_s,company_t");
- assertEquals(103, pivots.size());
- firstPlace = pivots.get(0);
- assertPivot("place_s", "cardiff", 257, firstPlace);
- assertEquals(54, firstPlace.getPivot().size());
- firstCompany = firstPlace.getPivot().get(0);
- assertPivot("company_t", "bbc", 101, firstCompany);
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ rsp = query(p);
+ pivots = rsp.getFacetPivot().get("place_s,company_t");
+ assertEquals(103, pivots.size());
+ firstPlace = pivots.get(0);
+ assertPivot("place_s", "cardiff", 257, firstPlace);
+ assertEquals(54, firstPlace.getPivot().size());
+ firstCompany = firstPlace.getPivot().get(0);
+ assertPivot("company_t", "bbc", 101, firstCompany);
}
// Negative per-field facet limit (outer)
@@ -816,16 +798,12 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas
"facet", "true",
"facet.sort", "count"),
facetParams);
- try {
- rsp = query(p);
- pivots = rsp.getFacetPivot().get("place_s,id");
- assertEquals(100, pivots.size()); // default
- firstPlace = pivots.get(0);
- assertPivot("place_s", "cardiff", 257, firstPlace);
- assertEquals(257, firstPlace.getPivot().size());
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ rsp = query(p);
+ pivots = rsp.getFacetPivot().get("place_s,id");
+ assertEquals(100, pivots.size()); // default
+ firstPlace = pivots.get(0);
+ assertPivot("place_s", "cardiff", 257, firstPlace);
+ assertEquals(257, firstPlace.getPivot().size());
}
// Negative per-field facet limit (inner)
@@ -848,16 +826,12 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas
"facet", "true",
"facet.sort", "count"),
facetParams);
- try {
- rsp = query(p);
- pivots = rsp.getFacetPivot().get("place_s,id");
- assertEquals(103, pivots.size());
- firstPlace = pivots.get(0);
- assertPivot("place_s", "cardiff", 257, firstPlace);
- assertEquals(100, firstPlace.getPivot().size()); // default
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ rsp = query(p);
+ pivots = rsp.getFacetPivot().get("place_s,id");
+ assertEquals(103, pivots.size());
+ firstPlace = pivots.get(0);
+ assertPivot("place_s", "cardiff", 257, firstPlace);
+ assertEquals(100, firstPlace.getPivot().size()); // default
}
// Mincount + facet.pivot 2 different ways (swap field order)
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 49bc11090cc..ff77a3186b3 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
@@ -23,7 +23,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import junit.framework.AssertionFailedError;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.response.FieldStatsInfo;
import org.apache.solr.client.solrj.response.PivotField;
@@ -300,21 +299,16 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"facet.limit", "4"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(4, pivots.size());
- assertEquals("fujitsu", pivots.get(0).getValue());
- assertEquals(4, pivots.get(0).getCount());
- assertEquals("microsoft", pivots.get(1).getValue());
- assertEquals(5, pivots.get(1).getCount());
- assertEquals("null", pivots.get(2).getValue());
- assertEquals(6, pivots.get(2).getCount());
- assertEquals("polecat", pivots.get(3).getValue());
- assertEquals(6, pivots.get(3).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(4, pivots.size());
+ assertEquals("fujitsu", pivots.get(0).getValue());
+ assertEquals(4, pivots.get(0).getCount());
+ assertEquals("microsoft", pivots.get(1).getValue());
+ assertEquals(5, pivots.get(1).getCount());
+ assertEquals("null", pivots.get(2).getValue());
+ assertEquals(6, pivots.get(2).getCount());
+ assertEquals("polecat", pivots.get(3).getValue());
+ assertEquals(6, pivots.get(3).getCount());
}
// sort=index + mincount + limit + offset
@@ -339,19 +333,14 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"facet.offset", "1",
"facet.limit", "4"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(3, pivots.size()); // asked for 4, but not enough meet the mincount
- assertEquals("microsoft", pivots.get(0).getValue());
- assertEquals(5, pivots.get(0).getCount());
- assertEquals("null", pivots.get(1).getValue());
- assertEquals(6, pivots.get(1).getCount());
- assertEquals("polecat", pivots.get(2).getValue());
- assertEquals(6, pivots.get(2).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(3, pivots.size()); // asked for 4, but not enough meet the mincount
+ assertEquals("microsoft", pivots.get(0).getValue());
+ assertEquals(5, pivots.get(0).getCount());
+ assertEquals("null", pivots.get(1).getValue());
+ assertEquals(6, pivots.get(1).getCount());
+ assertEquals("polecat", pivots.get(2).getValue());
+ assertEquals(6, pivots.get(2).getCount());
}
// sort=index + mincount + limit + offset (more permutations)
@@ -381,15 +370,10 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"facet.pivot", "company_t"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(1, pivots.size());
- assertEquals(pivots.toString(), "null", pivots.get(0).getValue());
- assertEquals(pivots.toString(), 6, pivots.get(0).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(1, pivots.size());
+ assertEquals(pivots.toString(), "null", pivots.get(0).getValue());
+ assertEquals(pivots.toString(), 6, pivots.get(0).getCount());
}
doTestDeepPivotStats(false); // all price stats
@@ -1082,21 +1066,16 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"4"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(4, pivots.size());
- assertEquals("fujitsu", pivots.get(0).getValue());
- assertEquals(4, pivots.get(0).getCount());
- assertEquals("microsoft", pivots.get(1).getValue());
- assertEquals(5, pivots.get(1).getCount());
- assertEquals("null", pivots.get(2).getValue());
- assertEquals(6, pivots.get(2).getCount());
- assertEquals("polecat", pivots.get(3).getValue());
- assertEquals(6, pivots.get(3).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(4, pivots.size());
+ assertEquals("fujitsu", pivots.get(0).getValue());
+ assertEquals(4, pivots.get(0).getCount());
+ assertEquals("microsoft", pivots.get(1).getValue());
+ assertEquals(5, pivots.get(1).getCount());
+ assertEquals("null", pivots.get(2).getValue());
+ assertEquals(6, pivots.get(2).getCount());
+ assertEquals("polecat", pivots.get(3).getValue());
+ assertEquals(6, pivots.get(3).getCount());
}
// sort=index + mincount + limit + offset
@@ -1126,20 +1105,16 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"facet.limit",
"4"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(3, pivots.size()); // asked for 4, but not enough meet the
- // mincount
- assertEquals("microsoft", pivots.get(0).getValue());
- assertEquals(5, pivots.get(0).getCount());
- assertEquals("null", pivots.get(1).getValue());
- assertEquals(6, pivots.get(1).getCount());
- assertEquals("polecat", pivots.get(2).getValue());
- assertEquals(6, pivots.get(2).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(3, pivots.size()); // asked for 4, but not enough meet the
+ // mincount
+ assertEquals("microsoft", pivots.get(0).getValue());
+ assertEquals(5, pivots.get(0).getCount());
+ assertEquals("null", pivots.get(1).getValue());
+ assertEquals(6, pivots.get(1).getCount());
+ assertEquals("polecat", pivots.get(2).getValue());
+ assertEquals(6, pivots.get(2).getCount());
}
// sort=index + mincount + limit + offset (more permutations)
@@ -1170,15 +1145,10 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"company_t"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(1, pivots.size());
- assertEquals(pivots.toString(), "null", pivots.get(0).getValue());
- assertEquals(pivots.toString(), 6, pivots.get(0).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(1, pivots.size());
+ assertEquals(pivots.toString(), "null", pivots.get(0).getValue());
+ assertEquals(pivots.toString(), 6, pivots.get(0).getCount());
}
}
@@ -2028,21 +1998,16 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"4"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(4, pivots.size());
- assertEquals("fujitsu", pivots.get(0).getValue());
- assertEquals(4, pivots.get(0).getCount());
- assertEquals("microsoft", pivots.get(1).getValue());
- assertEquals(5, pivots.get(1).getCount());
- assertEquals("null", pivots.get(2).getValue());
- assertEquals(6, pivots.get(2).getCount());
- assertEquals("polecat", pivots.get(3).getValue());
- assertEquals(6, pivots.get(3).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(4, pivots.size());
+ assertEquals("fujitsu", pivots.get(0).getValue());
+ assertEquals(4, pivots.get(0).getCount());
+ assertEquals("microsoft", pivots.get(1).getValue());
+ assertEquals(5, pivots.get(1).getCount());
+ assertEquals("null", pivots.get(2).getValue());
+ assertEquals(6, pivots.get(2).getCount());
+ assertEquals("polecat", pivots.get(3).getValue());
+ assertEquals(6, pivots.get(3).getCount());
}
// sort=index + mincount + limit + offset
@@ -2072,20 +2037,15 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"facet.limit",
"4"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(3, pivots.size()); // asked for 4, but not enough meet the
- // mincount
- assertEquals("microsoft", pivots.get(0).getValue());
- assertEquals(5, pivots.get(0).getCount());
- assertEquals("null", pivots.get(1).getValue());
- assertEquals(6, pivots.get(1).getCount());
- assertEquals("polecat", pivots.get(2).getValue());
- assertEquals(6, pivots.get(2).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(3, pivots.size()); // asked for 4, but not enough meet the
+ // mincount
+ assertEquals("microsoft", pivots.get(0).getValue());
+ assertEquals(5, pivots.get(0).getCount());
+ assertEquals("null", pivots.get(1).getValue());
+ assertEquals(6, pivots.get(1).getCount());
+ assertEquals("polecat", pivots.get(2).getValue());
+ assertEquals(6, pivots.get(2).getCount());
}
// sort=index + mincount + limit + offset (more permutations)
@@ -2116,15 +2076,10 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
"company_t"),
variableParams);
- try {
- List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
- assertEquals(1, pivots.size());
- assertEquals(pivots.toString(), "null", pivots.get(0).getValue());
- assertEquals(pivots.toString(), 6, pivots.get(0).getCount());
-
- } catch (AssertionFailedError ae) {
- throw new AssertionError(ae.getMessage() + " <== " + p, ae);
- }
+ List<PivotField> pivots = query(p).getFacetPivot().get("company_t");
+ assertEquals(1, pivots.size());
+ assertEquals(pivots.toString(), "null", pivots.get(0).getValue());
+ assertEquals(pivots.toString(), 6, pivots.get(0).getCount());
}
}
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 07114e15627..b5d19730109 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
@@ -19,7 +19,6 @@ package org.apache.solr.handler.component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.SolrClient;
@@ -27,6 +26,7 @@ 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;
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 21ebf91d5e1..832f8a3e9e3 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
@@ -19,12 +19,12 @@ package org.apache.solr.handler.component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
import org.apache.solr.BaseDistributedSearchTestCase;
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;
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 0f259ca5383..10f57fb5515 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
@@ -36,6 +36,7 @@ import org.apache.solr.handler.component.PhrasesIdentificationComponent.Phrase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -469,10 +470,11 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
// "brown fox" should score positively in both fields, and overall...
final Phrase brown_fox = phrases.get(8);
assertEquals("BROWN fox", brown_fox.getSubSequence().toString());
- assertThat(
+ MatcherAssert.assertThat(
brown_fox.toString(), brown_fox.getFieldScore("multigrams_title"), greaterThan(0.0D));
- assertThat(brown_fox.toString(), brown_fox.getFieldScore("multigrams_body"), greaterThan(0.0D));
- assertThat(brown_fox.toString(), brown_fox.getTotalScore(), greaterThan(0.0D));
+ MatcherAssert.assertThat(
+ brown_fox.toString(), brown_fox.getFieldScore("multigrams_body"), greaterThan(0.0D));
+ MatcherAssert.assertThat(brown_fox.toString(), brown_fox.getTotalScore(), greaterThan(0.0D));
// "we lazy" does appear in a title value, but should score poorly given how often the terms
// are used in other contexts, and should score -1 against body -- but because of our weights,
@@ -481,8 +483,9 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
assertEquals("we lAzY", we_lazy.getSubSequence().toString());
assertEquals(we_lazy.toString(), -1.0D, we_lazy.getFieldScore("multigrams_body"), 0.0D);
- assertThat(we_lazy.toString(), we_lazy.getFieldScore("multigrams_title"), lessThan(0.0D));
- assertThat(we_lazy.toString(), we_lazy.getTotalScore(), lessThan(0.0D));
+ MatcherAssert.assertThat(
+ we_lazy.toString(), we_lazy.getFieldScore("multigrams_title"), lessThan(0.0D));
+ MatcherAssert.assertThat(we_lazy.toString(), we_lazy.getTotalScore(), lessThan(0.0D));
assertEquals(
we_lazy.toString(),
we_lazy.getFieldScore("multigrams_title"),
@@ -495,8 +498,9 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
final Phrase wawl = phrases.get(phrases.size() - 7);
assertEquals("why are we lAzY", wawl.getSubSequence().toString());
assertEquals(wawl.toString(), -1.0D, wawl.getFieldScore("multigrams_body"), 0.0D);
- assertThat(wawl.toString(), wawl.getFieldScore("multigrams_title"), greaterThan(0.0D));
- assertThat(wawl.toString(), wawl.getTotalScore(), greaterThan(0.0D));
+ MatcherAssert.assertThat(
+ wawl.toString(), wawl.getFieldScore("multigrams_title"), greaterThan(0.0D));
+ MatcherAssert.assertThat(wawl.toString(), wawl.getTotalScore(), greaterThan(0.0D));
assertEquals(
wawl.toString(), wawl.getFieldScore("multigrams_title"), wawl.getTotalScore(), 0.0D);
@@ -530,7 +534,7 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
// about stop words, but the stopword field should reject them
final Phrase why_the_lazy = phrases.get(2);
assertEquals("why the lazy", why_the_lazy.getSubSequence().toString());
- assertThat(
+ MatcherAssert.assertThat(
why_the_lazy.toString(),
why_the_lazy.getFieldScore("multigrams_title"),
greaterThan(0.0D));
@@ -542,7 +546,7 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
final Phrase the_lazy_dog = phrases.get(8);
assertEquals("the lazy dog", the_lazy_dog.getSubSequence().toString());
- assertThat(
+ MatcherAssert.assertThat(
the_lazy_dog.toString(),
the_lazy_dog.getFieldScore("multigrams_title"),
greaterThan(0.0D));
@@ -556,13 +560,13 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
// "brown fox" should score positively in both fields, and overall...
final Phrase brown_fox = phrases.get(phrases.size() - 2);
assertEquals("brown fox", brown_fox.getSubSequence().toString());
- assertThat(
+ MatcherAssert.assertThat(
brown_fox.toString(), brown_fox.getFieldScore("multigrams_title"), greaterThan(0.0D));
- assertThat(
+ MatcherAssert.assertThat(
brown_fox.toString(),
brown_fox.getFieldScore("multigrams_title_stop"),
greaterThan(0.0D));
- assertThat(brown_fox.toString(), brown_fox.getTotalScore(), greaterThan(0.0D));
+ MatcherAssert.assertThat(brown_fox.toString(), brown_fox.getTotalScore(), greaterThan(0.0D));
}
{ // now flip things: our analysisField filters stopwords,
@@ -594,13 +598,13 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
// "brown fox" should score positively in both fields, and overall...
final Phrase brown_fox = phrases.get(phrases.size() - 2);
assertEquals("brown fox", brown_fox.getSubSequence().toString());
- assertThat(
+ MatcherAssert.assertThat(
brown_fox.toString(), brown_fox.getFieldScore("multigrams_title"), greaterThan(0.0D));
- assertThat(
+ MatcherAssert.assertThat(
brown_fox.toString(),
brown_fox.getFieldScore("multigrams_title_stop"),
greaterThan(0.0D));
- assertThat(brown_fox.toString(), brown_fox.getTotalScore(), greaterThan(0.0D));
+ MatcherAssert.assertThat(brown_fox.toString(), brown_fox.getTotalScore(), greaterThan(0.0D));
}
}
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 6d6a0a1b5c5..39458e7dc19 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
@@ -35,6 +35,7 @@ import org.apache.solr.cloud.MultiSolrCloudTestCase;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.security.AllowListUrlChecker;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -129,15 +130,19 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
@Test
public void test() throws Exception {
- assertThat(getAllowListUrlChecker(EXPLICIT_CLUSTER_KEY).getHostAllowList(), notNullValue());
- assertThat(getAllowListUrlChecker(IMPLICIT_CLUSTER_KEY).getHostAllowList().isEmpty(), is(true));
-
- assertThat(getAllowListUrlChecker(EXPLICIT_CLUSTER_KEY).hasExplicitAllowList(), is(true));
- assertThat(getAllowListUrlChecker(IMPLICIT_CLUSTER_KEY).hasExplicitAllowList(), is(false));
+ MatcherAssert.assertThat(
+ getAllowListUrlChecker(EXPLICIT_CLUSTER_KEY).getHostAllowList(), notNullValue());
+ MatcherAssert.assertThat(
+ getAllowListUrlChecker(IMPLICIT_CLUSTER_KEY).getHostAllowList().isEmpty(), is(true));
+
+ MatcherAssert.assertThat(
+ getAllowListUrlChecker(EXPLICIT_CLUSTER_KEY).hasExplicitAllowList(), is(true));
+ MatcherAssert.assertThat(
+ getAllowListUrlChecker(IMPLICIT_CLUSTER_KEY).hasExplicitAllowList(), is(false));
for (MiniSolrCloudCluster cluster : clusterId2cluster.values()) {
for (JettySolrRunner runner : cluster.getJettySolrRunners()) {
URI uri = runner.getBaseUrl().toURI();
- assertThat(
+ MatcherAssert.assertThat(
getAllowListUrlChecker(EXPLICIT_CLUSTER_KEY).getHostAllowList(),
hasItem(uri.getHost() + ":" + uri.getPort()));
}
@@ -156,21 +161,21 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
cluster.getSolrClient().commit(COLLECTION_NAME, true, true);
// test using ClusterState elements
- assertThat(
+ MatcherAssert.assertThat(
"No shards specified, should work in both clusters",
numDocs("*:*", null, cluster),
is(10));
- assertThat(
+ MatcherAssert.assertThat(
"Both shards specified, should work in both clusters",
numDocs("*:*", "shard1,shard2", cluster),
is(10));
- assertThat(
+ MatcherAssert.assertThat(
"Both shards specified with collection name, should work in both clusters",
numDocs("*:*", COLLECTION_NAME + "_shard1", cluster),
is(numDocs("*:*", "shard1", cluster)));
// test using explicit urls from within the cluster
- assertThat(
+ MatcherAssert.assertThat(
"Shards has the full URLs, should be allowed since they are internal. Cluster="
+ entry.getKey(),
numDocs(
@@ -178,7 +183,7 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
getShardUrl("shard1", cluster) + "," + getShardUrl("shard2", cluster),
cluster),
is(10));
- assertThat(
+ MatcherAssert.assertThat(
"Full URL without scheme",
numDocs(
"*:*",
@@ -189,11 +194,11 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
is(10));
// Mix shards with URLs
- assertThat(
+ MatcherAssert.assertThat(
"Mix URL and cluster state object",
numDocs("*:*", "shard1," + getShardUrl("shard2", cluster), cluster),
is(10));
- assertThat(
+ MatcherAssert.assertThat(
"Mix URL and cluster state object",
numDocs("*:*", getShardUrl("shard1", cluster) + ",shard2", cluster),
is(10));
@@ -201,7 +206,7 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
// explicit allow-list includes all the nodes in both clusters. Requests should be allowed to go
// through
- assertThat(
+ MatcherAssert.assertThat(
"A request to the explicit cluster with shards that point to the implicit one",
numDocs(
"id:implicitCluster*",
@@ -209,7 +214,7 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
explicitCluster),
is(10));
- assertThat(
+ MatcherAssert.assertThat(
"A request to the explicit cluster with shards that point to the both clusters",
numDocs(
"*:*",
@@ -237,7 +242,7 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
assertForbidden("id:explicitCluster*", getShardUrl("shard1", explicitCluster), implicitCluster);
- assertThat(
+ MatcherAssert.assertThat(
"A typical internal request, should be handled locally",
numDocs(
"id:explicitCluster*",
@@ -271,9 +276,10 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {
numDocs(query, shards, cluster);
fail("Expecting failure for shards parameter: '" + shards + "'");
} catch (SolrServerException e) {
- assertThat(e.getCause(), instanceOf(SolrException.class));
- assertThat(((SolrException) e.getCause()).code(), is(SolrException.ErrorCode.FORBIDDEN.code));
- assertThat(e.getCause().getMessage(), containsString(expectedExceptionMessage));
+ MatcherAssert.assertThat(e.getCause(), instanceOf(SolrException.class));
+ MatcherAssert.assertThat(
+ ((SolrException) e.getCause()).code(), is(SolrException.ErrorCode.FORBIDDEN.code));
+ MatcherAssert.assertThat(e.getCause().getMessage(), containsString(expectedExceptionMessage));
} finally {
unIgnoreException(expectedExceptionMessage);
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java
index 3d02dc6c395..378f0b7da13 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java
@@ -20,6 +20,7 @@ import static org.hamcrest.core.Is.is;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.spelling.suggest.SuggesterParams;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -160,7 +161,7 @@ public class SuggestComponentContextFilterQueryTest extends SolrTestCaseJ4 {
SuggesterParams.SUGGEST_Q,
"examp"));
});
- assertThat(ex.getMessage(), is("this suggester doesn't support contexts"));
+ MatcherAssert.assertThat(ex.getMessage(), is("this suggester doesn't support contexts"));
// When not building, no exception is thrown
assertQ(
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java
index c17a7de012e..6c20bdcdf08 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java
@@ -32,6 +32,7 @@ import org.apache.solr.client.solrj.impl.LBSolrClient;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.core.CoreContainer;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -133,7 +134,7 @@ public class TestHttpShardHandlerFactory extends SolrTestCaseJ4 {
cc = CoreContainer.createAndLoad(home, home.resolve("solr.xml"));
factory = cc.getShardHandlerFactory();
assertTrue(factory instanceof HttpShardHandlerFactory);
- assertThat(
+ MatcherAssert.assertThat(
cc.getAllowListUrlChecker().getHostAllowList(),
equalTo(new HashSet<>(Arrays.asList("abc:8983", "def:8984"))));
} finally {
@@ -149,9 +150,9 @@ public class TestHttpShardHandlerFactory extends SolrTestCaseJ4 {
new HashSet<>(Arrays.asList("1.2.3.4:8983_solr", "1.2.3.4:9000_", "1.2.3.4:9001_solr-2"));
ClusterState cs = new ClusterState(liveNodes, new HashMap<>());
Set<String> hostSet = cs.getHostAllowList();
- assertThat(hostSet.size(), is(3));
- assertThat(hostSet, hasItem("1.2.3.4:8983"));
- assertThat(hostSet, hasItem("1.2.3.4:9000"));
- assertThat(hostSet, hasItem("1.2.3.4:9001"));
+ MatcherAssert.assertThat(hostSet.size(), is(3));
+ MatcherAssert.assertThat(hostSet, hasItem("1.2.3.4:8983"));
+ MatcherAssert.assertThat(hostSet, hasItem("1.2.3.4:9000"));
+ MatcherAssert.assertThat(hostSet, hasItem("1.2.3.4:9001"));
}
}
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 0484b87170c..801e282b118 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
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Arrays;
-import junit.framework.TestCase;
+import org.apache.solr.SolrTestCase;
/**
* CSVParserTest
@@ -30,7 +30,7 @@ import junit.framework.TestCase;
* approach for fixing a potential bug (it's likely that the parser itself fails if the lexer has
* problems...).
*/
-public class CSVParserTest extends TestCase {
+public class CSVParserTest extends SolrTestCase {
/** TestCSVParser. */
static class TestCSVParser extends CSVParser {
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 6a3a4c6768e..72038c44779 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
@@ -20,10 +20,10 @@ import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.Random;
-import junit.framework.TestCase;
+import org.apache.solr.SolrTestCase;
/** CSVPrinterTest */
-public class CSVPrinterTest extends TestCase {
+public class CSVPrinterTest extends SolrTestCase {
String lineSeparator = "\n";
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 eeaf6adee91..9163ac7a32e 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
@@ -16,7 +16,7 @@
*/
package org.apache.solr.internal.csv;
-import junit.framework.TestCase;
+import org.apache.solr.SolrTestCase;
/**
* CSVStrategyTest
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
* approach for fixing a potential bug (it's likely that the strategy itself fails if the lexer has
* problems...).
*/
-public class CSVStrategyTest extends TestCase {
+public class CSVStrategyTest extends SolrTestCase {
// ======================================================
// getters
diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVUtilsTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVUtilsTest.java
index 89018cf1bcd..fa115d30843 100644
--- a/solr/core/src/test/org/apache/solr/internal/csv/CSVUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVUtilsTest.java
@@ -17,10 +17,10 @@
package org.apache.solr.internal.csv;
import java.io.IOException;
-import junit.framework.TestCase;
+import org.apache.solr.SolrTestCase;
/** CSVUtilsTest */
-public class CSVUtilsTest extends TestCase {
+public class CSVUtilsTest extends SolrTestCase {
// ======================================================
// static parser tests
diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java
index 04fd256dc01..d2164e70ad2 100644
--- a/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java
+++ b/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java
@@ -16,10 +16,9 @@
*/
package org.apache.solr.internal.csv;
-import junit.framework.TestCase;
import org.apache.solr.SolrTestCaseJ4;
-public class CharBufferTest extends TestCase {
+public class CharBufferTest extends SolrTestCaseJ4 {
public void testCreate() {
CharBuffer cb = new CharBuffer();
assertEquals(0, cb.length());
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 07d78c5f48d..3fc74da5b44 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
@@ -18,10 +18,10 @@ package org.apache.solr.internal.csv;
import java.io.StringReader;
import java.util.Arrays;
-import junit.framework.TestCase;
+import org.apache.solr.SolrTestCase;
/** ExtendedBufferedReaderTest */
-public class ExtendedBufferedReaderTest extends TestCase {
+public class ExtendedBufferedReaderTest extends SolrTestCase {
// ======================================================
// the test cases
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 f0a2b2e2f5f..79b4ce3765a 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
@@ -17,11 +17,11 @@
package org.apache.solr.response;
-import static junit.framework.Assert.fail;
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;
diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
index 0a0b2c606e1..d330f30c393 100644
--- a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
@@ -27,6 +27,7 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.BasicResultContext;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -137,7 +138,7 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
"id, subject,[child parentFilter=\"subject:bleh\" childFilter=\"title:bar\" limit=2]"));
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(
+ MatcherAssert.assertThat(
e.getMessage(),
containsString(
"Parent filter 'QueryBitSetProducer(subject:bleh)' doesn't match any parent documents"));
@@ -156,7 +157,7 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
"id, subject,[child parentFilter=e childFilter=\"title:bar\" limit=2]"));
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(
+ MatcherAssert.assertThat(
e.getMessage(),
containsString(
"Parent filter 'QueryBitSetProducer(text:e)' doesn't match any parent documents"));
@@ -175,7 +176,8 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
"id, subject,[child parentFilter=\"\"]"));
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(e.getMessage(), containsString("Invalid Parent filter '', resolves to null"));
+ MatcherAssert.assertThat(
+ e.getMessage(), containsString("Invalid Parent filter '', resolves to null"));
}
private void testSubQueryXML() {
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
index d944341c9c2..e6db67578b0 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
@@ -47,6 +47,7 @@ import org.apache.solr.util.LogListener;
import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestBase;
import org.apache.solr.util.RestTestHarness;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -1290,8 +1291,10 @@ public class TestBulkSchemaAPI extends RestTestBase {
"/responseHeader/status==0");
assertEquals(2, listener.getCount());
- assertThat(listener.pollMessage(), containsString("hardcoded behavior is omitNorms=true"));
- assertThat(listener.pollMessage(), containsString("hardcoded behavior is termOffsets=false"));
+ MatcherAssert.assertThat(
+ listener.pollMessage(), containsString("hardcoded behavior is omitNorms=true"));
+ MatcherAssert.assertThat(
+ listener.pollMessage(), containsString("hardcoded behavior is termOffsets=false"));
// Add a date range field with violated invariants
assertJPost(
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 9fb039a88a3..5b5e0d763c4 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestSortableTextField.java
@@ -39,6 +39,7 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.RefCounted;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -291,23 +292,23 @@ public class TestSortableTextField extends SolrTestCaseJ4 {
"whitespace_l_stxt")) {
values = createIndexableFields(field);
assertEquals(field, 2, values.size());
- assertThat(field, values.get(0), instanceOf(Field.class));
- assertThat(field, values.get(1), instanceOf(SortedDocValuesField.class));
+ MatcherAssert.assertThat(field, values.get(0), instanceOf(Field.class));
+ MatcherAssert.assertThat(field, values.get(1), instanceOf(SortedDocValuesField.class));
}
// special cases...
values = createIndexableFields("whitespace_nois_stxt");
assertEquals(1, values.size());
- assertThat(values.get(0), instanceOf(SortedDocValuesField.class));
+ MatcherAssert.assertThat(values.get(0), instanceOf(SortedDocValuesField.class));
//
values = createIndexableFields("whitespace_nodv_stxt");
assertEquals(1, values.size());
- assertThat(values.get(0), instanceOf(Field.class));
+ MatcherAssert.assertThat(values.get(0), instanceOf(Field.class));
//
values = createIndexableFields("whitespace_m_stxt");
assertEquals(2, values.size());
- assertThat(values.get(0), instanceOf(Field.class));
- assertThat(values.get(1), instanceOf(SortedSetDocValuesField.class));
+ MatcherAssert.assertThat(values.get(0), instanceOf(Field.class));
+ MatcherAssert.assertThat(values.get(1), instanceOf(SortedSetDocValuesField.class));
}
private List<IndexableField> createIndexableFields(String fieldName) {
diff --git a/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java b/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java
index 74b2253db87..ee03fcd459f 100644
--- a/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java
+++ b/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java
@@ -38,6 +38,7 @@ import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
/**
@@ -85,7 +86,7 @@ public class CursorMarkTest extends SolrTestCaseJ4 {
previous.createNext(Arrays.<Object>asList(buildRandomSortObjects(otherSort)));
});
assertEquals(500, e.code());
- assertThat(e.getMessage(), containsString("sort values != sort length"));
+ MatcherAssert.assertThat(e.getMessage(), containsString("sort values != sort length"));
}
public void testInvalidUsage() {
diff --git a/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java b/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java
index edada27727a..3532cd5a15a 100644
--- a/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java
+++ b/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java
@@ -33,6 +33,7 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.RankField;
import org.apache.solr.search.RankQParserPlugin.RankQParser;
import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
public class RankQParserPluginTest extends SolrTestCaseJ4 {
@@ -312,7 +313,7 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {
QParser parser = getRankQParser(localParams, req());
Query q = parser.parse();
assertNotNull(q);
- assertThat(q.toString(), CoreMatchers.equalTo(expectedToString));
+ MatcherAssert.assertThat(q.toString(), CoreMatchers.equalTo(expectedToString));
}
private String expectedFeatureQueryToString(String fieldName, String function, float boost) {
@@ -345,7 +346,7 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {
private void assertSyntaxError(
String assertionMsg, String expectedExceptionMsg, ThrowingRunnable runnable) {
SyntaxError se = expectThrows(SyntaxError.class, assertionMsg, runnable);
- assertThat(se.getMessage(), CoreMatchers.containsString(expectedExceptionMsg));
+ MatcherAssert.assertThat(se.getMessage(), CoreMatchers.containsString(expectedExceptionMsg));
}
private RankQParser getRankQParser(SolrParams localParams, SolrQueryRequest req)
diff --git a/solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java b/solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java
index c6175d24dd7..a8b651f66b7 100644
--- a/solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java
+++ b/solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java
@@ -31,6 +31,7 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.response.SolrQueryResponse;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.BeforeClass;
@@ -74,19 +75,19 @@ public class TestBlockCollapse extends SolrTestCaseJ4 {
" nullPolicy=collapse",
// when policy is 'collapse' hint should be ignored...
" nullPolicy=collapse hint=block")) {
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector("{!collapse field=foo_s1" + np + "}", req),
instanceOf(CollapsingQParserPlugin.OrdScoreCollector.class));
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector("{!collapse field=foo_i" + np + "}", req),
instanceOf(CollapsingQParserPlugin.IntScoreCollector.class));
for (String selector : fieldValueSelectors) {
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector("{!collapse field=foo_s1 " + selector + np + "}", req),
instanceOf(CollapsingQParserPlugin.OrdFieldValueCollector.class));
}
for (String selector : fieldValueSelectors) {
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector("{!collapse field=foo_i " + selector + np + "}", req),
instanceOf(CollapsingQParserPlugin.IntFieldValueCollector.class));
}
@@ -94,15 +95,15 @@ public class TestBlockCollapse extends SolrTestCaseJ4 {
// anything with cscore() is (currently) off limits regardless of null policy or hint...
for (String selector : Arrays.asList(" min=sum(42,cscore())", " max=cscore()")) {
for (String hint : Arrays.asList("", " hint=block")) {
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector(
"{!collapse field=_root_" + selector + np + hint + "}", req),
instanceOf(CollapsingQParserPlugin.OrdFieldValueCollector.class));
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector(
"{!collapse field=foo_s1" + selector + np + hint + "}", req),
instanceOf(CollapsingQParserPlugin.OrdFieldValueCollector.class));
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector(
"{!collapse field=foo_i" + selector + np + hint + "}", req),
instanceOf(CollapsingQParserPlugin.IntFieldValueCollector.class));
@@ -112,29 +113,29 @@ public class TestBlockCollapse extends SolrTestCaseJ4 {
// block based collectors as long as nullPolicy isn't collapse...
for (String np : Arrays.asList("", " nullPolicy=ignore", " nullPolicy=expand")) {
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector(
"{!collapse field=_root_" + np + "}", req), // implicit block collection on _root_
instanceOf(CollapsingQParserPlugin.BlockOrdScoreCollector.class));
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector(
"{!collapse field=_root_ hint=top_fc" + np + "}",
req), // top_fc shouldn't stop implicit block collection
instanceOf(CollapsingQParserPlugin.BlockOrdScoreCollector.class));
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector("{!collapse field=foo_s1 hint=block" + np + "}", req),
instanceOf(CollapsingQParserPlugin.BlockOrdScoreCollector.class));
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector("{!collapse field=foo_i hint=block" + np + "}", req),
instanceOf(CollapsingQParserPlugin.BlockIntScoreCollector.class));
for (String selector : fieldValueSelectors) {
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector(
"{!collapse field=foo_s1 hint=block " + selector + np + "}", req),
instanceOf(CollapsingQParserPlugin.BlockOrdSortSpecCollector.class));
}
for (String selector : fieldValueSelectors) {
- assertThat(
+ MatcherAssert.assertThat(
parseAndBuildCollector(
"{!collapse field=foo_i hint=block " + selector + np + "}", req),
instanceOf(CollapsingQParserPlugin.BlockIntSortSpecCollector.class));
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 c6a7ac9cbc5..e0c8cfe22ac 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
@@ -34,6 +34,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.search.CollapsingQParserPlugin.GroupHeadSelector;
import org.apache.solr.search.CollapsingQParserPlugin.GroupHeadSelectorType;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -970,7 +971,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
"id")));
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, ex.code());
- assertThat(ex.getMessage(), containsString("Can not use collapse with Grouping enabled"));
+ MatcherAssert.assertThat(
+ ex.getMessage(), containsString("Can not use collapse with Grouping enabled"));
// delete the elevated docs, confirm collapsing still works
assertU(delI("1"));
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 46890df3a3c..b86ca6aa636 100644
--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
@@ -51,6 +51,7 @@ import org.apache.solr.common.util.Utils;
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;
@@ -1385,19 +1386,19 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
"edismax",
"debugQuery",
"true"));
- assertThat(
+ MatcherAssert.assertThat(
"phrase field queries spanning multiple fields should be within their own dismax queries",
parsedquery,
anyOf(
containsString("(phrase_sw:\"aaaa bbbb\" | phrase1_sw:\"aaaa bbbb\")"),
containsString("(phrase1_sw:\"aaaa bbbb\" | phrase_sw:\"aaaa bbbb\")")));
- assertThat(
+ MatcherAssert.assertThat(
"phrase field queries spanning multiple fields should be within their own dismax queries",
parsedquery,
anyOf(
containsString("(phrase_sw:\"bbbb cccc\" | phrase1_sw:\"bbbb cccc\")"),
containsString("(phrase1_sw:\"bbbb cccc\" | phrase_sw:\"bbbb cccc\")")));
- assertThat(
+ MatcherAssert.assertThat(
"phrase field queries spanning multiple fields should be within their own dismax queries",
parsedquery,
anyOf(
@@ -2301,20 +2302,20 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
"false",
"debugQuery",
"true"));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:barking | title:barking))"),
containsString("((title:barking | name:barking))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:curds | title:curds))"),
containsString("((title:curds | name:curds))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(containsString("((name:of | title:of))"), containsString("((title:of | name:of))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:stigma | title:stigma))"),
@@ -2332,20 +2333,20 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
"true",
"debugQuery",
"true"));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:barking | title:barking))"),
containsString("((title:barking | name:barking))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:curds | title:curds))"),
containsString("((title:curds | name:curds))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(containsString("((name:of | title:of))"), containsString("((title:of | name:of))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:stigma | title:stigma))"),
@@ -2361,20 +2362,20 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
"edismax",
"debugQuery",
"true")); // Default sow=false
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:barking | title:barking))"),
containsString("((title:barking | name:barking))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:curds | title:curds))"),
containsString("((title:curds | name:curds))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(containsString("((name:of | title:of))"), containsString("((title:of | name:of))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((name:stigma | title:stigma))"),
@@ -2499,13 +2500,13 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
"true",
"debugQuery",
"true"));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((text_sw:oliv | title:olive))"),
containsString("((title:olive | text_sw:oliv))")));
- assertThat(parsedquery, containsString("DisjunctionMaxQuery((title:the))"));
- assertThat(
+ MatcherAssert.assertThat(parsedquery, containsString("DisjunctionMaxQuery((title:the))"));
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((text_sw:other | title:other))"),
@@ -2524,7 +2525,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
"false",
"debugQuery",
"true"));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString(
@@ -2551,18 +2552,18 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
"100%",
"debugQuery",
"true"));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((text_sw:oliv | title:olive))"),
containsString("((title:olive | text_sw:oliv))")));
- assertThat(parsedquery, containsString("DisjunctionMaxQuery((title:the))"));
- assertThat(
+ MatcherAssert.assertThat(parsedquery, containsString("DisjunctionMaxQuery((title:the))"));
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((text_sw:other | title:other))"),
containsString("((title:other | text_sw:other))")));
- assertThat(parsedquery, containsString("))~3"));
+ MatcherAssert.assertThat(parsedquery, containsString("))~3"));
parsedquery =
getParsedQuery(
@@ -2579,7 +2580,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
"100%",
"debugQuery",
"true"));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString(
@@ -2603,17 +2604,17 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
sow,
"debugQuery",
"true"));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((text_sw:oliv | title:olive))"),
containsString("((title:olive | text_sw:oliv))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((text_sw:blah | title:blah))"),
containsString("((title:blah | text_sw:blah))")));
- assertThat(
+ MatcherAssert.assertThat(
parsedquery,
anyOf(
containsString("((text_sw:other | title:other))"),
@@ -3026,7 +3027,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
try (SolrQueryRequest req = req(params)) {
QParser qParser = QParser.getParser("grackle", "edismax", req);
Query q = qParser.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -3036,7 +3037,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
qParser = QParser.getParser("grackle wi fi", "edismax", req);
q = qParser.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -3050,7 +3051,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
try (SolrQueryRequest req = req(sowTrueParams)) {
QParser qParser = QParser.getParser("grackle", "edismax", req);
Query q = qParser.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -3060,7 +3061,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
qParser = QParser.getParser("grackle wi fi", "edismax", req);
q = qParser.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
booleanQuery(
@@ -3078,7 +3079,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
try (SolrQueryRequest req = req("sow", "false", "qf", "subject title")) {
QParser qParser = QParser.getParser("one two", "edismax", req);
Query q = qParser.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
booleanQuery(
@@ -3089,7 +3090,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
try (SolrQueryRequest req = req("sow", "false", "qf", "subject title^5")) {
QParser qParser = QParser.getParser("one two", "edismax", req);
Query q = qParser.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
booleanQuery(
@@ -3100,7 +3101,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
try (SolrQueryRequest req = req("sow", "false", "qf", "subject^3 title")) {
QParser qParser = QParser.getParser("one two", "edismax", req);
Query q = qParser.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
booleanQuery(
@@ -3111,7 +3112,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
try (SolrQueryRequest req = req("sow", "false", "qf", "subject^10 title^20")) {
QParser qParser = QParser.getParser("one two", "edismax", req);
Query q = qParser.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
booleanQuery(
@@ -3344,7 +3345,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
// test valid field names
String response = h.query(req(params));
- assertThat(
+ MatcherAssert.assertThat(
response,
allOf(
containsString("+(+DisjunctionMaxQuery(("),
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 4517b5b6e1d..c29b28b96c2 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java
@@ -19,7 +19,6 @@ package org.apache.solr.search;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import junit.framework.Assert;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
@@ -39,6 +38,7 @@ 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 {
diff --git a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
index 6c4aaeba0ea..6a625fba59e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
@@ -36,6 +36,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.legacy.LegacyNumericRangeQuery;
+import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -65,7 +66,7 @@ public class TestMaxScoreQueryParser extends SolrTestCaseJ4 {
expected = IndexOrDocValuesQuery.class;
}
}
- assertThat(q, Matchers.instanceOf(expected));
+ MatcherAssert.assertThat(q, Matchers.instanceOf(expected));
}
@Test
@@ -95,7 +96,7 @@ public class TestMaxScoreQueryParser extends SolrTestCaseJ4 {
assertEquals(2, qa.size());
final Collection<String> qaStrings =
qa.stream().map(q -> q.toString()).collect(Collectors.toList());
- org.hamcrest.MatcherAssert.assertThat(qaStrings, hasItem("text:foo"));
+ MatcherAssert.assertThat(qaStrings, hasItem("text:foo"));
}
@Test
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 2385ceeb035..3c71eba2fe4 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java
@@ -32,6 +32,7 @@ import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.SolrParams;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -290,7 +291,7 @@ public class TestRandomCollapseQParserPlugin extends SolrTestCaseJ4 {
SolrException e = expectThrows(SolrException.class, () -> SOLR.query(solrParams));
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(e.getMessage(), containsString("Invalid nullPolicy: " + nullPolicy));
+ MatcherAssert.assertThat(e.getMessage(), containsString("Invalid nullPolicy: " + nullPolicy));
// valid nullPolicy
assertQ(req("q", "*:*", "fq", "{!collapse field=id nullPolicy=" + randomNullPolicy() + "}"));
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
index f8c2d5f028b..e2e79f9fe1d 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
@@ -57,6 +57,7 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.NumberType;
import org.apache.solr.schema.SchemaField;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -456,7 +457,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
SolrException.class,
"expected SolrException",
() -> assertJQ(req("q", too_long), "/response/numFound==6"));
- assertThat(e.getMessage(), containsString(expectedMsg));
+ MatcherAssert.assertThat(e.getMessage(), containsString(expectedMsg));
// but should still work as a filter query since TermsQuery can be used...
assertJQ(req("q", "*:*", "fq", too_long), "/response/numFound==6");
@@ -487,7 +488,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
SolrException.class,
"expected SolrException",
() -> assertJQ(req("q", way_too_long), "/response/numFound==6"));
- assertThat(e.getMessage(), containsString(expectedMsg));
+ MatcherAssert.assertThat(e.getMessage(), containsString(expectedMsg));
assertNotNull(e.getCause());
assertEquals(SyntaxError.class, e.getCause().getClass());
@@ -1153,7 +1154,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
public void testSynonymQueryStyle() throws Exception {
String field = "t_pick_best_foo";
Query q = QParser.getParser("tabby", req(params("df", field))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
disjunctionOf(
termQuery(field, "cat"),
@@ -1163,7 +1164,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
field = "t_as_distinct_foo";
q = QParser.getParser("tabby", req(params("df", field))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
termQuery(field, "cat"),
@@ -1179,7 +1180,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
field = "t_pick_best_foo";
q = QParser.getParser("jeans", req(params("df", field, "sow", "false"))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q, booleanQuery(disjunctionOf(termQuery(field, "jean"), phraseQuery(field, "denim pant"))));
}
@@ -1188,7 +1189,8 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
// tiger, tigre|0.9
String field = "t_pick_best_boosted_foo";
Query q = QParser.getParser("tiger", req(params("df", field))).getQuery();
- assertThat(q, disjunctionOf(termQuery(field, "tiger"), boosted(field, "tigre", 0.9f)));
+ MatcherAssert.assertThat(
+ q, disjunctionOf(termQuery(field, "tiger"), boosted(field, "tigre", 0.9f)));
field = "t_as_distinct_boosted_foo";
q = QParser.getParser("tiger", req(params("df", "t_as_distinct_boosted_foo"))).getQuery();
@@ -1204,12 +1206,12 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
// lynx => lince|0.8, lynx_canadensis|0.9
field = "t_pick_best_boosted_foo";
q = QParser.getParser("lynx", req(params("df", field))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q, disjunctionOf(boosted(field, "lince", 0.8f), boosted(field, "lynx_canadensis", 0.9f)));
field = "t_as_distinct_boosted_foo";
q = QParser.getParser("lynx", req(params("df", field))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q, booleanQuery(boosted(field, "lince", 0.8f), boosted(field, "lynx_canadensis", 0.9f)));
field = "t_as_same_term_boosted_foo";
@@ -1224,7 +1226,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
// leopard, big cat|0.8, bagheera|0.9, panthera pardus|0.85
String field = "t_pick_best_boosted_foo";
Query q = QParser.getParser("leopard", req(params("df", "t_pick_best_boosted_foo"))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -1245,7 +1247,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
// lion => panthera leo|0.9, simba leo|0.8, kimba|0.75
q = QParser.getParser("lion", req(params("df", "t_pick_best_boosted_foo"))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -1270,7 +1272,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
// lynx => lince|0.8, lynx_canadensis|0.9
String field = "t_pick_best_boosted_foo";
Query q = QParser.getParser("tiger lynx", req(params("df", field))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(boosted(field, "lince", 0.8f), boosted(field, "lynx_canadensis", 0.9f)),
@@ -1295,7 +1297,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
// lion => panthera leo|0.9, simba leo|0.8, kimba|0.75
String field = "t_pick_best_boosted_foo";
Query q = QParser.getParser("leopard lion", req(params("df", field))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -1332,7 +1334,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
Query q =
QParser.getParser("panthera pardus story", req(params("df", field, "sow", "false")))
.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
termQuery(field, "story"),
@@ -1389,7 +1391,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
String field = "t_pick_best_boosted_foo";
Query q =
QParser.getParser("panthera blytheae", req(params("df", field, "sow", "false"))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -1420,7 +1422,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
String field = "t_pick_best_boosted_foo";
Query q =
QParser.getParser("snow leopard", req(params("df", field, "sow", "false"))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf( // TODO why does this generate a single clause Boolean?
@@ -1450,7 +1452,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
QParser.getParser(
"panthera onca", req(params("df", "t_pick_best_boosted_foo", "sow", "false")))
.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -1483,7 +1485,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
Query q =
QParser.getParser("panthera pardus tiger", req(params("df", field, "sow", "false")))
.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(boosted(field, "leopard", 0.6f), phraseQuery(field, "panthera pardus")),
@@ -1516,7 +1518,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
Query q =
QParser.getParser("snow leopard panthera onca", req(params("df", field, "sow", "false")))
.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
@@ -1559,7 +1561,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
true,
req(params("sow", "false", "qf", field + "^10")))
.getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
booleanQuery(
@@ -1649,7 +1651,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
// leopard, big cat|0.8, bagheera|0.9, panthera pardus|0.85
String field = "t_pick_best_boosted_foo";
Query q = QParser.getParser("leopard", req(params("df", field))).getQuery();
- assertThat(
+ MatcherAssert.assertThat(
q,
booleanQuery(
disjunctionOf(
diff --git a/solr/core/src/test/org/apache/solr/search/TestTaskManagement.java b/solr/core/src/test/org/apache/solr/search/TestTaskManagement.java
index 9e44b1cd6b8..097906a3067 100644
--- a/solr/core/src/test/org/apache/solr/search/TestTaskManagement.java
+++ b/solr/core/src/test/org/apache/solr/search/TestTaskManagement.java
@@ -41,6 +41,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.NamedList;
import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
@@ -170,9 +171,9 @@ public class TestTaskManagement extends SolrCloudTestCase {
presentQueryIDs.add(Integer.parseInt(entry.getKey()));
}
- assertThat(presentQueryIDs.size(), betweenInclusive(0, 50));
+ MatcherAssert.assertThat(presentQueryIDs.size(), betweenInclusive(0, 50));
for (int value : presentQueryIDs) {
- assertThat(value, betweenInclusive(0, 49));
+ MatcherAssert.assertThat(value, betweenInclusive(0, 49));
}
}
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetErrors.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetErrors.java
index ea83c64ac21..d7a75ee4940 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetErrors.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetErrors.java
@@ -23,6 +23,7 @@ import org.apache.solr.JSONTestUtil;
import org.apache.solr.SolrTestCaseHS;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -587,7 +588,7 @@ public class TestJsonFacetErrors extends SolrTestCaseHS {
h.query(req("q", "*:*", "json.facet", "{bleh:'div(2,4)'}"));
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(
+ MatcherAssert.assertThat(
e.getMessage(),
containsString(
"Expected multi-doc aggregation from 'div' but got per-doc function in input ('div(2,4)"));
@@ -599,7 +600,7 @@ public class TestJsonFacetErrors extends SolrTestCaseHS {
h.query(req("q", "*:*", "json.facet", "{b:'agg(div(2,4))'}"));
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(
+ MatcherAssert.assertThat(
e.getMessage(),
containsString(
"Expected multi-doc aggregation from 'div' but got per-doc function in input ('agg(div(2,4))"));
@@ -611,7 +612,7 @@ public class TestJsonFacetErrors extends SolrTestCaseHS {
h.query(req("q", "*:*", "json.facet", "{b:'agg(bleh(2,4))'}"));
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(
+ MatcherAssert.assertThat(
e.getMessage(), containsString("Unknown aggregation 'bleh' in input ('agg(bleh(2,4))"));
e =
@@ -621,7 +622,8 @@ public class TestJsonFacetErrors extends SolrTestCaseHS {
h.query(req("q", "*:*", "json.facet", "{b:'bleh(2,4)'}"));
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(e.getMessage(), containsString("Unknown aggregation 'bleh' in input ('bleh(2,4)"));
+ MatcherAssert.assertThat(
+ e.getMessage(), containsString("Unknown aggregation 'bleh' in input ('bleh(2,4)"));
resetExceptionIgnores();
}
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetsStatsParsing.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetsStatsParsing.java
index 8cea716ddbd..ae356065748 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetsStatsParsing.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetsStatsParsing.java
@@ -49,10 +49,10 @@ public class TestJsonFacetsStatsParsing extends SolrTestCaseJ4 {
new FacetRequest.FacetSort("foo", FacetRequest.SortDirection.asc),
new FacetRequest.FacetSort("foo", FacetRequest.SortDirection.asc));
// negative assertions...
- assertThat(
+ MatcherAssert.assertThat(
new FacetRequest.FacetSort("foo", FacetRequest.SortDirection.desc),
not(new FacetRequest.FacetSort("foo", FacetRequest.SortDirection.asc)));
- assertThat(
+ MatcherAssert.assertThat(
new FacetRequest.FacetSort("bar", FacetRequest.SortDirection.desc),
not(new FacetRequest.FacetSort("foo", FacetRequest.SortDirection.desc)));
}
diff --git a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java
index f13bbcbb5da..d834f4f87e1 100644
--- a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java
+++ b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java
@@ -30,6 +30,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.CaffeineCache;
import org.apache.solr.search.DocSet;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -101,7 +102,8 @@ public class TestJsonRequest extends SolrTestCaseHS {
SolrException ex =
expectThrows(SolrException.class, () -> client.testJQ(params("q", "*:*", "json", "5")));
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, ex.code());
- assertThat(ex.getMessage(), containsString("Expected JSON Object but got Long=5"));
+ MatcherAssert.assertThat(
+ ex.getMessage(), containsString("Expected JSON Object but got Long=5"));
// this is to verify other json params are not affected
client.testJQ(params("q", "cat_s:A", "json.limit", "1"), "response/numFound==2");
@@ -560,7 +562,7 @@ public class TestJsonRequest extends SolrTestCaseHS {
() -> {
client.testJQ(params("json", "{query:{'lucene':'foo_s:ignore_exception'}}"));
});
- assertThat(e.getMessage(), containsString("foo_s"));
+ MatcherAssert.assertThat(e.getMessage(), containsString("foo_s"));
// test failure on unknown parameter
e =
@@ -571,7 +573,7 @@ public class TestJsonRequest extends SolrTestCaseHS {
params("json", "{query:'cat_s:A', foobar_ignore_exception:5}"),
"response/numFound==2");
});
- assertThat(e.getMessage(), containsString("foobar"));
+ MatcherAssert.assertThat(e.getMessage(), containsString("foobar"));
resetExceptionIgnores();
}
diff --git a/solr/core/src/test/org/apache/solr/security/AllowListUrlCheckerTest.java b/solr/core/src/test/org/apache/solr/security/AllowListUrlCheckerTest.java
index f129be79179..394c847260f 100644
--- a/solr/core/src/test/org/apache/solr/security/AllowListUrlCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/security/AllowListUrlCheckerTest.java
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Set;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
/** Tests {@link AllowListUrlChecker}. */
@@ -40,14 +41,14 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
SolrException e =
expectThrows(
SolrException.class, () -> checker.checkAllowList(urls("abc-1.com:8983/solr")));
- assertThat(e.code(), is(SolrException.ErrorCode.FORBIDDEN.code));
+ MatcherAssert.assertThat(e.code(), is(SolrException.ErrorCode.FORBIDDEN.code));
AllowListUrlChecker.ALLOW_ALL.checkAllowList(urls("abc-1.com:8983/solr"));
}
@Test
public void testNoInput() throws Exception {
- assertThat(
+ MatcherAssert.assertThat(
new AllowListUrlChecker(Collections.emptyList()).getHostAllowList().isEmpty(), is(true));
}
@@ -85,8 +86,8 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
SolrException e =
expectThrows(
SolrException.class, () -> checker.checkAllowList(urls("http://abc-4.com:8983/solr")));
- assertThat(e.code(), is(SolrException.ErrorCode.FORBIDDEN.code));
- assertThat(e.getMessage(), containsString("http://abc-4.com:8983/solr"));
+ MatcherAssert.assertThat(e.code(), is(SolrException.ErrorCode.FORBIDDEN.code));
+ MatcherAssert.assertThat(e.getMessage(), containsString("http://abc-4.com:8983/solr"));
}
@Test
@@ -98,8 +99,8 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
expectThrows(
SolrException.class,
() -> checker.checkAllowList(urls("abc-1.com:8983/solr", "abc-4.com:8983/solr")));
- assertThat(e.code(), is(SolrException.ErrorCode.FORBIDDEN.code));
- assertThat(e.getMessage(), containsString("abc-4.com:8983/solr"));
+ MatcherAssert.assertThat(e.code(), is(SolrException.ErrorCode.FORBIDDEN.code));
+ MatcherAssert.assertThat(e.getMessage(), containsString("abc-4.com:8983/solr"));
}
@Test
@@ -117,7 +118,7 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
expectThrows(
MalformedURLException.class,
() -> new AllowListUrlChecker(urls("http/abc-1.com:8983")));
- assertThat(e.getMessage(), containsString("http/abc-1.com:8983"));
+ MatcherAssert.assertThat(e.getMessage(), containsString("http/abc-1.com:8983"));
}
@Test
@@ -129,7 +130,7 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
expectThrows(
MalformedURLException.class,
() -> checker.checkAllowList(urls("http://abc-1.com:8983", "abc-2")));
- assertThat(e.getMessage(), containsString("abc-2"));
+ MatcherAssert.assertThat(e.getMessage(), containsString("abc-2"));
}
@Test
@@ -143,19 +144,20 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
@Test
public void testHostParsingUnsetEmpty() throws Exception {
- assertThat(AllowListUrlChecker.parseHostPorts(Collections.emptyList()).isEmpty(), is(true));
+ MatcherAssert.assertThat(
+ AllowListUrlChecker.parseHostPorts(Collections.emptyList()).isEmpty(), is(true));
}
@Test
public void testHostParsingSingle() throws Exception {
- assertThat(
+ MatcherAssert.assertThat(
AllowListUrlChecker.parseHostPorts(urls("http://abc-1.com:8983/solr/core1")),
equalTo(hosts("abc-1.com:8983")));
}
@Test
public void testHostParsingMulti() throws Exception {
- assertThat(
+ MatcherAssert.assertThat(
AllowListUrlChecker.parseHostPorts(
urls("http://abc-1.com:8983/solr/core1", "http://abc-1.com:8984/solr")),
equalTo(hosts("abc-1.com:8983", "abc-1.com:8984")));
@@ -163,7 +165,7 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
@Test
public void testHostParsingIpv4() throws Exception {
- assertThat(
+ MatcherAssert.assertThat(
AllowListUrlChecker.parseHostPorts(
urls("http://10.0.0.1:8983/solr/core1", "http://127.0.0.1:8984/solr")),
equalTo(hosts("10.0.0.1:8983", "127.0.0.1:8984")));
@@ -171,7 +173,7 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
@Test
public void testHostParsingIpv6() throws Exception {
- assertThat(
+ MatcherAssert.assertThat(
AllowListUrlChecker.parseHostPorts(
urls(
"http://[2001:abc:abc:0:0:123:456:1234]:8983/solr/core1",
@@ -181,17 +183,17 @@ public class AllowListUrlCheckerTest extends SolrTestCaseJ4 {
@Test
public void testHostParsingHttps() throws Exception {
- assertThat(
+ MatcherAssert.assertThat(
AllowListUrlChecker.parseHostPorts(urls("https://abc-1.com:8983/solr/core1")),
equalTo(hosts("abc-1.com:8983")));
}
@Test
public void testHostParsingNoProtocol() throws Exception {
- assertThat(
+ MatcherAssert.assertThat(
AllowListUrlChecker.parseHostPorts(urls("abc-1.com:8983/solr")),
equalTo(AllowListUrlChecker.parseHostPorts(urls("http://abc-1.com:8983/solr"))));
- assertThat(
+ MatcherAssert.assertThat(
AllowListUrlChecker.parseHostPorts(urls("abc-1.com:8983/solr")),
equalTo(AllowListUrlChecker.parseHostPorts(urls("https://abc-1.com:8983/solr"))));
}
diff --git a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
index ef52229219d..e30aa9515ab 100644
--- a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
@@ -54,6 +54,7 @@ import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.security.AuthorizationContext.CollectionRequest;
import org.apache.solr.security.AuthorizationContext.RequestType;
import org.apache.solr.util.LogLevel;
+import org.hamcrest.MatcherAssert;
import org.hamcrest.core.IsInstanceOf;
import org.junit.Before;
import org.junit.Test;
@@ -542,7 +543,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
@Test
public void testAllPermissionAllowsActionsWhenUserHasCorrectRole() {
SolrRequestHandler handler = new UpdateRequestHandler();
- assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
+ MatcherAssert.assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
setUserRole("dev", "dev");
setUserRole("admin", "admin");
addPermission("all", "dev", "admin");
@@ -563,7 +564,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
STATUS_OK);
handler = new PropertiesRequestHandler();
- assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
+ MatcherAssert.assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
checkRules(
Map.of(
"resource",
@@ -589,7 +590,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
@Test
public void testAllPermissionAllowsActionsWhenAssociatedRoleIsWildcard() {
SolrRequestHandler handler = new UpdateRequestHandler();
- assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
+ MatcherAssert.assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
setUserRole("dev", "dev");
setUserRole("admin", "admin");
addPermission("all", "*");
@@ -610,7 +611,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
STATUS_OK);
handler = new PropertiesRequestHandler();
- assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
+ MatcherAssert.assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
checkRules(
Map.of(
"resource",
@@ -636,7 +637,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
@Test
public void testAllPermissionDeniesActionsWhenUserIsNotCorrectRole() {
SolrRequestHandler handler = new UpdateRequestHandler();
- assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
+ MatcherAssert.assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
setUserRole("dev", "dev");
setUserRole("admin", "admin");
addPermission("all", "admin");
@@ -657,7 +658,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
FORBIDDEN);
handler = new PropertiesRequestHandler();
- assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
+ MatcherAssert.assertThat(handler, new IsInstanceOf(PermissionNameProvider.class));
checkRules(
Map.of(
"resource",
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 6db4d696073..d19cf56c7bc 100644
--- a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
+++ b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
@@ -36,6 +36,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.core.RateLimiterConfig;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -186,7 +187,7 @@ public class TestRequestRateLimiter extends SolrCloudTestCase {
try {
assertTrue(future.get() != null);
} catch (Exception e) {
- assertThat(
+ MatcherAssert.assertThat(
e.getMessage(), containsString("non ok status: 429, message:Too Many Requests"));
}
}
diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
index c923e1b4aff..f3f3c5e18ad 100644
--- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
+++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.solr.update;
+import static org.hamcrest.core.StringContains.containsString;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -67,13 +69,12 @@ import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.RefCounted;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -97,8 +98,6 @@ public class AddBlockUpdateTest extends SolrTestCaseJ4 {
private RefCounted<SolrIndexSearcher> searcherRef;
private SolrIndexSearcher _searcher;
- @Rule public ExpectedException thrown = ExpectedException.none();
-
@BeforeClass
public static void beforeClass() throws Exception {
String oldCacheNamePropValue = System.getProperty("blockJoinParentFilterCache");
@@ -323,10 +322,11 @@ public class AddBlockUpdateTest extends SolrTestCaseJ4 {
SolrInputDocument exceptionChildDoc = (SolrInputDocument) document1.get("child1_s").getValue();
addChildren("child", exceptionChildDoc, 0, false);
- thrown.expect(SolrException.class);
- final String expectedMessage = "Anonymous child docs can only hang from others or the root";
- thrown.expectMessage(expectedMessage);
- indexSolrInputDocumentsDirectly(document1);
+ SolrException thrown =
+ assertThrows(SolrException.class, () -> indexSolrInputDocumentsDirectly(document1));
+ MatcherAssert.assertThat(
+ thrown.getMessage(),
+ containsString("Anonymous child docs can only hang from others or the root"));
}
@Test
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 33cca6c994f..7a603bd74cc 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
@@ -42,6 +42,7 @@ import org.apache.solr.schema.IndexSchema;
import org.apache.solr.update.PeerSync.MissedUpdatesRequest;
import org.apache.solr.update.processor.DistributedUpdateProcessor;
import org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
@@ -347,7 +348,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
add(client0, inPlaceParams, sdoc("id", 6000, "val_i_dvo", 6003, "_version_", 5007));
});
assertEquals(ex.toString(), SolrException.ErrorCode.SERVER_ERROR.code, ex.code());
- assertThat(ex.getMessage(), containsString("Can't find document with id=6000"));
+ MatcherAssert.assertThat(ex.getMessage(), containsString("Can't find document with id=6000"));
// Reordered DBQ with Child-nodes (SOLR-10114)
docsAdded.clear();
diff --git a/solr/core/src/test/org/apache/solr/update/RootFieldTest.java b/solr/core/src/test/org/apache/solr/update/RootFieldTest.java
index 9170eb6cd97..1592e71f5d0 100644
--- a/solr/core/src/test/org/apache/solr/update/RootFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/update/RootFieldTest.java
@@ -27,10 +27,9 @@ import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class RootFieldTest extends EmbeddedSolrServerTestBase {
private static boolean useRootSchema;
@@ -38,8 +37,6 @@ public class RootFieldTest extends EmbeddedSolrServerTestBase {
"Update handler should create and process _root_ field "
+ "unless there is no such a field in schema";
- @Rule public ExpectedException thrown = ExpectedException.none();
-
private static boolean expectRoot() {
return useRootSchema;
}
@@ -70,15 +67,15 @@ public class RootFieldTest extends EmbeddedSolrServerTestBase {
query.set(CommonParams.FL, "id,name,_root_");
SolrDocumentList results = client.query(query).getResults();
- assertThat(results.getNumFound(), is(1L));
+ MatcherAssert.assertThat(results.getNumFound(), is(1L));
SolrDocument foundDoc = results.get(0);
// Check retrieved field values
- assertThat(foundDoc.getFieldValue("id"), is(docId));
- assertThat(foundDoc.getFieldValue("name"), is("child free doc"));
+ MatcherAssert.assertThat(foundDoc.getFieldValue("id"), is(docId));
+ MatcherAssert.assertThat(foundDoc.getFieldValue("name"), is("child free doc"));
String expectedRootValue = expectRoot() ? docId : null;
- assertThat(MESSAGE, foundDoc.getFieldValue("_root_"), is(expectedRootValue));
+ MatcherAssert.assertThat(MESSAGE, foundDoc.getFieldValue("_root_"), is(expectedRootValue));
// Update the doc
docToUpdate.setField("name", "updated doc");
@@ -90,9 +87,9 @@ public class RootFieldTest extends EmbeddedSolrServerTestBase {
foundDoc = results.get(0);
// Check updated field values
- assertThat(foundDoc.getFieldValue("id"), is(docId));
- assertThat(foundDoc.getFieldValue("name"), is("updated doc"));
- assertThat(MESSAGE, foundDoc.getFieldValue("_root_"), is(expectedRootValue));
+ MatcherAssert.assertThat(foundDoc.getFieldValue("id"), is(docId));
+ MatcherAssert.assertThat(foundDoc.getFieldValue("name"), is("updated doc"));
+ MatcherAssert.assertThat(MESSAGE, foundDoc.getFieldValue("_root_"), is(expectedRootValue));
}
@Test
@@ -110,13 +107,21 @@ public class RootFieldTest extends EmbeddedSolrServerTestBase {
child.addField("name", "child doc");
docToUpdate.addChildDocument(child);
if (!useRootSchema) {
- thrown.expect(SolrException.class);
- thrown.expectMessage(
+ String message =
"Unable to index docs with children:"
+ " the schema must include definitions for both a uniqueKey field"
- + " and the '_root_' field, using the exact same fieldType");
+ + " and the '_root_' field, using the exact same fieldType";
+ SolrException thrown =
+ assertThrows(
+ SolrException.class,
+ () -> {
+ client.add(docToUpdate);
+ });
+ assertEquals(message, thrown.getMessage());
+
+ } else {
+ client.add(docToUpdate);
}
- client.add(docToUpdate);
client.commit();
}
}
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java
index a9e3e5299b5..731d65ce02c 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java
@@ -42,7 +42,7 @@ import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.UpdateParams;
-import org.junit.Assert;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -92,7 +92,7 @@ public class TestInPlaceUpdateWithRouteField extends SolrCloudTestCase {
Long initialVersion = (Long) solrDocument.get("_version_");
Integer luceneDocId = (Integer) solrDocument.get("[docid]");
String shardName = (String) solrDocument.get("shardName");
- Assert.assertThat(solrDocument.get("inplace_updatable_int"), is(id));
+ MatcherAssert.assertThat(solrDocument.get("inplace_updatable_int"), is(id));
int newDocValue = TestUtil.nextInt(random(), 1, 2 * NUMBER_OF_DOCS - 1);
SolrInputDocument sdoc =
@@ -117,12 +117,12 @@ public class TestInPlaceUpdateWithRouteField extends SolrCloudTestCase {
updateRequest.commit(cluster.getSolrClient(), COLLECTION);
solrDocument = queryDoc(id);
Long newVersion = (Long) solrDocument.get("_version_");
- Assert.assertTrue(
+ assertTrue(
"Version of updated document must be greater than original one",
newVersion > initialVersion);
- Assert.assertThat(
+ MatcherAssert.assertThat(
"Doc value must be updated", solrDocument.get("inplace_updatable_int"), is(newDocValue));
- Assert.assertThat(
+ MatcherAssert.assertThat(
"Lucene doc id should not be changed for In-Place Updates.",
solrDocument.get("[docid]"),
is(luceneDocId));
@@ -147,7 +147,8 @@ public class TestInPlaceUpdateWithRouteField extends SolrCloudTestCase {
r.process(cluster.getSolrClient(), COLLECTION);
});
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
- assertThat(e.getMessage(), containsString("Unable to update doc in-place: " + id));
+ MatcherAssert.assertThat(
+ e.getMessage(), containsString("Unable to update doc in-place: " + id));
}
private void checkWrongCommandFailure(SolrInputDocument sdoc)
@@ -156,7 +157,7 @@ public class TestInPlaceUpdateWithRouteField extends SolrCloudTestCase {
new UpdateRequest().add(sdoc).process(cluster.getSolrClient(), COLLECTION);
fail("expect an exception for wrong update command");
} catch (SolrException ex) {
- assertThat("expecting 400 in " + ex.getMessage(), ex.code(), is(400));
+ MatcherAssert.assertThat("expecting 400 in " + ex.getMessage(), ex.code(), is(400));
}
}
@@ -181,7 +182,7 @@ public class TestInPlaceUpdateWithRouteField extends SolrCloudTestCase {
COLLECTION);
QueryResponse response = cluster.getSolrClient().query(COLLECTION, query);
SolrDocumentList result = (SolrDocumentList) response.getResponse().get("response");
- Assert.assertThat(result.getNumFound(), is(1L));
+ MatcherAssert.assertThat(result.getNumFound(), is(1L));
return result.get(0);
}
}
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 92ff239cf04..dd819b690c3 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
@@ -334,8 +334,8 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {
null);
});
assertEquals(exception.toString(), SolrException.ErrorCode.CONFLICT.code, exception.code());
- assertThat(exception.getMessage(), containsString("expected=-1"));
- assertThat(exception.getMessage(), containsString("actual=" + v20));
+ MatcherAssert.assertThat(exception.getMessage(), containsString("expected=-1"));
+ MatcherAssert.assertThat(exception.getMessage(), containsString("actual=" + v20));
long oldV20 = v20;
v20 =
@@ -350,8 +350,8 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {
null);
});
assertEquals(exception.toString(), SolrException.ErrorCode.CONFLICT.code, exception.code());
- assertThat(exception.getMessage(), containsString("expected=" + oldV20));
- assertThat(exception.getMessage(), containsString("actual=" + v20));
+ MatcherAssert.assertThat(exception.getMessage(), containsString("expected=" + oldV20));
+ MatcherAssert.assertThat(exception.getMessage(), containsString("actual=" + v20));
v20 =
addAndAssertVersion(
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 1fdb12c675e..1355f5b783f 100644
--- a/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
+++ b/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
@@ -17,6 +17,8 @@
package org.apache.solr.update;
+import static org.hamcrest.Matchers.containsString;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -32,11 +34,10 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.update.processor.NestedUpdateProcessorFactory;
import org.apache.solr.update.processor.UpdateRequestProcessor;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class TestNestedUpdateProcessor extends SolrTestCaseJ4 {
@@ -101,8 +102,6 @@ public class TestNestedUpdateProcessor extends SolrTestCaseJ4 {
+ " }\n"
+ "}";
- @Rule public ExpectedException thrown = ExpectedException.none();
-
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig-minimal.xml", "schema-nest.xml");
@@ -265,9 +264,8 @@ public class TestNestedUpdateProcessor extends SolrTestCaseJ4 {
public void testDeeplyNestedURPFieldNameException() throws Exception {
final String errMsg =
"contains: '" + PATH_SEP_CHAR + "' , which is reserved for the nested URP";
- thrown.expect(SolrException.class);
- indexSampleData(errDoc);
- thrown.expectMessage(errMsg);
+ SolrException thrown = assertThrows(SolrException.class, () -> indexSampleData(errDoc));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString(errMsg));
}
private void indexSampleData(String cmd) throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java b/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
index 6a35c3df32c..34a2f194016 100644
--- a/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
+++ b/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
@@ -28,6 +28,7 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.handler.component.RealTimeGetComponent;
import org.apache.solr.request.SolrQueryRequest;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -181,8 +182,9 @@ public class UpdateLogTest extends SolrTestCaseJ4 {
+ returnVal);
});
assertEquals(ex.toString(), SolrException.ErrorCode.INVALID_STATE.code, ex.code());
- assertThat(ex.getMessage(), containsString("should've been either ADD or UPDATE_INPLACE"));
- assertThat(ex.getMessage(), containsString("looking for id=1"));
+ MatcherAssert.assertThat(
+ ex.getMessage(), containsString("should've been either ADD or UPDATE_INPLACE"));
+ MatcherAssert.assertThat(ex.getMessage(), containsString("looking for id=1"));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java b/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java
index a2ccab1fd88..e461b68091a 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java
@@ -35,6 +35,7 @@ import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer.RequestWriterSupplier;
import org.apache.solr.common.util.ByteArrayUtf8CharSequence;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -92,14 +93,14 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
Collection<Object> fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(3, fieldValues.size());
- assertThat(
+ MatcherAssert.assertThat(
fieldValues, hasItems(vc.apply(values[0]), vc.apply(values[1]), vc.apply(values[2])));
- assertThat(fieldValues, not(hasItems(vc.apply(values[3]))));
+ MatcherAssert.assertThat(fieldValues, not(hasItems(vc.apply(values[3]))));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertEquals(3, fieldValues.size());
- assertThat(
+ MatcherAssert.assertThat(
fieldValues, hasItems(vc.apply(values[1]), vc.apply(values[2]), vc.apply(values[3])));
- assertThat(fieldValues, not(hasItems(vc.apply(values[0]))));
+ MatcherAssert.assertThat(fieldValues, not(hasItems(vc.apply(values[0]))));
getSolrClient()
.add(sdoc("id", "20000", fieldName, ImmutableMap.of("remove", List.of(values[0]))));
@@ -114,13 +115,13 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(2, fieldValues.size());
- assertThat(fieldValues, hasItems(vc.apply(values[1]), vc.apply(values[2])));
- assertThat(fieldValues, not(hasItems(vc.apply(values[0]), vc.apply(values[3]))));
+ MatcherAssert.assertThat(fieldValues, hasItems(vc.apply(values[1]), vc.apply(values[2])));
+ MatcherAssert.assertThat(fieldValues, not(hasItems(vc.apply(values[0]), vc.apply(values[3]))));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertEquals(3, fieldValues.size());
- assertThat(
+ MatcherAssert.assertThat(
fieldValues, hasItems(vc.apply(values[1]), vc.apply(values[2]), vc.apply(values[3])));
- assertThat(fieldValues, not(hasItems(vc.apply(values[0]))));
+ MatcherAssert.assertThat(fieldValues, not(hasItems(vc.apply(values[0]))));
getSolrClient()
.add(
@@ -140,12 +141,12 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(2, fieldValues.size());
- assertThat(fieldValues, hasItems(vc.apply(values[1]), vc.apply(values[2])));
- assertThat(fieldValues, not(hasItems(vc.apply(values[0]), vc.apply(values[3]))));
+ MatcherAssert.assertThat(fieldValues, hasItems(vc.apply(values[1]), vc.apply(values[2])));
+ MatcherAssert.assertThat(fieldValues, not(hasItems(vc.apply(values[0]), vc.apply(values[3]))));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertEquals(1, fieldValues.size());
- assertThat(fieldValues, hasItems(vc.apply(values[3])));
- assertThat(
+ MatcherAssert.assertThat(fieldValues, hasItems(vc.apply(values[3])));
+ MatcherAssert.assertThat(
fieldValues, not(hasItems(vc.apply(values[0]), vc.apply(values[1]), vc.apply(values[2]))));
getSolrClient()
@@ -173,13 +174,13 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(1, fieldValues.size());
- assertThat(fieldValues, hasItems(vc.apply(values[0])));
- assertThat(
+ MatcherAssert.assertThat(fieldValues, hasItems(vc.apply(values[0])));
+ MatcherAssert.assertThat(
fieldValues, not(hasItems(vc.apply(values[1]), vc.apply(values[2]), vc.apply(values[3]))));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertEquals(1, fieldValues.size());
- assertThat(fieldValues, hasItems(vc.apply(values[0])));
- assertThat(
+ MatcherAssert.assertThat(fieldValues, hasItems(vc.apply(values[0])));
+ MatcherAssert.assertThat(
fieldValues, not(hasItems(vc.apply(values[1]), vc.apply(values[2]), vc.apply(values[3]))));
getSolrClient()
@@ -206,13 +207,13 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(4, fieldValues.size());
- assertThat(
+ MatcherAssert.assertThat(
fieldValues,
hasItems(
vc.apply(values[0]), vc.apply(values[1]), vc.apply(values[2]), vc.apply(values[3])));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertEquals(4, fieldValues.size());
- assertThat(
+ MatcherAssert.assertThat(
fieldValues,
hasItems(
vc.apply(values[0]), vc.apply(values[1]), vc.apply(values[2]), vc.apply(values[3])));
@@ -274,10 +275,10 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
Collection<Object> fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(2, fieldValues.size());
- assertThat(fieldValues, hasItems(true, false));
+ MatcherAssert.assertThat(fieldValues, hasItems(true, false));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertEquals(2, fieldValues.size());
- assertThat(fieldValues, hasItems(true, false));
+ MatcherAssert.assertThat(fieldValues, hasItems(true, false));
getSolrClient().add(sdoc("id", "20000", fieldName, ImmutableMap.of("remove", List.of(false))));
getSolrClient().commit(true, true);
@@ -287,10 +288,10 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(1, fieldValues.size());
- assertThat(fieldValues, hasItems(true));
+ MatcherAssert.assertThat(fieldValues, hasItems(true));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertEquals(2, fieldValues.size());
- assertThat(fieldValues, hasItems(true, false));
+ MatcherAssert.assertThat(fieldValues, hasItems(true, false));
getSolrClient()
.add(sdoc("id", "20001", fieldName, ImmutableMap.of("remove", List.of(true, false))));
@@ -301,8 +302,8 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(1, fieldValues.size());
- assertThat(fieldValues, hasItems(true));
- assertThat(fieldValues, not(hasItems(false)));
+ MatcherAssert.assertThat(fieldValues, hasItems(true));
+ MatcherAssert.assertThat(fieldValues, not(hasItems(false)));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertNull(fieldValues);
@@ -317,7 +318,7 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(3, fieldValues.size());
- assertThat(fieldValues, hasItems(true, false));
+ MatcherAssert.assertThat(fieldValues, hasItems(true, false));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertNull(fieldValues);
@@ -333,10 +334,10 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase extends EmbeddedSo
fieldValues = getSolrClient().getById("20000").getFieldValues(fieldName);
assertEquals(2, fieldValues.size());
- assertThat(fieldValues, hasItems(true, false));
+ MatcherAssert.assertThat(fieldValues, hasItems(true, false));
fieldValues = getSolrClient().getById("20001").getFieldValues(fieldName);
assertEquals(2, fieldValues.size());
- assertThat(fieldValues, hasItems(true, false));
+ MatcherAssert.assertThat(fieldValues, hasItems(true, false));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorFactoryTest.java
index a68c41adad4..1615c483bd9 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorFactoryTest.java
@@ -24,6 +24,7 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Test;
@@ -84,7 +85,7 @@ public class ClassificationUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
ClassificationUpdateProcessorParams classificationParams =
cFactoryToTest.getClassificationParams();
- assertThat(classificationParams.getPredictedClassField(), is("classField1"));
+ MatcherAssert.assertThat(classificationParams.getPredictedClassField(), is("classField1"));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
index 86dc4409ae2..003385316dd 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.solr.update.processor;
-import static org.hamcrest.core.Is.is;
-
import java.io.IOException;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
@@ -81,9 +79,9 @@ public class ClassificationUpdateProcessorIntegrationTest extends SolrTestCaseJ4
addDoc(commit());
Document doc22 = getDoc("22");
- assertThat(doc22.get(CLASS), is("class2"));
+ assertEquals("class2", doc22.get(CLASS));
Document doc21 = getDoc("21");
- assertThat(doc21.get(CLASS), is("class1"));
+ assertEquals("class1", doc21.get(CLASS));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
index 3e4cbeee234..8108ae658e0 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
@@ -36,6 +36,7 @@ import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.update.AddUpdateCommand;
+import org.hamcrest.MatcherAssert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -104,7 +105,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
new ClassificationUpdateProcessor(params, mockProcessor, reader, req().getSchema());
updateProcessorToTest.processAdd(update);
- assertThat(unseenDocument1.getFieldValue(PREDICTED_CLASS), is("class2"));
+ MatcherAssert.assertThat(unseenDocument1.getFieldValue(PREDICTED_CLASS), is("class2"));
}
@Test
@@ -124,7 +125,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
new ClassificationUpdateProcessor(params, mockProcessor, reader, req().getSchema());
updateProcessorToTest.processAdd(update);
- assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class2"));
+ MatcherAssert.assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class2"));
}
@Test
@@ -146,7 +147,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
updateProcessorToTest.processAdd(update);
- assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class2"));
+ MatcherAssert.assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class2"));
}
@Test
@@ -166,7 +167,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
new ClassificationUpdateProcessor(params, mockProcessor, reader, req().getSchema());
updateProcessorToTest.processAdd(update);
- assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class1"));
+ MatcherAssert.assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class1"));
}
@Test
@@ -188,7 +189,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
new ClassificationUpdateProcessor(params, mockProcessor, reader, req().getSchema());
updateProcessorToTest.processAdd(update);
- assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class3"));
+ MatcherAssert.assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class3"));
}
@Test
@@ -210,7 +211,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
updateProcessorToTest.processAdd(update);
- assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class2"));
+ MatcherAssert.assertThat(unseenDocument1.getFieldValue(TRAINING_CLASS), is("class2"));
}
@Test
@@ -234,8 +235,8 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
@SuppressWarnings({"unchecked"})
ArrayList<Object> assignedClasses = (ArrayList) unseenDocument1.getFieldValues(TRAINING_CLASS);
- assertThat(assignedClasses.get(0), is("class2"));
- assertThat(assignedClasses.get(1), is("class1"));
+ MatcherAssert.assertThat(assignedClasses.get(0), is("class2"));
+ MatcherAssert.assertThat(assignedClasses.get(1), is("class1"));
}
@Test
@@ -258,9 +259,9 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
@SuppressWarnings({"unchecked"})
ArrayList<Object> assignedClasses = (ArrayList) unseenDocument1.getFieldValues(TRAINING_CLASS);
- assertThat(assignedClasses.size(), is(2));
- assertThat(assignedClasses.get(0), is("class2"));
- assertThat(assignedClasses.get(1), is("class1"));
+ MatcherAssert.assertThat(assignedClasses.size(), is(2));
+ MatcherAssert.assertThat(assignedClasses.get(0), is("class2"));
+ MatcherAssert.assertThat(assignedClasses.get(1), is("class1"));
}
@Test
@@ -283,9 +284,9 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
@SuppressWarnings({"unchecked"})
ArrayList<Object> assignedClasses = (ArrayList) unseenDocument1.getFieldValues(TRAINING_CLASS);
- assertThat(assignedClasses.size(), is(2));
- assertThat(assignedClasses.get(0), is("class2"));
- assertThat(assignedClasses.get(1), is("class1"));
+ MatcherAssert.assertThat(assignedClasses.size(), is(2));
+ MatcherAssert.assertThat(assignedClasses.get(0), is("class2"));
+ MatcherAssert.assertThat(assignedClasses.get(1), is("class1"));
}
@Test
@@ -311,9 +312,9 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
@SuppressWarnings({"unchecked"})
ArrayList<Object> assignedClasses = (ArrayList) unseenDocument1.getFieldValues(TRAINING_CLASS);
- assertThat(assignedClasses.size(), is(2));
- assertThat(assignedClasses.get(0), is("class4"));
- assertThat(assignedClasses.get(1), is("class6"));
+ MatcherAssert.assertThat(assignedClasses.size(), is(2));
+ MatcherAssert.assertThat(assignedClasses.get(0), is("class4"));
+ MatcherAssert.assertThat(assignedClasses.get(1), is("class6"));
}
@Test
@@ -339,9 +340,9 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
@SuppressWarnings({"unchecked"})
ArrayList<Object> assignedClasses = (ArrayList) unseenDocument1.getFieldValues(TRAINING_CLASS);
- assertThat(assignedClasses.size(), is(2));
- assertThat(assignedClasses.get(0), is("class4"));
- assertThat(assignedClasses.get(1), is("class6"));
+ MatcherAssert.assertThat(assignedClasses.size(), is(2));
+ MatcherAssert.assertThat(assignedClasses.get(0), is("class4"));
+ MatcherAssert.assertThat(assignedClasses.get(1), is("class6"));
}
private ClassificationUpdateProcessorParams initParams(
diff --git a/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java
index a1289db36a7..874201b9ae4 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java
@@ -40,6 +40,7 @@ import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.TimedVersionBucket;
import org.apache.solr.update.UpdateLog;
import org.apache.solr.update.VersionInfo;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -105,11 +106,11 @@ public class DistributedUpdateProcessorTest extends SolrTestCaseJ4 {
};
int succeeded = runCommands(threads, 1000, req, versionAddFunc);
// only one should succeed
- assertThat(succeeded, is(1));
+ MatcherAssert.assertThat(succeeded, is(1));
succeeded = runCommands(threads, -1, req, versionAddFunc);
// all should succeed
- assertThat(succeeded, is(threads));
+ MatcherAssert.assertThat(succeeded, is(threads));
}
@Test
@@ -130,11 +131,11 @@ public class DistributedUpdateProcessorTest extends SolrTestCaseJ4 {
int succeeded = runCommands(threads, 1000, req, versionDeleteFunc);
// only one should succeed
- assertThat(succeeded, is(1));
+ MatcherAssert.assertThat(succeeded, is(1));
succeeded = runCommands(threads, -1, req, versionDeleteFunc);
// all should succeed
- assertThat(succeeded, is(threads));
+ MatcherAssert.assertThat(succeeded, is(threads));
}
/**
diff --git a/solr/core/src/test/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactoryTest.java
index 6ef37a62578..07667cdfaba 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactoryTest.java
@@ -33,6 +33,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.util.LogListener;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
public class IgnoreLargeDocumentProcessorFactoryTest extends SolrTestCase {
@@ -69,7 +70,7 @@ public class IgnoreLargeDocumentProcessorFactoryTest extends SolrTestCase {
try (LogListener listener = LogListener.warn(IgnoreLargeDocumentProcessorFactory.class)) {
processor.processAdd(getUpdate(1024));
- assertThat(
+ MatcherAssert.assertThat(
listener.pollMessage(),
containsString("Skipping doc because estimated size exceeds limit"));
}
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java
index 0f8cf1d20b9..8aec63cf9ab 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java
@@ -31,7 +31,6 @@ import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.AddUpdateCommand;
import org.junit.After;
import org.junit.BeforeClass;
-import org.junit.rules.ExpectedException;
public class TemplateUpdateProcessorTest extends SolrCloudTestCase {
@@ -46,8 +45,6 @@ public class TemplateUpdateProcessorTest extends SolrCloudTestCase {
cluster.shutdown();
}
- @org.junit.Rule public ExpectedException expectedException = ExpectedException.none();
-
public void testSimple() throws Exception {
ModifiableSolrParams params =
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 ace4bdf86ed..7ff2c37a4cf 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
@@ -36,6 +36,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -696,7 +697,7 @@ public class TestDocBasedVersionConstraints extends SolrTestCaseJ4 {
config.add("versionField", "_version_");
factory.init(config);
IndexSchema schema = h.getCore().getLatestSchema();
- assertThat(factory.canCreateTombstoneDocument(schema), is(true));
+ MatcherAssert.assertThat(factory.canCreateTombstoneDocument(schema), is(true));
}
public void testCanCreateTombstonesMissingRequiredField() {
@@ -707,11 +708,11 @@ public class TestDocBasedVersionConstraints extends SolrTestCaseJ4 {
factory.init(config);
IndexSchema schema = h.getCore().getLatestSchema();
SchemaField sf = schema.getField("sku1");
- assertThat(sf, is(not(nullValue())));
- assertThat(schema.getRequiredFields(), not(hasItem(sf)));
+ MatcherAssert.assertThat(sf, is(not(nullValue())));
+ MatcherAssert.assertThat(schema.getRequiredFields(), not(hasItem(sf)));
try {
schema.getRequiredFields().add(sf);
- assertThat(factory.canCreateTombstoneDocument(schema), is(false));
+ MatcherAssert.assertThat(factory.canCreateTombstoneDocument(schema), is(false));
} finally {
schema.getRequiredFields().remove(sf);
}
@@ -728,7 +729,7 @@ public class TestDocBasedVersionConstraints extends SolrTestCaseJ4 {
SchemaField sf2 = new SchemaField("sku1_with_default", sf.getType(), sf.getProperties(), "foo");
try {
schema.getRequiredFields().add(sf2);
- assertThat(factory.canCreateTombstoneDocument(schema), is(true));
+ MatcherAssert.assertThat(factory.canCreateTombstoneDocument(schema), is(true));
} finally {
schema.getRequiredFields().remove(sf2);
}
@@ -745,11 +746,11 @@ public class TestDocBasedVersionConstraints extends SolrTestCaseJ4 {
factory.init(config);
IndexSchema schema = h.getCore().getLatestSchema();
SchemaField sf = schema.getField("sku1");
- assertThat(sf, is(not(nullValue())));
- assertThat(schema.getRequiredFields(), not(hasItem(sf)));
+ MatcherAssert.assertThat(sf, is(not(nullValue())));
+ MatcherAssert.assertThat(schema.getRequiredFields(), not(hasItem(sf)));
try {
schema.getRequiredFields().add(sf);
- assertThat(factory.canCreateTombstoneDocument(schema), is(true));
+ MatcherAssert.assertThat(factory.canCreateTombstoneDocument(schema), is(true));
} finally {
schema.getRequiredFields().remove(sf);
}
@@ -763,11 +764,11 @@ public class TestDocBasedVersionConstraints extends SolrTestCaseJ4 {
factory.init(config);
IndexSchema schema = h.getCore().getLatestSchema();
SchemaField versionField = schema.getField("_version_");
- assertThat(versionField, is(not(nullValue())));
- assertThat(schema.getRequiredFields(), not(hasItem(versionField)));
+ MatcherAssert.assertThat(versionField, is(not(nullValue())));
+ MatcherAssert.assertThat(schema.getRequiredFields(), not(hasItem(versionField)));
try {
schema.getRequiredFields().add(versionField);
- assertThat(factory.canCreateTombstoneDocument(schema), is(true));
+ MatcherAssert.assertThat(factory.canCreateTombstoneDocument(schema), is(true));
} finally {
schema.getRequiredFields().remove(versionField);
}
@@ -781,10 +782,10 @@ public class TestDocBasedVersionConstraints extends SolrTestCaseJ4 {
factory.init(config);
IndexSchema schema = h.getCore().getLatestSchema();
SchemaField uniqueKeyField = schema.getField("id");
- assertThat(uniqueKeyField, is(not(nullValue())));
- assertThat(uniqueKeyField, equalTo(schema.getUniqueKeyField()));
- assertThat(schema.getRequiredFields(), hasItem(schema.getUniqueKeyField()));
- assertThat(factory.canCreateTombstoneDocument(schema), is(true));
+ MatcherAssert.assertThat(uniqueKeyField, is(not(nullValue())));
+ MatcherAssert.assertThat(uniqueKeyField, equalTo(schema.getUniqueKeyField()));
+ MatcherAssert.assertThat(schema.getRequiredFields(), hasItem(schema.getUniqueKeyField()));
+ MatcherAssert.assertThat(factory.canCreateTombstoneDocument(schema), is(true));
}
private void updateWithChain(String chain, String... fields) throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/util/ModuleUtilsTest.java b/solr/core/src/test/org/apache/solr/util/ModuleUtilsTest.java
index 957c7268af4..b5629222c35 100644
--- a/solr/core/src/test/org/apache/solr/util/ModuleUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/ModuleUtilsTest.java
@@ -21,14 +21,15 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Set;
-import junit.framework.TestCase;
+import org.apache.solr.SolrTestCase;
-public class ModuleUtilsTest extends TestCase {
+public class ModuleUtilsTest extends SolrTestCase {
private Path mockRootDir;
private final Set<String> expectedMods = Set.of("mod1", "mod2");
@Override
public void setUp() throws Exception {
+ super.setUp();
mockRootDir = setupMockInstallDir(expectedMods);
}
diff --git a/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
index d377ba2a518..e39b63d7f39 100644
--- a/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
+++ b/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
@@ -39,6 +39,7 @@ import org.apache.solr.util.circuitbreaker.CPUCircuitBreaker;
import org.apache.solr.util.circuitbreaker.CircuitBreaker;
import org.apache.solr.util.circuitbreaker.CircuitBreakerManager;
import org.apache.solr.util.circuitbreaker.MemoryCircuitBreaker;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -164,7 +165,8 @@ public class TestCircuitBreaker extends SolrTestCaseJ4 {
try {
h.query(req("name:\"john smith\""));
} catch (SolrException e) {
- assertThat(e.getMessage(), containsString("Circuit Breakers tripped"));
+ MatcherAssert.assertThat(
+ e.getMessage(), containsString("Circuit Breakers tripped"));
failureCount.incrementAndGet();
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
@@ -224,7 +226,8 @@ public class TestCircuitBreaker extends SolrTestCaseJ4 {
try {
h.query(req("name:\"john smith\""));
} catch (SolrException e) {
- assertThat(e.getMessage(), containsString("Circuit Breakers tripped"));
+ MatcherAssert.assertThat(
+ e.getMessage(), containsString("Circuit Breakers tripped"));
failureCount.incrementAndGet();
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
diff --git a/solr/core/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java b/solr/core/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java
index 00bdcd9e729..82456d716ce 100644
--- a/solr/core/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java
@@ -18,20 +18,21 @@
package org.apache.solr.util.configuration;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.util.configuration.providers.EnvSSLCredentialProvider;
import org.apache.solr.util.configuration.providers.SysPropSSLCredentialProvider;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
-public class SSLConfigurationsTest {
+public class SSLConfigurationsTest extends SolrTestCase {
private Map<String, String> envs;
private SSLConfigurations sut;
@@ -55,7 +56,8 @@ public class SSLConfigurationsTest {
SSLConfigurations.SysProps.SSL_CLIENT_TRUST_STORE_PASSWORD);
@Before
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
envs = new HashMap<>();
}
@@ -72,14 +74,14 @@ public class SSLConfigurationsTest {
public void testSslConfigKeystorePwFromKeystoreEnvVar() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_KEY_STORE_PASSWORD, SAMPLE_PW1);
createSut().init();
- assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW1));
+ MatcherAssert.assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW1));
}
@Test
public void testSslConfigKeystorePwFromClientKeystoreEnvVar() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_CLIENT_KEY_STORE_PASSWORD, SAMPLE_PW2);
createSut().init();
- assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW2));
}
@Test
@@ -87,7 +89,7 @@ public class SSLConfigurationsTest {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_KEY_STORE_PASSWORD, SAMPLE_PW1);
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_CLIENT_KEY_STORE_PASSWORD, SAMPLE_PW2);
createSut().init();
- assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW2));
}
@Test
@@ -96,21 +98,22 @@ public class SSLConfigurationsTest {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_KEY_STORE_PASSWORD, SAMPLE_PW1);
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_CLIENT_KEY_STORE_PASSWORD, SAMPLE_PW2);
createSut().init();
- assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW3)); // unchanged
+ MatcherAssert.assertThat(
+ System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW3)); // unchanged
}
@Test
public void testSslConfigTruststorePwFromKeystoreEnvVar() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_TRUST_STORE_PASSWORD, SAMPLE_PW1);
createSut().init();
- assertThat(System.getProperty(CLIENT_TRUST_STORE_PASSWORD), is(SAMPLE_PW1));
+ MatcherAssert.assertThat(System.getProperty(CLIENT_TRUST_STORE_PASSWORD), is(SAMPLE_PW1));
}
@Test
public void testSslConfigTruststorePwFromClientKeystoreEnvVar() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD, SAMPLE_PW2);
createSut().init();
- assertThat(System.getProperty(CLIENT_TRUST_STORE_PASSWORD), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(System.getProperty(CLIENT_TRUST_STORE_PASSWORD), is(SAMPLE_PW2));
}
@Test
@@ -118,7 +121,7 @@ public class SSLConfigurationsTest {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_TRUST_STORE_PASSWORD, SAMPLE_PW1);
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD, SAMPLE_PW2);
createSut().init();
- assertThat(System.getProperty(CLIENT_TRUST_STORE_PASSWORD), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(System.getProperty(CLIENT_TRUST_STORE_PASSWORD), is(SAMPLE_PW2));
}
@Test
@@ -127,62 +130,63 @@ public class SSLConfigurationsTest {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_TRUST_STORE_PASSWORD, SAMPLE_PW1);
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD, SAMPLE_PW2);
createSut().init();
- assertThat(System.getProperty(CLIENT_TRUST_STORE_PASSWORD), is(SAMPLE_PW3)); // unchanged
+ MatcherAssert.assertThat(
+ System.getProperty(CLIENT_TRUST_STORE_PASSWORD), is(SAMPLE_PW3)); // unchanged
}
@Test
public void testGetKeyStorePasswordFromProperty() {
System.setProperty(KEY_STORE_PASSWORD, SAMPLE_PW1);
- assertThat(createSut().getKeyStorePassword(), is(SAMPLE_PW1));
+ MatcherAssert.assertThat(createSut().getKeyStorePassword(), is(SAMPLE_PW1));
}
@Test
public void testGetKeyStorePasswordFromEnv() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_KEY_STORE_PASSWORD, SAMPLE_PW2);
- assertThat(createSut().getKeyStorePassword(), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(createSut().getKeyStorePassword(), is(SAMPLE_PW2));
}
@Test
public void testGetTrustStorePasswordFromProperty() {
System.setProperty(TRUST_STORE_PASSWORD, SAMPLE_PW1);
- assertThat(createSut().getTrustStorePassword(), is(SAMPLE_PW1));
+ MatcherAssert.assertThat(createSut().getTrustStorePassword(), is(SAMPLE_PW1));
}
@Test
public void testGetTrustStorePasswordFromEnv() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_TRUST_STORE_PASSWORD, SAMPLE_PW2);
- assertThat(createSut().getTrustStorePassword(), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(createSut().getTrustStorePassword(), is(SAMPLE_PW2));
}
@Test
public void testGetClientKeyStorePasswordFromProperty() {
System.setProperty(CLIENT_KEY_STORE_PASSWORD, SAMPLE_PW1);
- assertThat(createSut().getClientKeyStorePassword(), is(SAMPLE_PW1));
+ MatcherAssert.assertThat(createSut().getClientKeyStorePassword(), is(SAMPLE_PW1));
}
@Test
public void testGetClientKeyStorePasswordFromEnv() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_CLIENT_KEY_STORE_PASSWORD, SAMPLE_PW2);
- assertThat(createSut().getClientKeyStorePassword(), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(createSut().getClientKeyStorePassword(), is(SAMPLE_PW2));
}
@Test
public void testGetClientTrustStorePasswordFromProperty() {
System.setProperty(CLIENT_TRUST_STORE_PASSWORD, SAMPLE_PW1);
- assertThat(createSut().getClientTrustStorePassword(), is(SAMPLE_PW1));
+ MatcherAssert.assertThat(createSut().getClientTrustStorePassword(), is(SAMPLE_PW1));
}
@Test
public void testGetClientTrustStorePasswordFromEnv() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD, SAMPLE_PW2);
- assertThat(createSut().getClientTrustStorePassword(), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(createSut().getClientTrustStorePassword(), is(SAMPLE_PW2));
}
@Test
public void testSystemPropertyPriorityOverEnvVar() {
envs.put(EnvSSLCredentialProvider.EnvVars.SOLR_SSL_KEY_STORE_PASSWORD, SAMPLE_PW2);
- assertThat(createSut().getKeyStorePassword(), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(createSut().getKeyStorePassword(), is(SAMPLE_PW2));
System.setProperty(KEY_STORE_PASSWORD, SAMPLE_PW1);
- assertThat(createSut().getKeyStorePassword(), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(createSut().getKeyStorePassword(), is(SAMPLE_PW2));
}
}
diff --git a/solr/core/src/test/org/apache/solr/util/configuration/SSLCredentialProviderFactoryTest.java b/solr/core/src/test/org/apache/solr/util/configuration/SSLCredentialProviderFactoryTest.java
index cf4d6334b2c..43fa4e88000 100644
--- a/solr/core/src/test/org/apache/solr/util/configuration/SSLCredentialProviderFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/util/configuration/SSLCredentialProviderFactoryTest.java
@@ -19,19 +19,20 @@ package org.apache.solr.util.configuration;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
import java.util.List;
import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.util.configuration.providers.EnvSSLCredentialProvider;
import org.apache.solr.util.configuration.providers.SysPropSSLCredentialProvider;
import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
/** */
-public class SSLCredentialProviderFactoryTest {
+public class SSLCredentialProviderFactoryTest extends SolrTestCase {
@Rule
public TestRule syspropRestore =
@@ -46,13 +47,13 @@ public class SSLCredentialProviderFactoryTest {
public void testGetProvidersOrder() {
SSLCredentialProviderFactory sut = getSut("sysprop;env");
List<SSLCredentialProvider> providers = sut.getProviders();
- assertThat(providers.get(0), isA(SysPropSSLCredentialProvider.class));
- assertThat(providers.get(1), isA(EnvSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(0), isA(SysPropSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(1), isA(EnvSSLCredentialProvider.class));
sut = getSut("env;sysprop");
providers = sut.getProviders();
- assertThat(providers.get(0), isA(EnvSSLCredentialProvider.class));
- assertThat(providers.get(1), isA(SysPropSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(0), isA(EnvSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(1), isA(SysPropSSLCredentialProvider.class));
}
@Test
@@ -60,9 +61,9 @@ public class SSLCredentialProviderFactoryTest {
SSLCredentialProviderFactory sut =
getSut("sysprop;class://" + CustomSSLCredentialProvider.class.getName() + ";env");
List<SSLCredentialProvider> providers = sut.getProviders();
- assertThat(providers.get(0), isA(SysPropSSLCredentialProvider.class));
- assertThat(providers.get(1), isA(CustomSSLCredentialProvider.class));
- assertThat(providers.get(2), isA(EnvSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(0), isA(SysPropSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(1), isA(CustomSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(2), isA(EnvSSLCredentialProvider.class));
}
@Test(expected = RuntimeException.class)
@@ -76,9 +77,9 @@ public class SSLCredentialProviderFactoryTest {
System.setProperty(SSLCredentialProviderFactory.PROVIDER_CHAIN_KEY, chain);
SSLCredentialProviderFactory sut = new SSLCredentialProviderFactory();
List<SSLCredentialProvider> providers = sut.getProviders();
- assertThat(providers.get(0), isA(SysPropSSLCredentialProvider.class));
- assertThat(providers.get(1), isA(CustomSSLCredentialProvider.class));
- assertThat(providers.get(2), isA(EnvSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(0), isA(SysPropSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(1), isA(CustomSSLCredentialProvider.class));
+ MatcherAssert.assertThat(providers.get(2), isA(EnvSSLCredentialProvider.class));
}
private SSLCredentialProviderFactory getSut(String providerChain) {
diff --git a/solr/core/src/test/org/apache/solr/util/configuration/providers/EnvSSLCredentialProviderTest.java b/solr/core/src/test/org/apache/solr/util/configuration/providers/EnvSSLCredentialProviderTest.java
index 1b663baad2d..e0bd1452cd2 100644
--- a/solr/core/src/test/org/apache/solr/util/configuration/providers/EnvSSLCredentialProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/util/configuration/providers/EnvSSLCredentialProviderTest.java
@@ -19,14 +19,15 @@ package org.apache.solr.util.configuration.providers;
import static org.apache.solr.util.configuration.providers.AbstractSSLCredentialProvider.DEFAULT_CREDENTIAL_KEY_MAP;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
import java.util.Map;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.util.configuration.SSLCredentialProvider;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
/** */
-public class EnvSSLCredentialProviderTest {
+public class EnvSSLCredentialProviderTest extends SolrTestCase {
@Test
public void testGetCredentials() {
@@ -43,7 +44,7 @@ public class EnvSSLCredentialProviderTest {
for (Map.Entry<SSLCredentialProvider.CredentialType, String> set :
DEFAULT_CREDENTIAL_KEY_MAP.entrySet()) {
String expectedpw = "pw" + ++cnt;
- assertThat(sut.getCredential(set.getKey()), is(expectedpw));
+ MatcherAssert.assertThat(sut.getCredential(set.getKey()), is(expectedpw));
}
}
diff --git a/solr/core/src/test/org/apache/solr/util/configuration/providers/SysPropSSLCredentialProviderTest.java b/solr/core/src/test/org/apache/solr/util/configuration/providers/SysPropSSLCredentialProviderTest.java
index a003aa91a10..1bcc4ee6c6a 100644
--- a/solr/core/src/test/org/apache/solr/util/configuration/providers/SysPropSSLCredentialProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/util/configuration/providers/SysPropSSLCredentialProviderTest.java
@@ -19,18 +19,19 @@ package org.apache.solr.util.configuration.providers;
import static org.apache.solr.util.configuration.providers.AbstractSSLCredentialProvider.DEFAULT_CREDENTIAL_KEY_MAP;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
import java.util.Map;
import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.util.configuration.SSLConfigurations;
import org.apache.solr.util.configuration.SSLCredentialProvider;
+import org.hamcrest.MatcherAssert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
/** */
-public class SysPropSSLCredentialProviderTest {
+public class SysPropSSLCredentialProviderTest extends SolrTestCase {
@Rule
public TestRule syspropRestore =
@@ -48,7 +49,7 @@ public class SysPropSSLCredentialProviderTest {
DEFAULT_CREDENTIAL_KEY_MAP.entrySet()) {
String pw = "pw" + ++cnt;
System.setProperty(set.getValue(), pw);
- assertThat(sut.getCredential(set.getKey()), is(pw));
+ MatcherAssert.assertThat(sut.getCredential(set.getKey()), is(pw));
}
}
diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java
index 7cee69f5c65..12ee42ed58d 100644
--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java
+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/SSLConfigurationsTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.util.configuration;
import static org.apache.hadoop.security.alias.CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
import java.io.IOException;
@@ -32,13 +31,14 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.configuration.providers.EnvSSLCredentialProvider;
import org.apache.solr.util.configuration.providers.SysPropSSLCredentialProvider;
import org.apache.solr.util.configuration.providers.hadoop.HadoopSSLCredentialProvider;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
import org.mockito.Mockito;
-public class SSLConfigurationsTest {
+public class SSLConfigurationsTest extends SolrTestCaseJ4 {
private Map<String, String> envs;
private SSLConfigurations sut;
@@ -57,7 +57,8 @@ public class SSLConfigurationsTest {
CREDENTIAL_PROVIDER_PATH);
@Before
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
envs = new HashMap<>();
}
@@ -78,7 +79,7 @@ public class SSLConfigurationsTest {
getSutWithMockedHadoopCredentialProvider(
SSLConfigurations.SysProps.SSL_KEY_STORE_PASSWORD, SAMPLE_PW1)
.init();
- assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW1));
+ MatcherAssert.assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW1));
}
@Test
@@ -87,7 +88,7 @@ public class SSLConfigurationsTest {
getSutWithMockedHadoopCredentialProvider(
SSLConfigurations.SysProps.SSL_CLIENT_KEY_STORE_PASSWORD, SAMPLE_PW2)
.init();
- assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW2));
+ MatcherAssert.assertThat(System.getProperty(CLIENT_KEY_STORE_PASSWORD), is(SAMPLE_PW2));
}
@Test
@@ -95,7 +96,7 @@ public class SSLConfigurationsTest {
SSLConfigurations sut =
getSutWithMockedHadoopCredentialProvider(
SSLConfigurations.SysProps.SSL_KEY_STORE_PASSWORD, SAMPLE_PW3);
- assertThat(sut.getKeyStorePassword(), is(SAMPLE_PW3));
+ MatcherAssert.assertThat(sut.getKeyStorePassword(), is(SAMPLE_PW3));
}
@Test
@@ -103,7 +104,7 @@ public class SSLConfigurationsTest {
SSLConfigurations sut =
getSutWithMockedHadoopCredentialProvider(
SSLConfigurations.SysProps.SSL_TRUST_STORE_PASSWORD, SAMPLE_PW3);
- assertThat(sut.getTrustStorePassword(), is(SAMPLE_PW3));
+ MatcherAssert.assertThat(sut.getTrustStorePassword(), is(SAMPLE_PW3));
}
@Test
@@ -111,7 +112,7 @@ public class SSLConfigurationsTest {
SSLConfigurations sut =
getSutWithMockedHadoopCredentialProvider(
SSLConfigurations.SysProps.SSL_CLIENT_KEY_STORE_PASSWORD, SAMPLE_PW3);
- assertThat(sut.getClientKeyStorePassword(), is(SAMPLE_PW3));
+ MatcherAssert.assertThat(sut.getClientKeyStorePassword(), is(SAMPLE_PW3));
}
@Test
@@ -119,14 +120,14 @@ public class SSLConfigurationsTest {
SSLConfigurations sut =
getSutWithMockedHadoopCredentialProvider(
SSLConfigurations.SysProps.SSL_CLIENT_TRUST_STORE_PASSWORD, SAMPLE_PW3);
- assertThat(sut.getClientTrustStorePassword(), is(SAMPLE_PW3));
+ MatcherAssert.assertThat(sut.getClientTrustStorePassword(), is(SAMPLE_PW3));
}
@Test
public void testHadoopCredentialProviderPrioritySysPropAndEnvVars() throws IOException {
SSLConfigurations sut =
getSutWithMockedHadoopCredentialProvider(KEY_STORE_PASSWORD, SAMPLE_PW3);
- assertThat(sut.getKeyStorePassword(), is(SAMPLE_PW3));
+ MatcherAssert.assertThat(sut.getKeyStorePassword(), is(SAMPLE_PW3));
}
private SSLConfigurations getSutWithMockedHadoopCredentialProvider(String key, String pw)
diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/providers/hadoop/HadoopSSLCredentialProviderTest.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/providers/hadoop/HadoopSSLCredentialProviderTest.java
index e6ae219d372..a304f106439 100644
--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/providers/hadoop/HadoopSSLCredentialProviderTest.java
+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/util/configuration/providers/hadoop/HadoopSSLCredentialProviderTest.java
@@ -20,7 +20,6 @@ package org.apache.solr.util.configuration.providers.hadoop;
import static org.apache.hadoop.security.alias.CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH;
import static org.apache.solr.util.configuration.providers.AbstractSSLCredentialProvider.DEFAULT_CREDENTIAL_KEY_MAP;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.util.Map;
@@ -28,13 +27,14 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.configuration.SSLCredentialProvider;
+import org.hamcrest.MatcherAssert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
import org.mockito.Mockito;
/** */
-public class HadoopSSLCredentialProviderTest {
+public class HadoopSSLCredentialProviderTest extends SolrTestCaseJ4 {
@Rule
public TestRule syspropRestore = new TestRuleRestoreSystemProperties(CREDENTIAL_PROVIDER_PATH);
@@ -52,7 +52,7 @@ public class HadoopSSLCredentialProviderTest {
String pw = "pw" + ++cnt;
HadoopSSLCredentialProvider sut =
new HadoopSSLCredentialProvider(getMockedHadoopCredentialProvider(set.getValue(), pw));
- assertThat(sut.getCredential(set.getKey()), is(pw));
+ MatcherAssert.assertThat(sut.getCredential(set.getKey()), is(pw));
}
}
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleavingTest.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TestTeamDraftInterleaving.java
similarity index 80%
rename from solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleavingTest.java
rename to solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TestTeamDraftInterleaving.java
index e7cfe334167..ae847df6626 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleavingTest.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TestTeamDraftInterleaving.java
@@ -18,18 +18,18 @@
package org.apache.solr.ltr.interleaving.algorithms;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Random;
import java.util.Set;
import org.apache.lucene.search.ScoreDoc;
+import org.apache.solr.SolrTestCase;
import org.apache.solr.ltr.interleaving.InterleavingResult;
+import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Test;
-public class TeamDraftInterleavingTest {
+public class TestTeamDraftInterleaving extends SolrTestCase {
private TeamDraftInterleaving toTest;
private ScoreDoc[] rerankedA, rerankedB;
private ScoreDoc a1, a2, a3, a4, a5;
@@ -66,15 +66,15 @@ public class TeamDraftInterleavingTest {
InterleavingResult interleaved = toTest.interleave(rerankedA, rerankedB);
ScoreDoc[] interleavedResults = interleaved.getInterleavedResults();
- assertThat(interleavedResults.length, is(5));
+ MatcherAssert.assertThat(interleavedResults.length, is(5));
- assertThat(interleavedResults[0], is(a1));
- assertThat(interleavedResults[1], is(b2));
+ MatcherAssert.assertThat(interleavedResults[0], is(a1));
+ MatcherAssert.assertThat(interleavedResults[1], is(b2));
- assertThat(interleavedResults[2], is(b3));
- assertThat(interleavedResults[3], is(a4));
+ MatcherAssert.assertThat(interleavedResults[2], is(b3));
+ MatcherAssert.assertThat(interleavedResults[3], is(a4));
- assertThat(interleavedResults[4], is(b4));
+ MatcherAssert.assertThat(interleavedResults[4], is(b4));
}
/** Random Boolean Choices Generation from Seed: [0,1,1] */
@@ -88,8 +88,8 @@ public class TeamDraftInterleavingTest {
Set<Integer> modelAPicks = interleavingPicks.get(0);
Set<Integer> modelBPicks = interleavingPicks.get(1);
- assertThat(modelAPicks.size(), is(2));
- assertThat(modelBPicks.size(), is(3));
+ MatcherAssert.assertThat(modelAPicks.size(), is(2));
+ MatcherAssert.assertThat(modelBPicks.size(), is(3));
assertTrue(modelAPicks.contains(a1.doc));
assertTrue(modelAPicks.contains(a4.doc));
@@ -123,15 +123,15 @@ public class TeamDraftInterleavingTest {
InterleavingResult interleaved = toTest.interleave(rerankedA, rerankedB);
ScoreDoc[] interleavedResults = interleaved.getInterleavedResults();
- assertThat(interleavedResults.length, is(5));
+ MatcherAssert.assertThat(interleavedResults.length, is(5));
- assertThat(interleavedResults[0], is(a1));
- assertThat(interleavedResults[1], is(b2));
+ MatcherAssert.assertThat(interleavedResults[0], is(a1));
+ MatcherAssert.assertThat(interleavedResults[1], is(b2));
- assertThat(interleavedResults[2], is(b3));
- assertThat(interleavedResults[3], is(a4));
+ MatcherAssert.assertThat(interleavedResults[2], is(b3));
+ MatcherAssert.assertThat(interleavedResults[3], is(a4));
- assertThat(interleavedResults[4], is(b5));
+ MatcherAssert.assertThat(interleavedResults[4], is(b5));
}
/** Random Boolean Choices Generation from Seed: [0,1,1] */
@@ -145,8 +145,8 @@ public class TeamDraftInterleavingTest {
Set<Integer> modelAPicks = interleavingPicks.get(0);
Set<Integer> modelBPicks = interleavingPicks.get(1);
- assertThat(modelAPicks.size(), is(2));
- assertThat(modelBPicks.size(), is(3));
+ MatcherAssert.assertThat(modelAPicks.size(), is(2));
+ MatcherAssert.assertThat(modelBPicks.size(), is(3));
assertTrue(modelAPicks.contains(a1.doc));
assertTrue(modelAPicks.contains(a4.doc));
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
index d96c02318e5..25d2578937f 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
@@ -20,6 +20,7 @@ import static org.hamcrest.core.StringContains.containsString;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.ltr.TestRerankBase;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -99,23 +100,24 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {
String qryResult = JQ("/query" + query.toQueryString());
qryResult = qryResult.replaceAll("\n", " ");
- assertThat(qryResult, containsString("\"debug\":{"));
+ MatcherAssert.assertThat(qryResult, containsString("\"debug\":{"));
qryResult = qryResult.substring(qryResult.indexOf("debug"));
- assertThat(qryResult, containsString("\"explain\":{"));
+ MatcherAssert.assertThat(qryResult, containsString("\"explain\":{"));
qryResult = qryResult.substring(qryResult.indexOf("explain"));
- assertThat(qryResult, containsString("multipleadditivetreesmodel"));
- assertThat(qryResult, containsString(MultipleAdditiveTreesModel.class.getSimpleName()));
+ MatcherAssert.assertThat(qryResult, containsString("multipleadditivetreesmodel"));
+ MatcherAssert.assertThat(
+ qryResult, containsString(MultipleAdditiveTreesModel.class.getSimpleName()));
- assertThat(qryResult, containsString("-100.0 = tree 0"));
- assertThat(qryResult, containsString("50.0 = tree 0"));
- assertThat(qryResult, containsString("-20.0 = tree 1"));
- assertThat(qryResult, containsString("'matchedTitle':1.0 > 0.5"));
- assertThat(qryResult, containsString("'matchedTitle':0.0 <= 0.5"));
+ MatcherAssert.assertThat(qryResult, containsString("-100.0 = tree 0"));
+ MatcherAssert.assertThat(qryResult, containsString("50.0 = tree 0"));
+ MatcherAssert.assertThat(qryResult, containsString("-20.0 = tree 1"));
+ MatcherAssert.assertThat(qryResult, containsString("'matchedTitle':1.0 > 0.5"));
+ MatcherAssert.assertThat(qryResult, containsString("'matchedTitle':0.0 <= 0.5"));
- assertThat(qryResult, containsString(" Go Right "));
- assertThat(qryResult, containsString(" Go Left "));
+ MatcherAssert.assertThat(qryResult, containsString(" Go Right "));
+ MatcherAssert.assertThat(qryResult, containsString(" Go Left "));
}
@Test
diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTest.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTest.java
index c01bc160304..e10141ee6e2 100644
--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTest.java
+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.solr.prometheus.exporter;
-import junit.framework.TestCase;
+import org.apache.solr.SolrTestCase;
-public class SolrExporterTest extends TestCase {
+public class SolrExporterTest extends SolrTestCase {
public void testDefaultClusterIdHash() {
assertEquals(
"a2542cfcee",
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 6fb9a2dbf66..bc0deddaa77 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
@@ -76,6 +76,7 @@ import org.apache.solr.common.util.ContentStreamBase;
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;
@@ -666,7 +667,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
query.set(AnalysisParams.FIELD_VALUE, "ignore_exception");
SolrException ex = expectThrows(SolrException.class, () -> client.query(query));
assertEquals(400, ex.code());
- assertThat(ex.getMessage(), containsString("Invalid Number: ignore_exception"));
+ MatcherAssert.assertThat(ex.getMessage(), containsString("Invalid Number: ignore_exception"));
// the df=text here is a kluge for the test to supply a default field in case there is none in
// schema.xml. alternatively, the resulting assertion could be modified to assert that no
@@ -2970,9 +2971,9 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
q.addSort("id", SolrQuery.ORDER.desc);
SolrDocumentList results = client.query(q).getResults();
- assertThat(results.getNumFound(), is(1L));
+ MatcherAssert.assertThat(results.getNumFound(), is(1L));
SolrDocument foundDoc = results.get(0);
- assertThat(foundDoc.getFieldValue("title_s"), is("i am a child free doc"));
+ MatcherAssert.assertThat(foundDoc.getFieldValue("title_s"), is("i am a child free doc"));
// Rewrite child free doc
docToUpdate.setField("title_s", "i am a parent");
@@ -2988,11 +2989,11 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
results = client.query(q).getResults();
- assertThat(results.getNumFound(), is(2L));
+ MatcherAssert.assertThat(results.getNumFound(), is(2L));
foundDoc = results.get(0);
- assertThat(foundDoc.getFieldValue("title_s"), is("i am a parent"));
+ MatcherAssert.assertThat(foundDoc.getFieldValue("title_s"), is("i am a parent"));
foundDoc = results.get(1);
- assertThat(foundDoc.getFieldValue("title_s"), is("i am a child"));
+ MatcherAssert.assertThat(foundDoc.getFieldValue("title_s"), is("i am a child"));
}
@Test
@@ -3026,13 +3027,13 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {
SolrQuery q = new SolrQuery("*:*");
SolrDocumentList results = client.query(q).getResults();
- assertThat(results.getNumFound(), is(4L));
+ MatcherAssert.assertThat(results.getNumFound(), is(4L));
client.deleteById("p0");
client.commit();
results = client.query(q).getResults();
- assertThat(
+ MatcherAssert.assertThat(
"All the children are expected to be deleted together with parent",
results.getNumFound(),
is(0L));
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 3cfb2811d15..aef8ca94e06 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
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.Assert;
import org.apache.solr.SolrJettyTestBase;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;
import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -32,6 +31,7 @@ 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 {
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 9111169fd5b..3199601d1e3 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
@@ -24,12 +24,12 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-import junit.framework.Assert;
import org.apache.lucene.util.SuppressForbidden;
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
@@ -55,7 +55,7 @@ public class SolrQueryTest extends SolrTestCase {
Assert.assertEquals(b, false);
b = q.removeFacetField("state");
Assert.assertEquals(b, true);
- Assert.assertEquals(null, q.getFacetFields());
+ Assert.assertNull(q.getFacetFields());
b = q.removeFacetQuery("instock:true");
Assert.assertEquals(b, true);
@@ -63,7 +63,7 @@ public class SolrQueryTest extends SolrTestCase {
b = q.removeFacetQuery("a:c");
Assert.assertEquals(b, false);
b = q.removeFacetQuery("a:b");
- Assert.assertEquals(null, q.getFacetQuery());
+ Assert.assertNull(q.getFacetQuery());
q.addSort("price", SolrQuery.ORDER.asc);
q.addSort("date", SolrQuery.ORDER.desc);
@@ -84,7 +84,7 @@ public class SolrQueryTest extends SolrTestCase {
q.removeHighlightField("hl3");
Assert.assertEquals(1, q.getHighlightFields().length);
q.removeHighlightField("hl2");
- Assert.assertEquals(null, q.getHighlightFields());
+ Assert.assertNull(q.getHighlightFields());
// check to see that the removes are properly clearing the cgi params
Assert.assertEquals(q.toString(), "q=dog");
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 7403d472c9e..22cb8ef694e 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
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.IOUtils;
import org.apache.solr.SolrTestCaseJ4;
@@ -40,6 +39,7 @@ 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;
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 8057b6d2c76..d18d8a00645 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
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.lucene.util.IOUtils;
@@ -41,6 +40,7 @@ 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;
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 983b5c6d151..9ffdf024c94 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
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
import org.apache.solr.core.SolrCore;
+import org.junit.Assert;
import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
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 cde2962c20c..29b8f5d46d7 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
@@ -80,9 +80,7 @@ import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -834,8 +832,6 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
}
}
- @Rule public ExpectedException exception = ExpectedException.none();
-
@Test
public void testWrongZkChrootTest() throws IOException {
try (CloudSolrClient client =
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 cc1e77b0d93..acd63484b7a 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
@@ -16,7 +16,6 @@
*/
package org.apache.solr.client.solrj.io.stream;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.ops.GroupOperation;
import org.apache.solr.client.solrj.io.stream.expr.Explanation;
@@ -29,6 +28,7 @@ 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;
/** */
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 dcbb3e67b76..92c1eff4a01 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
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.AbsoluteValueEvaluator;
@@ -27,6 +26,7 @@ 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 {
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 c77d44bb28b..bbcd2ffba04 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
@@ -18,12 +18,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 e4d98bc5364..1cb4dd0c82a 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
@@ -18,12 +18,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 883c57e1f6a..4dc6d22a357 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
@@ -20,12 +20,12 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 6f7df301815..e6c41f24384 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 178384bc4ba..a9b64a9f272 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 450a7925679..9748f8453c4 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 8184e3b4ede..d27f7c2210a 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
@@ -20,13 +20,13 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
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 {
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 43f9b115c8c..715ee136c51 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 2c84da89981..60e11d6e5d3 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
@@ -18,12 +18,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 64589eeabdf..b494a9a507b 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,8 +17,8 @@
package org.apache.solr.client.solrj.io.stream.eval;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.HashMap;
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 3d8c728174f..f892bf5cd20 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.commons.math3.stat.correlation.PearsonsCorrelation;
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 {
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 e93dc57f3f6..e56588a4eec 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 2bdc4cfe414..0c1efb00730 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 a5d393a2236..ca79d8097e2 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
@@ -19,13 +19,13 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.commons.math3.distribution.NormalDistribution;
import org.apache.solr.SolrTestCase;
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 {
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 c98fbf4172a..f126412ec7a 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
index f784950a133..99128b1b9db 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.commons.math3.random.EmpiricalDistribution;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
@@ -49,9 +48,10 @@ public class EmpiricalDistributionEvaluatorTest extends SolrTestCase {
EmpiricalDistribution dist = new EmpiricalDistribution();
dist.load(l1);
- Assert.assertEquals(
+ assertEquals(
dist.getNumericalMean(),
((EmpiricalDistribution) factory.constructEvaluator("emp(l1)").evaluate(new Tuple(values)))
- .getNumericalMean());
+ .getNumericalMean(),
+ 0.01);
}
}
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 7d14ba8d5c3..0dc20ced504 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
@@ -19,13 +19,13 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
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 {
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 955fa99b8bb..2edc79424fe 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
@@ -18,12 +18,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 690ebab6326..99536d32060 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
@@ -21,10 +21,10 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.PriorityQueue;
-import junit.framework.Assert;
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 {
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 d7b4c46d440..def4a2c37e2 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 502ab928044..f08f666baa8 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 3255174a494..c7d14bfd618 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 37e9f244145..494e350096f 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 404eba74171..2ebdf5f8be8 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
index 5957afe709a..b65f980a2fc 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.HyperbolicTangentEvaluator;
@@ -47,10 +46,10 @@ public class HyperbolicTangentEvaluatorTest extends SolrTestCase {
Object result = evaluator.evaluate(new Tuple(values));
if (null == value) {
- Assert.assertNull(result);
+ assertNull(result);
} else {
- Assert.assertTrue(result instanceof Number);
- Assert.assertEquals(Math.tanh(value), ((Number) result).doubleValue());
+ assertTrue(result instanceof Number);
+ assertEquals(Math.tanh(value), ((Number) result).doubleValue(), 0.01);
}
}
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 91a4d731714..24260427207 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
@@ -20,13 +20,13 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
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 {
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 5c6a5e9ea70..c926964cddc 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 c74945a6df6..76aae6ee8bd 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 a0b0e1ce317..4bf749c6f30 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 6b895dc6cbf..0dcf3a61275 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
@@ -18,12 +18,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 097b4a86ec8..ee96d63360f 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
@@ -19,13 +19,13 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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.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 {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalDistributionEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalDistributionEvaluatorTest.java
index c2a6e963055..2a029900327 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalDistributionEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalDistributionEvaluatorTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.commons.math3.distribution.NormalDistribution;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
@@ -45,9 +44,10 @@ public class NormalDistributionEvaluatorTest extends SolrTestCase {
values.put("l2", 7);
NormalDistribution dist = new NormalDistribution(3, 7);
- Assert.assertEquals(
+ assertEquals(
dist.getNumericalMean(),
((NormalDistribution) factory.constructEvaluator("norm(l1,l2)").evaluate(new Tuple(values)))
- .getNumericalMean());
+ .getNumericalMean(),
+ 0.01);
}
}
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 daca21ab3ff..c3ee2f17c75 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
@@ -21,12 +21,12 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.commons.math3.stat.StatUtils;
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 {
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 2b8ce6ae525..60170147acb 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
@@ -18,12 +18,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 546086fc4c5..ec563a4675c 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
@@ -18,12 +18,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 7c52653b3a8..66df6f869aa 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
@@ -20,12 +20,12 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 d88654014e2..8d00d682d9a 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
@@ -18,13 +18,13 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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.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 {
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 c6c1577c82b..975639a0fa8 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
@@ -18,7 +18,6 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.eval.AddEvaluator;
@@ -30,6 +29,7 @@ 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 {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RegressionEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RegressionEvaluatorTest.java
index 4a18d0848c9..f8a2555bd5e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RegressionEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RegressionEvaluatorTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.commons.math3.stat.regression.SimpleRegression;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
@@ -54,6 +53,6 @@ public class RegressionEvaluatorTest extends SolrTestCase {
regression.addData(l1[1], l2[1]);
regression.addData(l1[2], l2[2]);
- Assert.assertEquals(result.getDouble("slope"), regression.getSlope());
+ assertEquals(result.getDouble("slope"), regression.getSlope(), 0.01);
}
}
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 fcbc551918e..83307fd6013 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
@@ -20,11 +20,11 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
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 {
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 f960bfead28..4ef2a26a38c 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 1295de1f468..e1d39ae0d45 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 a2178832d5f..b01a1f52f9e 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
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 {
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 97bbbc83640..dad760eaaf1 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
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.SubtractEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Assert;
import org.junit.Test;
public class SubtractEvaluatorTest extends SolrTestCase {
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 c298a8900d1..492583dfc86 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
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.TangentEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Assert;
import org.junit.Test;
public class TangentEvaluatorTest extends SolrTestCase {
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 bc1c4eb0996..3d3341add99 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,8 +17,8 @@
package org.apache.solr.client.solrj.io.stream.eval;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.time.Instant;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UniformDistributionEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UniformDistributionEvaluatorTest.java
index 69a0927d027..d0bdb1fc942 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UniformDistributionEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UniformDistributionEvaluatorTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.commons.math3.distribution.UniformRealDistribution;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
@@ -46,10 +45,11 @@ public class UniformDistributionEvaluatorTest extends SolrTestCase {
values.put("l2", 7);
UniformRealDistribution dist = new UniformRealDistribution(3, 7);
- Assert.assertEquals(
+ assertEquals(
dist.getNumericalMean(),
((UniformRealDistribution)
factory.constructEvaluator("unif(l1,l2)").evaluate(new Tuple(values)))
- .getNumericalMean());
+ .getNumericalMean(),
+ 0.01);
}
}
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 8d8176bae31..e00da06def8 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
@@ -18,12 +18,12 @@ package org.apache.solr.client.solrj.io.stream.eval;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
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.UuidEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Assert;
import org.junit.Test;
public class UuidEvaluatorTest extends SolrTestCase {
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 10ae3ab0bcc..a30836336c5 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
@@ -18,13 +18,13 @@ package org.apache.solr.client.solrj.io.stream.ops;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
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;
/** */
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 7dfaa2956fd..c6e6df34415 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
@@ -18,13 +18,13 @@ package org.apache.solr.client.solrj.io.stream.ops;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.io.Tuple;
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;
/** */
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 5cb0e687d81..4c8f68e34ff 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
@@ -45,6 +45,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.util.RestTestBase;
import org.eclipse.jetty.servlet.ServletHolder;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -180,7 +181,7 @@ public class SchemaTest extends RestTestBase {
SchemaResponse.FieldsResponse fieldsResponse = fieldsSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(fieldsResponse);
List<Map<String, Object>> fields = fieldsResponse.getFields();
- assertThat(fields.isEmpty(), is(false));
+ MatcherAssert.assertThat(fields.isEmpty(), is(false));
}
@Test
@@ -190,8 +191,8 @@ public class SchemaTest extends RestTestBase {
SchemaResponse.FieldResponse fieldResponse = fieldSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(fieldResponse);
Map<String, Object> fieldAttributes = fieldResponse.getField();
- assertThat(fieldName, is(equalTo(fieldAttributes.get("name"))));
- assertThat("string", is(equalTo(fieldAttributes.get("type"))));
+ MatcherAssert.assertThat(fieldName, is(equalTo(fieldAttributes.get("name"))));
+ MatcherAssert.assertThat("string", is(equalTo(fieldAttributes.get("type"))));
}
@Test
@@ -201,7 +202,7 @@ public class SchemaTest extends RestTestBase {
dynamicFieldsSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(dynamicFieldsResponse);
List<Map<String, Object>> fields = dynamicFieldsResponse.getDynamicFields();
- assertThat(fields.isEmpty(), is(false));
+ MatcherAssert.assertThat(fields.isEmpty(), is(false));
}
@Test
@@ -213,8 +214,8 @@ public class SchemaTest extends RestTestBase {
dynamicFieldSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(dynamicFieldResponse);
Map<String, Object> dynamicFieldAttributes = dynamicFieldResponse.getDynamicField();
- assertThat(dynamicFieldName, is(equalTo(dynamicFieldAttributes.get("name"))));
- assertThat("int", is(equalTo(dynamicFieldAttributes.get("type"))));
+ MatcherAssert.assertThat(dynamicFieldName, is(equalTo(dynamicFieldAttributes.get("name"))));
+ MatcherAssert.assertThat("int", is(equalTo(dynamicFieldAttributes.get("type"))));
}
@Test
@@ -224,7 +225,7 @@ public class SchemaTest extends RestTestBase {
fieldTypesRequest.process(getSolrClient());
assertValidSchemaResponse(fieldTypesResponse);
List<FieldTypeRepresentation> fieldTypes = fieldTypesResponse.getFieldTypes();
- assertThat(fieldTypes.isEmpty(), is(false));
+ MatcherAssert.assertThat(fieldTypes.isEmpty(), is(false));
}
@Test
@@ -235,8 +236,10 @@ public class SchemaTest extends RestTestBase {
fieldTypeSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(fieldTypeResponse);
FieldTypeRepresentation fieldTypeDefinition = fieldTypeResponse.getFieldType();
- assertThat(fieldType, is(equalTo(fieldTypeDefinition.getAttributes().get("name"))));
- assertThat("solr.StrField", is(equalTo(fieldTypeDefinition.getAttributes().get("class"))));
+ MatcherAssert.assertThat(
+ fieldType, is(equalTo(fieldTypeDefinition.getAttributes().get("name"))));
+ MatcherAssert.assertThat(
+ "solr.StrField", is(equalTo(fieldTypeDefinition.getAttributes().get("class"))));
}
@Test
@@ -246,7 +249,7 @@ public class SchemaTest extends RestTestBase {
copyFieldsRequest.process(getSolrClient());
assertValidSchemaResponse(copyFieldsResponse);
List<Map<String, Object>> copyFieldsAttributes = copyFieldsResponse.getCopyFields();
- assertThat(copyFieldsAttributes.isEmpty(), is(false));
+ MatcherAssert.assertThat(copyFieldsAttributes.isEmpty(), is(false));
}
@Test
@@ -300,12 +303,12 @@ public class SchemaTest extends RestTestBase {
SchemaResponse.FieldResponse newFieldResponse = fieldSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(newFieldResponse);
Map<String, Object> newFieldAttributes = newFieldResponse.getField();
- assertThat(fieldName, is(equalTo(newFieldAttributes.get("name"))));
- assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
- assertThat(false, is(equalTo(newFieldAttributes.get("stored"))));
- assertThat(true, is(equalTo(newFieldAttributes.get("indexed"))));
- assertThat("accuracy", is(equalTo(newFieldAttributes.get("default"))));
- assertThat(true, is(equalTo(newFieldAttributes.get("required"))));
+ MatcherAssert.assertThat(fieldName, is(equalTo(newFieldAttributes.get("name"))));
+ MatcherAssert.assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
+ MatcherAssert.assertThat(false, is(equalTo(newFieldAttributes.get("stored"))));
+ MatcherAssert.assertThat(true, is(equalTo(newFieldAttributes.get("indexed"))));
+ MatcherAssert.assertThat("accuracy", is(equalTo(newFieldAttributes.get("default"))));
+ MatcherAssert.assertThat(true, is(equalTo(newFieldAttributes.get("required"))));
}
@Test
@@ -341,7 +344,7 @@ public class SchemaTest extends RestTestBase {
SchemaResponse.FieldResponse initialFieldResponse = fieldSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(initialFieldResponse);
Map<String, Object> fieldAttributesResponse = initialFieldResponse.getField();
- assertThat(fieldName, is(equalTo(fieldAttributesResponse.get("name"))));
+ MatcherAssert.assertThat(fieldName, is(equalTo(fieldAttributesResponse.get("name"))));
SchemaRequest.DeleteField deleteFieldRequest = new SchemaRequest.DeleteField(fieldName);
SchemaResponse.UpdateResponse deleteFieldResponse = deleteFieldRequest.process(getSolrClient());
@@ -389,11 +392,11 @@ public class SchemaTest extends RestTestBase {
SchemaResponse.FieldResponse newFieldResponse = fieldSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(newFieldResponse);
Map<String, Object> newFieldAttributes = newFieldResponse.getField();
- assertThat(fieldName, is(equalTo(newFieldAttributes.get("name"))));
- assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
- assertThat(true, is(equalTo(newFieldAttributes.get("stored"))));
- assertThat(false, is(equalTo(newFieldAttributes.get("indexed"))));
- assertThat(true, is(equalTo(newFieldAttributes.get("required"))));
+ MatcherAssert.assertThat(fieldName, is(equalTo(newFieldAttributes.get("name"))));
+ MatcherAssert.assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
+ MatcherAssert.assertThat(true, is(equalTo(newFieldAttributes.get("stored"))));
+ MatcherAssert.assertThat(false, is(equalTo(newFieldAttributes.get("indexed"))));
+ MatcherAssert.assertThat(true, is(equalTo(newFieldAttributes.get("required"))));
}
@Test
@@ -427,10 +430,10 @@ public class SchemaTest extends RestTestBase {
SchemaResponse.DynamicFieldResponse newFieldResponse = dFieldRequest.process(getSolrClient());
assertValidSchemaResponse(newFieldResponse);
Map<String, Object> newFieldAttributes = newFieldResponse.getDynamicField();
- assertThat(dFieldName, is(equalTo(newFieldAttributes.get("name"))));
- assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
- assertThat(false, is(equalTo(newFieldAttributes.get("stored"))));
- assertThat(true, is(equalTo(newFieldAttributes.get("indexed"))));
+ MatcherAssert.assertThat(dFieldName, is(equalTo(newFieldAttributes.get("name"))));
+ MatcherAssert.assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
+ MatcherAssert.assertThat(false, is(equalTo(newFieldAttributes.get("stored"))));
+ MatcherAssert.assertThat(true, is(equalTo(newFieldAttributes.get("indexed"))));
}
@Test
@@ -469,7 +472,7 @@ public class SchemaTest extends RestTestBase {
dynamicFieldSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(initialDFieldResponse);
Map<String, Object> fieldAttributesResponse = initialDFieldResponse.getDynamicField();
- assertThat(dynamicFieldName, is(equalTo(fieldAttributesResponse.get("name"))));
+ MatcherAssert.assertThat(dynamicFieldName, is(equalTo(fieldAttributesResponse.get("name"))));
SchemaRequest.DeleteDynamicField deleteFieldRequest =
new SchemaRequest.DeleteDynamicField(dynamicFieldName);
@@ -524,10 +527,10 @@ public class SchemaTest extends RestTestBase {
dynamicFieldSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(newFieldResponse);
Map<String, Object> newFieldAttributes = newFieldResponse.getDynamicField();
- assertThat(fieldName, is(equalTo(newFieldAttributes.get("name"))));
- assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
- assertThat(true, is(equalTo(newFieldAttributes.get("stored"))));
- assertThat(false, is(equalTo(newFieldAttributes.get("indexed"))));
+ MatcherAssert.assertThat(fieldName, is(equalTo(newFieldAttributes.get("name"))));
+ MatcherAssert.assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
+ MatcherAssert.assertThat(true, is(equalTo(newFieldAttributes.get("stored"))));
+ MatcherAssert.assertThat(false, is(equalTo(newFieldAttributes.get("indexed"))));
}
@Test
@@ -596,10 +599,11 @@ public class SchemaTest extends RestTestBase {
fieldTypeRequest.process(getSolrClient());
assertValidSchemaResponse(newFieldTypeResponse);
FieldTypeRepresentation newFieldTypeRepresentation = newFieldTypeResponse.getFieldType();
- assertThat(fieldTypeName, is(equalTo(newFieldTypeRepresentation.getAttributes().get("name"))));
- assertThat(
+ MatcherAssert.assertThat(
+ fieldTypeName, is(equalTo(newFieldTypeRepresentation.getAttributes().get("name"))));
+ MatcherAssert.assertThat(
"solr.TextField", is(equalTo(newFieldTypeRepresentation.getAttributes().get("class"))));
- assertThat(
+ MatcherAssert.assertThat(
analyzerDefinition.getTokenizer().get("class"),
is(equalTo(newFieldTypeRepresentation.getAnalyzer().getTokenizer().get("class"))));
}
@@ -639,8 +643,9 @@ public class SchemaTest extends RestTestBase {
fieldTypeRequest.process(getSolrClient());
assertValidSchemaResponse(newFieldTypeResponse);
FieldTypeRepresentation newFieldTypeRepresentation = newFieldTypeResponse.getFieldType();
- assertThat(fieldTypeName, is(equalTo(newFieldTypeRepresentation.getAttributes().get("name"))));
- assertThat(
+ MatcherAssert.assertThat(
+ fieldTypeName, is(equalTo(newFieldTypeRepresentation.getAttributes().get("name"))));
+ MatcherAssert.assertThat(
similarityAttributes.get("class"),
is(equalTo(newFieldTypeRepresentation.getSimilarity().get("class"))));
}
@@ -672,8 +677,9 @@ public class SchemaTest extends RestTestBase {
fieldTypeRequest.process(getSolrClient());
assertValidSchemaResponse(newFieldTypeResponse);
FieldTypeRepresentation newFieldTypeRepresentation = newFieldTypeResponse.getFieldType();
- assertThat(fieldTypeName, is(equalTo(newFieldTypeRepresentation.getAttributes().get("name"))));
- assertThat(
+ MatcherAssert.assertThat(
+ fieldTypeName, is(equalTo(newFieldTypeRepresentation.getAttributes().get("name"))));
+ MatcherAssert.assertThat(
analyzerAttributes.get("class"),
is(equalTo(newFieldTypeRepresentation.getAnalyzer().getAttributes().get("class"))));
}
@@ -721,7 +727,7 @@ public class SchemaTest extends RestTestBase {
assertValidSchemaResponse(initialFieldTypeResponse);
FieldTypeRepresentation responseFieldTypeRepresentation =
initialFieldTypeResponse.getFieldType();
- assertThat(
+ MatcherAssert.assertThat(
fieldTypeName, is(equalTo(responseFieldTypeRepresentation.getAttributes().get("name"))));
SchemaRequest.DeleteFieldType deleteFieldTypeRequest =
@@ -794,14 +800,15 @@ public class SchemaTest extends RestTestBase {
FieldTypeRepresentation replacedFieldTypeRepresentation = newFieldTypeResponse.getFieldType();
Map<String, Object> replacedFieldTypeAttributes =
replacedFieldTypeRepresentation.getAttributes();
- assertThat(fieldTypeName, is(equalTo(replacedFieldTypeAttributes.get("name"))));
- assertThat(
+ MatcherAssert.assertThat(fieldTypeName, is(equalTo(replacedFieldTypeAttributes.get("name"))));
+ MatcherAssert.assertThat(
RANDOMIZED_NUMERIC_FIELDTYPES.get(Integer.class),
is(equalTo(replacedFieldTypeAttributes.get("class"))));
- assertThat(false, is(equalTo(replacedFieldTypeAttributes.get("omitNorms"))));
- assertThat("42", is(equalTo(replacedFieldTypeAttributes.get("positionIncrementGap"))));
+ MatcherAssert.assertThat(false, is(equalTo(replacedFieldTypeAttributes.get("omitNorms"))));
+ MatcherAssert.assertThat(
+ "42", is(equalTo(replacedFieldTypeAttributes.get("positionIncrementGap"))));
// should be unchanged...
- assertThat(useDv, is(equalTo(replacedFieldTypeAttributes.get("docValues"))));
+ MatcherAssert.assertThat(useDv, is(equalTo(replacedFieldTypeAttributes.get("docValues"))));
}
@Test
@@ -860,7 +867,7 @@ public class SchemaTest extends RestTestBase {
if (srcFieldName.equals(currentCopyField.get("source"))) {
String currentDestFieldName = (String) currentCopyField.get("dest");
int currentMaxChars = (Integer) currentCopyField.get("maxChars");
- assertThat(
+ MatcherAssert.assertThat(
currentDestFieldName, anyOf(is(equalTo(destFieldName1)), is(equalTo(destFieldName2))));
assertTrue(maxChars == currentMaxChars);
}
@@ -947,24 +954,25 @@ public class SchemaTest extends RestTestBase {
fieldTypeSchemaRequest.process(getSolrClient());
assertValidSchemaResponse(fieldTypeResponse);
FieldTypeRepresentation fieldTypeRepresentation = fieldTypeResponse.getFieldType();
- assertThat(fieldTypeName, is(equalTo(fieldTypeRepresentation.getAttributes().get("name"))));
+ MatcherAssert.assertThat(
+ fieldTypeName, is(equalTo(fieldTypeRepresentation.getAttributes().get("name"))));
SchemaRequest.Field field1SchemaRequest = new SchemaRequest.Field(field1Name);
SchemaResponse.FieldResponse field1Response = field1SchemaRequest.process(getSolrClient());
assertValidSchemaResponse(field1Response);
Map<String, ?> field1Attributes = field1Response.getField();
- assertThat(field1Name, is(equalTo(field1Attributes.get("name"))));
- assertThat(fieldTypeName, is(equalTo(field1Attributes.get("type"))));
- assertThat(true, is(equalTo(field1Attributes.get("stored"))));
- assertThat(true, is(equalTo(field1Attributes.get("indexed"))));
+ MatcherAssert.assertThat(field1Name, is(equalTo(field1Attributes.get("name"))));
+ MatcherAssert.assertThat(fieldTypeName, is(equalTo(field1Attributes.get("type"))));
+ MatcherAssert.assertThat(true, is(equalTo(field1Attributes.get("stored"))));
+ MatcherAssert.assertThat(true, is(equalTo(field1Attributes.get("indexed"))));
SchemaRequest.Field field2SchemaRequest = new SchemaRequest.Field(field1Name);
SchemaResponse.FieldResponse field2Response = field2SchemaRequest.process(getSolrClient());
assertValidSchemaResponse(field2Response);
Map<String, ?> field2Attributes = field2Response.getField();
- assertThat(field1Name, is(equalTo(field2Attributes.get("name"))));
- assertThat(fieldTypeName, is(equalTo(field2Attributes.get("type"))));
- assertThat(true, is(equalTo(field2Attributes.get("stored"))));
- assertThat(true, is(equalTo(field2Attributes.get("indexed"))));
+ MatcherAssert.assertThat(field1Name, is(equalTo(field2Attributes.get("name"))));
+ MatcherAssert.assertThat(fieldTypeName, is(equalTo(field2Attributes.get("type"))));
+ MatcherAssert.assertThat(true, is(equalTo(field2Attributes.get("stored"))));
+ MatcherAssert.assertThat(true, is(equalTo(field2Attributes.get("indexed"))));
}
}
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 7195d91311f..f5cde4d38ec 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
@@ -17,12 +17,12 @@
package org.apache.solr.client.solrj.request;
import java.io.File;
-import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
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;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
index 17006fcad9c..87256553395 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
@@ -46,6 +46,7 @@ import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.metrics.SolrCoreMetricManager;
import org.apache.solr.metrics.SolrMetricManager;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -90,10 +91,10 @@ public class TestCoreAdmin extends AbstractEmbeddedSolrServerTestCase {
req.setConfigSet("configset-2");
CoreAdminResponse response = req.process(client);
- assertThat((String) response.getResponse().get("core"), is("corewithconfigset"));
+ MatcherAssert.assertThat((String) response.getResponse().get("core"), is("corewithconfigset"));
try (SolrCore core = cores.getCore("corewithconfigset")) {
- assertThat(core, is(notNullValue()));
+ MatcherAssert.assertThat(core, is(notNullValue()));
}
}
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 0e835b1a475..bba08fe4ded 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
@@ -18,48 +18,55 @@ package org.apache.solr.client.solrj.request;
import java.util.Arrays;
import org.apache.solr.common.SolrInputDocument;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.Assert;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class TestUpdateRequest {
- @Rule public ExpectedException exception = ExpectedException.none();
-
- @Before
- public void expectException() {
- exception.expect(NullPointerException.class);
- exception.expectMessage("Cannot add a null SolrInputDocument");
- }
-
@Test
public void testCannotAddNullSolrInputDocument() {
UpdateRequest req = new UpdateRequest();
- req.add((SolrInputDocument) null);
+
+ NullPointerException thrown =
+ Assert.assertThrows(NullPointerException.class, () -> req.add((SolrInputDocument) null));
+ Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
@Test
public void testCannotAddNullDocumentWithOverwrite() {
UpdateRequest req = new UpdateRequest();
- req.add(null, true);
+
+ NullPointerException thrown =
+ Assert.assertThrows(NullPointerException.class, () -> req.add(null, true));
+ Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
@Test
public void testCannotAddNullDocumentWithCommitWithin() {
UpdateRequest req = new UpdateRequest();
- req.add(null, 1);
+
+ NullPointerException thrown =
+ Assert.assertThrows(NullPointerException.class, () -> req.add(null, 1));
+ Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
@Test
public void testCannotAddNullDocumentWithParameters() {
UpdateRequest req = new UpdateRequest();
- req.add(null, 1, true);
+
+ NullPointerException thrown =
+ Assert.assertThrows(NullPointerException.class, () -> req.add(null, 1, true));
+ Assert.assertEquals("Cannot add a null SolrInputDocument", thrown.getMessage());
}
@Test
public void testCannotAddNullDocumentAsPartOfList() {
UpdateRequest req = new UpdateRequest();
- req.add(Arrays.asList(new SolrInputDocument(), new SolrInputDocument(), null));
+
+ NullPointerException thrown =
+ Assert.assertThrows(
+ NullPointerException.class,
+ () -> req.add(Arrays.asList(new SolrInputDocument(), new SolrInputDocument(), null)));
+ Assert.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 4a96cba960b..6fffc0b33da 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
@@ -30,7 +30,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import junit.framework.Assert;
import org.apache.solr.SolrTestCase;
import org.apache.solr.common.IteratorWriter;
import org.apache.solr.common.MapWriter;
@@ -38,6 +37,7 @@ 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;
/**
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DomainMapTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DomainMapTest.java
index 4cbf7a9cbc5..08df0bbbc3b 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DomainMapTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DomainMapTest.java
@@ -22,6 +22,7 @@ import static org.hamcrest.core.StringContains.containsString;
import java.util.List;
import java.util.Map;
import org.apache.solr.SolrTestCaseJ4;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
public class DomainMapTest extends SolrTestCaseJ4 {
@@ -34,7 +35,7 @@ public class DomainMapTest extends SolrTestCaseJ4 {
() -> {
new DomainMap().withFilter(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -66,7 +67,7 @@ public class DomainMapTest extends SolrTestCaseJ4 {
() -> {
new DomainMap().withQuery(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -98,7 +99,7 @@ public class DomainMapTest extends SolrTestCaseJ4 {
() -> {
new DomainMap().withTagsToExclude(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -131,7 +132,7 @@ public class DomainMapTest extends SolrTestCaseJ4 {
() -> {
new DomainMap().setBlockParentQuery(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -148,7 +149,7 @@ public class DomainMapTest extends SolrTestCaseJ4 {
() -> {
new DomainMap().setBlockChildQuery(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -165,7 +166,7 @@ public class DomainMapTest extends SolrTestCaseJ4 {
() -> {
new DomainMap().setJoinTransformation(null, "valid-to-field");
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -176,7 +177,7 @@ public class DomainMapTest extends SolrTestCaseJ4 {
() -> {
new DomainMap().setJoinTransformation("valid-from-field", null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java
index 75348ce0a12..67588d50b72 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java
@@ -20,6 +20,7 @@ package org.apache.solr.client.solrj.request.json;
import static org.hamcrest.core.StringContains.containsString;
import org.apache.solr.SolrTestCaseJ4;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
@@ -32,7 +33,7 @@ public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
() -> {
new HeatmapFacetMap(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -50,7 +51,8 @@ public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
new HeatmapFacetMap("ANY_FIELD_NAME")
.withSubFacet("ANY_NAME", new TermsFacetMap("ANY_OTHER_FIELD_NAME"));
});
- assertThat(thrown.getMessage(), containsString("doesn't currently support subfacets"));
+ MatcherAssert.assertThat(
+ thrown.getMessage(), containsString("doesn't currently support subfacets"));
}
@Test
@@ -61,7 +63,7 @@ public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
() -> {
new HeatmapFacetMap("ANY_FIELD_NAME").setRegionQuery(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -79,7 +81,7 @@ public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
() -> {
new HeatmapFacetMap("ANY_FIELD_NAME").setGridLevel(0);
});
- assertThat(thrown.getMessage(), containsString("must be a positive integer"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be a positive integer"));
}
@Test
@@ -96,7 +98,7 @@ public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
() -> {
new HeatmapFacetMap("ANY_FIELD_NAME").setDistErr(-1.0);
});
- assertThat(thrown.getMessage(), containsString("must be non-negative"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-negative"));
}
@Test
@@ -113,7 +115,7 @@ public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
() -> {
new HeatmapFacetMap("ANY_FIELD_NAME").setDistErrPct(2.0);
});
- assertThat(thrown.getMessage(), containsString("must be between 0.0 and 1.0"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be between 0.0 and 1.0"));
}
@Test
@@ -130,7 +132,7 @@ public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
() -> {
new HeatmapFacetMap("ANY_FIELD_NAME").setHeatmapFormat(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestUnitTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestUnitTest.java
index 775ebe243f3..977cffdf8d3 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestUnitTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestUnitTest.java
@@ -28,6 +28,7 @@ import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.request.RequestWriter;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.MapWriter;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
/** Unit tests for {@link JsonQueryRequest} */
@@ -43,7 +44,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().setQuery((String) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -54,7 +55,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().setQuery((Map<String, Object>) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -65,14 +66,14 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().setQuery((MapWriter) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
public void testWritesProvidedQueryStringToJsonCorrectly() {
final JsonQueryRequest request = new JsonQueryRequest().setQuery("text:solr");
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"query\":\"text:solr\""));
+ MatcherAssert.assertThat(requestBody, containsString("\"query\":\"text:solr\""));
}
@Test
@@ -84,7 +85,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
paramsMap.put("q", "*:*");
final JsonQueryRequest request = new JsonQueryRequest().setQuery(queryMap);
final String requestBody = writeRequestToJson(request);
- assertThat(
+ MatcherAssert.assertThat(
requestBody, containsString("\"query\":{\"lucene\":{\"q\":\"*:*\",\"df\":\"text\"}}"));
}
@@ -105,7 +106,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
};
final JsonQueryRequest request = new JsonQueryRequest().setQuery(queryWriter);
final String requestBody = writeRequestToJson(request);
- assertThat(
+ MatcherAssert.assertThat(
requestBody, containsString("\"query\":{\"lucene\":{\"q\":\"*:*\",\"df\":\"text\"}}"));
}
@@ -117,7 +118,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withFacet(null, new HashMap<>());
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
thrown =
expectThrows(
@@ -125,7 +126,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withStatFacet(null, "avg(price)");
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -136,7 +137,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withFacet("anyFacetName", (Map<String, Object>) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -147,7 +148,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withFacet("anyFacetName", (MapWriter) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -158,7 +159,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withStatFacet("anyFacetName", (String) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -169,7 +170,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
final JsonQueryRequest request =
new JsonQueryRequest().withFacet("top_categories", categoryFacetMap);
final String requestBody = writeRequestToJson(request);
- assertThat(
+ MatcherAssert.assertThat(
requestBody,
containsString(
"\"facet\":{\"top_categories\":{\"field\":\"category\",\"type\":\"terms\"}}"));
@@ -188,7 +189,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
final JsonQueryRequest request =
new JsonQueryRequest().withFacet("top_categories", facetWriter);
final String requestBody = writeRequestToJson(request);
- assertThat(
+ MatcherAssert.assertThat(
requestBody,
containsString(
"\"facet\":{\"top_categories\":{\"type\":\"terms\",\"field\":\"category\"}}"));
@@ -199,7 +200,8 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
final JsonQueryRequest request =
new JsonQueryRequest().withStatFacet("avg_price", "avg(price)");
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"facet\":{\"avg_price\":\"avg(price)\"}"));
+ MatcherAssert.assertThat(
+ requestBody, containsString("\"facet\":{\"avg_price\":\"avg(price)\"}"));
}
@Test
@@ -216,7 +218,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
request.withFacet("facet2", facetMap2);
final String requestBody = writeRequestToJson(request);
- assertThat(
+ MatcherAssert.assertThat(
requestBody,
containsString(
"\"facet\":{\"facet2\":{\"field\":\"b\",\"type\":\"terms\"},\"facet1\":{\"field\":\"a\",\"type\":\"terms\"}}"));
@@ -230,14 +232,14 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().setLimit(-1);
});
- assertThat(thrown.getMessage(), containsString("must be non-negative"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-negative"));
}
@Test
public void testWritesProvidedLimitToJsonCorrectly() {
final JsonQueryRequest request = new JsonQueryRequest().setLimit(5);
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"limit\":5"));
+ MatcherAssert.assertThat(requestBody, containsString("\"limit\":5"));
}
@Test
@@ -248,14 +250,14 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().setOffset(-1);
});
- assertThat(thrown.getMessage(), containsString("must be non-negative"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-negative"));
}
@Test
public void testWritesProvidedOffsetToJsonCorrectly() {
final JsonQueryRequest request = new JsonQueryRequest().setOffset(5);
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"offset\":5"));
+ MatcherAssert.assertThat(requestBody, containsString("\"offset\":5"));
}
@Test
@@ -266,14 +268,14 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().setSort(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
public void testWritesProvidedSortToJsonCorrectly() {
final JsonQueryRequest request = new JsonQueryRequest().setSort("price asc");
final String requestBody = writeRequestToJson(request, LEAVE_WHITESPACE);
- assertThat(requestBody, containsString("\"sort\":\"price asc"));
+ MatcherAssert.assertThat(requestBody, containsString("\"sort\":\"price asc"));
}
@Test
@@ -284,7 +286,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withFilter((String) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -295,14 +297,14 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withFilter((Map<String, Object>) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
public void testWritesProvidedFilterToJsonCorrectly() {
final JsonQueryRequest request = new JsonQueryRequest().withFilter("text:solr");
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"filter\":[\"text:solr\"]"));
+ MatcherAssert.assertThat(requestBody, containsString("\"filter\":[\"text:solr\"]"));
}
@Test
@@ -310,7 +312,8 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
final JsonQueryRequest request =
new JsonQueryRequest().withFilter("text:solr").withFilter("text:lucene");
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"filter\":[\"text:solr\",\"text:lucene\"]"));
+ MatcherAssert.assertThat(
+ requestBody, containsString("\"filter\":[\"text:solr\",\"text:lucene\"]"));
}
@Test
@@ -321,21 +324,21 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().returnFields((Iterable<String>) null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
public void testWritesProvidedFieldsToJsonCorrectly() {
final JsonQueryRequest request = new JsonQueryRequest().returnFields("price");
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"fields\":[\"price\"]"));
+ MatcherAssert.assertThat(requestBody, containsString("\"fields\":[\"price\"]"));
}
@Test
public void testWritesMultipleProvidedFieldsToJsonCorrectly() {
final JsonQueryRequest request = new JsonQueryRequest().returnFields("price", "name");
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"fields\":[\"price\",\"name\"]"));
+ MatcherAssert.assertThat(requestBody, containsString("\"fields\":[\"price\",\"name\"]"));
}
@Test
@@ -346,7 +349,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withParam(null, "any-value");
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -357,14 +360,14 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {
() -> {
new JsonQueryRequest().withParam("any-name", null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
public void testWritesMiscParamsToJsonCorrectly() {
final JsonQueryRequest request = new JsonQueryRequest().withParam("fq", "inStock:true");
final String requestBody = writeRequestToJson(request);
- assertThat(requestBody, containsString("\"params\":{\"fq\":\"inStock:true\"}"));
+ MatcherAssert.assertThat(requestBody, containsString("\"params\":{\"fq\":\"inStock:true\"}"));
}
private String writeRequestToJson(JsonQueryRequest request, boolean trimWhitespace) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java
index e58530e8587..c86799b729a 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java
@@ -20,6 +20,7 @@ package org.apache.solr.client.solrj.request.json;
import static org.hamcrest.core.StringContains.containsString;
import org.apache.solr.SolrTestCaseJ4;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
public class QueryFacetMapTest extends SolrTestCaseJ4 {
@@ -37,7 +38,7 @@ public class QueryFacetMapTest extends SolrTestCaseJ4 {
() -> {
final QueryFacetMap queryFacet = new QueryFacetMap(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/RangeFacetMapTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/RangeFacetMapTest.java
index ca618fd57d1..52e885c778f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/RangeFacetMapTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/RangeFacetMapTest.java
@@ -20,6 +20,7 @@ package org.apache.solr.client.solrj.request.json;
import static org.hamcrest.core.StringContains.containsString;
import org.apache.solr.SolrTestCaseJ4;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
/** Unit tests for {@link RangeFacetMap} */
@@ -32,7 +33,7 @@ public class RangeFacetMapTest extends SolrTestCaseJ4 {
() -> {
new RangeFacetMap(null, 1, 2, 3);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -43,7 +44,8 @@ public class RangeFacetMapTest extends SolrTestCaseJ4 {
() -> {
new RangeFacetMap("ANY_FIELD_NAME", 1, -1, 3);
});
- assertThat(thrown.getMessage(), containsString("'end' must be greater than parameter 'start'"));
+ MatcherAssert.assertThat(
+ thrown.getMessage(), containsString("'end' must be greater than parameter 'start'"));
}
@Test
@@ -54,7 +56,7 @@ public class RangeFacetMapTest extends SolrTestCaseJ4 {
() -> {
new RangeFacetMap("ANY_FIELD_NAME", 1, 2, -1);
});
- assertThat(thrown.getMessage(), containsString("must be a positive integer"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be a positive integer"));
}
@Test
@@ -80,7 +82,7 @@ public class RangeFacetMapTest extends SolrTestCaseJ4 {
() -> {
new RangeFacetMap("ANY_FIELD_NAME", 1, 2, 3).setOtherBuckets(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/TermsFacetMapTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/TermsFacetMapTest.java
index cee8ae6bcc1..6ff34bedce6 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/TermsFacetMapTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/TermsFacetMapTest.java
@@ -20,6 +20,7 @@ package org.apache.solr.client.solrj.request.json;
import static org.hamcrest.core.StringContains.containsString;
import org.apache.solr.SolrTestCaseJ4;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
public class TermsFacetMapTest extends SolrTestCaseJ4 {
@@ -46,7 +47,7 @@ public class TermsFacetMapTest extends SolrTestCaseJ4 {
final TermsFacetMap termsFacet =
new TermsFacetMap(ANY_FIELD_NAME).setBucketOffset(-1);
});
- assertThat(thrown.getMessage(), containsString("must be non-negative"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-negative"));
}
@Test
@@ -69,7 +70,7 @@ public class TermsFacetMapTest extends SolrTestCaseJ4 {
() -> {
final TermsFacetMap termsFacet = new TermsFacetMap(ANY_FIELD_NAME).setSort(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -86,7 +87,7 @@ public class TermsFacetMapTest extends SolrTestCaseJ4 {
() -> {
final TermsFacetMap termsFacet = new TermsFacetMap(ANY_FIELD_NAME).setOverRequest(-2);
});
- assertThat(thrown.getMessage(), containsString("must be >= -1"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be >= -1"));
}
@Test
@@ -110,7 +111,7 @@ public class TermsFacetMapTest extends SolrTestCaseJ4 {
() -> {
final TermsFacetMap termsFacet = new TermsFacetMap(ANY_FIELD_NAME).setOverRefine(-2);
});
- assertThat(thrown.getMessage(), containsString("must be >= -1"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be >= -1"));
}
@Test
@@ -127,7 +128,7 @@ public class TermsFacetMapTest extends SolrTestCaseJ4 {
() -> {
final TermsFacetMap termsFacet = new TermsFacetMap(ANY_FIELD_NAME).setMinCount(-1);
});
- assertThat(thrown.getMessage(), containsString("must be a non-negative integer"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be a non-negative integer"));
}
@Test
@@ -160,7 +161,7 @@ public class TermsFacetMapTest extends SolrTestCaseJ4 {
final TermsFacetMap termsFacet =
new TermsFacetMap(ANY_FIELD_NAME).setTermPrefix(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
@@ -178,7 +179,7 @@ public class TermsFacetMapTest extends SolrTestCaseJ4 {
final TermsFacetMap termsFacet =
new TermsFacetMap(ANY_FIELD_NAME).setFacetMethod(null);
});
- assertThat(thrown.getMessage(), containsString("must be non-null"));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));
}
@Test
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 6a5e841214b..67ed6548562 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
@@ -17,12 +17,12 @@
package org.apache.solr.client.solrj.response;
import java.util.List;
-import junit.framework.Assert;
import org.apache.solr.EmbeddedSolrServerTestBase;
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;
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 95552cf756d..dc2b4092f1e 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
@@ -17,7 +17,6 @@
package org.apache.solr.client.solrj.response;
import java.util.List;
-import junit.framework.Assert;
import org.apache.solr.EmbeddedSolrServerTestBase;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.request.QueryRequest;
@@ -26,6 +25,7 @@ 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;
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 956a6a9714b..c0c7e631119 100644
--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -45,7 +45,6 @@ import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.Filter;
-import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.lucene.tests.util.TestUtil;
import org.apache.lucene.util.Constants;
@@ -68,6 +67,7 @@ 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;
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index e8ea27bec20..25f7f6c3b5b 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -157,6 +157,7 @@ import org.apache.solr.util.StartupLoggingUtils;
import org.apache.solr.util.TestHarness;
import org.apache.solr.util.TestInjection;
import org.apache.zookeeper.KeeperException;
+import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -232,7 +233,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
if (expectedStrings != null) {
for (String expectedString : expectedStrings) {
- assertThat(thrown.getMessage(), containsString(expectedString));
+ MatcherAssert.assertThat(thrown.getMessage(), containsString(expectedString));
}
}
}
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
index 9f321df99aa..d058a1b1641 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
@@ -48,6 +48,7 @@ import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CollectionAdminParams;
import org.apache.solr.common.params.CoreAdminParams;
+import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -218,7 +219,7 @@ public abstract class AbstractCloudBackupRestoreTestCase extends SolrCloudTestCa
restore.setConfigName("confFaulty");
assertEquals(RequestStatusState.FAILED, restore.processAndWait(solrClient, 30));
- assertThat(
+ MatcherAssert.assertThat(
"Failed collection is still in the clusterstate: "
+ cluster
.getSolrClient()
diff --git a/solr/test-framework/src/java/org/apache/solr/util/LogListener.java b/solr/test-framework/src/java/org/apache/solr/util/LogListener.java
index 59434149ce1..d0c2a43fcaf 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/LogListener.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/LogListener.java
@@ -17,7 +17,7 @@
package org.apache.solr.util;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.io.Closeable;
import java.lang.invoke.MethodHandles;
@@ -63,8 +63,8 @@ import org.apache.solr.common.util.SuppressForbidden;
* // ... some test code ...
*
* // convinience method for only dealing with Message String of the LogEvent
- * assertThat(secWarnLog.pollMessage(), containsString("hoss"));
- * assertThat(secWarnLog.getQueue().isEmpty()); // no other WARNings matching PKI
+ * MatcherAssert.assertThat(secWarnLog.pollMessage(), containsString("hoss"));
+ * MatcherAssert.assertThat(secWarnLog.getQueue().isEmpty()); // no other WARNings matching PKI
*
* // ... more test code ...
*
diff --git a/solr/test-framework/src/test/org/apache/solr/cloud/JettySolrRunnerTest.java b/solr/test-framework/src/test/org/apache/solr/cloud/JettySolrRunnerTest.java
index c05d3763e99..f3f13cac420 100644
--- a/solr/test-framework/src/test/org/apache/solr/cloud/JettySolrRunnerTest.java
+++ b/solr/test-framework/src/test/org/apache/solr/cloud/JettySolrRunnerTest.java
@@ -26,6 +26,7 @@ import java.nio.file.Path;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettyConfig;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
public class JettySolrRunnerTest extends SolrTestCaseJ4 {
@@ -56,7 +57,7 @@ public class JettySolrRunnerTest extends SolrTestCaseJ4 {
jetty.stop();
jetty.start(false);
- assertThat(
+ MatcherAssert.assertThat(
"After restart, jetty port should be different",
jetty.getBaseUrl().getPort(),
not(usedPort));
diff --git a/solr/test-framework/src/test/org/apache/solr/util/TestErrorLogMuter.java b/solr/test-framework/src/test/org/apache/solr/util/TestErrorLogMuter.java
index 002ef355356..57bb24a76a5 100644
--- a/solr/test-framework/src/test/org/apache/solr/util/TestErrorLogMuter.java
+++ b/solr/test-framework/src/test/org/apache/solr/util/TestErrorLogMuter.java
@@ -23,6 +23,7 @@ import java.lang.invoke.MethodHandles;
import java.util.regex.Pattern;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.util.SuppressForbidden;
+import org.hamcrest.MatcherAssert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,8 +49,8 @@ public class TestErrorLogMuter extends SolrTestCaseJ4 {
log.warn("This is an warn message, mentioning 'eRrOr Log', that should also not be muted");
assertEquals(1, x.getCount());
// the root logger better have gotten both of those...
- assertThat(rootErrorCheck.pollMessage(), containsString("should not mute"));
- assertThat(rootWarnCheck.pollMessage(), containsString("also not be muted"));
+ MatcherAssert.assertThat(rootErrorCheck.pollMessage(), containsString("should not mute"));
+ MatcherAssert.assertThat(rootWarnCheck.pollMessage(), containsString("also not be muted"));
log.error(
"This {} because of the {} msg",
@@ -113,7 +114,7 @@ public class TestErrorLogMuter extends SolrTestCaseJ4 {
log.error("this matches the default ignore_exception pattern");
log.error("something matching foo that should make it"); // E1
assertEquals(1, rootErrorCheck.getCount());
- assertThat(rootErrorCheck.pollMessage(), containsString("should make it"));
+ MatcherAssert.assertThat(rootErrorCheck.pollMessage(), containsString("should make it"));
ignoreException("foo");
log.error("something matching foo that should NOT make it");
ignoreException("foo");
@@ -124,17 +125,17 @@ public class TestErrorLogMuter extends SolrTestCaseJ4 {
"A warning should be fine even if it matches ignore_exception and foo and bar"); // W1
assertEquals(1, rootErrorCheck.getCount());
assertEquals(1, rootWarnCheck.getCount());
- assertThat(rootErrorCheck.pollMessage(), containsString("should be fine"));
+ MatcherAssert.assertThat(rootErrorCheck.pollMessage(), containsString("should be fine"));
unIgnoreException("foo");
log.error("another thing matching foo that should make it"); // E2
assertEquals(2, rootErrorCheck.getCount());
- assertThat(rootErrorCheck.pollMessage(), containsString("another thing"));
+ MatcherAssert.assertThat(rootErrorCheck.pollMessage(), containsString("another thing"));
log.error("something matching baaaar that should still NOT make it");
assertEquals(2, rootErrorCheck.getCount());
resetExceptionIgnores();
log.error("this still matches the default ignore_exception pattern");
log.error("but something matching baaaar should make it now"); // E3
- assertThat(rootErrorCheck.pollMessage(), containsString("should make it now"));
+ MatcherAssert.assertThat(rootErrorCheck.pollMessage(), containsString("should make it now"));
// the root logger must have only gotten the non-muted messages...
assertEquals(3, rootErrorCheck.getCount());