Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-13721: TestApiFramework#testFramework failing in master consistently

This commit is contained in:
noble 2019-08-27 12:01:23 +10:00
parent d0ea612d4e
commit 3d146febb8
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
View File

@ -19,14 +19,20 @@ package org.apache.solr.handler.admin;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag; import org.apache.solr.api.ApiBag;
import org.apache.solr.api.V2HttpCall;
import org.apache.solr.api.V2HttpCall.CompositeApi; import org.apache.solr.api.V2HttpCall.CompositeApi;
import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.CommandOperation;
import org.apache.solr.common.util.PathTrie;
import org.apache.solr.common.util.StrUtils; import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.util.Utils; import org.apache.solr.common.util.Utils;
import org.apache.solr.common.util.ValidatingJsonMap; import org.apache.solr.common.util.ValidatingJsonMap;
@ -39,10 +45,6 @@ import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.api.Api;
import org.apache.solr.api.V2HttpCall;
import org.apache.solr.common.util.CommandOperation;
import org.apache.solr.common.util.PathTrie;
import static org.apache.solr.api.ApiBag.EMPTY_SPEC; import static org.apache.solr.api.ApiBag.EMPTY_SPEC;
import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET; import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;
@ -122,18 +124,21 @@ public class TestApiFramework extends SolrTestCaseJ4 {
SolrQueryResponse rsp = invoke(containerHandlers, null, "/collections/_introspect", GET, mockCC); SolrQueryResponse rsp = invoke(containerHandlers, null, "/collections/_introspect", GET, mockCC);
assertConditions(rsp.getValues().asMap(2), Utils.makeMap( Set<String> methodNames = new HashSet<>();
"/spec[0]/methods[0]", "DELETE", methodNames.add(rsp.getValues()._getStr("/spec[0]/methods[0]", null));
"/spec[1]/methods[0]", "POST", methodNames.add(rsp.getValues()._getStr("/spec[1]/methods[0]", null));
"/spec[2]/methods[0]", "GET" methodNames.add(rsp.getValues()._getStr("/spec[2]/methods[0]", null));
assertTrue(methodNames.contains("DELETE"));
assertTrue(methodNames.contains("POST"));
assertTrue(methodNames.contains("GET"));
)); methodNames = new HashSet<>();
rsp = invoke(coreHandlers, "/schema/_introspect", "/collections/hello/schema/_introspect", GET, mockCC); rsp = invoke(coreHandlers, "/schema/_introspect", "/collections/hello/schema/_introspect", GET, mockCC);
assertConditions(rsp.getValues().asMap(2), Utils.makeMap( methodNames.add(rsp.getValues()._getStr("/spec[0]/methods[0]", null));
"/spec[0]/methods[0]", "POST", methodNames.add(rsp.getValues()._getStr("/spec[1]/methods[0]", null));
"/spec[0]/commands", NOT_NULL, assertTrue(methodNames.contains("POST"));
"/spec[1]/methods[0]", "GET")); assertTrue(methodNames.contains("GET"));
rsp = invoke(coreHandlers, "/", "/collections/hello/_introspect", GET, mockCC); rsp = invoke(coreHandlers, "/", "/collections/hello/_introspect", GET, mockCC);
assertConditions(rsp.getValues().asMap(2), Utils.makeMap( assertConditions(rsp.getValues().asMap(2), Utils.makeMap(
@ -146,7 +151,8 @@ public class TestApiFramework extends SolrTestCaseJ4 {
)); ));
} }
public void testTrailingTemplatePaths(){
public void testTrailingTemplatePaths() {
PathTrie<Api> registry = new PathTrie<>(); PathTrie<Api> registry = new PathTrie<>();
Api api = new Api(EMPTY_SPEC) { Api api = new Api(EMPTY_SPEC) {
@Override @Override
@ -154,8 +160,8 @@ public class TestApiFramework extends SolrTestCaseJ4 {
} }
}; };
Api intropsect = new ApiBag.IntrospectApi(api,false); Api intropsect = new ApiBag.IntrospectApi(api, false);
ApiBag.registerIntrospect(Collections.emptyMap(),registry,"/c/.system/blob/{name}",intropsect); ApiBag.registerIntrospect(Collections.emptyMap(), registry, "/c/.system/blob/{name}", intropsect);
ApiBag.registerIntrospect(Collections.emptyMap(), registry, "/c/.system/{x}/{name}", intropsect); ApiBag.registerIntrospect(Collections.emptyMap(), registry, "/c/.system/{x}/{name}", intropsect);
assertEquals(intropsect, registry.lookup("/c/.system/blob/random_string/_introspect", new HashMap<>())); assertEquals(intropsect, registry.lookup("/c/.system/blob/random_string/_introspect", new HashMap<>()));
assertEquals(intropsect, registry.lookup("/c/.system/blob/_introspect", new HashMap<>())); assertEquals(intropsect, registry.lookup("/c/.system/blob/_introspect", new HashMap<>()));
@ -163,6 +169,7 @@ public class TestApiFramework extends SolrTestCaseJ4 {
assertEquals(intropsect, registry.lookup("/c/.system/v1/_introspect", new HashMap<>())); assertEquals(intropsect, registry.lookup("/c/.system/v1/_introspect", new HashMap<>()));
assertEquals(intropsect, registry.lookup("/c/.system/v1/v2/_introspect", new HashMap<>())); assertEquals(intropsect, registry.lookup("/c/.system/v1/v2/_introspect", new HashMap<>()));
} }
private SolrQueryResponse invoke(PluginBag<SolrRequestHandler> reqHandlers, String path, private SolrQueryResponse invoke(PluginBag<SolrRequestHandler> reqHandlers, String path,
String fullPath, SolrRequest.METHOD method, String fullPath, SolrRequest.METHOD method,
CoreContainer mockCC) { CoreContainer mockCC) {
@ -184,14 +191,14 @@ public class TestApiFramework extends SolrTestCaseJ4 {
} }
SolrQueryResponse rsp = new SolrQueryResponse(); SolrQueryResponse rsp = new SolrQueryResponse();
LocalSolrQueryRequest req = new LocalSolrQueryRequest(null, new MapSolrParams(new HashMap<>())){ LocalSolrQueryRequest req = new LocalSolrQueryRequest(null, new MapSolrParams(new HashMap<>())) {
@Override @Override
public List<CommandOperation> getCommands(boolean validateInput) { public List<CommandOperation> getCommands(boolean validateInput) {
return Collections.emptyList(); return Collections.emptyList();
} }
}; };
api.call(req,rsp); api.call(req, rsp);
return rsp; return rsp;
} }
@ -201,12 +208,12 @@ public class TestApiFramework extends SolrTestCaseJ4 {
for (Object o : conditions.entrySet()) { for (Object o : conditions.entrySet()) {
Map.Entry e = (Map.Entry) o; Map.Entry e = (Map.Entry) o;
String path = (String) e.getKey(); String path = (String) e.getKey();
List<String> parts = StrUtils.splitSmart(path, path.charAt(0) == '/' ? '/':' ', true); List<String> parts = StrUtils.splitSmart(path, path.charAt(0) == '/' ? '/' : ' ', true);
Object val = Utils.getObjectByPath(root, false, parts); Object val = Utils.getObjectByPath(root, false, parts);
if (e.getValue() instanceof ValidatingJsonMap.PredicateWithErrMsg) { if (e.getValue() instanceof ValidatingJsonMap.PredicateWithErrMsg) {
ValidatingJsonMap.PredicateWithErrMsg value = (ValidatingJsonMap.PredicateWithErrMsg) e.getValue(); ValidatingJsonMap.PredicateWithErrMsg value = (ValidatingJsonMap.PredicateWithErrMsg) e.getValue();
String err = value.test(val); String err = value.test(val);
if(err != null){ if (err != null) {
assertEquals(err + " for " + e.getKey() + " in :" + Utils.toJSONString(root), e.getValue(), val); assertEquals(err + " for " + e.getKey() + " in :" + Utils.toJSONString(root), e.getValue(), val);
} }