Repository: ignite Updated Branches: refs/heads/ignite-10189 4472ae936 -> 5a0c51787
IGNITE-10189 WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a0c5178 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a0c5178 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a0c5178 Branch: refs/heads/ignite-10189 Commit: 5a0c517877768755cb8fa1fd6d26764712ce43cb Parents: 4472ae9 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Dec 5 19:11:29 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Dec 5 19:11:29 2018 +0700 ---------------------------------------------------------------------- .../client/ClientSslParametersTest.java | 22 +++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0c5178/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java index 228ce82..44af06f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java @@ -25,7 +25,10 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.client.ssl.GridSslBasicContextFactory; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.ssl.SslContextFactory; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; @@ -47,10 +50,11 @@ public class ClientSslParametersTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + cfg.setSslContextFactory(createSslFactory()); + ConnectorConfiguration conCfg = new ConnectorConfiguration(); conCfg.setSslEnabled(true); conCfg.setSslClientAuth(true); - conCfg.setSslContextFactory(createSslFactory()); cfg.setConnectorConfiguration(conCfg); @@ -69,15 +73,27 @@ public class ClientSslParametersTest extends GridCommonAbstractTest { cfg.setServers(Collections.singleton("127.0.0.1:11211")); - cfg.setSslContextFactory(createSslFactory()); + cfg.setSslContextFactory(createOldSslFactory()); return cfg; } /** + * @return SSL factory. + */ + @NotNull private SslContextFactory createSslFactory() { + SslContextFactory factory = (SslContextFactory)GridTestUtils.sslFactory(); + + factory.setCipherSuites(cipherSuites); + factory.setProtocols(protocols); + + return factory; + } + + /** * @return SSL Factory. */ - @NotNull private GridSslBasicContextFactory createSslFactory() { + @NotNull private GridSslBasicContextFactory createOldSslFactory() { GridSslBasicContextFactory factory = (GridSslBasicContextFactory)GridTestUtils.sslContextFactory(); factory.setCipherSuites(cipherSuites);
