# ignite-sprint-6 more info in test assert
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d874b00d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d874b00d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d874b00d Branch: refs/heads/ignite-1026 Commit: d874b00dcb1687339adc34b6212e8cbc5b9ffe16 Parents: 6c683c2 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jun 18 11:07:04 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jun 18 11:07:04 2015 +0300 ---------------------------------------------------------------------- .../IgniteCacheAbstractStopBusySelfTest.java | 30 ++++++++++++-------- .../IgniteCacheAtomicStopBusySelfTest.java | 8 +++--- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +++--- 3 files changed, 26 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d874b00d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java index 10b14cc..074f6ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java @@ -36,9 +36,13 @@ import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.io.*; +import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; +import static org.apache.ignite.cache.CacheRebalanceMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; + /** * */ @@ -53,7 +57,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst public static final String CACHE_NAME = "StopTest"; /** */ - public static final TcpDiscoveryIpFinder finder = new TcpDiscoveryVmIpFinder(true); + public final TcpDiscoveryIpFinder finder = new TcpDiscoveryVmIpFinder(true); /** */ private AtomicBoolean suspended = new AtomicBoolean(false); @@ -62,7 +66,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst private CountDownLatch blocked; /** */ - protected AtomicReference<Class> bannedMessage = new AtomicReference<>(); + protected AtomicReference<Class> bannedMsg = new AtomicReference<>(); /** * @return Cache mode. @@ -93,9 +97,9 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst if (gridName.endsWith(String.valueOf(CLN_GRD))) cfg.setClientMode(true); - cacheCfg.setRebalanceMode(CacheRebalanceMode.SYNC); + cacheCfg.setRebalanceMode(SYNC); - cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setBackups(1); @@ -125,14 +129,14 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst TimeUnit.MILLISECONDS.sleep(100L); } - assert clientNode().cluster().nodes().size() == 2; + assertEquals(2, clientNode().cluster().nodes().size()); } /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { suspended.set(false); - bannedMessage.set(null); + bannedMsg.set(null); afterTestsStopped(); @@ -140,7 +144,9 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst stopGrid(CLN_GRD); - assert G.allGrids().isEmpty(); + List<Ignite> nodes = G.allGrids(); + + assertTrue("Unexpected nodes: " + nodes, nodes.isEmpty()); } /** @@ -203,12 +209,11 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst * @throws Exception If failed. */ public void testGet() throws Exception { - bannedMessage.set(GridNearGetRequest.class); + bannedMsg.set(GridNearGetRequest.class); executeTest(new Callable<Integer>() { /** {@inheritDoc} */ - @Override - public Integer call() throws Exception { + @Override public Integer call() throws Exception { info("Start operation."); Integer put = (Integer) clientCache().get(1); @@ -318,6 +323,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst * @return Cache configuration. * @throws Exception In case of error. */ + @SuppressWarnings("unchecked") private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception { CacheConfiguration cfg = defaultCacheConfiguration(); @@ -339,10 +345,10 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst /** {@inheritDoc} */ @Override public void sendMessage(ClusterNode node, Message msg) throws IgniteSpiException { if (suspended.get()) { - assert bannedMessage.get() != null; + assert bannedMsg.get() != null; if (msg instanceof GridIoMessage - && ((GridIoMessage)msg).message().getClass().equals(bannedMessage.get())) { + && ((GridIoMessage)msg).message().getClass().equals(bannedMsg.get())) { blocked.countDown(); return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d874b00d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java index bae1601..ed15724 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java @@ -31,28 +31,28 @@ public class IgniteCacheAtomicStopBusySelfTest extends IgniteCacheAbstractStopBu /** {@inheritDoc} */ @Override public void testPut() throws Exception { - bannedMessage.set(GridNearAtomicUpdateRequest.class); + bannedMsg.set(GridNearAtomicUpdateRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testPutBatch() throws Exception { - bannedMessage.set(GridNearAtomicUpdateRequest.class); + bannedMsg.set(GridNearAtomicUpdateRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testPutAsync() throws Exception { - bannedMessage.set(GridNearAtomicUpdateRequest.class); + bannedMsg.set(GridNearAtomicUpdateRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testRemove() throws Exception { - bannedMessage.set(GridNearAtomicUpdateRequest.class); + bannedMsg.set(GridNearAtomicUpdateRequest.class); super.testPut(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d874b00d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java index fe1b266..e87a772 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java @@ -30,28 +30,28 @@ public class IgniteCacheTransactionalStopBusySelfTest extends IgniteCacheAbstrac /** {@inheritDoc} */ @Override public void testPut() throws Exception { - bannedMessage.set(GridNearTxPrepareRequest.class); + bannedMsg.set(GridNearTxPrepareRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testPutBatch() throws Exception { - bannedMessage.set(GridNearTxPrepareRequest.class); + bannedMsg.set(GridNearTxPrepareRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testPutAsync() throws Exception { - bannedMessage.set(GridNearTxPrepareRequest.class); + bannedMsg.set(GridNearTxPrepareRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testRemove() throws Exception { - bannedMessage.set(GridNearTxPrepareRequest.class); + bannedMsg.set(GridNearTxPrepareRequest.class); super.testPut(); }
