diff options
author | gjoranv <gv@yahoo-inc.com> | 2017-05-05 15:30:31 +0200 |
---|---|---|
committer | gjoranv <gv@yahoo-inc.com> | 2017-05-09 14:51:22 +0200 |
commit | 662c1f1640cce174d1369daef84327dc3148d362 (patch) | |
tree | 9b4a98c0baa9a52f1d97994cc8d02da3c28c6124 /jdisc_http_service | |
parent | 380966af69d8d61ad7b9907282d2b648c4aba6db (diff) |
Add missing module bindings to necessary config instances.
Diffstat (limited to 'jdisc_http_service')
3 files changed, 9 insertions, 0 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java index 04a9dd50a3a..74100dbf727 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java @@ -13,9 +13,11 @@ import com.yahoo.jdisc.handler.CompletionHandler; import com.yahoo.jdisc.handler.ContentChannel; import com.yahoo.jdisc.handler.ResponseDispatch; import com.yahoo.jdisc.handler.ResponseHandler; +import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.jdisc.http.HttpRequest; import com.yahoo.jdisc.http.HttpResponse; import com.yahoo.jdisc.http.ServerConfig; +import com.yahoo.jdisc.http.ServletPathsConfig; import com.yahoo.jdisc.http.filter.RequestFilter; import com.yahoo.jdisc.http.filter.chain.RequestFilterChain; import com.yahoo.jdisc.http.filter.ResponseFilter; @@ -402,6 +404,8 @@ public class FilterTestCase { requestFilters != null ? requestFilters : EMPTY_REQUEST_FILTER_REPOSITORY, responseFilters != null ? responseFilters : EMPTY_RESPONSE_FILTER_REPOSITORY)); bind(ServerConfig.class).toInstance(new ServerConfig(new ServerConfig.Builder())); + bind(ConnectorConfig.class).toInstance(new ConnectorConfig(new ConnectorConfig.Builder())); + bind(ServletPathsConfig.class).toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder())); } }, new ConnectorFactoryRegistryModule()); diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java index adae818b288..bc8f63dcdca 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java @@ -6,6 +6,7 @@ import com.google.inject.Module; import com.google.inject.util.Modules; import com.yahoo.jdisc.application.BindingRepository; import com.yahoo.jdisc.http.ServerConfig; +import com.yahoo.jdisc.http.ServletPathsConfig; import com.yahoo.jdisc.http.guiceModules.ConnectorFactoryRegistryModule; import com.yahoo.jdisc.http.server.FilterBindings; import com.yahoo.jdisc.test.ServerProviderConformanceTest; @@ -750,6 +751,8 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest { new BindingRepository<>())); bind(ServerConfig.class) .toInstance(new ServerConfig(new ServerConfig.Builder())); + bind(ServletPathsConfig.class) + .toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder())); } }, new ConnectorFactoryRegistryModule()); diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java index 3137ae24b7b..84457019a6a 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java @@ -8,6 +8,7 @@ import com.yahoo.jdisc.application.BindingRepository; import com.yahoo.jdisc.handler.RequestHandler; import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.jdisc.http.ServerConfig; +import com.yahoo.jdisc.http.ServletPathsConfig; import com.yahoo.jdisc.http.filter.RequestFilter; import com.yahoo.jdisc.http.filter.ResponseFilter; import com.yahoo.jdisc.http.guiceModules.ConnectorFactoryRegistryModule; @@ -80,6 +81,7 @@ public class TestDrivers { new AbstractModule() { @Override protected void configure() { + bind(ServletPathsConfig.class).toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder())); bind(ServerConfig.class).toInstance(new ServerConfig(serverConfig)); bind(ConnectorConfig.class).toInstance(new ConnectorConfig(connectorConfigBuilder)); bind(FilterBindings.class).toInstance( |