ivmaykov commented on a change in pull request #728: ZOOKEEPER-3160: Custom User SSLContext URL: https://github.com/apache/zookeeper/pull/728#discussion_r248848580
########## File path: zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java ########## @@ -406,26 +407,30 @@ public void testGetSslHandshakeDetectionTimeoutMillisProperty() { } } + @Test(expected = X509Exception.SSLContextException.class) + public void testCreateSSLContext_invalidCustomSSLContextClass() throws Exception { + ZKConfig zkConfig = new ZKConfig(); + ClientX509Util clientX509Util = new ClientX509Util(); + zkConfig.setProperty(clientX509Util.getSslContextSupplierClassProperty(), String.class.getCanonicalName()); + clientX509Util.createSSLContext(zkConfig); + } + @Test - public void testCreateSSLContext_invalidCustomSSLContextClass() { + public void testCreateSSLContext_validNullCustomSSLContextClass() throws X509Exception.SSLContextException { ZKConfig zkConfig = new ZKConfig(); ClientX509Util clientX509Util = new ClientX509Util(); - zkConfig.setProperty(clientX509Util.getSslClientContextProperty(), String.class.getCanonicalName()); - try { - clientX509Util.createSSLContext(zkConfig); - fail("SSLContextException expected."); - } catch (X509Exception.SSLContextException e) { - assertTrue(e.getMessage().contains(clientX509Util.getSslClientContextProperty())); - } + zkConfig.setProperty(clientX509Util.getSslContextSupplierClassProperty(), X509UtilTest.class.getCanonicalName() + "$" + NullSslContextSupplier.class.getSimpleName()); + final SSLContext sslContext = clientX509Util.createSSLContext(zkConfig); + assertNull(sslContext); } @Test public void testCreateSSLContext_validCustomSSLContextClass() throws X509Exception.SSLContextException { ZKConfig zkConfig = new ZKConfig(); ClientX509Util clientX509Util = new ClientX509Util(); - zkConfig.setProperty(clientX509Util.getSslClientContextProperty(), ZKTestClientSSLContext.class.getCanonicalName()); + zkConfig.setProperty(clientX509Util.getSslContextSupplierClassProperty(), X509UtilTest.class.getCanonicalName() + "$" + SslContextSupplier.class.getSimpleName()); final SSLContext sslContext = clientX509Util.createSSLContext(zkConfig); - assertNull(sslContext); + assertNotNull(sslContext); Review comment: nit: I think this can be `assertEquals(SSLContext.getDefault(), sslContext)` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services