Skip to content

Commit 5ba7753

Browse files
WIP
1 parent 3a88f21 commit 5ba7753

File tree

5 files changed

+57
-275
lines changed

5 files changed

+57
-275
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.ignite.spi.discovery.tcp;
19+
20+
import org.apache.ignite.IgniteSystemProperties;
21+
22+
/**
23+
*
24+
*/
25+
public class TcpDiscoveryMdcReversedPendingMessageDeliveryTest extends TcpDiscoveryMdcPlainPendingMessageDeliveryTest {
26+
/** */
27+
@Override protected void applyDC() {
28+
String prev = System.getProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID);
29+
30+
System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID, prev == null ? DC_ID_1 : DC_ID_0);
31+
}
32+
}
33+

modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMdcWithCoordinatorChangePendingMessageDeliveryTest.java renamed to modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMdcSelReversedChangeTest.java

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@
1818
package org.apache.ignite.spi.discovery.tcp;
1919

2020
import org.apache.ignite.IgniteSystemProperties;
21-
import org.junit.Test;
2221

2322
/**
24-
*
23+
* Test for {@link TcpDiscoverySpi} with Multi Data Centers where coordinator changed on second node join.
2524
*/
26-
public class TcpDiscoveryMdcWithCoordinatorChangePendingMessageDeliveryTest extends TcpDiscoveryMdcPlainPendingMessageDeliveryTest {
25+
public class TcpDiscoveryMdcSelReversedChangeTest extends TcpDiscoveryMdcSelfPlainTest {
2726
/**
2827
* @throws Exception If fails.
2928
*/
30-
public TcpDiscoveryMdcWithCoordinatorChangePendingMessageDeliveryTest() throws Exception {
29+
public TcpDiscoveryMdcSelReversedChangeTest() throws Exception {
3130
}
3231

3332
/** */
@@ -36,35 +35,4 @@ public TcpDiscoveryMdcWithCoordinatorChangePendingMessageDeliveryTest() throws E
3635

3736
System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID, prev == null ? DC_ID_1 : DC_ID_0);
3837
}
39-
40-
/**
41-
* @throws Exception If failed.
42-
*/
43-
@Test
44-
@Override public void testPendingMessagesOverflow() throws Exception {
45-
startGrid(0);
46-
47-
super.testPendingMessagesOverflow();
48-
}
49-
50-
/**
51-
* @throws Exception If failed.
52-
*/
53-
@Test
54-
@Override public void testCustomMessageInSingletonCluster() throws Exception {
55-
startGrid(0);
56-
57-
super.testCustomMessageInSingletonCluster();
58-
}
59-
60-
/**
61-
* @throws Exception If failed.
62-
*/
63-
@Test
64-
@Override public void testDeliveryAllFailedMessagesInCorrectOrder() throws Exception {
65-
startGrid(0);
66-
67-
super.testDeliveryAllFailedMessagesInCorrectOrder();
68-
}
6938
}
70-

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

Lines changed: 0 additions & 219 deletions
This file was deleted.

0 commit comments

Comments
 (0)