ivmaykov commented on a change in pull request #728: ZOOKEEPER-3160: Custom
User SSLContext
URL: https://github.com/apache/zookeeper/pull/728#discussion_r248850022
##########
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());
Review comment:
I think `NullSslContextSupplier.class.getName()` will return the full class
name for the inner class so you don't need to manually concatenate.
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
