http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java index 090c86a..96820ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java @@ -45,8 +45,8 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest { private static final String CACHE_NAME = "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); cfg.setCacheConfiguration(cacheConfiguration(CACHE_NAME));
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java index 7642fcb..ee523e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java @@ -36,8 +36,8 @@ public class IgfsCommonAbstractTest 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.setPeerClassLoadingEnabled(false); cfg.setLocalHost("127.0.0.1"); @@ -46,8 +46,8 @@ public class IgfsCommonAbstractTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName, IgniteTestResources rsrcs) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName, rsrcs); + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName, IgniteTestResources rsrcs) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName, rsrcs); cfg.setPeerClassLoadingEnabled(false); 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/internal/processors/igfs/IgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java index 9636c7d..f12590a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java @@ -86,8 +86,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { } /** {@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/processors/igfs/IgfsMaxSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java index f3b777c..bfba10a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java @@ -36,8 +36,8 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest { /** {@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); FileSystemConfiguration igfsCfg = new FileSystemConfiguration(); @@ -69,7 +69,7 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest { igfsCfg.setMetaCacheConfiguration(metaCacheCfg); cfg.setFileSystemConfiguration(igfsCfg); - cfg.setGridName(gridName); + cfg.setIgniteInstanceName(igniteInstanceName); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java index e8f66ad..cf1f37d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java @@ -73,8 +73,8 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { } /** {@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/processors/igfs/IgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java index b3061c8..1ff0c00 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java @@ -152,7 +152,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("grid-" + idx); + cfg.setIgniteInstanceName("grid-" + idx); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -201,7 +201,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("grid-secondary"); + cfg.setIgniteInstanceName("grid-secondary"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java index c4d7835..40ac0e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java @@ -132,7 +132,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("igfs-grid"); + cfg.setIgniteInstanceName("igfs-grid"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -186,7 +186,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("igfs-grid-secondary"); + cfg.setIgniteInstanceName("igfs-grid-secondary"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java index 0cb797a..58fb71b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java @@ -41,8 +41,8 @@ public class IgfsOneClientNodeTest extends GridCommonAbstractTest { private static final String CACHE_NAME = "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); cfg.setCacheConfiguration(cacheConfiguration(CACHE_NAME)); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java index 3a735ae..2fb2b84 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java @@ -115,8 +115,8 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { } /** {@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/processors/igfs/IgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java index a31a81a..001696a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java @@ -69,8 +69,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { } /** {@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/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index 1b74909..0d65bb8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -128,7 +128,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e * @throws Exception In case of any error. */ protected IgniteConfiguration gridConfiguration() throws Exception { - IgniteConfiguration cfg = getConfiguration(getTestGridName()); + IgniteConfiguration cfg = getConfiguration(getTestIgniteInstanceName()); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); discoSpi.setIpFinder(IP_FINDER); @@ -163,7 +163,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e * @throws Exception In case of any error. */ IgniteConfiguration gridConfigurationManyIgfsCaches(int cacheCtn) throws Exception { - IgniteConfiguration cfg = getConfiguration(getTestGridName()); + IgniteConfiguration cfg = getConfiguration(getTestIgniteInstanceName()); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); discoSpi.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java index 7a1ccef..1fa4f56 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java @@ -109,8 +109,8 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { } /** {@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); FileSystemConfiguration igfsCfg = new FileSystemConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java index 9be3814..a04f5c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java @@ -91,7 +91,7 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest { cfg.setFileSystemConfiguration(igfsCfg); } - cfg.setGridName("node-" + idx); + cfg.setIgniteInstanceName("node-" + idx); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java index 9c735f5..cc1b53b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java @@ -112,8 +112,8 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { } /** {@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.setLateAffinityAssignment(false); cfg.setCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java index b07c7b8..0d468b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java @@ -143,7 +143,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setFileSystemConfiguration(igfsCfg); - cfg.setGridName("node-" + idx); + cfg.setIgniteInstanceName("node-" + idx); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java index f2b14a2..b8e1e3b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java @@ -82,7 +82,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("grid"); + cfg.setIgniteInstanceName("grid"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java index 49aab10..3e90a52 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java @@ -47,9 +47,9 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** {@inheritDoc} */ @Override protected boolean expectedClient(String testGridName) { - return getTestGridName(CLIENT_NODE_IDX).equals(testGridName) - || getTestGridName(3).equals(testGridName) - || getTestGridName(5).equals(testGridName); + return getTestIgniteInstanceName(CLIENT_NODE_IDX).equals(testGridName) + || getTestIgniteInstanceName(3).equals(testGridName) + || getTestIgniteInstanceName(5).equals(testGridName); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcProcessorValidationSelfTest.java index aaee2a9..c07ff5a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcProcessorValidationSelfTest.java @@ -155,7 +155,7 @@ public class OdbcProcessorValidationSelfTest extends GridCommonAbstractTest { private void check(OdbcConfiguration odbcCfg, boolean success) throws Exception { final IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName(OdbcProcessorValidationSelfTest.class.getName() + "-" + NODE_IDX_GEN.incrementAndGet()); + cfg.setIgniteInstanceName(OdbcProcessorValidationSelfTest.class.getName() + "-" + NODE_IDX_GEN.incrementAndGet()); cfg.setLocalHost("127.0.0.1"); cfg.setOdbcConfiguration(odbcCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java index 49c6968..3119f2d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java @@ -56,8 +56,8 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { private 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); cfg.setMarshaller(new OptimizedMarshaller(false)); @@ -65,7 +65,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(); - if (gridName.equals(getTestGridName(0))) + if (igniteInstanceName.equals(getTestIgniteInstanceName(0))) cfg.setClientMode(true); return cfg; @@ -89,7 +89,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { Set<String> srvNames = new HashSet<>(NODES_CNT - 1); for (int i = 1; i < NODES_CNT; ++i) - srvNames.add(getTestGridName(i)); + srvNames.add(getTestIgniteInstanceName(i)); for (int i = 0 ; i < NODES_CNT; i++) { log.info("Iteration: " + i); @@ -137,7 +137,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { assertEquals(1, res.size()); - assertEquals(getTestGridName(0), F.first(res)); + assertEquals(getTestIgniteInstanceName(0), F.first(res)); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java index 665294d..08f2709 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java @@ -38,8 +38,8 @@ public class GridServiceClientNodeTest extends GridCommonAbstractTest { private 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); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setMaxMissedClientHeartbeats(30); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java index 111cb71..c6505ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -61,8 +61,8 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs private static final Random RAND = new Random(); /** {@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(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java index 1fa6b0f..d2fda2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java @@ -39,12 +39,12 @@ public class GridServiceProxyClientReconnectSelfTest extends GridCommonAbstractT 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); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); - cfg.setClientMode(gridName.contains("client")); + cfg.setClientMode(igniteInstanceName.contains("client")); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java index 39d311f..93d063d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java @@ -37,8 +37,8 @@ public class GridServiceProxyNodeStopSelfTest extends GridCommonAbstractTest { private final static 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); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceSerializationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceSerializationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceSerializationSelfTest.java index f709dfe..7c0b03d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceSerializationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceSerializationSelfTest.java @@ -43,8 +43,8 @@ public class GridServiceSerializationSelfTest extends GridCommonAbstractTest { 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); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); @@ -133,7 +133,7 @@ public class GridServiceSerializationSelfTest extends GridCommonAbstractTest { private boolean clientThread() { assert Thread.currentThread() instanceof IgniteThread; - return ((IgniteThread)Thread.currentThread()).getGridName().contains("client"); + return ((IgniteThread)Thread.currentThread()).getIgniteInstanceName().contains("client"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java index 4e6d1e6..0e33650 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java @@ -69,8 +69,8 @@ public class IgniteServiceConfigVariationsFullApiTest extends IgniteConfigVariat return super.expectedClient(testGridName); // Use two client nodes if grid index 5 or greater. - return getTestGridName(CLIENT_NODE_IDX).equals(testGridName) - || getTestGridName(CLIENT_NODE_IDX_2).equals(testGridName); + return getTestIgniteInstanceName(CLIENT_NODE_IDX).equals(testGridName) + || getTestIgniteInstanceName(CLIENT_NODE_IDX_2).equals(testGridName); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.java index e77ded7..000ed20 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.java @@ -85,8 +85,8 @@ public class IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest extends G /** {@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); @@ -98,12 +98,12 @@ public class IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest extends G cfg.setMarshaller(marshaller()); - cfg.setUserAttributes(Collections.singletonMap(NODE_NAME_ATTR, gridName)); + cfg.setUserAttributes(Collections.singletonMap(NODE_NAME_ATTR, igniteInstanceName)); - if (grp1.contains(gridName)) + if (grp1.contains(igniteInstanceName)) cfg.setClassLoader(extClsLdr1); - if (grp2.contains(gridName)) + if (grp2.contains(igniteInstanceName)) cfg.setClassLoader(extClsLdr2); cfg.setClientMode(client); @@ -123,10 +123,10 @@ public class IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest extends G super.beforeTest(); for (int i = 0; i < GRID_CNT; i += 2) - grp1.add(getTestGridName(i)); + grp1.add(getTestIgniteInstanceName(i)); for (int i = 1; i < GRID_CNT; i += 2) - grp2.add(getTestGridName(i)); + grp2.add(getTestIgniteInstanceName(i)); } /** {@inheritDoc} */ @@ -251,9 +251,9 @@ public class IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest extends G /** {@inheritDoc} */ @SuppressWarnings("SuspiciousMethodCalls") @Override public boolean apply(ClusterNode node) { - Object gridName = node.attribute(NODE_NAME_ATTR); + Object igniteInstanceName = node.attribute(NODE_NAME_ATTR); - return grp.contains(gridName); + return grp.contains(igniteInstanceName); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.java index a8599f4..7f08721 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.java @@ -62,8 +62,8 @@ public class IgniteServiceDeploymentClassLoadingDefaultMarshallerTest extends Gr private Set<String> extClsLdrGrids = new HashSet<>(); /** {@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); @@ -75,13 +75,13 @@ public class IgniteServiceDeploymentClassLoadingDefaultMarshallerTest extends Gr cfg.setMarshaller(marshaller()); - cfg.setUserAttributes(Collections.singletonMap(NODE_NAME_ATTR, gridName)); + cfg.setUserAttributes(Collections.singletonMap(NODE_NAME_ATTR, igniteInstanceName)); - if (getTestGridName(CLIENT_NODE_WITH_EXT_CLASS_LOADER).equals(gridName) - || getTestGridName(CLIENT_NODE).equals(gridName)) + if (getTestIgniteInstanceName(CLIENT_NODE_WITH_EXT_CLASS_LOADER).equals(igniteInstanceName) + || getTestIgniteInstanceName(CLIENT_NODE).equals(igniteInstanceName)) cfg.setClientMode(true); - if (extClsLdrGrids.contains(gridName)) + if (extClsLdrGrids.contains(igniteInstanceName)) cfg.setClassLoader(extClsLdr); return cfg; @@ -100,8 +100,8 @@ public class IgniteServiceDeploymentClassLoadingDefaultMarshallerTest extends Gr extClsLdrGrids.clear(); - extClsLdrGrids.add(getTestGridName(SERVER_NODE_WITH_EXT_CLASS_LOADER)); - extClsLdrGrids.add(getTestGridName(CLIENT_NODE_WITH_EXT_CLASS_LOADER)); + extClsLdrGrids.add(getTestIgniteInstanceName(SERVER_NODE_WITH_EXT_CLASS_LOADER)); + extClsLdrGrids.add(getTestIgniteInstanceName(CLIENT_NODE_WITH_EXT_CLASS_LOADER)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java index c41f2f0..026e6a6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java @@ -43,8 +43,8 @@ public class IgniteServiceDynamicCachesSelfTest extends GridCommonAbstractTest { 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 discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceProxyTimeoutInitializedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceProxyTimeoutInitializedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceProxyTimeoutInitializedTest.java index 41eef31..17e583d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceProxyTimeoutInitializedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceProxyTimeoutInitializedTest.java @@ -57,12 +57,12 @@ public class IgniteServiceProxyTimeoutInitializedTest extends GridCommonAbstract private static CountDownLatch latch2; /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(final String gridName) throws Exception { - final IgniteConfiguration cfg = super.getConfiguration(gridName); + @Override protected IgniteConfiguration getConfiguration(final String igniteInstanceName) throws Exception { + final IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); final ServiceConfiguration scfg = new ServiceConfiguration(); - if (gridName.endsWith("0")) { + if (igniteInstanceName.endsWith("0")) { scfg.setName("testService"); scfg.setService(srvc); scfg.setMaxPerNodeCount(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java index 09c631c..8116d1b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java @@ -43,8 +43,8 @@ public class IgniteServiceReassignmentTest extends GridCommonAbstractTest { private ServiceConfiguration srvcCfg; /** {@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(IP_FINDER); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java index 5b446cc..7858390 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java @@ -53,8 +53,8 @@ public class ServicePredicateAccessCacheTest extends GridCommonAbstractTest { private static CountDownLatch latch; /** {@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(IP_FINDER); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java index 301febd..55398a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java @@ -156,7 +156,7 @@ public class IpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testForceClose() throws Exception { - File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestGridName()); + File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestIgniteInstanceName()); assert tokFile.createNewFile() || tokFile.exists(); @@ -197,7 +197,7 @@ public class IpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReadAfterClose() throws Exception { - File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestGridName()); + File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestIgniteInstanceName()); assert tokFile.createNewFile() || tokFile.exists(); @@ -235,7 +235,7 @@ public class IpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testWriteAfterClose() throws Exception { - File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestGridName()); + File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestIgniteInstanceName()); assert tokFile.createNewFile() || tokFile.exists(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtilsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtilsSelfTest.java index 9b09185..8b2aa41 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtilsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryUtilsSelfTest.java @@ -51,7 +51,7 @@ public class IpcSharedMemoryUtilsSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIdsGet() throws Exception { - File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestGridName()); + File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestIgniteInstanceName()); assert tokFile.createNewFile() || tokFile.exists(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java index 552dd28..4dbb7ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java @@ -618,7 +618,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { .listener(lsnr) .logger(log) .selectorCount(Runtime.getRuntime().availableProcessors()) - .gridName("nio-test-grid") + .igniteInstanceName("nio-test-grid") .tcpNoDelay(true) .directBuffer(true) .byteOrder(ByteOrder.nativeOrder()) http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java index bb16828..1c4aa27 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java @@ -62,7 +62,7 @@ public class GridNioSslSelfTest extends GridNioSelfTest { .listener(lsnr) .logger(log) .selectorCount(2) - .gridName("nio-test-grid") + .igniteInstanceName("nio-test-grid") .tcpNoDelay(false) .directBuffer(true) .byteOrder(ByteOrder.nativeOrder()) http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java index 8ac6e6a..e0540ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java @@ -40,8 +40,8 @@ public class IgniteExceptionInNioWorkerSelfTest extends GridCommonAbstractTest { 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); CacheConfiguration ccfg = new CacheConfiguration("cache"); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java index 5134626..f0ccd3a 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java @@ -48,8 +48,8 @@ public class GridCacheMultiNodeLoadTest 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); TcpDiscoverySpi spi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java index 92b29e4..f6a0b03 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java @@ -77,8 +77,8 @@ public class GridIoManagerBenchmark0 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(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java index b6c6797..b620949 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java @@ -84,7 +84,7 @@ package org.apache.ignite.loadtests.communication; // // 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/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index eda640e..25b1059 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -54,8 +54,8 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe private static final AtomicInteger idx = new AtomicInteger(); /** {@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); AtomicConfiguration atomicCfg = new AtomicConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java index 27e9b66..ab6b272 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java @@ -46,7 +46,7 @@ public class GridMultiSplitsLoadTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @SuppressWarnings("ConstantConditions") - @Override public String getTestGridName() { + @Override public String getTestIgniteInstanceName() { return null; } @@ -91,7 +91,7 @@ public class GridMultiSplitsLoadTest extends GridCommonAbstractTest { * @throws Exception If task execution failed. */ public void testLoad() throws Exception { - final Ignite ignite = G.ignite(getTestGridName()); + final Ignite ignite = G.ignite(getTestIgniteInstanceName()); final long end = getTestDurationInMinutes() * 60 * 1000 + System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java index 92ecf0e..4f4124f 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java @@ -76,7 +76,7 @@ public class GridMultiSplitsRedeployLoadTest extends GridCommonAbstractTest { * @throws Exception If task execution failed. */ public void testLoad() throws Exception { - final Ignite ignite = G.ignite(getTestGridName()); + final Ignite ignite = G.ignite(getTestIgniteInstanceName()); deployTask(ignite); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java index 1081998..5d909c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java @@ -49,8 +49,8 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo /** {@inheritDoc} */ @SuppressWarnings("ConstantConditions") - @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.setCommunicationSpi(new TcpCommunicationSpi()); @@ -95,7 +95,7 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo * @throws Exception If task execution failed. */ public void testLoad() throws Exception { - final Ignite ignite = startGrid(getTestGridName()); + final Ignite ignite = startGrid(getTestIgniteInstanceName()); try { final long end = getTestDurationInMinutes() * 60 * 1000 + System.currentTimeMillis(); @@ -176,7 +176,7 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo info("Final test statistics: " + stats); } finally { - G.stop(getTestGridName(), false); + G.stop(getTestIgniteInstanceName(), false); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java index 20bc3c5..210e78e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java @@ -92,7 +92,7 @@ public class GridSingleSplitsRedeployLoadTest extends GridCommonAbstractTest { * @throws Exception If task execution failed. */ public void testLoad() throws Exception { - final Ignite ignite = G.ignite(getTestGridName()); + final Ignite ignite = G.ignite(getTestIgniteInstanceName()); final long end = getTestDurationInMinutes() * 60 * 1000 + System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTest.java index 3e41fc2..14c9794 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTest.java @@ -61,7 +61,7 @@ public class GridSessionLoadTest extends GridCommonAbstractTest { */ @SuppressWarnings("unchecked") public void testSessionLoad() throws Exception { - final Ignite ignite = G.ignite(getTestGridName()); + final 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/loadtests/direct/stealing/GridStealingLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java index 1ec1d87..cb55749 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java @@ -61,8 +61,8 @@ public class GridStealingLoadTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String name) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(name); + @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/loadtests/job/GridJobLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java index 7a5e37c..6d019e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java @@ -181,12 +181,12 @@ public class GridJobLoadTest implements Runnable { /** * Starts new grid node. * - * @param gridName name of new node. + * @param igniteInstanceName name of new node. * @param springCfg file with spring configuration to use for this node. * @return a grid instance local to new node {@link org.apache.ignite.Ignition#start(org.apache.ignite.configuration.IgniteConfiguration)}. * @throws Exception if node run failed. */ - protected Ignite startNode(String gridName, File springCfg) throws Exception { + protected Ignite startNode(String igniteInstanceName, File springCfg) throws Exception { assert springCfg != null; ListableBeanFactory springCtx = new FileSystemXmlApplicationContext( @@ -199,7 +199,7 @@ public class GridJobLoadTest implements Runnable { IgniteConfiguration cfg = (IgniteConfiguration)cfgMap.values().iterator().next(); - cfg.setGridName(gridName + "-" + getNextNodeNum()); + cfg.setIgniteInstanceName(igniteInstanceName + "-" + getNextNodeNum()); return G.start(cfg); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java index cda0e5c..7fca432 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java @@ -91,7 +91,7 @@ public class GridNioBenchmarkTest { .listener(lsnr) .logger(log) .selectorCount(selectorCnt) - .gridName("") + .igniteInstanceName("") .tcpNoDelay(false) .directBuffer(false) .byteOrder(ByteOrder.nativeOrder()) http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java index 0400de4..f75af03 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java @@ -42,8 +42,8 @@ public class DynamicProxySerializationMultiJvmSelfTest extends GridCommonAbstrac } /** {@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(marshFactory.call()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java index 0e858ed..fe3da2b 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java @@ -89,7 +89,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest private static Marshaller marsh; /** */ - private static String gridName; + private static String igniteInstanceName; /** Closure job. */ protected IgniteInClosure<String> c1 = new IgniteInClosure<String>() { @@ -129,8 +129,8 @@ public abstract class GridMarshallerAbstractTest 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); CacheConfiguration namedCache = new CacheConfiguration(); @@ -151,7 +151,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { marsh = grid().configuration().getMarshaller(); - gridName = grid().configuration().getGridName(); + igniteInstanceName = grid().configuration().getIgniteInstanceName(); } /** @@ -846,16 +846,15 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest } }); - // Any deserialization has to be executed under a thread, that contains the grid name. - new IgniteThread(gridName, "unmarshal-thread", f).start(); + // Any deserialization has to be executed under a thread, that contains the Ignite instance name. + new IgniteThread(igniteInstanceName, "unmarshal-thread", f).start(); try { return f.get(); } catch (Exception e) { - if (e.getCause() instanceof IgniteCheckedException) { + if (e.getCause() instanceof IgniteCheckedException) throw (IgniteCheckedException)e.getCause(); - } fail(e.getCause().getMessage()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java index ebbd8ac..d6bbdb4 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java @@ -52,8 +52,8 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest private String workDir; /** {@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/messaging/GridMessagingNoPeerClassLoadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java index 9186f17..4338947 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java @@ -37,8 +37,8 @@ public class GridMessagingNoPeerClassLoadingSelfTest extends GridMessagingSelfTe private static CountDownLatch rcvLatch; /** {@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/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index a166c3d..3f66c5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -201,8 +201,8 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser } /** {@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 discoSpi = new TestTcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java index e885f48..b731b4b 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java @@ -51,12 +51,12 @@ public class IgniteMessagingWithClientTest extends GridCommonAbstractTest implem } /** {@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 OptimizedMarshaller(false)); - if (gridName.equals(getTestGridName(2))) { + if (igniteInstanceName.equals(getTestIgniteInstanceName(2))) { cfg.setClientMode(true); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java index b23dec8..b0ac19b 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java @@ -44,8 +44,8 @@ abstract class GridAbstractMultinodeRedeployTest extends GridCommonAbstractTest private static final String TASK_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; /** {@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/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java index 864da24..0c021b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -40,8 +40,8 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest /** Number of grids cache. */ private static final int GRID_CNT = 2; - /** Name for grid without cache. */ - private static final String GRID_NAME = "grid-no-cache"; + /** Name for Ignite instance without cache. */ + private static final String IGNITE_INSTANCE_NAME = "grid-no-cache"; /** First test task name. */ private static final String TEST_TASK_1 = "org.apache.ignite.tests.p2p.GridP2PContinuousDeploymentTask1"; @@ -50,12 +50,12 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest private static final String TEST_TASK_2 = "org.apache.ignite.tests.p2p.GridP2PContinuousDeploymentTask2"; /** {@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(CONTINUOUS); - if (GRID_NAME.equals(gridName)) + if (IGNITE_INSTANCE_NAME.equals(igniteInstanceName)) cfg.setCacheConfiguration(); else cfg.setCacheConfiguration(cacheConfiguration()); @@ -99,20 +99,20 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest */ @SuppressWarnings("unchecked") public void testDeployment() throws Exception { - Ignite ignite = startGrid(GRID_NAME); + Ignite ignite = startGrid(IGNITE_INSTANCE_NAME); Class cls = getExternalClassLoader().loadClass(TEST_TASK_1); compute(ignite.cluster().forRemotes()).execute(cls, null); - stopGrid(GRID_NAME); + stopGrid(IGNITE_INSTANCE_NAME); - ignite = startGrid(GRID_NAME); + ignite = startGrid(IGNITE_INSTANCE_NAME); cls = getExternalClassLoader().loadClass(TEST_TASK_2); compute(ignite.cluster().forRemotes()).execute(cls, null); - stopGrid(GRID_NAME); + stopGrid(IGNITE_INSTANCE_NAME); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java index 82281c4..3af720f 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java @@ -67,8 +67,8 @@ public class GridP2PDifferentClassLoaderSelfTest 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/GridP2PDoubleDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java index faf0f57..f384090 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java @@ -42,8 +42,8 @@ public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { private 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); // Override P2P configuration to exclude Task and Job classes cfg.setPeerClassLoadingLocalClassPathExclude(GridP2PTestTask.class.getName(), http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java index 52d0dce..620bf24 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java @@ -41,8 +41,8 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { private static final long P2P_TIMEOUT = 1000; /** {@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(TASK_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java index e685b11..d67e294 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java @@ -43,8 +43,8 @@ public class GridP2PJobClassLoaderSelfTest 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/GridP2PLocalDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java index 05f102c..9acb4d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java @@ -56,8 +56,8 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { private static ClassLoader taskLdr; /** {@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/GridP2PMissedResourceCacheSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java index 909089e..d5ecde9 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java @@ -61,8 +61,8 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe private 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); // Override P2P configuration to exclude Task and Job classes cfg.setPeerClassLoadingLocalClassPathExclude(GridP2PTestTask.class.getName(), GridP2PTestJob.class.getName());
