Skip to content

Commit fc0ceba

Browse files
wernerdvwernerdv
authored
IGNITE-28446 Fix the tests after updating Java on the TeamCity agents (#12976)
1 parent e8f16e0 commit fc0ceba

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class NodeSslConnectionMetricTest extends GridCommonAbstractTest {
6767
private static final String CIPHER_SUITE = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256";
6868

6969
/** Cipher suite not supported by cluster nodes. */
70-
private static final String UNSUPPORTED_CIPHER_SUITE = "TLS_RSA_WITH_AES_128_GCM_SHA256";
70+
private static final String UNSUPPORTED_CIPHER_SUITE = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256";
7171

7272
/** Local server address. */
7373
private static final String LOCAL_CLIENT_ADDRESS = "127.0.0.1:10800";

‎modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void testDefaultCipherSuite() throws Exception {
154154
@Test
155155
public void testSameCipherSuite() throws Exception {
156156
String ciphers = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," +
157-
"TLS_RSA_WITH_AES_128_GCM_SHA256," +
157+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," +
158158
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";
159159

160160
activate(ciphers, ciphers, EXIT_CODE_OK);
@@ -165,7 +165,7 @@ public void testSameCipherSuite() throws Exception {
165165
*/
166166
@Test
167167
public void testOneCommonCipherSuite() throws Exception {
168-
String nodeCipherSuites = "TLS_RSA_WITH_AES_128_GCM_SHA256," +
168+
String nodeCipherSuites = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," +
169169
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";
170170

171171
String utilityCipherSuites = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," +
@@ -179,7 +179,7 @@ public void testOneCommonCipherSuite() throws Exception {
179179
*/
180180
@Test
181181
public void testNoCommonCipherSuite() throws Exception {
182-
String nodeCipherSuites = "TLS_RSA_WITH_AES_128_GCM_SHA256";
182+
String nodeCipherSuites = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256";
183183

184184
String utilityCipherSuites = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," +
185185
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";

‎modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected ClientConfiguration getClientConfiguration() {
101101
public void testSameCipherSuite() throws Exception {
102102
cipherSuites = new String[] {
103103
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
104-
"TLS_RSA_WITH_AES_128_GCM_SHA256",
104+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
105105
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
106106
};
107107

@@ -110,7 +110,7 @@ public void testSameCipherSuite() throws Exception {
110110
checkSuccessfulClientStart(
111111
new String[] {
112112
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
113-
"TLS_RSA_WITH_AES_128_GCM_SHA256",
113+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
114114
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
115115
},
116116
null
@@ -123,7 +123,7 @@ public void testSameCipherSuite() throws Exception {
123123
@Test
124124
public void testOneCommonCipherSuite() throws Exception {
125125
cipherSuites = new String[] {
126-
"TLS_RSA_WITH_AES_128_GCM_SHA256",
126+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
127127
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
128128
};
129129

@@ -144,7 +144,7 @@ public void testOneCommonCipherSuite() throws Exception {
144144
@Test
145145
public void testNoCommonCipherSuite() throws Exception {
146146
cipherSuites = new String[] {
147-
"TLS_RSA_WITH_AES_128_GCM_SHA256"
147+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
148148
};
149149

150150
startGrid();
@@ -164,7 +164,7 @@ public void testNoCommonCipherSuite() throws Exception {
164164
@Test
165165
public void testNonExistentCipherSuite() throws Exception {
166166
cipherSuites = new String[] {
167-
"TLS_RSA_WITH_AES_128_GCM_SHA256"
167+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
168168
};
169169

170170
startGrid();

‎modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ public void testSameCipherSuite() throws Exception {
6666
new String[][] {
6767
new String[] {
6868
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
69-
"TLS_RSA_WITH_AES_128_GCM_SHA256",
69+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
7070
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
7171
},
7272
new String[] {
7373
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
74-
"TLS_RSA_WITH_AES_128_GCM_SHA256",
74+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
7575
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
7676
}
7777
},
@@ -87,7 +87,7 @@ public void testOneCommonCipherSuite() throws Exception {
8787
checkDiscoverySuccess(
8888
new String[][] {
8989
new String[] {
90-
"TLS_RSA_WITH_AES_128_GCM_SHA256",
90+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
9191
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
9292
},
9393
new String[] {
@@ -107,7 +107,7 @@ public void testNoCommonCipherSuite() throws Exception {
107107
checkDiscoveryFailure(
108108
new String[][] {
109109
new String[] {
110-
"TLS_RSA_WITH_AES_128_GCM_SHA256",
110+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
111111
},
112112
new String[] {
113113
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
@@ -126,7 +126,7 @@ public void testNonExistentCipherSuite() throws Exception {
126126
checkDiscoveryFailure(
127127
new String[][] {
128128
new String[] {
129-
"TLS_RSA_WITH_AES_128_GCM_SHA256",
129+
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
130130
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
131131
},
132132
new String[] {

0 commit comments

Comments
 (0)