You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/11/10 01:45:37 UTC
[lucene-solr] branch reference_impl_dev updated: @1128 Fix up test.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new bdcab72 @1128 Fix up test.
bdcab72 is described below
commit bdcab72805834b2dea3337b05aee823350a220f2
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Nov 9 19:41:23 2020 -0600
@1128 Fix up test.
---
.../client/solrj/routing/ReplicaListTransformerTest.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java
index 4c9dd19..a33e6a4 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.solr.SolrTestCase;
import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.Utils;
@@ -61,7 +62,10 @@ public class ReplicaListTransformerTest extends SolrTestCase {
Object choice = it.next();
final String url;
if (choice instanceof String) {
- url = (String) choice;
+ url = (String)choice;
+ }
+ else if (choice instanceof Replica) {
+ url = ((Replica)choice).getCoreUrl();
} else {
url = null;
}
@@ -103,7 +107,7 @@ public class ReplicaListTransformerTest extends SolrTestCase {
@Test
public void testTransform() throws Exception {
- final String regex = ".*_n" + random().nextInt(10) + ".*";
+ final String regex = ".*?r_n\\d+.*";
AtomicReference<ReplicaListTransformer> transformer = new AtomicReference<>();
try {
@@ -147,17 +151,16 @@ public class ReplicaListTransformerTest extends SolrTestCase {
final List<String> urls = createRandomUrls();
for (int ii = 0; ii < urls.size(); ++ii) {
- final String name = "r_n" + (ii + 1);
+ final String name = "coll1_s1_r_n" + (ii + 1);
final String url = urls.get(ii);
final Map<String, Object> propMap = new HashMap<String, Object>();
- propMap.put("core", "test_core");
- propMap.put("node_name", url);
+ propMap.put(ZkStateReader.NODE_NAME_PROP, url);
propMap.put("type", "NRT");
// a skeleton replica, good enough for this test's purposes
final Replica replica = new Replica(name, propMap, "c1", "s1", new Replica.NodeNameToBaseUrl() {
@Override
public String getBaseUrlForNodeName(String nodeName) {
- return Utils.getBaseUrlForNodeName(nodeName, "http");
+ return Utils.getBaseUrlForNodeName(name, "http");
}
});