Repository: ignite Updated Branches: refs/heads/ignite-5272 314b139e5 -> c3883a48d
ignite-5272 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c3883a48 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c3883a48 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c3883a48 Branch: refs/heads/ignite-5272 Commit: c3883a48dc39ca8f7630c7cd31a1c408f2ea617a Parents: 314b139 Author: sboikov <[email protected]> Authored: Wed Jun 14 17:14:21 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Jun 14 17:18:56 2017 +0300 ---------------------------------------------------------------------- ...gniteTopologyValidatorAbstractCacheTest.java | 29 ++++++++++++++++---- ...ologyValidatorAbstractTxCacheGroupsTest.java | 12 ++++---- ...iteTopologyValidatorAbstractTxCacheTest.java | 28 +++++++++---------- 3 files changed, 43 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c3883a48/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java index 5c75ed8..9860199 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import java.io.Serializable; import java.util.Collection; +import java.util.Collections; import java.util.List; import javax.cache.CacheException; import org.apache.ignite.Ignite; @@ -111,9 +112,14 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac */ void putInvalid(String cacheName) { try { - grid(0).cache(cacheName).put(KEY_VAL, KEY_VAL); + List<Ignite> nodes = nodes(); - assert false : "topology validation broken"; + assertFalse(nodes.isEmpty()); + + for (Ignite node : nodes) + node.cache(cacheName).put(KEY_VAL, KEY_VAL); + + fail("Topology validation broken"); } catch (CacheException ex) { assert ex.getCause() instanceof IgniteCheckedException && @@ -128,7 +134,7 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac */ void putValid(String cacheName) { try { - List<Ignite> nodes = G.allGrids(); + List<Ignite> nodes = nodes(); assertFalse(nodes.isEmpty()); @@ -149,7 +155,7 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac * @param cacheName cache name. */ void getInvalid(String cacheName) { - List<Ignite> nodes = G.allGrids(); + List<Ignite> nodes = nodes(); assertFalse(nodes.isEmpty()); @@ -164,7 +170,7 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac */ void removeInvalid(String cacheName) { try { - List<Ignite> nodes = G.allGrids(); + List<Ignite> nodes = nodes(); assertFalse(nodes.isEmpty()); @@ -180,6 +186,17 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac } /** + * @return Nodes. + */ + private List<Ignite> nodes() { + if (this instanceof IgniteTopologyValidatorAbstractTxCacheTest || + this instanceof IgniteTopologyValidatorAbstractTxCacheGroupsTest) + return Collections.singletonList(ignite(0)); + else + return G.allGrids(); + } + + /** * Commits with error. * * @param tx transaction. @@ -218,7 +235,7 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac * @param cacheName cache name. */ void assertEmpty(String cacheName) { - assert grid(0).cache(cacheName).get(KEY_VAL) == null; + assertNull(grid(0).cache(cacheName).get(KEY_VAL)); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/c3883a48/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java index 06f1922..0787535 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java @@ -49,8 +49,8 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest commitFailed(tx); } - assertEmpty(CACHE_NAME_1); // rolled back - assertEmpty(CACHE_NAME_3); // rolled back + assertEmpty(CACHE_NAME_1); // Rolled back. + assertEmpty(CACHE_NAME_3); // Rolled back. try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putInvalid(CACHE_NAME_1); @@ -65,7 +65,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest putInvalid(CACHE_NAME_1); } - assertEmpty(DEFAULT_CACHE_NAME); // rolled back + assertEmpty(DEFAULT_CACHE_NAME); // Rolled back. startGrid(1); @@ -94,7 +94,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest putInvalid(CACHE_NAME_1); } - assertEmpty(CACHE_NAME_3); // rolled back + assertEmpty(CACHE_NAME_3); // Rolled back. try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); @@ -102,8 +102,8 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest commitFailed(tx); } - assertEmpty(CACHE_NAME_1); // rolled back - assertEmpty(CACHE_NAME_3); // rolled back + assertEmpty(CACHE_NAME_1); // Rolled back. + assertEmpty(CACHE_NAME_3); // Rolled back. try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/c3883a48/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java index 7949c50..781d88d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java @@ -20,10 +20,11 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.transactions.Transaction; -import org.apache.ignite.transactions.TransactionConcurrency; -import org.apache.ignite.transactions.TransactionIsolation; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; +import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; +import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** * Topology validator test @@ -41,17 +42,16 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT /** {@inheritDoc} */ @Override public void testTopologyValidator() throws Exception { - - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); commitFailed(tx); } - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putInvalid(CACHE_NAME_1); } - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); putValid(DEFAULT_CACHE_NAME); putValid(CACHE_NAME_2); @@ -62,7 +62,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT assertEmpty(CACHE_NAME_1); // rolled back assertEmpty(CACHE_NAME_2); // rolled back - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); putInvalid(CACHE_NAME_1); } @@ -72,14 +72,14 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT startGrid(1); - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); tx.commit(); } remove(CACHE_NAME_1); - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); tx.commit(); } @@ -88,7 +88,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT startGrid(2); - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); putInvalid(CACHE_NAME_1); } @@ -96,16 +96,16 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT assertEmpty(DEFAULT_CACHE_NAME); // rolled back assertEmpty(CACHE_NAME_1); // rolled back - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); commitFailed(tx); } - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putInvalid(CACHE_NAME_1); } - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); putValid(CACHE_NAME_2); tx.commit(); @@ -114,7 +114,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT remove(DEFAULT_CACHE_NAME); remove(CACHE_NAME_2); - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); putValid(CACHE_NAME_2); tx.commit();
