http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java index 202c296..bc0d787 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java @@ -56,8 +56,8 @@ public class GridP2PNodeLeftSelfTest extends GridCommonAbstractTest { private DeploymentMode depMode; /** {@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.setDeploymentMode(depMode);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java index a18ef32..a35409d 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java @@ -45,8 +45,8 @@ public class GridP2PRecursionTaskSelfTest extends GridCommonAbstractTest { private DeploymentMode depMode; /** {@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.setDeploymentMode(depMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java index d98a28d..623c962 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java @@ -48,8 +48,8 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { private DeploymentMode depMode; /** {@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( http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java index 9ac4852..a126b4b 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java @@ -67,8 +67,8 @@ public class GridP2PSameClassLoaderSelfTest 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.setDeploymentMode(depMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java index f4150a5..56aab0e 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java @@ -39,8 +39,8 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { private DeploymentMode depMode; /** {@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(GridP2PTestTask.class.getName(), GridP2PTestJob.class.getName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java index b13d4a5..4eae064 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java @@ -48,13 +48,13 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { private Map<String, LocalDeploymentSpi> spis = new HashMap<>(); /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName, + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName, IgniteTestResources rsrcs) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName, rsrcs); + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName, rsrcs); LocalDeploymentSpi spi = new LocalDeploymentSpi(); - spis.put(gridName, spi); + spis.put(igniteInstanceName, spi); cfg.setDeploymentSpi(spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java index 18fb806..832af7c 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java @@ -124,7 +124,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe assertEquals(expVal, val); assertNotNull(val.node); - assertEquals(val.node.name(), ctx.gridName()); + assertEquals(val.node.name(), ctx.igniteInstanceName()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/platform/PlatformStopIgniteTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformStopIgniteTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformStopIgniteTask.java index 238f058..be23ed6 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformStopIgniteTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformStopIgniteTask.java @@ -56,20 +56,20 @@ public class PlatformStopIgniteTask extends ComputeTaskAdapter<String, Boolean> */ private static class PlatformStopIgniteJob extends ComputeJobAdapter { /** */ - private final String gridName; + private final String igniteInstanceName; /** * Ctor. * - * @param gridName Name. + * @param igniteInstanceName Name. */ - private PlatformStopIgniteJob(String gridName) { - this.gridName = gridName; + private PlatformStopIgniteJob(String igniteInstanceName) { + this.igniteInstanceName = igniteInstanceName; } /** {@inheritDoc} */ @Override public Object execute() throws IgniteException { - return Ignition.stop(gridName, true); + return Ignition.stop(igniteInstanceName, true); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java index 6d61e67..68a6771 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java @@ -78,8 +78,8 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr } /** {@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(); @@ -137,7 +137,7 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr * @throws IgniteCheckedException if failed */ private void checkTask(int num) throws InterruptedException, IgniteCheckedException { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java index 43664de..ece2b57 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java @@ -80,8 +80,8 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract } /** {@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(); @@ -139,7 +139,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract * @throws IgniteCheckedException If failed. */ private void checkTask(int num) throws InterruptedException, IgniteCheckedException { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java index 4e83f01..19fab41 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java @@ -78,8 +78,8 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac } /** {@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(); @@ -137,7 +137,7 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac * @throws IgniteCheckedException If failed. */ private void checkTask(int num) throws InterruptedException, IgniteCheckedException { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java index 42e71f9..078d27e 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java @@ -167,7 +167,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb checkFinishedState("reduce:session:key:" + i, "reduce:global:key:" + i, "reduce:global:testval:" + i); } finally { - G.stop(getTestGridName(), false); + G.stop(getTestIgniteInstanceName(), false); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java index eddf6ec..1b111a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java @@ -65,7 +65,7 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testCollisionSessionAttribute() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().execute(GridSessionTestTask.class, null); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java index 70a3ae2..36c3027 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java @@ -72,7 +72,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac * @throws Exception if failed. */ public void testSetAttribute() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); @@ -86,7 +86,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac * @throws Exception if failed. */ public void testMultiThreaded() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); @@ -120,7 +120,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac * @throws InterruptedException if failed. */ private void checkTask(int num) throws InterruptedException { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); IgniteCompute comp = ignite.compute().withAsync(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java index ddc240c..358920f 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java @@ -73,7 +73,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra * @throws Exception if failed. */ public void testSetAttribute() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); @@ -87,7 +87,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra * @throws Exception if failed. */ public void testMultiThreaded() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); @@ -122,7 +122,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra * @throws IgniteCheckedException if failed. */ private void checkTask(int num) throws InterruptedException, IgniteCheckedException { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), num); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java index 4873c1c..72277c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java @@ -50,8 +50,8 @@ public class GridSessionJobFailoverSelfTest 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/session/GridSessionJobWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java index c596bad..e7490e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java @@ -62,8 +62,8 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT } /** {@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(); @@ -115,7 +115,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT * @throws IgniteCheckedException if failed. */ private void checkTask(int num) throws IgniteCheckedException { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), null); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java index 7e9f914..ae75a2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java @@ -60,8 +60,8 @@ public class GridSessionLoadSelfTest extends GridCommonAbstractTest { private boolean locMarsh; /** {@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.setMarshalLocalJobs(locMarsh); c.setPeerClassLoadingEnabled(false); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java index 3744cae..6299650 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java @@ -70,8 +70,8 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes } /** {@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(); @@ -130,7 +130,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes * @throws IgniteCheckedException if failed. */ private void checkTask(int num) throws InterruptedException, IgniteCheckedException { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index 0aca91f..f5c13fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -72,8 +72,8 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo } /** {@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(); @@ -90,7 +90,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo * @throws Exception If failed. */ public void testSetAttribute() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java index 47714d0..bb286c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java @@ -62,8 +62,8 @@ public class GridSessionSetJobAttributeSelfTest 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(); @@ -116,7 +116,7 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { * @throws IgniteCheckedException if failed. */ private void checkTask(int num) throws IgniteCheckedException { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index 1342439..6cf642b 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -67,8 +67,8 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb } /** {@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(); @@ -85,7 +85,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb * @throws Exception If failed. */ public void testSetAttribute() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java index 476555b..4092e74 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java @@ -62,7 +62,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest * @throws Exception if failed. */ public void testSetAttribute() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); @@ -74,7 +74,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest * @throws Exception if failed. */ public void testMultiThreaded() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); @@ -105,7 +105,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest * @param num Number. */ private void checkTask(int num) { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); IgniteCompute comp = ignite.compute().withAsync(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java index ffcd91d..41f6457 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java @@ -62,7 +62,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT * @throws Exception if failed. */ public void testSetAttribute() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); @@ -74,7 +74,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT * @throws Exception if failed. */ public void testMultiThreaded() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader()); @@ -105,7 +105,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT * @param num Number. */ private void checkTask(int num) { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); IgniteCompute comp = ignite.compute().withAsync(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java index b9d80ef..f3f39ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java @@ -90,8 +90,8 @@ public class GridSessionWaitAttributeSelfTest 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(); @@ -207,8 +207,8 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { private void checkWaitAttributeMethod(WaitAttributeType type) throws Exception { assert type != null; - Ignite ignite1 = G.ignite(getTestGridName() + '1'); - Ignite ignite2 = G.ignite(getTestGridName() + '2'); + Ignite ignite1 = G.ignite(getTestIgniteInstanceName() + '1'); + Ignite ignite2 = G.ignite(getTestIgniteInstanceName() + '2'); assert ignite1 != null; assert ignite2 != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java index a3ead1a..2d339bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java @@ -55,7 +55,7 @@ public abstract class GridSpiStartStopAbstractTest<T extends IgniteSpi> extends // Call to get node attributes as part of life cycle. getSpi().getNodeAttributes(); - getSpi().spiStart(getTestGridName()); + getSpi().spiStart(getTestIgniteInstanceName()); getSpi().onContextInitialized(getSpiContext()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java index 5ca8f26..1e25003 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java @@ -76,7 +76,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @SuppressWarnings({"IfMayBeConditional", "deprecation"}) - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); if (ipFinderUseLocPorts) @@ -89,20 +89,20 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { final int locPort; final int commLocPort; - if (getTestGridName(0).equals(gridName)) { + if (getTestIgniteInstanceName(0).equals(igniteInstanceName)) { locPort = locPort1; commLocPort = commLocPort1; } - else if (getTestGridName(1).equals(gridName)) { + else if (getTestIgniteInstanceName(1).equals(igniteInstanceName)) { locPort = locPort2; commLocPort = commLocPort2; } else - throw new IllegalArgumentException("Unknown grid name"); + throw new IllegalArgumentException("Unknown Ignite instance name"); spi.setIpFinder(ipFinder); - IgniteConfiguration cfg = super.getConfiguration(gridName); + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); spi.setLocalPort(locPort); spi.setLocalPortRange(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java index 76369cf..797743a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java @@ -47,8 +47,8 @@ public class CacheCheckpointSpiSecondCacheSelfTest 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); TcpDiscoverySpi disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java index 93339ed..88276c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java @@ -292,7 +292,7 @@ public abstract class GridAbstractCommunicationSelfTest<T extends CommunicationS for (int i = 0; i < getSpiCount(); i++) { CommunicationSpi<Message> spi = getSpi(i); - GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "gridName", "grid-" + i); + GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "igniteInstanceName", "grid-" + i); IgniteTestResources rsrcs = new IgniteTestResources(); @@ -326,7 +326,7 @@ public abstract class GridAbstractCommunicationSelfTest<T extends CommunicationS nodes.add(node); - spi.spiStart(getTestGridName() + (i + 1)); + spi.spiStart(getTestIgniteInstanceName() + (i + 1)); spis.put(rsrcs.getNodeId(), spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java index c0ea662..0a08b3a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java @@ -89,8 +89,8 @@ public class GridCacheMessageSelfTest 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(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java index f600e99..272e349 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java @@ -66,8 +66,8 @@ public class GridCacheDhtLockBackupSelfTest 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 disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java index 3c4fea0..54b3a78 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java @@ -111,8 +111,8 @@ abstract class GridTcpCommunicationSpiAbstractTest extends GridAbstractCommunica if (client0 == null) return; - info("Check failed for SPI [grid=" + - GridTestUtils.getFieldValue(spi, IgniteSpiAdapter.class, "gridName") + + info("Check failed for SPI [igniteInstanceName=" + + GridTestUtils.getFieldValue(spi, IgniteSpiAdapter.class, "igniteInstanceName") + ", client=" + client0 + ", spi=" + spi + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java index a649130..78bf869 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java @@ -410,7 +410,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic for (int i = 0; i < SPI_CNT; i++) { CommunicationSpi<Message> spi = createSpi(); - GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "gridName", "grid-" + i); + GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "igniteInstanceName", "grid-" + i); IgniteTestResources rsrcs = new IgniteTestResources(); @@ -443,7 +443,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic nodes.add(node); - spi.spiStart(getTestGridName() + (i + 1)); + spi.spiStart(getTestIgniteInstanceName() + (i + 1)); spis.add(spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java index 5345a9b..100811b 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java @@ -62,7 +62,7 @@ public class GridTcpCommunicationSpiConfigSelfTest extends GridSpiAbstractConfig spi.setLocalPortRange(0); cfg.setCommunicationSpi(spi); - startGrid(cfg.getGridName(), cfg); + startGrid(cfg.getIgniteInstanceName(), cfg); } finally { stopAllGrids(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java index 8581109..868408e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java @@ -236,7 +236,7 @@ public class GridTcpCommunicationSpiLanTest extends GridSpiAbstractTest<TcpCommu locNode.setAttributes(attrs); - spi.spiStart(getTestGridName()); + spi.spiStart(getTestIgniteInstanceName()); spi.onContextInitialized(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java index 0c57105..90af25e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java @@ -484,7 +484,7 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest extends GridSpiAbstrac for (int i = 0; i < getSpiCount(); i++) { CommunicationSpi<Message> spi = newCommunicationSpi(); - GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "gridName", "grid-" + i); + GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "igniteInstanceName", "grid-" + i); IgniteTestResources rsrcs = new IgniteTestResources(); @@ -517,7 +517,7 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest extends GridSpiAbstrac nodes.add(node); - spi.spiStart(getTestGridName() + (i + 1)); + spi.spiStart(getTestIgniteInstanceName() + (i + 1)); spis.put(rsrcs.getNodeId(), spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java index 12c2edb..feaae11 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java @@ -382,7 +382,7 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest<T extends CommunicationS for (int i = 0; i < SPI_CNT; i++) { TcpCommunicationSpi spi = getSpi(ackCnt, idleTimeout, queueLimit); - GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "gridName", "grid-" + i); + GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "igniteInstanceName", "grid-" + i); IgniteTestResources rsrcs = new IgniteTestResources(); @@ -402,7 +402,7 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest<T extends CommunicationS nodes.add(node); - spi.spiStart(getTestGridName() + (i + 1)); + spi.spiStart(getTestIgniteInstanceName() + (i + 1)); spis.add(spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java index 065a3d7..2a043ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java @@ -689,7 +689,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> for (int i = 0; i < SPI_CNT; i++) { TcpCommunicationSpi spi = getSpi(i); - GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "gridName", "grid-" + i); + GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "igniteInstanceName", "grid-" + i); IgniteTestResources rsrcs = new IgniteTestResources(); @@ -720,7 +720,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> nodes.add(node); - spi.spiStart(getTestGridName() + (i + 1)); + spi.spiStart(getTestIgniteInstanceName() + (i + 1)); spis.add(spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java index 3324fcc..ab4a608 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java @@ -29,8 +29,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; */ public class IgniteCacheSslStartStopSelfTest extends IgniteCachePutRetryAbstractSelfTest { /** {@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.setSslContextFactory(GridTestUtils.sslFactory()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java index c4930a0..3f58055 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java @@ -418,7 +418,7 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest<T extends Communic for (int i = 0; i < SPI_CNT; i++) { TcpCommunicationSpi spi = getSpi(ackCnt, idleTimeout, queueLimit); - GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "gridName", "grid-" + i); + GridTestUtils.setFieldValue(spi, IgniteSpiAdapter.class, "igniteInstanceName", "grid-" + i); IgniteTestResources rsrcs = new IgniteTestResources(); @@ -438,7 +438,7 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest<T extends Communic nodes.add(node); - spi.spiStart(getTestGridName() + (i + 1)); + spi.spiStart(getTestIgniteInstanceName() + (i + 1)); spis.add(spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java index 137eda2..4c5252c 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java @@ -425,7 +425,7 @@ public abstract class AbstractDiscoverySelfTest<T extends IgniteSpi> extends Gri ignite.setStaticCfg(cfg); } - spi.spiStart(getTestGridName() + i); + spi.spiStart(getTestIgniteInstanceName() + i); spis.add(spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java index 5282cf2..6402e63 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java @@ -67,8 +67,8 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract private 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); cfg.setClientMode(clientMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java index c624f2c..d3ffb96 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java @@ -34,10 +34,10 @@ public class TcpClientDiscoveryMarshallerCheckSelfTest extends GridCommonAbstrac private static 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); - if (gridName.endsWith("0")) + if (igniteInstanceName.endsWith("0")) cfg.setMarshaller(new JdkMarshaller()); else { cfg.setClientMode(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java index ba8fe73..e19b121 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java @@ -49,8 +49,8 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest { private ThreadLocal<Integer> discoPort = new ThreadLocal<>(); /** {@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("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java index 331b581..67ad629 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java @@ -149,16 +149,16 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { private boolean reconnectDisabled; /** {@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 = getDiscoverySpi(); disco.setMaxMissedClientHeartbeats(maxMissedClientHbs); - if (gridName.startsWith("server")) + if (igniteInstanceName.startsWith("server")) disco.setIpFinder(IP_FINDER); - else if (gridName.startsWith("client")) { + else if (igniteInstanceName.startsWith("client")) { cfg.setClientMode(true); TcpDiscoveryVmIpFinder ipFinder; @@ -196,9 +196,9 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { disco.setSocketTimeout(2000); } else { - disco.setAckTimeout(gridName.startsWith("client") ? TcpDiscoverySpi.DFLT_ACK_TIMEOUT_CLIENT : + disco.setAckTimeout(igniteInstanceName.startsWith("client") ? TcpDiscoverySpi.DFLT_ACK_TIMEOUT_CLIENT : TcpDiscoverySpi.DFLT_ACK_TIMEOUT); - disco.setSocketTimeout(gridName.startsWith("client") ? TcpDiscoverySpi.DFLT_SOCK_TIMEOUT_CLIENT : + disco.setSocketTimeout(igniteInstanceName.startsWith("client") ? TcpDiscoverySpi.DFLT_SOCK_TIMEOUT_CLIENT : TcpDiscoverySpi.DFLT_SOCK_TIMEOUT); } } @@ -1346,7 +1346,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { else if (evt.type() == EVT_NODE_JOINED) { TcpDiscoveryNode node = (TcpDiscoveryNode)evt0.eventNode(); - if ("client-0".equals(node.attribute(IgniteNodeAttributes.ATTR_GRID_NAME))) { + if ("client-0".equals(node.attribute(IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME))) { assertEquals(changeTop ? 5L : 4L, node.order()); joinLatch.countDown(); @@ -2258,7 +2258,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { if (delayJoinAckFor != null && msg instanceof TcpDiscoveryJoinRequestMessage) { TcpDiscoveryJoinRequestMessage msg0 = (TcpDiscoveryJoinRequestMessage)msg; - if (delayJoinAckFor.equals(msg0.node().attribute(IgniteNodeAttributes.ATTR_GRID_NAME))) { + if (delayJoinAckFor.equals(msg0.node().attribute(IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME))) { log.info("Delay response [sock=" + sock + ", msg=" + msg0 + ", res=" + res + ']'); delayJoinAckFor = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java index 7dd27ea..f407523 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java @@ -40,8 +40,8 @@ public class TcpDiscoveryConcurrentStartTest extends GridCommonAbstractTest { private static volatile boolean client; /** {@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(new TcpDiscoverySpi().setIpFinder(ipFinder)); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java index 644965d..df2ea22 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java @@ -40,8 +40,8 @@ public class TcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractTest private static 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/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index 28b527e..0d08b76 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -108,8 +108,8 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @SuppressWarnings({"IfMayBeConditional"}) - @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); UUID id = nodeId.get(); @@ -344,7 +344,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { U.sleep(50); - Thread.currentThread().setName("stop-server-" + getTestGridName(stopIdx)); + Thread.currentThread().setName("stop-server-" + getTestIgniteInstanceName(stopIdx)); log.info("Stop server: " + stopIdx); @@ -353,7 +353,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { // Generate unique name to simplify debugging. int startIdx = srvStartIdx.getAndIncrement(); - Thread.currentThread().setName("start-server-" + getTestGridName(startIdx)); + Thread.currentThread().setName("start-server-" + getTestIgniteInstanceName(startIdx)); log.info("Start server: " + startIdx); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConfigConsistentIdSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConfigConsistentIdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConfigConsistentIdSelfTest.java index 9fd8ea9..3f80746 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConfigConsistentIdSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConfigConsistentIdSelfTest.java @@ -31,14 +31,14 @@ public class TcpDiscoveryNodeConfigConsistentIdSelfTest extends GridCommonAbstra private 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); cfg.setLocalHost("0.0.0.0"); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder)); - cfg.setConsistentId(gridName); + cfg.setConsistentId(igniteInstanceName); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java index 21b01f6..b9d7682 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java @@ -32,8 +32,8 @@ public class TcpDiscoveryNodeConsistentIdSelfTest extends GridCommonAbstractTest private 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); cfg.setLocalHost("0.0.0.0"); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java index 7beeb41..cacefa5 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java @@ -53,8 +53,8 @@ public class TcpDiscoveryRestartTest extends GridCommonAbstractTest { private static AtomicReference<String> err; /** {@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 spi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 26042a7..c6d1147 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -134,21 +134,21 @@ public class TcpDiscoverySelfTest 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); ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); TcpDiscoverySpi spi = nodeSpi.get(); if (spi == null) { - spi = gridName.contains("testPingInterruptedOnNodeFailedFailingNode") ? + spi = igniteInstanceName.contains("testPingInterruptedOnNodeFailedFailingNode") ? new TestTcpDiscoverySpi() : new TcpDiscoverySpi(); } else nodeSpi.set(null); - discoMap.put(gridName, spi); + discoMap.put(igniteInstanceName, spi); spi.setIpFinder(ipFinder); @@ -173,10 +173,10 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { cfg.setIncludeProperties(); - if (!gridName.contains("LoopbackProblemTest")) + if (!igniteInstanceName.contains("LoopbackProblemTest")) cfg.setLocalHost("127.0.0.1"); - if (gridName.contains("testFailureDetectionOnNodePing")) { + if (igniteInstanceName.contains("testFailureDetectionOnNodePing")) { spi.setReconnectCount(1); // To make test faster: on Windows 1 connect takes 1 second. spi.setHeartbeatFrequency(40000); } @@ -186,14 +186,14 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { if (nodeId != null) cfg.setNodeId(nodeId); - if (gridName.contains("NonSharedIpFinder")) { + if (igniteInstanceName.contains("NonSharedIpFinder")) { TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(); finder.setAddresses(Arrays.asList("127.0.0.1:47501")); spi.setIpFinder(finder); } - else if (gridName.contains("MulticastIpFinder")) { + else if (igniteInstanceName.contains("MulticastIpFinder")) { TcpDiscoveryMulticastIpFinder finder = new TcpDiscoveryMulticastIpFinder(); finder.setAddressRequestAttempts(5); @@ -207,16 +207,16 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { if (U.isMacOs()) spi.setLocalAddress(F.first(U.allLocalIps())); } - else if (gridName.contains("testPingInterruptedOnNodeFailedPingingNode")) + else if (igniteInstanceName.contains("testPingInterruptedOnNodeFailedPingingNode")) cfg.setFailureDetectionTimeout(30_000); - else if (gridName.contains("testNoRingMessageWorkerAbnormalFailureNormalNode")) + else if (igniteInstanceName.contains("testNoRingMessageWorkerAbnormalFailureNormalNode")) cfg.setFailureDetectionTimeout(3_000); - else if (gridName.contains("testNoRingMessageWorkerAbnormalFailureSegmentedNode")) { + else if (igniteInstanceName.contains("testNoRingMessageWorkerAbnormalFailureSegmentedNode")) { cfg.setFailureDetectionTimeout(6_000); cfg.setGridLogger(strLog = new GridStringLogger()); } - else if (gridName.contains("testNodeShutdownOnRingMessageWorkerFailureFailedNode")) + else if (igniteInstanceName.contains("testNodeShutdownOnRingMessageWorkerFailureFailedNode")) cfg.setGridLogger(strLog = new GridStringLogger()); cfg.setClientMode(client); @@ -302,11 +302,11 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { try { Ignite g1 = startGrid(1); - final AtomicInteger gridNameIdx = new AtomicInteger(1); + final AtomicInteger igniteInstanceNameIdx = new AtomicInteger(1); GridTestUtils.runMultiThreaded(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { - startGrid(gridNameIdx.incrementAndGet()); + startGrid(igniteInstanceNameIdx.incrementAndGet()); return null; } @@ -2534,17 +2534,17 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { * @throws Exception If anything failed. */ private Ignite startGridNoOptimize(int idx) throws Exception { - return startGridNoOptimize(getTestGridName(idx)); + return startGridNoOptimize(getTestIgniteInstanceName(idx)); } /** * Starts new grid with given name. Method optimize is not invoked. * - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @return Started grid. * @throws Exception If failed. */ - private Ignite startGridNoOptimize(String gridName) throws Exception { - return G.start(getConfiguration(gridName)); + private Ignite startGridNoOptimize(String igniteInstanceName) throws Exception { + return G.start(getConfiguration(igniteInstanceName)); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java index 47e9112..b55473c 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java @@ -34,8 +34,8 @@ import static org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi.DFLT_TOP_HISTO */ public class TcpDiscoverySnapshotHistoryTest 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); TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java index 24f47c9..c349e5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java @@ -59,7 +59,7 @@ public class TcpDiscoverySpiConfigSelfTest extends GridSpiAbstractConfigTest<Tcp spi.setLocalPortRange(0); cfg.setDiscoverySpi(spi); - startGrid(cfg.getGridName(), cfg); + startGrid(cfg.getIgniteInstanceName(), cfg); } finally { stopAllGrids(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiWildcardSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiWildcardSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiWildcardSelfTest.java index 899e0e9..3d2f243 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiWildcardSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiWildcardSelfTest.java @@ -33,8 +33,8 @@ public class TcpDiscoverySpiWildcardSelfTest extends GridCommonAbstractTest { private static final int NODES = 5; /** {@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 spi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslSelfTest.java index 3f13134..b0122ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslSelfTest.java @@ -32,8 +32,8 @@ public class TcpDiscoverySslSelfTest extends TcpDiscoverySelfTest { } /** {@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.setSslContextFactory(GridTestUtils.sslFactory()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java index aa00007..25cb083 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java @@ -253,7 +253,7 @@ public class TcpDiscoveryVmIpFinderSelfTest private static IgniteConfiguration config(String name, boolean client, boolean forceServerMode) { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName(name); + cfg.setIgniteInstanceName(name); cfg.setClientMode(client); TcpDiscoverySpi disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java index da1a4e5..80e76bd 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/internal/GridInternalTasksLoadBalancingSelfTest.java @@ -68,8 +68,8 @@ public class GridInternalTasksLoadBalancingSelfTest 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); if (customLoadBalancer) cfg.setLoadBalancingSpi(new CustomLoadBalancerSpi()); @@ -184,7 +184,7 @@ public class GridInternalTasksLoadBalancingSelfTest extends GridCommonAbstractTe @IgniteSpiMultipleInstancesSupport(true) private static class CustomLoadBalancerSpi extends IgniteSpiAdapter implements LoadBalancingSpi { /** {@inheritDoc} */ - @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException { + @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException { // No-op. }
