You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2016/01/30 20:11:40 UTC
ignite git commit: testsuite3 rollback
Repository: ignite
Updated Branches:
refs/heads/ignite-2224-cache3 [created] 71a70d5d8
testsuite3 rollback
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/71a70d5d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/71a70d5d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/71a70d5d
Branch: refs/heads/ignite-2224-cache3
Commit: 71a70d5d84eb489b1e145c9964b3830bbc1a5210
Parents: e7caaa0
Author: Anton Vinogradov <av...@apache.org>
Authored: Sat Jan 30 22:11:27 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Sat Jan 30 22:11:27 2016 +0300
----------------------------------------------------------------------
.../GridCacheInterceptorAbstractSelfTest.java | 172 +++++--------------
1 file changed, 41 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/71a70d5d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
index 19c8639..c57869f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -30,7 +29,6 @@ import javax.cache.processor.EntryProcessor;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-import org.apache.ignite.cache.CacheEntry;
import org.apache.ignite.cache.CacheInterceptor;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.Affinity;
@@ -154,32 +152,19 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
* @throws Exception If failed.
*/
public void testGet() throws Exception {
- testGet(primaryKey(0), false);
+ testGet(primaryKey(0));
afterTest();
if (cacheMode() != LOCAL)
- testGet(backupKey(0), false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testGetEntry() throws Exception {
- testGet(primaryKey(0), true);
-
- afterTest();
-
- if (cacheMode() != LOCAL)
- testGet(backupKey(0), true);
+ testGet(backupKey(0));
}
/**
* @param key Key.
- * @param needVer Need version.
* @throws Exception If failed.
*/
- private void testGet(String key, boolean needVer) throws Exception {
+ private void testGet(String key) throws Exception {
// Try when value is not in cache.
interceptor.retInterceptor = new NullGetInterceptor();
@@ -188,7 +173,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
IgniteCache<String, Integer> cache = jcache(0);
- assertEquals(null, needVer ? cache.getEntry(key).getValue() : cache.get(key));
+ assertEquals(null, cache.get(key));
assertEquals(1, interceptor.invokeCnt.get());
@@ -200,7 +185,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
log.info("Get 2.");
- assertEquals((Integer)1, needVer ? cache.getEntry(key).getValue() : cache.get(key));
+ assertEquals((Integer)1, cache.get(key));
assertEquals(1, interceptor.invokeCnt.get());
@@ -222,7 +207,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
log.info("Get 3.");
- assertEquals(null, needVer ? cache.getEntry(key).getValue() : cache.get(key));
+ assertEquals(null, cache.get(key));
assertEquals(1, interceptor.invokeCnt.get());
@@ -238,7 +223,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
log.info("Get 4.");
- assertEquals((Integer)101, needVer ? cache.getEntry(key).getValue() : cache.get(key));
+ assertEquals((Integer)101, cache.get(key));
assertEquals(1, interceptor.invokeCnt.get());
@@ -256,16 +241,9 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
IgniteCache<String, Integer> cacheAsync = cache.withAsync();
- if (needVer) {
- cacheAsync.getEntry(key);
+ cacheAsync.get(key);
- assertEquals((Integer)101, cacheAsync.<CacheEntry<String, Integer>>future().get().getValue());
- }
- else {
- cacheAsync.get(key);
-
- assertEquals((Integer)101, cacheAsync.<Integer>future().get());
- }
+ assertEquals((Integer)101, cacheAsync.<Integer>future().get());
assertEquals(1, interceptor.invokeCnt.get());
@@ -280,20 +258,6 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
* @throws Exception If failed.
*/
public void testGetAll() throws Exception {
- testGetAll(false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testGetEntries() throws Exception {
- testGetAll(true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testGetAll(boolean needVer) throws Exception {
Set<String> keys = new LinkedHashSet<>();
for (int i = 0; i < 1000; i++)
@@ -305,19 +269,10 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
IgniteCache<String, Integer> cacheAsync = cache.withAsync();
- Collection<CacheEntry<String, Integer>> c;
- Map<String, Integer> map;
-
- if (needVer){
- c = cache.getEntries(keys);
+ Map<String, Integer> map = cache.getAll(keys);
- assertTrue(c.isEmpty());
- }else {
- map = cache.getAll(keys);
-
- for (String key : keys)
- assertEquals(null, map.get(key));
- }
+ for (String key : keys)
+ assertEquals(null, map.get(key));
assertEquals(1000, interceptor.invokeCnt.get());
@@ -325,28 +280,15 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
interceptor.retInterceptor = new GetAllInterceptor1();
- if (needVer) {
- c = cache.getEntries(keys);
+ map = cache.getAll(keys);
- assertEquals(500, c.size());
+ for (String key : keys) {
+ int k = Integer.valueOf(key);
- for (CacheEntry<String, Integer> e : c) {
- int k = Integer.valueOf(e.getKey());
-
- assertEquals((Integer)(k * 2), e.getValue());
- }
- }
- else {
- map = cache.getAll(keys);
-
- for (String key : keys) {
- int k = Integer.valueOf(key);
-
- if (k % 2 == 0)
- assertEquals(null, map.get(key));
- else
- assertEquals((Integer)(k * 2), map.get(key));
- }
+ if (k % 2 == 0)
+ assertEquals(null, map.get(key));
+ else
+ assertEquals((Integer)(k * 2), map.get(key));
}
assertEquals(1000, interceptor.invokeCnt.get());
@@ -365,72 +307,40 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
interceptor.retInterceptor = new GetAllInterceptor2();
- if (needVer) {
- if (j == 0)
- c = cache.getEntries(keys);
- else {
- cacheAsync.getEntries(keys);
-
- c = cacheAsync.<Collection<CacheEntry<String, Integer>>>future().get();
- }
-
- for (CacheEntry<String, Integer> e : c) {
- int k = Integer.valueOf(e.getKey());
-
- switch (k % 3) {
- case 1:
- Integer exp = k < 500 ? k : null;
-
- assertEquals(exp, e.getValue());
-
- break;
-
- case 2:
- assertEquals((Integer)(k * 3), e.getValue());
-
- break;
-
- default:
- fail();
- }
- }
- }
+ if (j == 0)
+ map = cache.getAll(keys);
else {
- if (j == 0)
- map = cache.getAll(keys);
- else {
- cacheAsync.getAll(keys);
+ cacheAsync.getAll(keys);
- map = cacheAsync.<Map<String, Integer>>future().get();
- }
-
- int i = 0;
+ map = cacheAsync.<Map<String, Integer>>future().get();
+ }
- for (String key : keys) {
- switch (i % 3) {
- case 0:
- assertEquals(null, map.get(key));
+ int i = 0;
- break;
+ for (String key : keys) {
+ switch (i % 3) {
+ case 0:
+ assertEquals(null, map.get(key));
- case 1:
- Integer exp = i < 500 ? i : null;
+ break;
- assertEquals(exp, map.get(key));
+ case 1:
+ Integer exp = i < 500 ? i : null;
- break;
+ assertEquals(exp, map.get(key));
- case 2:
- assertEquals((Integer)(i * 3), map.get(key));
+ break;
- break;
+ case 2:
+ assertEquals((Integer)(i * 3), map.get(key));
- default:
- fail();
- }
+ break;
- i++;
+ default:
+ fail();
}
+
+ i++;
}
assertEquals(1000, interceptor.invokeCnt.get());