You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/11/20 14:55:04 UTC

[21/50] [abbrv] ignite git commit: IGNITE-10197 Fixed unexpected IllegalArgumentException in IgniteDbPutGetAbstractTest#testRandomPutGetRemove - Fixes #5410.

IGNITE-10197 Fixed unexpected IllegalArgumentException in IgniteDbPutGetAbstractTest#testRandomPutGetRemove - Fixes #5410.

Signed-off-by: Dmitriy Govorukhin <dm...@gmail.com>


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

Branch: refs/heads/ignite-10044
Commit: 9e3bd7dd686d3392e6bbe2c7defebe260eb029f7
Parents: c9906aa
Author: ibessonov <be...@gmail.com>
Authored: Mon Nov 19 13:06:47 2018 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Mon Nov 19 13:06:47 2018 +0300

----------------------------------------------------------------------
 .../database/IgniteDbPutGetAbstractTest.java    | 28 +++++++------
 .../IgniteDbSingleNodeTinyPutGetTest.java       | 42 ++++++++++----------
 2 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9e3bd7dd/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
index 0b0c763..f170280 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.util.GridRandom;
 import org.apache.ignite.internal.util.typedef.PA;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.GridTestUtils.SF;
 import org.junit.Assert;
 
 /**
@@ -810,22 +811,29 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
         }
     }
 
-    public void _testRandomPutGetRemove() throws Exception {
-        final IgniteCache<Integer, DbValue> cache = cache(null);
+    /**
+     * @throws Exception If failed.
+     */
+    public void testRandomPutGetRemove() throws Exception {
+        final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
         int cnt = KEYS_COUNT;
 
         Map<Integer, DbValue> map = new HashMap<>(cnt);
 
-        long seed = 1460943282308L; // System.currentTimeMillis();
+        long seed = System.currentTimeMillis();
+
+        int iterations = SF.apply(300_000);
 
-        X.println(" seed---> " + seed);
+        X.println("Seed: " + seed);
+
+        X.println("Iterations total: " + iterations);
 
         Random rnd = new GridRandom(seed);
 
-        for (int i = 0; i < 1000_000; i++) {
+        for (int i = 0; i < iterations; i++) {
             if (i % 5000 == 0)
-                X.println(" --> " + i);
+                X.println("Iteration #" + i);
 
             int key = rnd.nextInt(cnt);
 
@@ -833,27 +841,21 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
 
             switch (rnd.nextInt(3)) {
                 case 0:
-                    X.println("Put: " + key + " = " + v0);
-
                     assertEquals(map.put(key, v0), cache.getAndPut(key, v0));
 
                 case 1:
-                    X.println("Get: " + key);
-
                     assertEquals(map.get(key), cache.get(key));
 
                     break;
 
                 case 2:
-                    X.println("Rmv: " + key);
-
                     assertEquals(map.remove(key), cache.getAndRemove(key));
 
                     assertNull(cache.get(key));
             }
         }
 
-//        assertEquals(map.size(), cache.size(CachePeekMode.ALL));
+        assertEquals(map.size(), cache.size());
 
         for (Integer key : map.keySet())
             assertEquals(map.get(key), cache.get(key));

http://git-wip-us.apache.org/repos/asf/ignite/blob/9e3bd7dd/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
index 53d299e..345eb86 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
@@ -29,10 +29,8 @@ public class IgniteDbSingleNodeTinyPutGetTest extends IgniteDbSingleNodePutGetTe
         return true;
     }
 
-    /**
-     * @throws Exception If fail.
-     */
-    public void testPutGetTiny() throws Exception {
+    /** */
+    public void testPutGetTiny() {
         IgniteEx ig = grid(0);
 
         IgniteCache<Short, Byte> cache = ig.cache("tiny");
@@ -60,92 +58,92 @@ public class IgniteDbSingleNodeTinyPutGetTest extends IgniteDbSingleNodePutGetTe
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutGetSimple() throws Exception {
+    @Override public void testPutGetSimple() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutGetLarge() throws Exception {
+    @Override public void testPutGetLarge() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutGetOverwrite() throws Exception {
+    @Override public void testPutGetOverwrite() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testOverwriteNormalSizeAfterSmallerSize() throws Exception {
+    @Override public void testOverwriteNormalSizeAfterSmallerSize() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutDoesNotTriggerRead() throws Exception {
+    @Override public void testPutDoesNotTriggerRead() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutGetMultipleObjects() throws Exception {
+    @Override public void testPutGetMultipleObjects() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testSizeClear() throws Exception {
+    @Override public void testSizeClear() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testBounds() throws Exception {
+    @Override public void testBounds() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testMultithreadedPut() throws Exception {
+    @Override public void testMultithreadedPut() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutGetRandomUniqueMultipleObjects() throws Exception {
+    @Override public void testPutGetRandomUniqueMultipleObjects() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutPrimaryUniqueSecondaryDuplicates() throws Exception {
+    @Override public void testPutPrimaryUniqueSecondaryDuplicates() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutGetRandomNonUniqueMultipleObjects() throws Exception {
+    @Override public void testPutGetRandomNonUniqueMultipleObjects() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutGetRemoveMultipleForward() throws Exception {
+    @Override public void testPutGetRemoveMultipleForward() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void _testRandomPutGetRemove() {
+    @Override public void testRandomPutGetRemove() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testPutGetRemoveMultipleBackward() throws Exception {
+    @Override public void testPutGetRemoveMultipleBackward() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testIndexOverwrite() throws Exception {
+    @Override public void testIndexOverwrite() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testObjectKey() throws Exception {
+    @Override public void testObjectKey() {
         // No-op
     }
 
     /** {@inheritDoc} */
-    @Override public void testIterators() throws Exception {
+    @Override public void testIterators() {
         // No-op
     }
 }