You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/13 11:24:46 UTC
[19/25] ignite git commit: ignite-3207 Rename
IgniteConfiguration.gridName -> igniteInstanceName.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
index c4e4aab..c8e3143 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
@@ -75,8 +75,8 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -96,7 +96,7 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- ignite = G.ignite(getTestGridName());
+ ignite = G.ignite(getTestIgniteInstanceName());
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
index cb04f55..c78003a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
@@ -99,7 +99,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- ignite = G.ignite(getTestGridName());
+ ignite = G.ignite(getTestIgniteInstanceName());
long tstamp = startTimestamp();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
index 17479f4..97626c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
@@ -50,8 +50,8 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
/** {@inheritDoc} */
@SuppressWarnings("deprecation")
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setIncludeEventTypes(inclEvtTypes);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
index ab58746..089462d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
@@ -74,7 +74,7 @@ public class GridFactoryVmShutdownTest {
@Override public void run() {
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("test1");
+ cfg.setIgniteInstanceName("test1");
try {
G.start(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
index 49a3f94..f8dbaa5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
@@ -43,8 +43,8 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java
index f60deef..9446db6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java
@@ -41,7 +41,7 @@ public class GridFailedInputParametersSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- ignite = G.ignite(getTestGridName());
+ ignite = G.ignite(getTestIgniteInstanceName());
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
index 0105ff4..6f70373 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java
@@ -60,8 +60,8 @@ public class GridFailoverCustomTopologySelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@SuppressWarnings("deprecation")
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setNodeId(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java
index e734b9a..5ed2245 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java
@@ -55,8 +55,8 @@ public class GridFailoverSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setFailoverSpi(new AlwaysFailoverSpi());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
index 8d441cb..84f31cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java
@@ -61,7 +61,7 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes
/** Predicate to exclude the second node from topology */
private final IgnitePredicate<ClusterNode> p = new IgnitePredicate<ClusterNode>() {
@Override public boolean apply(ClusterNode e) {
- return !NODE2.equals(e.attribute(IgniteNodeAttributes.ATTR_GRID_NAME));
+ return !NODE2.equals(e.attribute(IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME));
}
};
@@ -72,8 +72,8 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes
private final AtomicBoolean failed = new AtomicBoolean();
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setFailoverSpi(new AlwaysFailoverSpi() {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java
index 5bd9158..0965549 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTopologySelfTest.java
@@ -52,8 +52,8 @@ public class GridFailoverTopologySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setNodeId(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java
index 26d98ba..74d50cf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridGetOrStartSelfTest.java
@@ -35,9 +35,9 @@ public class GridGetOrStartSelfTest extends GridCommonAbstractTest {
}
/**
- * Tests default grid
+ * Tests default Ignite instance
*/
- public void testDefaultGridGetOrStart() throws Exception {
+ public void testDefaultIgniteInstanceGetOrStart() throws Exception {
IgniteConfiguration cfg = getConfiguration(null);
try(Ignite ignite = Ignition.getOrStart(cfg)) {
try {
@@ -52,9 +52,9 @@ public class GridGetOrStartSelfTest extends GridCommonAbstractTest {
}
/**
- * Tests named grid
+ * Tests named Ignite instance
*/
- public void testNamedGridGetOrStart() throws Exception {
+ public void testNamedIgniteInstanceGetOrStart() throws Exception {
IgniteConfiguration cfg = getConfiguration("test");
try(Ignite ignite = Ignition.getOrStart(cfg)) {
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
index acdd722..281c360 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
@@ -30,8 +30,8 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_HOME;
*/
public class GridHomePathSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setLocalHost(getTestResources().getLocalHost());
@@ -46,7 +46,7 @@ public class GridHomePathSelfTest extends GridCommonAbstractTest {
startGrid(0);
// Test home override.
- IgniteConfiguration c = getConfiguration(getTestGridName(1));
+ IgniteConfiguration c = getConfiguration(getTestIgniteInstanceName(1));
c.setIgniteHome("/new/path");
@@ -63,7 +63,7 @@ public class GridHomePathSelfTest extends GridCommonAbstractTest {
}
// Test no override.
- IgniteConfiguration c1 = getConfiguration(getTestGridName(1));
+ IgniteConfiguration c1 = getConfiguration(getTestIgniteInstanceName(1));
c1.setIgniteHome(System.getProperty(IGNITE_HOME));
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
index ec139da..eca7ebe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
@@ -50,8 +50,8 @@ public class GridJobCheckpointCleanupSelfTest extends GridCommonAbstractTest {
private CheckpointSpi checkpointSpi;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
c.setCheckpointSpi(checkpointSpi);
@@ -127,7 +127,7 @@ public class GridJobCheckpointCleanupSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
index 09e8799..c213464 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
@@ -80,7 +80,7 @@ public class GridJobCollisionCancelSelfTest extends GridCommonAbstractTest {
*/
@SuppressWarnings( {"AssignmentToCatchBlockParameter"})
public void testCancel() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().localDeployTask(GridCancelTestTask.class, GridCancelTestTask.class.getClassLoader());
@@ -269,7 +269,7 @@ public class GridJobCollisionCancelSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
index a484ec3..608eab4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
@@ -101,8 +101,8 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
index 21c0430..56683b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
@@ -289,8 +289,8 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
JobStealingCollisionSpi colSpi = new JobStealingCollisionSpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java
index c36211d..31015ce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java
@@ -80,13 +80,13 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
JobStealingCollisionSpi colSpi = new JobStealingCollisionSpi();
// One job at a time.
- colSpi.setActiveJobsThreshold(gridName.endsWith("1") ? 0 : 2);
+ colSpi.setActiveJobsThreshold(igniteInstanceName.endsWith("1") ? 0 : 2);
colSpi.setWaitJobsThreshold(0);
JobStealingFailoverSpi failSpi = new JobStealingFailoverSpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
index d293b89..17ef65a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
@@ -152,8 +152,8 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
}
/** {@inheritDoc} */
- @Override protected final IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected final IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TestConnectorMessageInterceptor interceptor = new TestConnectorMessageInterceptor();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
index 28c87c8..7fe0924 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
@@ -50,8 +50,8 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
private LifeCycleBaseBean bean;
/** */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
c.setLifecycleBeans(bean);
@@ -102,7 +102,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
startGrid();
try {
- assertEquals(IgniteState.STARTED, G.state(getTestGridName()));
+ assertEquals(IgniteState.STARTED, G.state(getTestIgniteInstanceName()));
assertEquals(1, bean.count(BEFORE_NODE_START));
assertEquals(1, bean.count(AFTER_NODE_START));
@@ -114,7 +114,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
}
- assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
+ assertEquals(IgniteState.STOPPED, G.state(getTestIgniteInstanceName()));
assertEquals(1, bean.count(BEFORE_NODE_START));
assertEquals(1, bean.count(AFTER_NODE_START));
@@ -165,7 +165,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
catch (IgniteCheckedException expected) {
info("Got expected exception: " + expected);
- assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
+ assertEquals(IgniteState.STOPPED, G.state(getTestIgniteInstanceName()));
}
finally {
stopAllGrids();
@@ -192,7 +192,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
catch (IgniteCheckedException expected) {
info("Got expected exception: " + expected);
- assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
+ assertEquals(IgniteState.STOPPED, G.state(getTestIgniteInstanceName()));
}
finally {
stopAllGrids();
@@ -263,7 +263,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
try {
startGrid();
- assertEquals(IgniteState.STARTED, G.state(getTestGridName()));
+ assertEquals(IgniteState.STARTED, G.state(getTestIgniteInstanceName()));
}
catch (IgniteCheckedException ignore) {
assertTrue(false);
@@ -272,7 +272,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
try {
stopAllGrids();
- assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
+ assertEquals(IgniteState.STOPPED, G.state(getTestIgniteInstanceName()));
}
catch (Exception ignore) {
assertTrue(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java
index ec384e2..4337178 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java
@@ -35,10 +35,10 @@ public class GridLocalEventListenerSelfTest extends GridCommonAbstractTest {
private final CountDownLatch fired = new CountDownLatch(1);
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- int idx = getTestGridIndex(gridName);
+ int idx = getTestIgniteInstanceIndex(igniteInstanceName);
if (idx == 0) {
Map<IgnitePredicate<? extends Event>, int[]> lsnrs = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
index a975e2c..0970ba4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
@@ -78,8 +78,8 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
@@ -87,7 +87,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
c.setDiscoverySpi(disco);
- if (getTestGridName(1).equals(gridName))
+ if (getTestIgniteInstanceName(1).equals(igniteInstanceName))
c.setCacheConfiguration(/* no configured caches */);
else {
CacheConfiguration cc = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java
index ba510a7..32a7e65 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java
@@ -78,8 +78,8 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
GridTestFailoverSpi fail1 = new GridTestFailoverSpi("fail2");
GridTestFailoverSpi fail2 = new GridTestFailoverSpi("fail2");
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
index 370869c..dc5c16d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java
@@ -65,8 +65,8 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
// Override P2P configuration to exclude Task and Job classes
cfg.setPeerClassLoadingLocalClassPathExclude(GridDeploymentTestJob.class.getName(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
index 77603c9..b64a6ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
@@ -134,8 +134,8 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
JobStealingCollisionSpi colSpi = new JobStealingCollisionSpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
index 5379fe7..dccd225 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
@@ -42,7 +42,7 @@ public class GridNodeLocalSelfTest extends GridCommonAbstractTest {
* @throws Exception If test failed.
*/
public void testNodeLocal() throws Exception {
- Ignite g = G.ignite(getTestGridName());
+ Ignite g = G.ignite(getTestIgniteInstanceName());
String keyStr = "key";
int keyNum = 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogSelfTest.java
index fe5922e..13fae24 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogSelfTest.java
@@ -43,8 +43,8 @@ public class GridNodeMetricsLogSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@SuppressWarnings({"unchecked"})
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setMetricsLogFrequency(1000);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
index fddfd74..78385a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
@@ -44,8 +44,8 @@ public class GridNodeVisorAttributesSelfTest extends GridCommonAbstractTest {
private String[] inclProps;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setIncludeProperties(inclProps);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
index 1911176..2fcbf49 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
@@ -53,8 +53,8 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setMetricsHistorySize(5);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
index 2386ae4..c4173d4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
@@ -51,17 +51,19 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
private Ignite ignite;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setDiscoverySpi(discoverySpi());
List<CacheConfiguration> ccfgs = new ArrayList<>();
- if (gridName.equals(getTestGridName(0)))
- ccfgs.add(cacheConfiguration(null, new AttributeFilter(getTestGridName(0)), false));
- else if (gridName.equals(getTestGridName(2)) || gridName.equals(getTestGridName(3)))
- ccfgs.add(cacheConfiguration(CACHE_NAME, new AttributeFilter(getTestGridName(2), getTestGridName(3)), true));
+ if (igniteInstanceName.equals(getTestIgniteInstanceName(0)))
+ ccfgs.add(cacheConfiguration(null, new AttributeFilter(getTestIgniteInstanceName(0)), false));
+ else if (igniteInstanceName.equals(getTestIgniteInstanceName(2)) ||
+ igniteInstanceName.equals(getTestIgniteInstanceName(3)))
+ ccfgs.add(cacheConfiguration(CACHE_NAME, new AttributeFilter(getTestIgniteInstanceName(2),
+ getTestIgniteInstanceName(3)), true));
cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()]));
@@ -296,10 +298,10 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public boolean apply(ClusterNode node) {
- String gridName = node.attribute(IgniteNodeAttributes.ATTR_GRID_NAME);
+ String igniteInstanceName = node.attribute(IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME);
for (String attr : attrs) {
- if (F.eq(attr, gridName))
+ if (F.eq(attr, igniteInstanceName))
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index fc94663..cced946 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -56,8 +56,8 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheConfiguration cache = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
index 4d284c1..b3e69a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
@@ -42,8 +42,8 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
private boolean clientMode;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
if (clientMode)
cfg.setClientMode(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
index 9ec84f5..d3408da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
@@ -83,7 +83,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testExecuteFailed() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().localDeployTask(GridTaskFailedTestTask.class, GridTaskFailedTestTask.class.getClassLoader());
@@ -113,7 +113,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testMapFailed() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().localDeployTask(GridTaskFailedTestTask.class, GridTaskFailedTestTask.class.getClassLoader());
@@ -143,7 +143,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testResultFailed() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().localDeployTask(GridTaskFailedTestTask.class, GridTaskFailedTestTask.class.getClassLoader());
@@ -173,7 +173,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testReduceFailed() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().localDeployTask(GridTaskFailedTestTask.class, GridTaskFailedTestTask.class.getClassLoader());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java
index 8d5301c..a588ce0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java
@@ -51,8 +51,8 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setEventStorageSpi(new GridTestRuntimeExceptionSpi());
cfg.setDeploymentSpi(new GridTestCheckedExceptionSpi());
@@ -105,7 +105,7 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest {
@IgniteSpiMultipleInstancesSupport(true)
private static class GridTestRuntimeExceptionSpi extends IgniteSpiAdapter implements EventStorageSpi {
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
startStopwatch();
}
@@ -131,7 +131,7 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest {
@IgniteSpiMultipleInstancesSupport(true)
private static class GridTestCheckedExceptionSpi extends IgniteSpiAdapter implements DeploymentSpi {
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
startStopwatch();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
index a08db92..3d21d32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
@@ -77,7 +77,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
cfg.setConnectorConfiguration(null);
- cfg.setGridName(getTestGridName(0));
+ cfg.setIgniteInstanceName(getTestIgniteInstanceName(0));
CacheConfiguration cc = new CacheConfiguration();
@@ -89,7 +89,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
cfg = new IgniteConfiguration();
- cfg.setGridName(getTestGridName(1));
+ cfg.setIgniteInstanceName(getTestIgniteInstanceName(1));
cc = new CacheConfiguration();
@@ -113,7 +113,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
info("Before stop.");
- G.stop(getTestGridName(1), true);
+ G.stop(getTestIgniteInstanceName(1), true);
}
}
catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java
index 4ece66c..dee0f1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java
@@ -68,8 +68,8 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setFailoverSpi(new AlwaysFailoverSpi());
@@ -99,8 +99,8 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
}
finally {
// Do not cancel but wait.
- G.stop(getTestGridName(1), false);
- G.stop(getTestGridName(2), false);
+ G.stop(getTestIgniteInstanceName(1), false);
+ G.stop(getTestIgniteInstanceName(2), false);
}
assert fut != null;
@@ -133,8 +133,8 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
}
finally {
// Do not cancel but wait.
- G.stop(getTestGridName(1), false);
- G.stop(getTestGridName(2), false);
+ G.stop(getTestIgniteInstanceName(1), false);
+ G.stop(getTestIgniteInstanceName(2), false);
}
assert fut != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
index 7997560..5760c19 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
@@ -50,14 +50,14 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
private boolean clientMode;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
- boolean client = clientMode && gridName.equals(getTestGridName(0));
+ boolean client = clientMode && igniteInstanceName.equals(getTestIgniteInstanceName(0));
if (client) {
cfg.setClientMode(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
index c0714ec..c576863 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java
@@ -70,7 +70,7 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest {
* @throws Exception If test failed.
*/
public void testGet() throws Exception {
- Ignite ignite = startGrid(getTestGridName());
+ Ignite ignite = startGrid(getTestIgniteInstanceName());
Thread futThread = null;
@@ -127,7 +127,7 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest {
}
// Stops grid.
- stopGrid(getTestGridName());
+ stopGrid(getTestIgniteInstanceName());
boolean finished = latch.await(WAIT_TIME, TimeUnit.MILLISECONDS);
@@ -146,8 +146,8 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest {
futThread.interrupt();
}
- if (G.state(getTestGridName()) != IgniteState.STOPPED)
- stopGrid(getTestGridName());
+ if (G.state(getTestIgniteInstanceName()) != IgniteState.STOPPED)
+ stopGrid(getTestIgniteInstanceName());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java
index 4074712..32fc350 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java
@@ -50,7 +50,7 @@ public class GridTaskInstanceExecutionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testSynchronousExecute() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
testState = 12345;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
index 146f562..ed3ad63 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
@@ -62,8 +62,8 @@ public class GridTaskJobRejectSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
FifoQueueCollisionSpi collision = new FifoQueueCollisionSpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
index 68ff069..3cf9ef8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskListenerSelfTest.java
@@ -63,7 +63,7 @@ public class GridTaskListenerSelfTest extends GridCommonAbstractTest {
}
};
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
assert ignite != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java
index ecf69e6..17e2cbd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java
@@ -50,8 +50,8 @@ public class GridTaskMapAsyncSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -66,7 +66,7 @@ public class GridTaskMapAsyncSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testTaskMap() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
info("Executing sync mapped task.");
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java
index 143cca8..fb66652 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskResultCacheSelfTest.java
@@ -48,7 +48,7 @@ public class GridTaskResultCacheSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNoCacheResults() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().execute(GridResultNoCacheTestTask.class, "Grid Result No Cache Test Argument");
}
@@ -57,7 +57,7 @@ public class GridTaskResultCacheSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testCacheResults() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().execute(GridResultCacheTestTask.class, "Grid Result Cache Test Argument");
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
index 7fcd9eb..1c18045 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
@@ -70,7 +70,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
* @param execId Execution ID.
*/
private void checkTimedOutEvents(final IgniteUuid execId) {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
Collection<Event> evts = ignite.events().localQuery(new PE() {
@Override public boolean apply(Event evt) {
@@ -85,7 +85,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testSynchronousTimeout() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().localDeployTask(GridTaskTimeoutTestTask.class, GridTaskTimeoutTestTask.class.getClassLoader());
@@ -110,7 +110,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAsynchronousTimeout() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ignite.compute().localDeployTask(GridTaskTimeoutTestTask.class, GridTaskTimeoutTestTask.class.getClassLoader());
@@ -127,7 +127,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testSynchronousTimeoutMultithreaded() throws Exception {
- final Ignite ignite = G.ignite(getTestGridName());
+ final Ignite ignite = G.ignite(getTestIgniteInstanceName());
final AtomicBoolean finish = new AtomicBoolean();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
index 4d49366..10fa6ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
@@ -73,8 +73,8 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
protected boolean clientMode;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TestTcpDiscoverySpi disco = new TestTcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
index 47f7d2a..31f72e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
@@ -61,8 +61,8 @@ import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
*/
public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnectAbstractTest {
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setCacheConfiguration(new CacheConfiguration());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 0f0165b..682d2d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -104,8 +104,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
private UUID nodeId;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TestCommunicationSpi commSpi = new TestCommunicationSpi();
@@ -698,7 +698,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
IgniteInternalFuture<Boolean> fut = GridTestUtils.runAsync(new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
try {
- Ignition.start(optimize(getConfiguration(getTestGridName(SRV_CNT))));
+ Ignition.start(optimize(getConfiguration(getTestIgniteInstanceName(SRV_CNT))));
fail();
@@ -1449,8 +1449,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
Set<UUID> blockNodes = blockCls.get(msg0.getClass());
if (F.contains(blockNodes, node.id())) {
- log.info("Block message [node=" + node.attribute(IgniteNodeAttributes.ATTR_GRID_NAME) +
- ", msg=" + msg0 + ']');
+ log.info("Block message [node=" +
+ node.attribute(IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME) + ", msg=" + msg0 + ']');
blockedMsgs.add(new T2<>(node, (GridIoMessage)msg));
@@ -1491,7 +1491,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
for (T2<ClusterNode, GridIoMessage> msg : blockedMsgs) {
ClusterNode node = msg.get1();
- log.info("Send blocked message: [node=" + node.attribute(IgniteNodeAttributes.ATTR_GRID_NAME) +
+ log.info("Send blocked message: [node=" +
+ node.attribute(IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME) +
", msg=" + msg.get2().message() + ']');
super.sendMessage(msg.get1(), msg.get2());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
index 79ba739..3e98051 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
@@ -53,8 +53,8 @@ public abstract class IgniteClientReconnectFailoverAbstractTest extends IgniteCl
protected static final long TEST_TIME = 90_000;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setPeerClassLoadingEnabled(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
index 0409122..81b8ec2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
@@ -51,8 +51,8 @@ public class IgniteClientReconnectFailoverTest extends IgniteClientReconnectFail
protected static final String TX_CACHE = "TX_CACHE";
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheConfiguration ccfg1 = new CacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
index 1e87751..e9935d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
@@ -51,8 +51,8 @@ public class IgniteClientReconnectStreamerTest extends IgniteClientReconnectAbst
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<Integer, Integer>(CACHE_NAME)
.setAtomicityMode(ATOMIC)
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
index b595fee..49a97bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
@@ -44,8 +44,8 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
index 57f03b9..19f46fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
@@ -47,7 +47,7 @@ public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
* @throws Exception Thrown in case of test failure.
*/
public void testExecute() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ExecutorService srvc = createExecutorService(ignite);
@@ -71,7 +71,7 @@ public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
* @throws Exception Thrown in case of test failure.
*/
public void testSubmit() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ExecutorService srvc = createExecutorService(ignite);
@@ -108,7 +108,7 @@ public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
* @throws Exception Thrown in case of test failure.
*/
public void testSubmitWithFutureTimeout() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ExecutorService srvc = createExecutorService(ignite);
@@ -135,7 +135,7 @@ public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
*/
@SuppressWarnings("TooBroadScope")
public void testInvokeAll() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ExecutorService srvc = createExecutorService(ignite);
@@ -166,7 +166,7 @@ public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
*/
@SuppressWarnings("TooBroadScope")
public void testInvokeAllWithTimeout() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ExecutorService srvc = createExecutorService(ignite);
@@ -212,7 +212,7 @@ public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
*/
@SuppressWarnings("TooBroadScope")
public void testInvokeAny() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ExecutorService srvc = createExecutorService(ignite);
@@ -238,7 +238,7 @@ public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
*/
@SuppressWarnings("TooBroadScope")
public void testInvokeAnyWithTimeout() throws Exception {
- Ignite ignite = G.ignite(getTestGridName());
+ Ignite ignite = G.ignite(getTestIgniteInstanceName());
ExecutorService srvc = createExecutorService(ignite);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
index 052ea95..1b253ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
@@ -58,8 +58,8 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends GridCommonAbstract
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
// Override P2P configuration to exclude Task and Job classes
cfg.setPeerClassLoadingLocalClassPathExclude(GridDeploymentResourceTestTask.class.getName(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
index 5f22399..7eae2ce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
@@ -40,7 +40,7 @@ public class IgniteLocalNodeMapBeforeStartTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNodeLocalMapFromLifecycleBean() throws Exception {
- IgniteConfiguration cfg = getConfiguration(getTestGridName(0));
+ IgniteConfiguration cfg = getConfiguration(getTestIgniteInstanceName(0));
LifecycleBeanTest lifecycleBean = new LifecycleBeanTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
index 0ec3b6b..00a33a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
@@ -48,10 +48,10 @@ public class IgniteRoundRobinErrorAfterClientReconnectTest extends GridCommonAbs
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- if (gridName.endsWith("1"))
+ if (igniteInstanceName.endsWith("1"))
cfg.setClientMode(true);
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
index 5721887..3e8149b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
@@ -61,13 +61,14 @@ public class IgniteSlowClientDetectionSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setClientReconnectDisabled(true);
- if (getTestGridName(nodeCount() - 1).equals(gridName) || getTestGridName(nodeCount() - 2).equals(gridName))
+ if (getTestIgniteInstanceName(nodeCount() - 1).equals(igniteInstanceName) ||
+ getTestIgniteInstanceName(nodeCount() - 2).equals(igniteInstanceName))
cfg.setClientMode(true);
TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
index a255f15..a348ea5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
@@ -52,8 +52,8 @@ public class IgniteUpdateNotifierPerClusterSettingSelfTest extends GridCommonAbs
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
index 1e3b213..50fa494 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
@@ -55,8 +55,8 @@ public class TaskNodeRestartTest extends GridCommonAbstractTest {
private static final int NODES = 3;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java b/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java
index 2aed459..53e6add 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java
@@ -35,7 +35,7 @@ import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_GRID_NAME;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME;
/**
*
@@ -76,7 +76,7 @@ public class TestRecordingCommunicationSpi extends TcpCommunicationSpi {
Set<String> blockNodes = blockCls.get(msg0.getClass());
if (blockNodes != null) {
- String nodeName = (String)node.attributes().get(ATTR_GRID_NAME);
+ String nodeName = (String)node.attributes().get(ATTR_IGNITE_INSTANCE_NAME);
block = blockNodes.contains(nodeName);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
index 4a16662..91500d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
@@ -68,8 +68,8 @@ public class BinaryArrayIdentityResolverSelfTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setMarshaller(new BinaryMarshaller());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
index 7a56d9c..3dfa179 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
@@ -44,8 +44,8 @@ public class BinaryConfigurationConsistencySelfTest extends GridCommonAbstractTe
private boolean isClient;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setClientMode(isClient);