Skip to content

Migrate tests from deprecated LocalSolrQueryRequest to SolrQueryRequestBase #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Migrate tests from deprecated LocalSolrQueryRequest to SolrQueryRequestBase #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e627b40
Initial plan
Copilot Nov 22, 2025
b036b60
Migrate tests from LocalSolrQueryRequest to SimpleSolrQueryRequest
Copilot Nov 22, 2025
78736ae
Fix remaining LocalSolrQueryRequest references in tests
Copilot Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SimpleSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.ResultContext;
Expand Down Expand Up @@ -503,7 +503,7 @@ public void testLocalSolrQueryRequestParams() {
HashMap<String, Object> args = new HashMap<>();
args.put("string", "string value");
args.put("array", new String[] {"array", "value"});
SolrQueryRequest req = new LocalSolrQueryRequest(null, null, null, 0, 20, args);
SolrQueryRequest req = new SimpleSolrQueryRequest(null, null, null, 0, 20, args);
assertEquals("string value", req.getParams().get("string"));
assertEquals("array", req.getParams().get("array"));

Expand Down Expand Up @@ -592,7 +592,7 @@ public void testSolrParams() {
m.put("s", "BBB");
m.put("ss", "SSS");

LocalSolrQueryRequest req = new LocalSolrQueryRequest(null, nl);
SimpleSolrQueryRequest req = new SimpleSolrQueryRequest(null, nl);
SolrParams p = req.getParams();

assertEquals(p.get("i"), "555");
Expand Down
48 changes: 24 additions & 24 deletions solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.util.HashMap;
import java.util.Map;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SimpleSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.ErrorLogMuter;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -106,50 +106,50 @@ public void testABunchOfConvertedStuff() {
assertU("<commit/>");
assertQ(req("val_s:[a TO z]"), "//*[@numFound='3'] ", "*[count(//doc)=3] ", "//*[@start='0']");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 2, 5, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 2, 5, args);
assertQ(
req,
"//*[@numFound='3'] ",
"*[count(//doc)=1] ",
"*//doc[1]/str[.='pear'] ",
"//*[@start='2']");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 3, 5, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 3, 5, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 4, 5, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 4, 5, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 25, 5, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 25, 5, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 1, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 1, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=1] ", "*//doc[1]/str[.='apple']");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 2, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 2, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=2] ", "*//doc[2]/str[.='banana']");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 1, 1, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 1, 1, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=1] ", "*//doc[1]/str[.='banana']");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 3, 1, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 3, 1, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 4, 1, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 4, 1, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 1, 0, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 1, 0, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
args = new HashMap<>();
args.put("sort", "val_s1 asc");
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
args = new HashMap<>();
args.put("sort", "val_s1 desc");
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args);
req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args);
assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]");
assertQ(req("val_s:[a TO b]"), "//*[@numFound='1']");
assertQ(req("val_s:[a TO cat]"), "//*[@numFound='2']");
Expand Down Expand Up @@ -808,18 +808,18 @@ public void testABunchOfConvertedStuff() {
assertQ(req("id:44"));
args = new HashMap<>();
args.put("fl", "fname_s,arr_f ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(req, "//str[.='Yonik'] ", "//float[.='1.4142135']");
args = new HashMap<>();
args.put("fl", "fname_s,score");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(req, "//str[.='Yonik']", "//float[@name='score' and . > 0]");

// test addition of score field

args = new HashMap<>();
args.put("fl", "score,* ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(
req,
"//str[.='Yonik'] ",
Expand All @@ -828,7 +828,7 @@ public void testABunchOfConvertedStuff() {
"*[count(//doc/*)>=13]");
args = new HashMap<>();
args.put("fl", "*,score ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(
req,
"//str[.='Yonik'] ",
Expand All @@ -837,33 +837,33 @@ public void testABunchOfConvertedStuff() {
"*[count(//doc/*)>=13]");
args = new HashMap<>();
args.put("fl", "* ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(req, "//str[.='Yonik'] ", "//float[.='1.4142135'] ", "*[count(//doc/*)>=12]");

// test maxScore

args = new HashMap<>();
args.put("fl", "score ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(req, "//result[@maxScore>0]");
args = new HashMap<>();
args.put("fl", "score ");
args.put("sort", "id desc");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(req, "//result[@maxScore>0]");
args = new HashMap<>();
args.put("fl", "score ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(req, "//@maxScore = //doc/float[@name='score']");
args = new HashMap<>();
args.put("fl", "score ");
args.put("sort", "id desc");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args);
assertQ(req, "//@maxScore = //doc/float[@name='score']");
args = new HashMap<>();
args.put("fl", "*,score");
args.put("sort", "id desc");
req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 0, args);
req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 0, args);
assertQ(req, "//result[@maxScore>0]");

// test schema field attribute inheritance and overriding
Expand Down
4 changes: 2 additions & 2 deletions solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SimpleSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.SolrRequestInfo;
Expand Down Expand Up @@ -213,7 +213,7 @@ void doTestJoin(String joinPrefix) throws Exception {
public void testCoresAreDifferent() throws Exception {
assertQEx("schema12.xml" + " has no \"cat\" field", req("cat:*"), ErrorCode.BAD_REQUEST);
try (var req =
new LocalSolrQueryRequest(fromCore, "cat:*", "/select", 0, 100, Collections.emptyMap())) {
new SimpleSolrQueryRequest(fromCore, "cat:*", "/select", 0, 100, Collections.emptyMap())) {
final String resp = query(fromCore, req);
assertTrue(resp, resp.contains("numFound=\"1\""));
assertTrue(resp, resp.contains("<str name=\"id\">10</str>"));
Expand Down
6 changes: 3 additions & 3 deletions solr/core/src/test/org/apache/solr/core/TestLazyCores.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.handler.admin.CoreAdminHandler;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SimpleSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.AddUpdateCommand;
Expand Down Expand Up @@ -590,8 +590,8 @@ private void addLazy(SolrCore core, String... fieldValues) throws IOException {
updater.addDoc(cmd);
}

private LocalSolrQueryRequest makeReq(SolrCore core, String... paramPairs) {
return new LocalSolrQueryRequest(core, params(paramPairs));
private SimpleSolrQueryRequest makeReq(SolrCore core, String... paramPairs) {
return new SimpleSolrQueryRequest(core, params(paramPairs));
}

@Test
Expand Down
16 changes: 8 additions & 8 deletions solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SimpleSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.TextField;
Expand Down Expand Up @@ -101,7 +101,7 @@ public void testResolveAnalysisRequest() {
params.add(AnalysisParams.FIELD_VALUE, "the quick red fox jumped over the lazy brown dogs");
params.add(CommonParams.Q, "fox brown");

SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params);
SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params);
FieldAnalysisRequest request = handler.resolveAnalysisRequest(req);
List<String> fieldNames = request.getFieldNames();
assertEquals("Expecting 2 field names", 2, fieldNames.size());
Expand All @@ -118,28 +118,28 @@ public void testResolveAnalysisRequest() {

// testing override of query value using analysis.query param
params.add(AnalysisParams.QUERY, "quick lazy");
req = new LocalSolrQueryRequest(h.getCore(), params);
req = new SimpleSolrQueryRequest(h.getCore(), params);
request = handler.resolveAnalysisRequest(req);
assertEquals("quick lazy", request.getQuery());
req.close();

// testing analysis.showmatch param
params.add(AnalysisParams.SHOW_MATCH, "false");
req = new LocalSolrQueryRequest(h.getCore(), params);
req = new SimpleSolrQueryRequest(h.getCore(), params);
request = handler.resolveAnalysisRequest(req);
assertFalse(request.isShowMatch());
req.close();

params.set(AnalysisParams.SHOW_MATCH, "true");
req = new LocalSolrQueryRequest(h.getCore(), params);
req = new SimpleSolrQueryRequest(h.getCore(), params);
request = handler.resolveAnalysisRequest(req);
assertTrue(request.isShowMatch());
req.close();

// testing absence of query value
params.remove(CommonParams.Q);
params.remove(AnalysisParams.QUERY);
req = new LocalSolrQueryRequest(h.getCore(), params);
req = new SimpleSolrQueryRequest(h.getCore(), params);
request = handler.resolveAnalysisRequest(req);
assertNull(request.getQuery());
req.close();
Expand All @@ -162,7 +162,7 @@ public void testResolveAnalysisRequest() {
params.remove(CommonParams.Q);
params.remove(AnalysisParams.QUERY);
params.remove(AnalysisParams.FIELD_VALUE);
try (SolrQueryRequest solrQueryRequest = new LocalSolrQueryRequest(h.getCore(), params)) {
try (SolrQueryRequest solrQueryRequest = new SimpleSolrQueryRequest(h.getCore(), params)) {
SolrException ex =
expectThrows(SolrException.class, () -> handler.resolveAnalysisRequest(solrQueryRequest));
assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, ex.code());
Expand Down Expand Up @@ -813,7 +813,7 @@ public TokenStream create(TokenStream input) {
public void testNoDefaultField() {
ModifiableSolrParams params = new ModifiableSolrParams();
params.add(CommonParams.Q, "fox brown");
SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params);
SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params);
handler.resolveAnalysisRequest(req);
}

Expand Down
22 changes: 11 additions & 11 deletions solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.FacetComponent;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SimpleSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.response.SolrQueryResponse;
Expand Down Expand Up @@ -169,7 +169,7 @@ public void testInterface() {

params.set(CommonParams.Q, "id:42");

try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(
"morelikethis - tom cruise",
mltreq,
Expand All @@ -179,7 +179,7 @@ public void testInterface() {

params.set(MoreLikeThisParams.BOOST, "true");

try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(
"morelikethis - tom cruise",
mltreq,
Expand All @@ -188,13 +188,13 @@ public void testInterface() {
}

params.set(CommonParams.Q, "id:44");
try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ("morelike this - harrison ford", mltreq, "//result/doc[1]/str[@name='id'][.='45']");
}

// test MoreLikeThis debug
params.set(CommonParams.DEBUG_QUERY, "true");
try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(
"morelike this - harrison ford",
mltreq,
Expand All @@ -207,13 +207,13 @@ public void testInterface() {
// test that qparser plugins work
params.remove(CommonParams.DEBUG_QUERY);
params.set(CommonParams.Q, "{!field f=id}44");
try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(mltreq, "//result/doc[1]/str[@name='id'][.='45']");
}

params.set(CommonParams.Q, "id:42");
params.set(MoreLikeThisParams.QF, "name^5.0 subword^0.1");
try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(
"morelikethis with weights",
mltreq,
Expand All @@ -224,14 +224,14 @@ public void testInterface() {
// test that qparser plugins work w/ the MoreLikeThisHandler
params.set(CommonParams.QT, "/mlt");
params.set(CommonParams.Q, "{!field f=id}44");
try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(mltreq, "//result/doc[1]/str[@name='id'][.='45']");
}

// test that debugging works (test for MoreLikeThis*Handler*)
params.set(CommonParams.QT, "/mlt");
params.set(CommonParams.DEBUG_QUERY, "true");
try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(
mltreq,
"//result/doc[1]/str[@name='id'][.='45']",
Expand All @@ -240,15 +240,15 @@ public void testInterface() {

params.set(FacetComponent.COMPONENT_NAME, "true");
params.set("facet.field", "name");
try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(
mltreq,
"//result/doc[1]/str[@name='id'][.='45']",
"//lst[@name='facet_counts']/lst[@name='facet_fields']/lst[@name='name']/int[@name='George'][.='1']");
}
params.set("facet.field", "{!ex=tg}name");
params.set("fq", "{!tag=tg}name:George");
try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) {
assertQ(
mltreq,
"//result/doc[1]/str[@name='id'][.='45']",
Expand Down
Loading