# ignite-648: fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37fca3ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37fca3ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37fca3ba Branch: refs/heads/ignite-648-failover Commit: 37fca3ba2b4e52fe461996144ef709f759d521a4 Parents: 44692e3 Author: ashutak <ashu...@gridgain.com> Authored: Thu Jul 2 18:39:39 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Thu Jul 2 18:39:39 2015 +0300 ---------------------------------------------------------------------- .../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../GridCachePartitionedMultiNodeCounterSelfTest.java | 3 +++ .../GridCachePartitionedMultiNodeFullApiSelfTest.java | 3 +++ .../ignite/testframework/junits/GridAbstractTest.java | 11 +++++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37fca3ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index 60168e1..3d9364b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -125,7 +125,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio return F.view(super.affinityNodes(), new P1<ClusterNode>() { @Override public boolean apply(ClusterNode n) { - return !F.eq(G.ignite(n.id()).name(), grid(nearIdx).name()); + return !F.eq(grid(n).name(), grid(nearIdx).name()); } }); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37fca3ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index 5d00e1e..0ee28e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -537,6 +537,9 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst * @throws Exception If failed. */ private void checkNearAndPrimaryMultiNode(int gridCnt) throws Exception { + if (isMultiJvm()) + fail("https://issues.apache.org/jira/browse/IGNITE-648";); + Affinity<String> aff = affinity(grid(0).<String, Integer>cache(null)); Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37fca3ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index df29a5a..814ad06 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -327,6 +327,9 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti */ @SuppressWarnings("unchecked") public void testNearDhtKeySize() throws Exception { + if (isMultiJvm()) + fail("https://issues.apache.org/jira/browse/IGNITE-648";); + List<String> keys = new ArrayList<>(5); info("Generating keys for test..."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37fca3ba/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 fc7cc88..2a48fe6 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 @@ -909,8 +909,15 @@ public abstract class GridAbstractTest extends TestCase { protected final Ignite grid(ClusterNode node) { if (!isMultiJvm()) return G.ignite(node.id()); - else - return IgniteProcessProxy.ignite(node.id()); + else { + try { + return IgniteProcessProxy.ignite(node.id()); + } + catch (Exception ignore) { + // A hack if it is local grid. + return G.ignite(node.id()); + } + } } /**
