[solr] branch main updated: SOLR-15868: Fix test broken by new sorting of nodeList (#471)

[houston]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new fdfe0c3  SOLR-15868: Fix test broken by new sorting of nodeList (#471)
fdfe0c3 is described below

commit fdfe0c3d93e9d7c19ed195f19e61eee402e4e1dd
Author: Houston Putman <hous...@apache.org>
AuthorDate: Wed Dec 22 18:09:08 2021 -0500

    SOLR-15868: Fix test broken by new sorting of nodeList (#471)
---
 .../cloud/OverseerCollectionConfigSetProcessorTest.java   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git 
a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
 
b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
index 4ca02bd..86e9ca6 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));
       }
     }