SOLR-17217: Simplify verbose MatcherAssert.assertThat usage in tests

Author: hossman

solr/CHANGES.txt

@@ -181,6 +181,8 @@ Other Changes
 * SOLR-17201: Http2SolrClient and friends no longer marked as @lucene.experimental.
   Krb5HttpClientBuilder and PreemptiveBasicAuthClientBuilderFactory no longer deprecated (janhoy)
 
+* SOLR-17217: Simplify verbose MatcherAssert.assertThat usage in tests (hossman)
+
 ==================  9.5.0 ==================
 New Features
 ---------------------

solr/core/src/test/org/apache/solr/TestDistributedGrouping.java

@@ -30,7 +30,6 @@
 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;
 
 /**
@@ -888,7 +887,7 @@ public void test() throws Exception {
                     "group.offset",
                     "-1"));
     assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, exception.code());
-    MatcherAssert.assertThat(
+    assertThat(
         exception.getMessage(), containsString("'group.offset' parameter cannot be negative"));
     resetExceptionIgnores();
 

solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java

@@ -29,7 +29,6 @@
 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,8 +75,7 @@ public static void createCluster() throws Exception {
   public void testCreateCollectionCleanup() throws Exception {
     final CloudSolrClient cloudClient = cluster.getSolrClient();
     String collectionName = "foo";
-    MatcherAssert.assertThat(
-        CollectionAdminRequest.listCollections(cloudClient), not(hasItem(collectionName)));
+    assertThat(CollectionAdminRequest.listCollections(cloudClient), not(hasItem(collectionName)));
     // Create a collection that would fail
     CollectionAdminRequest.Create create =
         CollectionAdminRequest.createCollection(collectionName, "conf1", 1, 1);
@@ -95,7 +93,7 @@ public void testCreateCollectionCleanup() throws Exception {
         });
 
     // Confirm using LIST that the collection does not exist
-    MatcherAssert.assertThat(
+    assertThat(
         "Failed collection is still in the clusterstate: "
             + cluster.getSolrClient().getClusterState().getCollectionOrNull(collectionName),
         CollectionAdminRequest.listCollections(cloudClient),
@@ -106,8 +104,7 @@ public void testCreateCollectionCleanup() throws Exception {
   public void testAsyncCreateCollectionCleanup() throws Exception {
     final CloudSolrClient cloudClient = cluster.getSolrClient();
     String collectionName = "foo2";
-    MatcherAssert.assertThat(
-        CollectionAdminRequest.listCollections(cloudClient), not(hasItem(collectionName)));
+    assertThat(CollectionAdminRequest.listCollections(cloudClient), not(hasItem(collectionName)));
 
     // Create a collection that would fail
     CollectionAdminRequest.Create create =
@@ -125,10 +122,10 @@ public void testAsyncCreateCollectionCleanup() throws Exception {
     RequestStatusState state =
         AbstractFullDistribZkTestBase.getRequestStateAfterCompletion(
             "testAsyncCreateCollectionCleanup", 30, cloudClient);
-    MatcherAssert.assertThat(state.getKey(), is("failed"));
+    assertThat(state.getKey(), is("failed"));
 
     // Confirm using LIST that the collection does not exist
-    MatcherAssert.assertThat(
+    assertThat(
         "Failed collection is still in the clusterstate: "
             + cluster.getSolrClient().getClusterState().getCollectionOrNull(collectionName),
         CollectionAdminRequest.listCollections(cloudClient),

solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java

@@ -40,7 +40,6 @@
 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;
@@ -204,7 +203,7 @@ private void testJoins(String toColl, String fromColl, String toDocId, boolean i
 
   private void assertScore(boolean isScoresTest, SolrDocument doc) {
     if (isScoresTest) {
-      MatcherAssert.assertThat(
+      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());

solr/core/src/test/org/apache/solr/cloud/LeaderElectionContextKeyTest.java

@@ -32,7 +32,6 @@
 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;
 
@@ -115,11 +114,11 @@ public void test()
       }
       assertTrue(found);
       // There are no leader election was kicked off on testCollection2
-      MatcherAssert.assertThat(
+      assertThat(
           collection2Shard1Nodes,
           CoreMatchers.is(
               getElectionNodes(TEST_COLLECTION_2, "shard1", stateReader.getZkClient())));
-      MatcherAssert.assertThat(
+      assertThat(
           collection2Shard2Nodes,
           CoreMatchers.is(
               getElectionNodes(TEST_COLLECTION_2, "shard2", stateReader.getZkClient())));

solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java

@@ -39,7 +39,6 @@
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.util.TestInjection;
-import org.hamcrest.MatcherAssert;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -138,7 +137,7 @@ private Replica corruptLeader(String collection) throws IOException, SolrServerE
       } catch (RemoteSolrException e) {
         // solrClient.add would throw RemoteSolrException with code 500
         // or 404 if the bad replica has already been deleted
-        MatcherAssert.assertThat(e.code(), anyOf(is(500), is(404)));
+        assertThat(e.code(), anyOf(is(500), is(404)));
       } catch (AlreadyClosedException e) {
         // If giving up leadership, might be already closed/closing
       }

solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java

@@ -23,7 +23,6 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.embedded.JettySolrRunner;
-import org.hamcrest.MatcherAssert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -51,7 +50,7 @@ public void test() throws Exception {
                 () -> {
                   client.add("collection", new SolrInputDocument());
                 });
-        MatcherAssert.assertThat(
+        assertThat(
             e.getMessage(), containsString("Document is missing mandatory uniqueKey field: id"));
       }
     }

solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java

@@ -46,7 +46,6 @@
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.embedded.JettySolrRunner;
-import org.hamcrest.MatcherAssert;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -138,7 +137,7 @@ public void multipleOptionsSplitTest() {
             .setShardName("shard1");
     SolrException thrown =
         assertThrows(SolrException.class, () -> splitShard.process(cluster.getSolrClient()));
-    MatcherAssert.assertThat(
+    assertThat(
         thrown.getMessage(),
         containsString("numSubShards can not be specified with split.key or ranges parameters"));
   }

solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java

@@ -47,7 +47,6 @@
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.search.TestPseudoReturnFields;
-import org.hamcrest.MatcherAssert;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -745,16 +744,15 @@ public void testAugmenters() throws Exception {
         assertTrue(msg, doc.getFieldValue("[docid]") instanceof Integer);
 
         assertTrue(msg, doc.getFieldValue("shard_id") instanceof String);
-        MatcherAssert.assertThat(doc.getFieldValue("shard_id").toString(), startsWith("shard"));
+        assertThat(doc.getFieldValue("shard_id").toString(), startsWith("shard"));
 
         assertTrue(msg, doc.getFieldValue("replica_urls") instanceof String);
-        MatcherAssert.assertThat(
+        assertThat(
             doc.getFieldValue("replica_urls").toString(),
             containsString(
                 "/solr/org.apache.solr.cloud.TestCloudPseudoReturnFields_collection_shard"));
         if (1 < repFactor) {
-          MatcherAssert.assertThat(
-              doc.getFieldValue("replica_urls").toString(), containsString("|"));
+          assertThat(doc.getFieldValue("replica_urls").toString(), containsString("|"));
         }
 
         assertEquals(msg, doc.getFieldValue("shard_id"), doc.getFieldValue("[shard]"));
@@ -791,16 +789,15 @@ public void testAugmenters() throws Exception {
         String msg = p + " => " + doc;
 
         assertTrue(msg, doc.getFieldValue("shard_id") instanceof String);
-        MatcherAssert.assertThat(doc.getFieldValue("shard_id").toString(), startsWith("shard"));
+        assertThat(doc.getFieldValue("shard_id").toString(), startsWith("shard"));
 
         assertTrue(msg, doc.getFieldValue("replica_urls") instanceof String);
-        MatcherAssert.assertThat(
+        assertThat(
             doc.getFieldValue("replica_urls").toString(),
             containsString(
                 "/solr/org.apache.solr.cloud.TestCloudPseudoReturnFields_collection_shard"));
         if (1 < repFactor) {
-          MatcherAssert.assertThat(
-              doc.getFieldValue("replica_urls").toString(), containsString("|"));
+          assertThat(doc.getFieldValue("replica_urls").toString(), containsString("|"));
         }
 
         assertEquals(msg, doc.getFieldValue("shard_id"), doc.getFieldValue("[shard]"));

solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java

@@ -106,7 +106,6 @@
 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;
@@ -1402,8 +1401,7 @@ public void testUploadWithScriptUpdateProcessor() throws Exception {
             });
     unIgnoreException("uploaded without any authentication in place");
 
-    MatcherAssert.assertThat(
-        thrown.getMessage(), containsString("Underlying core creation failed"));
+    assertThat(thrown.getMessage(), containsString("Underlying core creation failed"));
 
     // Authorization on
     final String trustedSuffix = "-trusted";
@@ -1438,8 +1436,7 @@ public void testUploadWithLibDirective() throws Exception {
             });
     unIgnoreException("without any authentication in place");
 
-    MatcherAssert.assertThat(
-        thrown.getMessage(), containsString("Underlying core creation failed"));
+    assertThat(thrown.getMessage(), containsString("Underlying core creation failed"));
 
     // Authorization on
     final String trustedSuffix = "-trusted";