Apache Solr open-source search software
SOLR-15868: Fix test broken by new sorting of nodeList (#471)
Houston Putmanfdfe0c3d93e9
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.javaindex 4ca02bd7582..86e9ca667a4 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java@@ -689,18 +689,13 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {assertEquals(numberOfSlices * numberOfReplica, coreNames.size());for (int i = 1; i <= numberOfSlices; i++) {+ Set<String> foundNodeNames = new HashSet<>(numberOfReplica);for (int j = 1; j <= numberOfReplica; j++) {String coreName = coreNames.get((i-1) * numberOfReplica + (j-1));-- if (dontShuffleCreateNodeSet) {- final String expectedNodeName = nodeUrlWithoutProtocolPartForLiveNodes.get((numberOfReplica * (i - 1) + (j - 1)) % nodeUrlWithoutProtocolPartForLiveNodes.size());- assertFalse("expectedNodeName is null for coreName="+coreName, null == expectedNodeName);-- final String actualNodeName = coreName_TO_nodeUrlWithoutProtocolPartForLiveNodes_map.get(coreName);- assertFalse("actualNodeName is null for coreName="+coreName, null == actualNodeName);-- assertTrue("node name mismatch for coreName="+coreName+" ( actual="+actualNodeName+" versus expected="+expectedNodeName+" )", actualNodeName.equals(expectedNodeName));- }++ String foundNode = coreName_TO_nodeUrlWithoutProtocolPartForLiveNodes_map.get(coreName);+ assertTrue("Multiple replicas scheduled for node: "+foundNode, foundNodeNames.add(foundNode));+ assertTrue("Assigned node name not in list of given nodes: "+foundNode, nodeUrlWithoutProtocolPartForLiveNodes.contains(foundNode));}}