# ignite-648: review (jvm->JVM, isRemoteJvm)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00a98583 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00a98583 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00a98583 Branch: refs/heads/ignite-648-failover Commit: 00a9858300cf0e9ec7009a3c879d3ad6c6f01d7e Parents: 83f4895 Author: ashutak <ashu...@gridgain.com> Authored: Wed Jul 8 13:34:21 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Wed Jul 8 13:34:21 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 2 +- ...AtomicClientOnlyMultiJvmFullApiSelfTest.java | 4 +- ...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 4 +- ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 4 +- ...omicFairAffinityMultiJvmFullApiSelfTest.java | 4 +- .../GridCacheAtomicMultiJvmFullApiSelfTest.java | 2 +- ...tomicMultiJvmP2PDisabledFullApiSelfTest.java | 4 +- ...bledFairAffinityMultiJvmFullApiSelfTest.java | 4 +- ...tomicNearEnabledMultiJvmFullApiSelfTest.java | 4 +- ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 4 +- ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java | 2 +- ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 4 +- ...cheAtomicOffHeapMultiJvmFullApiSelfTest.java | 4 +- ...micOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +- ...rderFairAffinityMultiJvmFullApiSelfTest.java | 4 +- ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 4 +- ...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 4 +- ...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 4 +- ...derOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +- ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 4 +- ...ridCacheNearOnlyMultiJvmFullApiSelfTest.java | 2 +- ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 4 +- .../GridCacheNearTxMultiJvmSelfTest.java | 2 +- ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 4 +- ...onedFairAffinityMultiJvmFullApiSelfTest.java | 4 +- ...CachePartitionedMultiJvmCounterSelfTest.java | 4 +- ...CachePartitionedMultiJvmFullApiSelfTest.java | 2 +- ...ionedMultiJvmP2PDisabledFullApiSelfTest.java | 4 +- ...micOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +- ...bledFairAffinityMultiJvmFullApiSelfTest.java | 4 +- ...onedNearDisabledMultiJvmFullApiSelfTest.java | 4 +- ...abledMultiJvmP2PDisabledFullApiSelfTest.java | 4 +- ...rDisabledOffHeapMultiJvmFullApiSelfTest.java | 4 +- ...ledOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +- ...rtitionedOffHeapMultiJvmFullApiSelfTest.java | 4 +- ...nedOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +- ...ReplicatedAtomicMultiJvmFullApiSelfTest.java | 2 +- ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 4 +- ...dCacheReplicatedMultiJvmFullApiSelfTest.java | 2 +- ...catedMultiJvmP2PDisabledFullApiSelfTest.java | 4 +- ...plicatedNearOnlyMultiJvmFullApiSelfTest.java | 2 +- ...eplicatedOffHeapMultiJvmFullApiSelfTest.java | 4 +- ...tedOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 46 +++++++++++--------- .../junits/multijvm/AffinityProcessProxy.java | 2 +- .../multijvm/IgniteClusterProcessProxy.java | 2 +- .../junits/multijvm/IgniteNodeRunner.java | 2 +- .../junits/multijvm/IgniteProcessProxy.java | 6 +-- ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 12 +---- 51 files changed, 106 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 65681dc..238332a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -207,7 +207,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cfg.setCacheConfiguration(); - if (!isMultiJvmAndNodeIsRemote(gridName)) + if (!isRemoteJvm(gridName)) return IgnitionEx.start(optimize(cfg), ctx); else return startRemoteGrid(gridName, optimize(cfg), ctx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index d98a550..4cd208d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -369,7 +369,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @return Cache context. */ protected GridCacheContext<String, Integer> context(final int idx) { - if (isMultiJvmAndNodeIsRemote(idx) && !weAreOnRemoteJvm()) + if (isRemoteJvm(idx) && !isRemoteJvm()) throw new UnsupportedOperationException("Operation can't be done automatically via proxy. " + "Send task with this logic on remote jvm instead."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.java index 85269f5..e2ac8a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest extends GridCacheAtomicClientOnlyFairAffinityMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest.java index 0768b9f..dfffc70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest extends +public class GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest extends GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.java index 3c33730..2d8b9a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest extends +public class GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest extends GridCacheAtomicClientOnlyMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.java index 781b14b..1388a75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest extends +public class GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest extends GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest.java index 164f14b..5808f28 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest extends +public class GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest extends GridCacheAtomicFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmFullApiSelfTest.java index 6064d05..0d6a1ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheAtomicMultiJvmFullApiSelfTest extends GridCacheAtomicMultiNodeFullApiSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.java index fb5348b..0f35862 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest extends +public class GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest extends GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java index 3d2debc..44e0a6d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest extends +public class GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest extends GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java index 0177d2b..44f3c6f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest extends +public class GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest extends GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java index 3fcd505..e23ab52 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest extends +public class GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest extends GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest.java index ba01611..a2850c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest extends GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java index 8b67346..f07d51d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest extends +public class GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest extends GridCacheAtomicNearOnlyMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java index 01fbaab..8eb4db1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicOffHeapMultiJvmFullApiSelfTest extends +public class GridCacheAtomicOffHeapMultiJvmFullApiSelfTest extends GridCacheAtomicOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java index 7b2aad1..acc1892 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest extends GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java index 2838d02..421ce32 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest extends +public class GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java index 82498ce..928b955 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends +public class GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java index 2659d11..c805377 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest extends +public class GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java index 5f4a5c1..3732cd2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest extends +public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java index ed43c15..192b4a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.java index e4fd892..c8829a1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest extends +public class GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest extends GridCacheNearOnlyFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmFullApiSelfTest.java index fdc3ebb..40504d8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheNearOnlyMultiJvmFullApiSelfTest extends GridCacheNearOnlyMultiNodeFullApiSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java index 9a83d14..5e48504 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest extends +public class GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest extends GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java index a74f7cd..467e32c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheNearTxMultiJvmSelfTest extends GridCacheNearTxMultiNodeSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest.java index eaa5f79..2aa8ed8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest extends +public class GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest extends GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest.java index 48335bb..7bd0043 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest extends +public class GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest extends GridCachePartitionedFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmCounterSelfTest.java index 7f39342..8644ca6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmCounterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmCounterSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedMultiJvmCounterSelfTest extends +public class GridCachePartitionedMultiJvmCounterSelfTest extends GridCachePartitionedMultiNodeCounterSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java index 336949a..c88f360 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCachePartitionedMultiJvmFullApiSelfTest extends GridCachePartitionedMultiNodeFullApiSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.java index dc3a060..1e619eb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest extends +public class GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest extends GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java index 42bf885..c4332df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest.java index 00459d6..b3e45ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest extends +public class GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.java index ba37f99..6cdd3be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest extends +public class GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.java index 7cabc39..c873b11 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest extends +public class GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest extends GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java index bebd3ad..8d0bc7f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest extends +public class GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java index 519d840..486ca2e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java index 6d10111..5cf5d8a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCachePartitionedOffHeapMultiJvmFullApiSelfTest extends +public class GridCachePartitionedOffHeapMultiJvmFullApiSelfTest extends GridCachePartitionedOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java index 6e44dd1..d2d45b2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.near.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest extends GridCachePartitionedOffHeapTieredMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.java index a4a50a4..7f8bfa1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheReplicatedAtomicMultiJvmFullApiSelfTest extends GridCacheReplicatedAtomicMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java index 0f7a180..fb87c9c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends +public class GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java index b135099..19a5abd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheReplicatedMultiJvmFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.java index 96de19b..7473bdc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest extends +public class GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest extends GridCacheReplicatedMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java index 90f2eb8..9d7639c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest extends GridCacheReplicatedNearOnlyMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java index 5bd9dd6..f054f4b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ -public class GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest extends +public class GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest extends GridCacheReplicatedOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java index d859c58..dcf2721 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.multijvm; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** - * Multy Jvm tests. + * Multi-JVM tests. */ public class GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest extends GridCacheReplicatedOffHeapTieredMultiNodeFullApiSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 3cdced7..3d27d2d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -211,7 +211,7 @@ public abstract class GridAbstractTest extends TestCase { * @return logger. */ protected IgniteLogger log() { - if (weAreOnRemoteJvm()) + if (isRemoteJvm()) return IgniteNodeRunner.startedInstance().log(); return log; @@ -676,7 +676,7 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. */ protected Ignite startGrid(String gridName, GridSpringResourceContext ctx) throws Exception { - if (!isMultiJvmAndNodeIsRemote(gridName)) { + if (!isRemoteJvm(gridName)) { startingGrid.set(gridName); try { @@ -755,7 +755,7 @@ public abstract class GridAbstractTest extends TestCase { info(">>> Stopping grid [name=" + ignite.name() + ", id=" + ignite.cluster().localNode().id() + ']'); - if (!isMultiJvmAndNodeIsRemote(gridName)) + if (!isRemoteJvm(gridName)) G.stop(gridName, cancel); else IgniteProcessProxy.stop(gridName, cancel); @@ -801,7 +801,7 @@ public abstract class GridAbstractTest extends TestCase { assert G.allGrids().isEmpty(); } finally { - IgniteProcessProxy.killAll(); // In multi jvm case. + IgniteProcessProxy.killAll(); // In multi-JVM case. } } @@ -871,10 +871,10 @@ public abstract class GridAbstractTest extends TestCase { * @return Grid instance. */ protected IgniteEx grid(String name) { - if (!isMultiJvmAndNodeIsRemote(name)) + if (!isRemoteJvm(name)) return (IgniteEx)G.ignite(name); else { - if (weAreOnRemoteJvm()) + if (isRemoteJvm()) return IgniteNodeRunner.startedInstance(); else return IgniteProcessProxy.ignite(name); @@ -956,7 +956,7 @@ public abstract class GridAbstractTest extends TestCase { protected Ignite startGrid(String gridName, IgniteConfiguration cfg) throws Exception { cfg.setGridName(gridName); - if (!isMultiJvmAndNodeIsRemote(gridName)) + if (!isRemoteJvm(gridName)) return G.start(cfg); else return startRemoteGrid(gridName, cfg, null); @@ -1362,11 +1362,14 @@ public abstract class GridAbstractTest extends TestCase { } /** - * Gets flag whether nodes will run in one jvm or in separate jvms. + * Gets flag whether nodes will run in one JVM or in separate JVMs. * - * @return <code>True</code> to run nodes in separate jvms. + * @return <code>True</code> to run nodes in separate JVMs. * @see IgniteNodeRunner * @see IgniteProcessProxy + * @see #isRemoteJvm() + * @see #isRemoteJvm(int) + * @see #isRemoteJvm(String) * @see #executeOnLocalOrRemoteJvm(int, TestIgniteIdxCallable) * @see #executeOnLocalOrRemoteJvm(Ignite, TestIgniteCallable) * @see #executeOnLocalOrRemoteJvm(IgniteCache, TestCacheCallable) @@ -1377,24 +1380,25 @@ public abstract class GridAbstractTest extends TestCase { /** * @param gridName Grid name. - * @return <code>True</code> if test was run in multy jvm mode and grid at another jvm. + * @return <code>True</code> if test was run in multi-JVM mode and grid with this name was started at another JVM. */ - protected boolean isMultiJvmAndNodeIsRemote(String gridName) { + protected boolean isRemoteJvm(String gridName) { return isMultiJvm() && !gridName.endsWith("0"); } /** * @param idx Grid index. - * @return <code>True</code> if test was run in multy jvm mode and grid at another jvm. + * @return <code>True</code> if test was run in multi-JVM mode and grid with this ID was started at another JVM. */ - protected boolean isMultiJvmAndNodeIsRemote(int idx) { + protected boolean isRemoteJvm(int idx) { return isMultiJvm() && idx != 0; } /** - * @return <code>True</code> if current jvm contains remote started node. + * @return <code>True</code> if current JVM contains remote started node + * (It differs from JVM where tests executing). */ - protected boolean weAreOnRemoteJvm() { + protected boolean isRemoteJvm() { return IgniteNodeRunner.hasStartedInstance(); } @@ -1415,7 +1419,7 @@ public abstract class GridAbstractTest extends TestCase { } /** - * Calls job on local jvm or on remote jvm in multi jvm case. + * Calls job on local JVM or on remote JVM in multi-JVM case. * * @param idx Grid index. * @param job Job. @@ -1435,7 +1439,7 @@ public abstract class GridAbstractTest extends TestCase { } /** - * Calls job on local jvm or on remote jvm in multi jvm case. + * Calls job on local JVM or on remote JVM in multi-JVM case. * * @param ignite Ignite. * @param job Job. @@ -1453,7 +1457,7 @@ public abstract class GridAbstractTest extends TestCase { } /** - * Calls job on local jvm or on remote jvm in multi jvm case. + * Calls job on local JVM or on remote JVM in multi-JVM case. * * @param cache Cache. * @param job Job. @@ -1473,7 +1477,7 @@ public abstract class GridAbstractTest extends TestCase { } /** - * Calls job on remote jvm. + * Calls job on remote JVM. * * @param idx Grid index. * @param job Job. @@ -1494,7 +1498,7 @@ public abstract class GridAbstractTest extends TestCase { } /** - * Calls job on remote jvm. + * Calls job on remote JVM. * * @param proxy Ignite. * @param job Job. @@ -1512,7 +1516,7 @@ public abstract class GridAbstractTest extends TestCase { } /** - * Runs job on remote jvm. + * Runs job on remote JVM. * * @param cache Cache. * @param job Job. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/AffinityProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/AffinityProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/AffinityProcessProxy.java index 1c816f5..e87895d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/AffinityProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/AffinityProcessProxy.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * Proxy class for affinity at another jvm. + * Proxy class for affinity at another JVM. */ @SuppressWarnings("TransientFieldInNonSerializableClass") public class AffinityProcessProxy<K> implements Affinity<K> { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java index 99ec424..159c451 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java @@ -28,7 +28,7 @@ import java.util.*; import java.util.concurrent.*; /** - * Proxy class for cluster at another jvm. + * Proxy class for cluster at another JVM. */ @SuppressWarnings("TransientFieldInNonSerializableClass") public class IgniteClusterProcessProxy implements IgniteClusterEx { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java index 04721e8..22411e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java @@ -67,7 +67,7 @@ public class IgniteNodeRunner { } /** - * @return <code>True</code> if there is ignite node started via {@link IgniteNodeRunner} at this jvm. + * @return <code>True</code> if there is ignite node started via {@link IgniteNodeRunner} at this JVM. */ public static boolean hasStartedInstance() { return ignite != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index 7ac652a..a3161be 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -51,7 +51,7 @@ public class IgniteProcessProxy implements IgniteEx { /** Configuration. */ private final transient IgniteConfiguration cfg; - /** Local jvm grid. */ + /** Local JVM grid. */ private final transient Ignite locJvmGrid; /** Logger. */ @@ -63,7 +63,7 @@ public class IgniteProcessProxy implements IgniteEx { /** * @param cfg Configuration. * @param log Logger. - * @param locJvmGrid Local jvm grid. + * @param locJvmGrid Local JVM grid. */ public IgniteProcessProxy(final IgniteConfiguration cfg, final IgniteLogger log, final Ignite locJvmGrid) throws Exception { @@ -101,7 +101,7 @@ public class IgniteProcessProxy implements IgniteEx { System.getProperty("surefire.test.class.path") ); - assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node with id=" + id + " didn't join."; + assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node is not joined [id=" + id + "]"; gridProxies.put(cfg.getGridName(), this); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00a98583/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java index 75d34c4..f52c031 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java @@ -21,11 +21,11 @@ import junit.framework.*; import org.apache.ignite.internal.processors.cache.multijvm.*; /** - * Multi jvm test suite. + * Multi-JVM test suite. */ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite { /** - * @return Multi JVM tests suite. + * @return Multi-JVM tests suite. * @throws Exception If failed. */ public static TestSuite suite() throws Exception { @@ -69,10 +69,6 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.class); -// suite.addTestSuite(GridCacheNearReloadAllSelfTest.class); -// suite.addTestSuite(GridCacheColocatedReloadAllSelfTest.class); -// suite.addTestSuite(GridCacheAtomicReloadAllSelfTest.class); -// suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.class); suite.addTestSuite(GridCacheNearTxMultiJvmSelfTest.class); suite.addTestSuite(GridCachePartitionedMultiJvmCounterSelfTest.class); @@ -91,10 +87,6 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite { suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.class); - // Multithreaded -// suite.addTestSuite(GridCacheReplicatedFullApiMultithreadedSelfTest.class); -// suite.addTestSuite(GridCachePartitionedFullApiMultithreadedSelfTest.class); - return suite; } }
