Merge branch 'master' into hakonhall/define-enable-logserver-flag

1 files changed, 0 insertions, 27 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 eb18a3ee341..cf32801ce88 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
@@ -17,9 +17,6 @@ import java.net.InetSocketAddress;
 import java.nio.channels.ServerSocketChannel;
 import java.util.Map;
 
-import static com.yahoo.jdisc.http.ConnectorConfig.Ssl;
-import static com.yahoo.jdisc.http.ConnectorConfig.Ssl.KeyStoreType.Enum.JKS;
-import static com.yahoo.jdisc.http.ConnectorConfig.Ssl.KeyStoreType.Enum.PEM;
 import static org.hamcrest.CoreMatchers.equalTo;
 
 /**
@@ -27,30 +24,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
  */
 public class ConnectorFactoryTest {
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void ssl_jks_config_is_validated() {
-        ConnectorConfig config = new ConnectorConfig(
-                new ConnectorConfig.Builder()
-                        .ssl(new Ssl.Builder()
-                                     .enabled(true)
-                                     .keyStoreType(JKS)
-                                     .pemKeyStore(
-                                             new Ssl.PemKeyStore.Builder()
-                                                     .keyPath("nonEmpty"))));
-        ConnectorFactory willThrowException = createConnectorFactory(config);
-    }
-
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void ssl_pem_config_is_validated() {
-        ConnectorConfig config = new ConnectorConfig(
-                new ConnectorConfig.Builder()
-                        .ssl(new Ssl.Builder()
-                                     .enabled(true)
-                                     .keyStoreType(PEM)
-                                     .keyStorePath("nonEmpty")));
-        ConnectorFactory willThrowException = createConnectorFactory(config);
-    }
-
     @Test
     public void requireThatNoPreBoundChannelWorks() throws Exception {
         Server server = new Server();