diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-07-01 15:25:45 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-07-01 15:25:45 +0200 |
commit | d1f0fbd25399aed93d72b8c435a49b964614c12f (patch) | |
tree | 084e723cc0601e36b660695057a76715ef5419ca /container-search/src | |
parent | da057833cf0fb3f7b56056036365f3cdcd8c4b20 (diff) |
Rename and move 'SearchHandlerTestCase'
Diffstat (limited to 'container-search/src')
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java (renamed from container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java) | 8 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/handler/test/config/chains.cfg | 16 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg | 12 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/handler/test/config/handlers2/chains.cfg | 8 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/handler/test/config/handlersInvalid/handlers.cfg | 2 |
5 files changed, 22 insertions, 24 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java index 2eb5901b786..3fe3c824653 100644 --- a/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.search.handler.test; +package com.yahoo.search.handler; import com.yahoo.container.Container; import com.yahoo.container.core.config.testutil.HandlersConfigurerTestWrapper; @@ -14,8 +14,6 @@ import com.yahoo.net.HostName; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; -import com.yahoo.search.handler.HttpSearchResponse; -import com.yahoo.search.handler.SearchHandler; import com.yahoo.search.rendering.XmlRenderer; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.result.Hit; @@ -45,7 +43,7 @@ import static org.junit.Assert.assertTrue; /** * @author bratseth */ -public class SearchHandlerTestCase { +public class SearchHandlerTest { private static final String testDir = "src/test/java/com/yahoo/search/handler/test/config"; private static final String myHostnameHeader = "my-hostname-header"; @@ -310,7 +308,7 @@ public class SearchHandlerTestCase { } private void assertHandlerResponse(int status, String responseData, String handlerName) throws Exception { - RequestHandler forwardingHandler = configurer.getRequestHandlerRegistry().getComponent("com.yahoo.search.handler.test.SearchHandlerTestCase$" + handlerName + "Handler"); + RequestHandler forwardingHandler = configurer.getRequestHandlerRegistry().getComponent("com.yahoo.search.handler.SearchHandlerTest$" + handlerName + "Handler"); try (RequestHandlerTestDriver forwardingDriver = new RequestHandlerTestDriver(forwardingHandler)) { RequestHandlerTestDriver.MockResponseHandler response = forwardingDriver.sendRequest("http://localhost/" + handlerName + "?query=test"); response.awaitResponse(); diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/config/chains.cfg b/container-search/src/test/java/com/yahoo/search/handler/test/config/chains.cfg index 9a16c6ed1e7..f7eba221ef1 100644 --- a/container-search/src/test/java/com/yahoo/search/handler/test/config/chains.cfg +++ b/container-search/src/test/java/com/yahoo/search/handler/test/config/chains.cfg @@ -1,20 +1,20 @@ chains[4] chains[0].id default chains[0].components[1] -chains[0].components[0] com.yahoo.search.handler.test.SearchHandlerTestCase$TestSearcher +chains[0].components[0] com.yahoo.search.handler.SearchHandlerTest$TestSearcher chains[1].id classLoadingError chains[1].components[1] -chains[1].components[0] com.yahoo.search.handler.test.SearchHandlerTestCase$ClassLoadingErrorSearcher +chains[1].components[0] com.yahoo.search.handler.SearchHandlerTest$ClassLoadingErrorSearcher chains[2].id exceptionInPlugin chains[2].components[1] -chains[2].components[0] com.yahoo.search.handler.test.SearchHandlerTestCase$ExceptionInPluginSearcher +chains[2].components[0] com.yahoo.search.handler.SearchHandlerTest$ExceptionInPluginSearcher chains[3].id echoingQuery chains[3].components[2] chains[3].components[0] com.yahoo.search.yql.MinimalQueryInserter -chains[3].components[1] com.yahoo.search.handler.test.SearchHandlerTestCase$EchoingQuerySearcher +chains[3].components[1] com.yahoo.search.handler.SearchHandlerTest$EchoingQuerySearcher components[5] -components[0].id com.yahoo.search.handler.test.SearchHandlerTestCase$TestSearcher -components[1].id com.yahoo.search.handler.test.SearchHandlerTestCase$ClassLoadingErrorSearcher -components[2].id com.yahoo.search.handler.test.SearchHandlerTestCase$ExceptionInPluginSearcher -components[3].id com.yahoo.search.handler.test.SearchHandlerTestCase$EchoingQuerySearcher +components[0].id com.yahoo.search.handler.SearchHandlerTest$TestSearcher +components[1].id com.yahoo.search.handler.SearchHandlerTest$ClassLoadingErrorSearcher +components[2].id com.yahoo.search.handler.SearchHandlerTest$ExceptionInPluginSearcher +components[3].id com.yahoo.search.handler.SearchHandlerTest$EchoingQuerySearcher components[4].id com.yahoo.search.yql.MinimalQueryInserter diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg b/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg index 915da8dc037..12f218581d5 100644 --- a/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg +++ b/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg @@ -1,9 +1,9 @@ handler[8] handler[0].id com.yahoo.search.handler.SearchHandler -handler[1].id com.yahoo.search.handler.test.SearchHandlerTestCase$NullReturningHandler -handler[2].id com.yahoo.search.handler.test.SearchHandlerTestCase$NullReturningAsyncHandler -handler[3].id com.yahoo.search.handler.test.SearchHandlerTestCase$ThrowingHandler -handler[4].id com.yahoo.search.handler.test.SearchHandlerTestCase$ThrowingAsyncHandler -handler[5].id com.yahoo.search.handler.test.SearchHandlerTestCase$ForwardingHandler -handler[6].id com.yahoo.search.handler.test.SearchHandlerTestCase$ForwardingAsyncHandler +handler[1].id com.yahoo.search.handler.SearchHandlerTest$NullReturningHandler +handler[2].id com.yahoo.search.handler.SearchHandlerTest$NullReturningAsyncHandler +handler[3].id com.yahoo.search.handler.SearchHandlerTest$ThrowingHandler +handler[4].id com.yahoo.search.handler.SearchHandlerTest$ThrowingAsyncHandler +handler[5].id com.yahoo.search.handler.SearchHandlerTest$ForwardingHandler +handler[6].id com.yahoo.search.handler.SearchHandlerTest$ForwardingAsyncHandler handler[7].id com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers2/chains.cfg b/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers2/chains.cfg index 2437efdec4f..83db7ef1cc9 100644 --- a/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers2/chains.cfg +++ b/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers2/chains.cfg @@ -1,10 +1,10 @@ chains[2] chains[0].id default chains[0].components[1] -chains[0].components[0] com.yahoo.search.handler.test.SearchHandlerTestCase$TestSearcher +chains[0].components[0] com.yahoo.search.handler.SearchHandlerTest$TestSearcher chains[1].id hello chains[1].components[1] -chains[1].components[0] com.yahoo.search.handler.test.SearchHandlerTestCase$HelloWorldSearcher +chains[1].components[0] com.yahoo.search.handler.SearchHandlerTest$HelloWorldSearcher components[2] -components[0].id com.yahoo.search.handler.test.SearchHandlerTestCase$TestSearcher -components[1].id com.yahoo.search.handler.test.SearchHandlerTestCase$HelloWorldSearcher +components[0].id com.yahoo.search.handler.SearchHandlerTest$TestSearcher +components[1].id com.yahoo.search.handler.SearchHandlerTest$HelloWorldSearcher diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/config/handlersInvalid/handlers.cfg b/container-search/src/test/java/com/yahoo/search/handler/test/config/handlersInvalid/handlers.cfg index 691b37b4955..9dd1aff9d06 100644 --- a/container-search/src/test/java/com/yahoo/search/handler/test/config/handlersInvalid/handlers.cfg +++ b/container-search/src/test/java/com/yahoo/search/handler/test/config/handlersInvalid/handlers.cfg @@ -1,3 +1,3 @@ handler[2] handler[0].id com.yahoo.search.handler.SearchHandler -handler[1].id com.yahoo.search.handler.test.SearchHandlerTestCase$ErrorOnInitializationHandler +handler[1].id com.yahoo.search.handler.SearchHandlerTest$ErrorOnInitializationHandler |