Apache Solr open-source search software
SOLR-16396 | Fixed failing tests (#5187)
Jalaz Kumarb7518ba91827
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.javaindex 1f16c3ab7ff..f00d7fd4cba 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 class TestSolrConfigHandler extends RestTestBase {/*** 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(@@ -203,6 +203,12 @@ public class TestSolrConfigHandler extends RestTestBase {// 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 +291,7 @@ public class TestSolrConfigHandler extends RestTestBase {testForResponseElement(writeHarness,"/config",- asList("config", "queryConverter", "qc", "class"),+ asList("config", queryConverterKey, "qc", "class"),"org.apache.solr.spelling.SpellingQueryConverter",TIMEOUT_S);payload =@@ -296,14 +302,14 @@ public class TestSolrConfigHandler extends RestTestBase {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 +322,7 @@ public class TestSolrConfigHandler extends RestTestBase {testForResponseElement(writeHarness,"/config",- asList("config", "listener[0]", "class"),+ asList("config", listenerKey + "[0]", "class"),"solr.QuerySenderListener",TIMEOUT_S);@@ -331,13 +337,13 @@ public class TestSolrConfigHandler extends RestTestBase {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 +382,7 @@ public class TestSolrConfigHandler extends RestTestBase {testForResponseElement(writeHarness,"/config",- asList("config", "valueSourceParser", "cu", "class"),+ asList("config", valueSourceParserKey, "cu", "class"),"org.apache.solr.core.CountUsageValueSourceParser",TIMEOUT_S);// <valueSourceParser name="nvl" class="org.apache.solr.search.function.NvlValueSourceParser">@@ -390,14 +396,14 @@ public class TestSolrConfigHandler extends RestTestBase {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);// <transformer name="mytrans2"// class="org.apache.solr.response.transform.ValueAugmenterFactory" >// <int name="value">5</int>@@ -410,7 +416,7 @@ public class TestSolrConfigHandler extends RestTestBase {testForResponseElement(writeHarness,"/config",- asList("config", "transformer", "mytrans", "class"),+ asList("config", transformerKey, "mytrans", "class"),"org.apache.solr.response.transform.ValueAugmenterFactory",TIMEOUT_S);@@ -422,7 +428,7 @@ public class TestSolrConfigHandler extends RestTestBase {testForResponseElement(writeHarness,"/config",- asList("config", "transformer", "mytrans", "value"),+ asList("config", transformerKey, "mytrans", "value"),"6",TIMEOUT_S);@@ -434,7 +440,7 @@ public class TestSolrConfigHandler extends RestTestBase {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);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.javaindex 059f452f0b2..73ebc01530c 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,8 @@ public class GetConfigTest extends SolrTestCase {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