From cb053d060d77d80bbb848578e72808ec0c8d16f5 Mon Sep 17 00:00:00 2001 From: tledkov-gridgain Date: Wed, 11 Apr 2018 15:14:26 +0300 Subject: [PATCH] IGNITE-8129: fix test: setup default SSL context at the test (because sometimes default SSL context may be setup by build system) --- .../jdbc/thin/JdbcThinConnectionSSLTest.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java index cc71f51772400..355a198c56672 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java @@ -164,7 +164,14 @@ public void testConnectionUseIgniteFactory() throws Exception { * @throws Exception If failed. */ public void testDefaultContext() throws Exception { + // Store exists default SSL context to restore after test. + final SSLContext dfltSslCtx = SSLContext.getDefault(); + + // Setup default context + SSLContext.setDefault(getTestSslContextFactory().create()); + setSslCtxFactoryToCli = true; + // Factory return default SSL context sslCtxFactory = new Factory() { @Override public SSLContext create() { @@ -177,23 +184,16 @@ public void testDefaultContext() throws Exception { } }; - System.setProperty("javax.net.ssl.keyStore", CLI_KEY_STORE_PATH); - System.setProperty("javax.net.ssl.keyStorePassword", "123456"); - System.setProperty("javax.net.ssl.trustStore", TRUST_KEY_STORE_PATH); - System.setProperty("javax.net.ssl.trustStorePassword", "123456"); - startGrids(1); try (Connection conn = DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1/?sslMode=require")) { checkConnection(conn); } finally { - System.getProperties().remove("javax.net.ssl.keyStore"); - System.getProperties().remove("javax.net.ssl.keyStorePassword"); - System.getProperties().remove("javax.net.ssl.trustStore"); - System.getProperties().remove("javax.net.ssl.trustStorePassword"); - stopAllGrids(); + + // Restore SSL context. + SSLContext.setDefault(dfltSslCtx); } }