ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: IGNITE-2791 WIP
Date Mon, 21 Mar 2016 18:41:53 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2791 a4230323c -> 877e20d40


IGNITE-2791 WIP


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/877e20d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/877e20d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/877e20d4

Branch: refs/heads/ignite-2791
Commit: 877e20d404c419e00d4a9d13561facf2b6c4186b
Parents: a423032
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Mon Mar 21 21:41:53 2016 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Mon Mar 21 21:41:53 2016 +0300

----------------------------------------------------------------------
 .../GridCacheContinuousQueryConcurrentTest.java | 40 +++++++-------------
 1 file changed, 13 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/877e20d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
index 4995c6f..29b351b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
@@ -65,16 +65,23 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe
     private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
     /** */
-    private static final int NODES = 3;
+    private static final int NODES = 2;
 
     /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        super.beforeTestsStarted();
+    @Override protected void beforeTest() throws Exception {
+        super.beforeTest();
 
         startGridsMultiThreaded(NODES);
     }
 
     /** {@inheritDoc} */
+    @Override protected void afterTest() throws Exception {
+        stopAllGrids();
+
+        super.afterTest();
+    }
+
+    /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
         stopAllGrids();
 
@@ -105,13 +112,6 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
-    public void testRestartReplicatedTx() throws Exception {
-        testRestartRegistration(cacheConfiguration(CacheMode.REPLICATED, CacheAtomicityMode.TRANSACTIONAL,
2));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     public void testRestartReplicated() throws Exception {
         testRestartRegistration(cacheConfiguration(CacheMode.REPLICATED, CacheAtomicityMode.ATOMIC,
2));
     }
@@ -154,27 +154,13 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
-    public void testPartitionTxWithoutBackup() throws Exception {
-        testRegistration(cacheConfiguration(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL,
0));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPartitionAtomicWithoutBackup() throws Exception {
-        testRegistration(cacheConfiguration(CacheMode.PARTITIONED, CacheAtomicityMode.ATOMIC,
0));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     public void testRegistration(CacheConfiguration ccfg) throws Exception {
         ExecutorService execSrv = newSingleThreadExecutor();
 
         try {
             final IgniteCache<Integer, String> cache = grid(0).getOrCreateCache(ccfg);
 
-            for (int i = 0; i < 30; i++) {
+            for (int i = 0; i < 10; i++) {
                 log.info("Start iteration: " + i);
 
                 final int i0 = i;
@@ -264,7 +250,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe
 
             U.sleep(100);
 
-            for (int i = 0; i < 30; i++) {
+            for (int i = 0; i < 10; i++) {
                 log.info("Start iteration: " + i);
 
                 final int i0 = i;
@@ -403,7 +389,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe
      */
     private CacheConfiguration<Integer, String> cacheConfiguration(CacheMode cacheMode,
         CacheAtomicityMode atomicMode, int backups) {
-        CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>("test");
+        CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>("test-"
+ cacheMode + atomicMode + backups);
 
         cfg.setCacheMode(cacheMode);
         cfg.setAtomicityMode(atomicMode);


Mime
View raw message