This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new fc0cebabc6f IGNITE-28446 Fix the tests after updating Java on the
TeamCity agents (#12976)
fc0cebabc6f is described below
commit fc0cebabc6f8f3013ef136522c9a3dc6885bc117
Author: Dmitry Werner <[email protected]>
AuthorDate: Mon Apr 6 17:11:35 2026 +0500
IGNITE-28446 Fix the tests after updating Java on the TeamCity agents
(#12976)
---
.../org/apache/ignite/common/NodeSslConnectionMetricTest.java | 2 +-
.../java/org/apache/ignite/util/GridCommandHandlerSslTest.java | 6 +++---
.../test/java/org/apache/ignite/client/SslParametersTest.java | 10 +++++-----
.../spi/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 a1be30723f5..d91240911b3 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 0514bcaf416..15d181084cb 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 class GridCommandHandlerSslTest extends
GridCommandHandlerClusterPerMetho
@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 class GridCommandHandlerSslTest extends
GridCommandHandlerClusterPerMetho
*/
@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 class GridCommandHandlerSslTest extends
GridCommandHandlerClusterPerMetho
*/
@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 d7a1bdbb474..37ae4f2ccc7 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 @@ public class SslParametersTest extends
GridCommonAbstractTest {
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 class SslParametersTest extends
GridCommonAbstractTest {
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 class SslParametersTest extends
GridCommonAbstractTest {
@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 class SslParametersTest extends
GridCommonAbstractTest {
@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 class SslParametersTest extends
GridCommonAbstractTest {
@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 e6da699b05f..45bfc011f2f 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 class TcpDiscoverySslParametersTest extends
GridCommonAbstractTest {
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 class TcpDiscoverySslParametersTest extends
GridCommonAbstractTest {
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 class TcpDiscoverySslParametersTest extends
GridCommonAbstractTest {
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 class TcpDiscoverySslParametersTest extends
GridCommonAbstractTest {
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[] {
