Repository: incubator-ignite Updated Branches: refs/heads/ignite-648 90226a715 -> 529a9046c
# ignite-648: refactoring Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ec1d757 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ec1d757 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ec1d757 Branch: refs/heads/ignite-648 Commit: 1ec1d757ddef068c7b192ac33dff21cf8dc00114 Parents: 90226a7 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed May 13 20:21:39 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed May 13 20:21:39 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 22 ++++---------------- .../cache/GridCacheAbstractSelfTest.java | 1 - .../GridCacheMultiNodeAbstractTest.java | 4 ++-- ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 3 ++- ...AtomicClientOnlyMultiJvmFullApiSelfTest.java | 3 ++- ...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 3 ++- ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 3 ++- ...omicFairAffinityMultiJvmFullApiSelfTest.java | 3 ++- ...tomicMultiJvmP2PDisabledFullApiSelfTest.java | 3 ++- ...bledFairAffinityMultiJvmFullApiSelfTest.java | 3 ++- ...tomicNearEnabledMultiJvmFullApiSelfTest.java | 3 ++- ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 3 ++- ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java | 3 ++- ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 3 ++- ...cheAtomicOffHeapMultiJvmFullApiSelfTest.java | 3 ++- ...rderFairAffinityMultiJvmFullApiSelfTest.java | 3 ++- ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 3 ++- ...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 3 ++- ...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 3 ++- ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 3 ++- ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 3 ++- ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 3 ++- ...onedFairAffinityMultiJvmFullApiSelfTest.java | 3 ++- ...CachePartitionedMultiJvmCounterSelfTest.java | 3 ++- ...ionedMultiJvmP2PDisabledFullApiSelfTest.java | 3 ++- ...bledFairAffinityMultiJvmFullApiSelfTest.java | 3 ++- ...onedNearDisabledMultiJvmFullApiSelfTest.java | 3 ++- ...abledMultiJvmP2PDisabledFullApiSelfTest.java | 3 ++- ...rDisabledOffHeapMultiJvmFullApiSelfTest.java | 3 ++- ...rtitionedOffHeapMultiJvmFullApiSelfTest.java | 3 ++- ...ReplicatedAtomicMultiJvmFullApiSelfTest.java | 3 ++- ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 3 ++- ...catedMultiJvmP2PDisabledFullApiSelfTest.java | 3 ++- ...plicatedNearOnlyMultiJvmFullApiSelfTest.java | 3 ++- ...eplicatedOffHeapMultiJvmFullApiSelfTest.java | 3 ++- .../framework/IgniteExProcessProxy.java | 5 ++++- .../multijvm/framework/IgniteNodeRunner.java | 2 +- .../testframework/junits/GridAbstractTest.java | 15 +++++-------- 38 files changed, 80 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 6696dd3..0a19fa7 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 @@ -119,7 +119,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract /** All nodes join latch (for multi JVM mode). */ private CountDownLatch allNodesJoinLatch; - /** /** Node join listener (for multi JVM mode). */ + /** Node join listener (for multi JVM mode). */ private final IgnitePredicate<Event> nodeJoinLsnr = new IgnitePredicate<Event>() { @Override public boolean apply(Event evt) { allNodesJoinLatch.countDown(); @@ -262,17 +262,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract return IgnitionEx.start(optimize(cfg), ctx); } - startingGrid.set(gridName); - - try { - IgniteConfiguration cfg = optimize(getConfiguration(gridName)); - - return new IgniteExProcessProxy(cfg, log, grid(0)); - } - finally { - startingGrid.set(null); - } - + return new IgniteExProcessProxy(optimize(getConfiguration(gridName)), log, grid(0)); } /** {@inheritDoc} */ @@ -280,9 +270,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (!isMultiJvm() || idx == 0) return super.grid(idx); - String name = getTestGridName(idx); - - return IgniteExProcessProxy.get(name); + return IgniteExProcessProxy.get(getTestGridName(idx)); } /** @@ -294,9 +282,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (!isMultiJvm() || idx == 0) return super.jcache(idx); - String name = getTestGridName(idx); - - return IgniteExProcessProxy.get(name).cache(null); + return IgniteExProcessProxy.get(getTestGridName(idx)).cache(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 0e94b4b..efd0185 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 @@ -535,7 +535,6 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * Serializable factory. */ private static class TestStoreFactory implements Factory<CacheStore> { - /** {@inheritDoc} */ @Override public CacheStore create() { return cacheStore(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index ecf2f00..78bff83 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -289,7 +289,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT addListener(ignite2, lsnr); addListener(ignite3, lsnr); - cache1Async.getAndPut(1, "val1"); + cache1Async.getAndPut(2, "val1"); IgniteFuture<String> f1 = cache1Async.future(); @@ -297,7 +297,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT IgniteFuture<String> f2 = cache2Async.future(); - cache3Async.getAndPut(3, "val3"); + cache3Async.getAndPut(2, "val3"); IgniteFuture<String> f3 = cache3Async.future(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 e8c99f4..91e7f96 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest extends GridCacheAtomicClientOnlyFairAffinityMultiNodeFullApiSelfTest { +public class GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest + extends GridCacheAtomicClientOnlyFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 1fe696b..0768b9f 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest extends GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest { +public class GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest extends + GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 c38e312..3c33730 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest extends GridCacheAtomicClientOnlyMultiNodeP2PDisabledFullApiSelfTest { +public class GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest extends + GridCacheAtomicClientOnlyMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 063e99e..781b14b 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest extends GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest { +public class GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest extends + GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 6d2f2dd..164f14b 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest extends GridCacheAtomicFairAffinityMultiNodeFullApiSelfTest { +public class GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest extends + GridCacheAtomicFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 f7c8167..fb5348b 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest extends GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest { +public class GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest extends + GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 391388a..3d2debc 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest extends GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest { +public class GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest extends + GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 7426aa2..0177d2b 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest extends GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest { +public class GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest extends + GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 2128251..3fcd505 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest extends GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest { +public class GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest extends + GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 0abbba8..4a2dcdd 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest extends GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest { +public class GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest extends + GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 63c1257..8b67346 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest extends GridCacheAtomicNearOnlyMultiNodeP2PDisabledFullApiSelfTest { +public class GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest extends + GridCacheAtomicNearOnlyMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 57ffbe8..01fbaab 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicOffHeapMultiJvmFullApiSelfTest extends GridCacheAtomicOffHeapMultiNodeFullApiSelfTest { +public class GridCacheAtomicOffHeapMultiJvmFullApiSelfTest extends + GridCacheAtomicOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 da8f127..2838d02 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest { +public class GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest extends + GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 1a73c22..82498ce 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest { +public class GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends + GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 d5a960b..2659d11 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest { +public class GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest extends + GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 4b29717..5f4a5c1 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest { +public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest extends + GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 f4e2460..e4fd892 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest extends GridCacheNearOnlyFairAffinityMultiNodeFullApiSelfTest { +public class GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest extends + GridCacheNearOnlyFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 f90dca1..9a83d14 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest extends GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest { +public class GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest extends + GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 46f8603..eaa5f79 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest extends GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest { +public class GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest extends + GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 a0b38f9..48335bb 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest extends GridCachePartitionedFairAffinityMultiNodeFullApiSelfTest { +public class GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest extends + GridCachePartitionedFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 c50a4dd..7f39342 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedMultiJvmCounterSelfTest extends GridCachePartitionedMultiNodeCounterSelfTest { +public class GridCachePartitionedMultiJvmCounterSelfTest extends + GridCachePartitionedMultiNodeCounterSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 ee78747..dc3a060 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest extends GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest { +public class GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest extends + GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 13d4cc9..00459d6 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledFairAffinityMultiNodeFullApiSelfTest { +public class GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest extends + GridCachePartitionedNearDisabledFairAffinityMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 8228619..ba37f99 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest { +public class GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest extends + GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 abf3670..7cabc39 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest extends GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest { +public class GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest extends + GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 fa9547e..bebd3ad 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest { +public class GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest extends + GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 93ad751..6d10111 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; /** * Multy Jvm tests. */ -public class GridCachePartitionedOffHeapMultiJvmFullApiSelfTest extends GridCachePartitionedOffHeapMultiNodeFullApiSelfTest { +public class GridCachePartitionedOffHeapMultiJvmFullApiSelfTest extends + GridCachePartitionedOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 9caf3f3..1a92030 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** * Multy Jvm tests. */ -public class GridCacheReplicatedAtomicMultiJvmFullApiSelfTest extends GridCacheReplicatedAtomicMultiNodeFullApiSelfTest { +public class GridCacheReplicatedAtomicMultiJvmFullApiSelfTest extends + GridCacheReplicatedAtomicMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 2389882..0f7a180 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** * Multy Jvm tests. */ -public class GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest { +public class GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends + GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 c490b77..96de19b 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** * Multy Jvm tests. */ -public class GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest extends GridCacheReplicatedMultiNodeP2PDisabledFullApiSelfTest { +public class GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest extends + GridCacheReplicatedMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 66f36d1..5c031c9 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** * Multy Jvm tests. */ -public class GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest extends GridCacheReplicatedNearOnlyMultiNodeFullApiSelfTest { +public class GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest extends + GridCacheReplicatedNearOnlyMultiNodeFullApiSelfTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { fail("Hangs after commit: \"fix todo with sleep.\""); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 ce08542..5bd9dd6 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 @@ -22,7 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.*; /** * Multy Jvm tests. */ -public class GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest extends GridCacheReplicatedOffHeapMultiNodeFullApiSelfTest { +public class GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest extends + GridCacheReplicatedOffHeapMultiNodeFullApiSelfTest { /** {@inheritDoc} */ protected boolean isMultiJvm() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java index 86c7dec..12e818a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java @@ -89,9 +89,12 @@ public class IgniteExProcessProxy implements IgniteEx { locJvmGrid.events().localListen(new IgnitePredicateX<Event>() { @Override public boolean applyx(Event e) { - if (((DiscoveryEvent)e).eventNode().id().equals(id)) + if (((DiscoveryEvent)e).eventNode().id().equals(id)) { rmtNodeStartedLatch.countDown(); + return false; + } + return true; } }, EventType.EVT_NODE_JOINED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java index b591202..c430d47 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java @@ -48,7 +48,7 @@ public class IgniteNodeRunner { try { X.println(GridJavaProcess.PID_MSG_PREFIX + U.jvmPid()); - X.println("Starting Ignite Node... Args" + Arrays.toString(args)); + X.println("Starting Ignite Node... Args=" + Arrays.toString(args)); IgniteConfiguration cfg = readCfgFromFileAndDeleteFile(args[0]); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ec1d757/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 cd10d60..f3a9051 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 @@ -1053,7 +1053,7 @@ public abstract class GridAbstractTest extends TestCase { * @return Path for specific marshaller. */ @SuppressWarnings({"IfMayBeConditional", "deprecation"}) - private static String getDefaultCheckpointPath(Marshaller marshaller) { + protected String getDefaultCheckpointPath(Marshaller marshaller) { if (marshaller instanceof JdkMarshaller) return SharedFsCheckpointSpi.DFLT_DIR_PATH + "/jdk/"; else @@ -1085,11 +1085,6 @@ public abstract class GridAbstractTest extends TestCase { */ @SuppressWarnings("deprecation") protected IgniteConfiguration getConfiguration(String gridName, IgniteTestResources rsrcs) throws Exception { - return getConfiguration0(gridName, rsrcs, getClass(), isDebug()); - } - - public static IgniteConfiguration getConfiguration0(String gridName, IgniteTestResources rsrcs, - Class<? extends GridAbstractTest> cls, boolean isDebug) throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setGridName(gridName); @@ -1105,14 +1100,14 @@ public abstract class GridAbstractTest extends TestCase { TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - commSpi.setLocalPort(GridTestUtils.getNextCommPort(cls)); + commSpi.setLocalPort(GridTestUtils.getNextCommPort(getClass())); commSpi.setTcpNoDelay(true); cfg.setCommunicationSpi(commSpi); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - if (isDebug) { + if (isDebug()) { discoSpi.setMaxMissedHeartbeats(Integer.MAX_VALUE); cfg.setNetworkTimeout(Long.MAX_VALUE); } @@ -1127,13 +1122,13 @@ public abstract class GridAbstractTest extends TestCase { // Set heartbeat interval to 1 second to speed up tests. discoSpi.setHeartbeatFrequency(1000); - String mcastAddr = GridTestUtils.getNextMulticastGroup(cls); + String mcastAddr = GridTestUtils.getNextMulticastGroup(getClass()); if (!F.isEmpty(mcastAddr)) { TcpDiscoveryMulticastIpFinder ipFinder = new TcpDiscoveryMulticastIpFinder(); ipFinder.setMulticastGroup(mcastAddr); - ipFinder.setMulticastPort(GridTestUtils.getNextMulticastPort(cls)); + ipFinder.setMulticastPort(GridTestUtils.getNextMulticastPort(getClass())); discoSpi.setIpFinder(ipFinder); }
