From 7c89f40bd51c72eac73cee77bf4d5861e3d8624b Mon Sep 17 00:00:00 2001 From: jaykay12 Date: Wed, 21 Oct 2026 02:58:09 +0530 Subject: [PATCH 1/3] test fix 1 --- .../test/org/apache/solr/handler/admin/api/GetConfigTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/GetConfigTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/GetConfigTest.java index 059f452f0b2f..9a3e50be319d 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/api/GetConfigTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/api/GetConfigTest.java @@ -62,7 +62,9 @@ public void testGetConfigFromCore() throws Exception { assertFalse(response.config.containsKey("searchComponent")); assertTrue(response.config.containsKey("searchComponents")); - assertTrue(response.config.containsKey("updateProcessor")); + assertFalse(response.config.containsKey("updateProcessor")); + assertTrue(response.config.containsKey("updateProcessors")); + } @Test From c6e804e5b85722a901fec985e2ca79a1af920aaf Mon Sep 17 00:00:00 2001 From: jaykay12 Date: Wed, 21 Oct 2026 04:07:47 +0530 Subject: [PATCH 2/3] test fix 2 --- .../solr/core/TestSolrConfigHandler.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java index 1f16c3ab7ff6..7cef18a13ecb 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java @@ -203,6 +203,11 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio // pluralization below, since they already use the pluralized name. String searchComponentKey = fullConfigKey(writeHarness, "searchComponent", "searchComponents"); String requestHandlerKey = fullConfigKey(writeHarness, "requestHandler", "requestHandlers"); + String queryConverterKey = fullConfigKey(writeHarness, "queryConverter", "queryConverters"); + String listenerKey = fullConfigKey(writeHarness, "listener", "listeners"); + String valueSourceParserKey = fullConfigKey(writeHarness, "valueSourceParser", "valueSourceParsers"); + String transformerKey = fullConfigKey(writeHarness, "transformer", "transformers"); + String payload = "{\n" + "'create-requesthandler' : { 'name' : '/x', 'class': 'org.apache.solr.handler.DumpRequestHandler' , 'startup' : 'lazy'}\n" @@ -285,7 +290,7 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio testForResponseElement( writeHarness, "/config", - asList("config", "queryConverter", "qc", "class"), + asList("config", queryConverterKey, "qc", "class"), "org.apache.solr.spelling.SpellingQueryConverter", TIMEOUT_S); payload = @@ -296,14 +301,14 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio testForResponseElement( writeHarness, "/config", - asList("config", "queryConverter", "qc", "class"), + asList("config", queryConverterKey, "qc", "class"), "org.apache.solr.spelling.SuggestQueryConverter", TIMEOUT_S); payload = "{\n" + "'delete-queryconverter' : 'qc'" + "}"; runConfigCommand(writeHarness, "/config", payload); testForResponseElement( - writeHarness, "/config", asList("config", "queryConverter", "qc"), null, TIMEOUT_S); + writeHarness, "/config", asList("config", queryConverterKey, "qc"), null, TIMEOUT_S); payload = "{\n" @@ -316,7 +321,7 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio testForResponseElement( writeHarness, "/config", - asList("config", "listener[0]", "class"), + asList("config", listenerKey + "[0]", "class"), "solr.QuerySenderListener", TIMEOUT_S); @@ -331,13 +336,13 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio testForResponseElement( writeHarness, "/config", - asList("config", "listener[0]", "class"), + asList("config", listenerKey + "[0]", "class"), "org.apache.solr.core.QuerySenderListener", TIMEOUT_S); payload = "{\n" + "'delete-listener' : 'f7fb2d87bea44464af2401cf33f42b69'" + "}"; runConfigCommand(writeHarness, "/config", payload); - testForResponseElement(writeHarness, "/config", asList("config", "listener"), null, TIMEOUT_S); + testForResponseElement(writeHarness, "/config", asList("config", listenerKey), null, TIMEOUT_S); payload = "{\n" @@ -376,7 +381,7 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio testForResponseElement( writeHarness, "/config", - asList("config", "valueSourceParser", "cu", "class"), + asList("config", valueSourceParserKey, "cu", "class"), "org.apache.solr.core.CountUsageValueSourceParser", TIMEOUT_S); // @@ -390,14 +395,14 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio testForResponseElement( writeHarness, "/config", - asList("config", "valueSourceParser", "cu", "class"), + asList("config", valueSourceParserKey, "cu", "class"), "org.apache.solr.search.function.NvlValueSourceParser", TIMEOUT_S); payload = "{\n" + "'delete-valuesourceparser' : 'cu'" + "}"; runConfigCommand(writeHarness, "/config", payload); testForResponseElement( - writeHarness, "/config", asList("config", "valueSourceParser", "cu"), null, TIMEOUT_S); + writeHarness, "/config", asList("config", valueSourceParserKey, "cu"), null, TIMEOUT_S); // // 5 @@ -410,7 +415,7 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio testForResponseElement( writeHarness, "/config", - asList("config", "transformer", "mytrans", "class"), + asList("config", transformerKey, "mytrans", "class"), "org.apache.solr.response.transform.ValueAugmenterFactory", TIMEOUT_S); @@ -422,7 +427,7 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio testForResponseElement( writeHarness, "/config", - asList("config", "transformer", "mytrans", "value"), + asList("config", transformerKey, "mytrans", "value"), "6", TIMEOUT_S); @@ -434,7 +439,7 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio runConfigCommand(writeHarness, "/config", payload); Map map = testForResponseElement( - writeHarness, "/config", asList("config", "transformer", "mytrans"), null, TIMEOUT_S); + writeHarness, "/config", asList("config", transformerKey, "mytrans"), null, TIMEOUT_S); List l = (List) Utils.getObjectByPath(map, false, asList("config", "initParams")); assertNotNull("no object /config/initParams : " + map, l); From 8e5873be68d773fe65f93e0a61847e748ae332ee Mon Sep 17 00:00:00 2001 From: jaykay12 Date: Wed, 21 Oct 2026 04:09:51 +0530 Subject: [PATCH 3/3] tidying up --- .../src/test/org/apache/solr/core/TestSolrConfigHandler.java | 5 +++-- .../org/apache/solr/handler/admin/api/GetConfigTest.java | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java index 7cef18a13ecb..f00d7fd4cba7 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java @@ -100,7 +100,7 @@ public void after() throws Exception { /** * The full "/config" response pluralizes some section names (e.g. searchComponent -> - * searchComponents, requestHandler -> requestHandlers) under the V2 API (see + * searchComponents, requestHandler -> requestHandlers etc.) under the V2 API (see * GetConfig#getConfig), but not under V1. */ private static String fullConfigKey( @@ -205,7 +205,8 @@ public static void reqhandlertests(RestTestHarness writeHarness) throws Exceptio String requestHandlerKey = fullConfigKey(writeHarness, "requestHandler", "requestHandlers"); String queryConverterKey = fullConfigKey(writeHarness, "queryConverter", "queryConverters"); String listenerKey = fullConfigKey(writeHarness, "listener", "listeners"); - String valueSourceParserKey = fullConfigKey(writeHarness, "valueSourceParser", "valueSourceParsers"); + String valueSourceParserKey = + fullConfigKey(writeHarness, "valueSourceParser", "valueSourceParsers"); String transformerKey = fullConfigKey(writeHarness, "transformer", "transformers"); String payload = diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/GetConfigTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/GetConfigTest.java index 9a3e50be319d..73ebc01530cd 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/api/GetConfigTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/api/GetConfigTest.java @@ -64,7 +64,6 @@ public void testGetConfigFromCore() throws Exception { assertFalse(response.config.containsKey("updateProcessor")); assertTrue(response.config.containsKey("updateProcessors")); - } @Test