Apache Solr open-source search software
Fix confusing assertion messages
Pierre Salagnacc3a670a72bba
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.javaindex de433340cc7..20f17609ffb 100644--- a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java@@ -116,8 +116,8 @@ public class DeleteShardTest extends SolrCloudTestCase {waitForState("Expected 'b' to be removed", collection, c -> c.getSlice("b") == null);assertEquals(1, getCollectionState(collection).getActiveSlices().size());- assertTrue("Instance directory still exists", FileUtils.fileExists(coreStatus.instanceDir));- assertTrue("Data directory still exists", FileUtils.fileExists(coreStatus.dataDir));+ assertTrue("Instance directory not deleted", FileUtils.fileExists(coreStatus.instanceDir));+ assertTrue("Data directory not deleted", FileUtils.fileExists(coreStatus.dataDir));}private void setSliceState(String collectionName, String shardId, Slice.State state)diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.javaindex e9cb4d775ba..bae0a0cafb2 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.java@@ -46,7 +46,7 @@ public class OverseerModifyCollectionTest extends SolrCloudTestCase {CollectionAdminRequest.modifyCollection(collName, Collections.singletonMap("collection.configName", "conf2")).processAndWait(cluster.getSolrClient(), DEFAULT_TIMEOUT);- assertEquals(requestStatusState, RequestStatusState.COMPLETED);+ assertEquals(RequestStatusState.COMPLETED, requestStatusState);String configName =cluster.getSolrClient().getClusterStateProvider().getCollection(collName).getConfigName();