From e3d89a9a924280dcce582b0dacc11b44c0b53522 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Fri, 3 Apr 2026 11:12:46 +0500 Subject: [PATCH] IGNITE-28446 Fix the tests after updating Java on the TeamCity agents --- .../ignite/common/NodeSslConnectionMetricTest.java | 2 +- .../apache/ignite/util/GridCommandHandlerSslTest.java | 6 +++--- .../org/apache/ignite/client/SslParametersTest.java | 10 +++++----- .../discovery/tcp/TcpDiscoverySslParametersTest.java | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java b/modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java index a1be30723f512..d91240911b30e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java @@ -67,7 +67,7 @@ public class NodeSslConnectionMetricTest extends GridCommonAbstractTest { private static final String CIPHER_SUITE = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"; /** Cipher suite not supported by cluster nodes. */ - private static final String UNSUPPORTED_CIPHER_SUITE = "TLS_RSA_WITH_AES_128_GCM_SHA256"; + private static final String UNSUPPORTED_CIPHER_SUITE = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"; /** Local server address. */ private static final String LOCAL_CLIENT_ADDRESS = "127.0.0.1:10800"; diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java index 0514bcaf416f1..15d181084cb1a 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java @@ -154,7 +154,7 @@ public void testDefaultCipherSuite() throws Exception { @Test public void testSameCipherSuite() throws Exception { String ciphers = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," + - "TLS_RSA_WITH_AES_128_GCM_SHA256," + + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," + "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"; activate(ciphers, ciphers, EXIT_CODE_OK); @@ -165,7 +165,7 @@ public void testSameCipherSuite() throws Exception { */ @Test public void testOneCommonCipherSuite() throws Exception { - String nodeCipherSuites = "TLS_RSA_WITH_AES_128_GCM_SHA256," + + String nodeCipherSuites = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," + "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"; String utilityCipherSuites = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," + @@ -179,7 +179,7 @@ public void testOneCommonCipherSuite() throws Exception { */ @Test public void testNoCommonCipherSuite() throws Exception { - String nodeCipherSuites = "TLS_RSA_WITH_AES_128_GCM_SHA256"; + String nodeCipherSuites = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"; String utilityCipherSuites = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," + "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"; diff --git a/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java b/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java index d7a1bdbb474a8..37ae4f2ccc749 100644 --- a/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java +++ b/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java @@ -101,7 +101,7 @@ protected ClientConfiguration getClientConfiguration() { public void testSameCipherSuite() throws Exception { cipherSuites = new String[] { "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" }; @@ -110,7 +110,7 @@ public void testSameCipherSuite() throws Exception { checkSuccessfulClientStart( new String[] { "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" }, null @@ -123,7 +123,7 @@ public void testSameCipherSuite() throws Exception { @Test public void testOneCommonCipherSuite() throws Exception { cipherSuites = new String[] { - "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" }; @@ -144,7 +144,7 @@ public void testOneCommonCipherSuite() throws Exception { @Test public void testNoCommonCipherSuite() throws Exception { cipherSuites = new String[] { - "TLS_RSA_WITH_AES_128_GCM_SHA256" + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256" }; startGrid(); @@ -164,7 +164,7 @@ public void testNoCommonCipherSuite() throws Exception { @Test public void testNonExistentCipherSuite() throws Exception { cipherSuites = new String[] { - "TLS_RSA_WITH_AES_128_GCM_SHA256" + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256" }; startGrid(); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java index e6da699b05ffe..45bfc011f2f22 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java @@ -66,12 +66,12 @@ public void testSameCipherSuite() throws Exception { new String[][] { new String[] { "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" }, new String[] { "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" } }, @@ -87,7 +87,7 @@ public void testOneCommonCipherSuite() throws Exception { checkDiscoverySuccess( new String[][] { new String[] { - "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" }, new String[] { @@ -107,7 +107,7 @@ public void testNoCommonCipherSuite() throws Exception { checkDiscoveryFailure( new String[][] { new String[] { - "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", }, new String[] { "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", @@ -126,7 +126,7 @@ public void testNonExistentCipherSuite() throws Exception { checkDiscoveryFailure( new String[][] { new String[] { - "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" }, new String[] {