[solr] branch jira/solr16636_test updated: merging with 9X

[noble]

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

noble pushed a commit to branch jira/solr16636_test
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/jira/solr16636_test by this 
push:
     new 9c6b76ad09f merging with 9X
9c6b76ad09f is described below

commit 9c6b76ad09f4b3c6257822b939fca32f2d818cfc
Author: Noble Paul <noble.p...@gmail.com>
AuthorDate: Tue Feb 21 17:33:56 2023 +1100

    merging with 9X
---
 .../api/collections/SimpleCollectionCreateDeleteTest.java      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java
 
b/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java
index 3b048851f5b..9d8c18f42d7 100644
--- 
a/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java
+++ 
b/solr/core/src/test/org/apache/solr/cloud/api/collections/SimpleCollectionCreateDeleteTest.java
@@ -19,6 +19,7 @@ package org.apache.solr.cloud.api.collections;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -122,13 +123,16 @@ public class SimpleCollectionCreateDeleteTest extends 
AbstractFullDistribZkTestB
 
     DocCollection c =
         ClusterState.createFromCollectionMap(
-                0, (Map<String, Object>) Utils.fromJSON(node.data), 
Collections.emptySet())
+                0, (Map<String, Object>) Utils.fromJSON(node.data), 
Collections.emptySet(), null)
             .getCollection(collectionName);
 
+    Set<String> knownKeys =
+        Set.of("core", "leader", "node_name", "base_url", "state", "type", 
"force_set_state");
     c.forEachReplica(
         (s, replica) -> {
-          assertFalse(replica.getProperties().containsKey("collection"));
-          assertFalse(replica.getProperties().containsKey("shard"));
+          for (String k : replica.getProperties().keySet()) {
+            assertTrue(knownKeys.contains(k));
+          }
         });
   }