(solr) branch branch_9x updated: SOLR-18522: Fix branch_9x test compilation (follow-up to #5060)

[dsmiley]

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

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new f4f25071778 SOLR-18522: Fix branch_9x test compilation (follow-up to 
#5060)
f4f25071778 is described below

commit f4f2507177855cc5178a1ffcc0f51b28ba4e14b1
Author: David Smiley <dsmi...@apache.org>
AuthorDate: Mon Oct 19 01:06:52 2026 +0100

    SOLR-18522: Fix branch_9x test compilation (follow-up to #5060)
    
    Replace the Java 15+ text block with string concatenation (branch_9x 
targets Java 11),
    and use the QT param form of query() since branch_9x lacks the SOLR-18332 
qt-removal.
    
    Co-Authored-By: Claude Opus 5.5 (1M context) <nore...@anthropic.com>
---
 .../component/CombinedQueryComponentTest.java      | 28 ++++++++--------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git 
a/solr/core/src/test/org/apache/solr/handler/component/CombinedQueryComponentTest.java
 
b/solr/core/src/test/org/apache/solr/handler/component/CombinedQueryComponentTest.java
index c25358caeff..40ae4701e58 100644
--- 
a/solr/core/src/test/org/apache/solr/handler/component/CombinedQueryComponentTest.java
+++ 
b/solr/core/src/test/org/apache/solr/handler/component/CombinedQueryComponentTest.java
@@ -219,24 +219,16 @@ public class CombinedQueryComponentTest extends 
BaseDistributedSearchTestCase {
     }
     QueryResponse rsp =
         query(
-            "/search",
-            params(
-                CommonParams.JSON,
-                """
-                {
-                  "queries": {
-                    "lexical1": {"lucene": {"query": "id:(1 OR 2)"}},
-                    "lexical2": {"lucene": {"query": "id:(3 OR 4)"}}
-                  },
-                  "limit": 5,
-                  "fields": ["id", "score"],
-                  "params": {
-                    "combiner": true,
-                    "facet": true,
-                    "facet.field": "color_sdv",
-                    "combiner.query": ["lexical1", "lexical2"]
-                  }
-                }"""));
+            CommonParams.JSON,
+            "{\"queries\":"
+                + "{\"lexical1\":{\"lucene\":{\"query\":\"id:(1 OR 2)\"}},"
+                + "\"lexical2\":{\"lucene\":{\"query\":\"id:(3 OR 4)\"}}},"
+                + "\"limit\":5,"
+                + "\"fields\":[\"id\",\"score\"],"
+                + 
"\"params\":{\"combiner\":true,\"facet\":true,\"facet.field\":\"color_sdv\","
+                + "\"combiner.query\":[\"lexical1\",\"lexical2\"]}}",
+            CommonParams.QT,
+            "/search");
     assertEquals(4, rsp.getResults().size());
     assertEquals("[blue (2), red (2)]", 
rsp.getFacetField("color_sdv").getValues().toString());
   }