diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-15 12:35:32 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-15 12:35:32 +0100 |
commit | 96f48f37225d9656484842910b5610f871ace621 (patch) | |
tree | 49566e39a95b0744419df9a0236944a32db9c669 /jdisc_http_service | |
parent | eed46ca2384f088132d776fd88520ddf1a0b194f (diff) |
Remove code duplication
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java index 70037a59b32..781bc6a7b5f 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java @@ -38,11 +38,7 @@ public class ConnectorFactoryTest { .pemKeyStore( new Ssl.PemKeyStore.Builder() .keyPath("nonEmpty")))); - - ThrowingSecretStore secretStore = new ThrowingSecretStore(); - ConnectorFactory willThrowException = new ConnectorFactory(config, - secretStore, - new DefaultSslKeyStoreConfigurator(config, secretStore)); + ConnectorFactory willThrowException = createConnectorFactory(config); } @Test(expectedExceptions = IllegalArgumentException.class) @@ -53,11 +49,7 @@ public class ConnectorFactoryTest { .enabled(true) .keyStoreType(PEM) .keyStorePath("nonEmpty"))); - - ThrowingSecretStore secretStore = new ThrowingSecretStore(); - ConnectorFactory willThrowException = new ConnectorFactory(config, - secretStore, - new DefaultSslKeyStoreConfigurator(config, secretStore)); + ConnectorFactory willThrowException = createConnectorFactory(config); } @Test @@ -65,10 +57,7 @@ public class ConnectorFactoryTest { Server server = new Server(); try { ConnectorConfig config = new ConnectorConfig(new ConnectorConfig.Builder()); - ThrowingSecretStore secretStore = new ThrowingSecretStore(); - ConnectorFactory factory = new ConnectorFactory(config, - secretStore, - new DefaultSslKeyStoreConfigurator(config, secretStore)); + ConnectorFactory factory = createConnectorFactory(config); JDiscServerConnector connector = (JDiscServerConnector)factory.createConnector(new DummyMetric(), server, null); server.addConnector(connector); @@ -96,11 +85,9 @@ public class ConnectorFactoryTest { serverChannel.socket().bind(new InetSocketAddress(0)); ConnectorConfig config = new ConnectorConfig(new ConnectorConfig.Builder()); - ThrowingSecretStore secretStore = new ThrowingSecretStore(); - ConnectorFactory factory = new ConnectorFactory(config, - secretStore, - new DefaultSslKeyStoreConfigurator(config, secretStore)); - JDiscServerConnector connector = (JDiscServerConnector) factory.createConnector(new DummyMetric(), server, serverChannel); + ConnectorFactory factory = createConnectorFactory(config); + JDiscServerConnector connector = + (JDiscServerConnector) factory.createConnector(new DummyMetric(), server, serverChannel); server.addConnector(connector); server.setHandler(new HelloWorldHandler()); server.start(); @@ -118,6 +105,11 @@ public class ConnectorFactoryTest { } } + private static ConnectorFactory createConnectorFactory(ConnectorConfig config) { + ThrowingSecretStore secretStore = new ThrowingSecretStore(); + return new ConnectorFactory(config, secretStore, new DefaultSslKeyStoreConfigurator(config, secretStore)); + } + private static class HelloWorldHandler extends AbstractHandler { @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { |