You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/08/13 17:39:56 UTC
ignite git commit: IGNITE-9219 Uncomment 13 test classes in
IgniteCacheTestSuite4 (Cache 4). - Fixes #4504.
Repository: ignite
Updated Branches:
refs/heads/master d04d76440 -> cd5b32bb0
IGNITE-9219 Uncomment 13 test classes in IgniteCacheTestSuite4 (Cache 4). - Fixes #4504.
Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd5b32bb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd5b32bb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd5b32bb
Branch: refs/heads/master
Commit: cd5b32bb064b1aafcb287783c00b607c407780ca
Parents: d04d764
Author: Ilya Kasnacheev <il...@gmail.com>
Authored: Mon Aug 13 20:39:43 2018 +0300
Committer: Dmitriy Pavlov <dp...@apache.org>
Committed: Mon Aug 13 20:39:43 2018 +0300
----------------------------------------------------------------------
...heStoreSessionListenerLifecycleSelfTest.java | 5 ++-
...niteCacheCopyOnReadDisabledAbstractTest.java | 10 ++++--
.../IgniteCacheStoreValueAbstractTest.java | 13 ++++++--
.../testsuites/IgniteCacheTestSuite4.java | 34 ++++++++++----------
4 files changed, 40 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd5b32bb/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java
index 5327e19..ff176c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java
@@ -252,6 +252,9 @@ public class CacheStoreSessionListenerLifecycleSelfTest extends GridCommonAbstra
tx.commit();
}
+
+ // Force cache shutdown order
+ ignite.cache("cache-0").destroy();
}
finally {
stopGrid();
@@ -396,4 +399,4 @@ public class CacheStoreSessionListenerLifecycleSelfTest extends GridCommonAbstra
// No-op.
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd5b32bb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java
index bba779f..61f8136 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java
@@ -43,6 +43,11 @@ public abstract class IgniteCacheCopyOnReadDisabledAbstractTest extends GridCach
return ccfg;
}
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+
/**
* @throws Exception If failed.
*/
@@ -64,6 +69,7 @@ public abstract class IgniteCacheCopyOnReadDisabledAbstractTest extends GridCach
assertSame(val0, cache.localPeek(key));
}
+ /* Does not seem to work anymore since main storage mechanism is always off-heap.
TestKey key = new TestKey(0);
TestValue val0 = cache.get(key);
@@ -74,7 +80,7 @@ public abstract class IgniteCacheCopyOnReadDisabledAbstractTest extends GridCach
}
});
- assertSame(val0, invokeVal);
+ assertSame(val0, invokeVal);*/
}
/**
@@ -122,4 +128,4 @@ public abstract class IgniteCacheCopyOnReadDisabledAbstractTest extends GridCach
this.val = val;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd5b32bb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
index eceb9d2..4af0a15 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
@@ -65,6 +65,11 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
}
/** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+
+ /** {@inheritDoc} */
@Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
@@ -189,6 +194,8 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
assertNull(cache.localPeek(key, CachePeekMode.ONHEAP));
+ cache.get(key);
+
assertNotNull(cache.localPeek(key, CachePeekMode.ONHEAP));
checkNoValue(aff, key);
@@ -239,7 +246,7 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
for (int g = 0; g < gridCount(); g++) {
IgniteEx ig = grid(g);
- GridCacheAdapter cache0 = internalCache(ig, null);
+ GridCacheAdapter cache0 = internalCache(ig, DEFAULT_CACHE_NAME);
GridCacheEntryEx e = cache0.peekEx(key);
@@ -354,6 +361,8 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
assertNull(cache.localPeek(key, CachePeekMode.ONHEAP));
+ cache.get(key);
+
assertNotNull(cache.localPeek(key, CachePeekMode.ONHEAP));
checkHasValue(aff, key);
@@ -369,7 +378,7 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
for (int g = 0; g < gridCount(); g++) {
IgniteEx ig = grid(g);
- GridCacheAdapter cache0 = internalCache(ig, null);
+ GridCacheAdapter cache0 = internalCache(ig, DEFAULT_CACHE_NAME);
GridCacheEntryEx e = cache0.peekEx(key);
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd5b32bb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index 2cc5f0b..2ba81f3 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -57,10 +57,14 @@ import org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateSelfT
import org.apache.ignite.internal.processors.cache.GridCacheStoreManagerDeserializationTest;
import org.apache.ignite.internal.processors.cache.GridCacheVersionMultinodeTest;
import org.apache.ignite.internal.processors.cache.GridLocalCacheStoreManagerDeserializationTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicCopyOnReadDisabledTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalPeekModesTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalStoreValueTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearEnabledStoreValueTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearPeekModesTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPeekModesTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicReplicatedPeekModesTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicStoreValueTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheConfigurationDefaultTemplateTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheConfigurationTemplateTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheContainsKeyAtomicTest;
@@ -71,11 +75,15 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheInvokeReadThroughT
import org.apache.ignite.internal.processors.cache.IgniteCacheLoadRebalanceEvictionSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheReadThroughStoreCallTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheStartTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheTxCopyOnReadDisabledTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheTxLocalPeekModesTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheTxLocalStoreValueTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheTxNearEnabledStoreValueTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheTxNearPeekModesTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheTxPeekModesTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheTxPreloadNoWriteTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheTxReplicatedPeekModesTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheTxStoreValueTest;
import org.apache.ignite.internal.processors.cache.IgniteClientCacheInitializationFailTest;
import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheFilterTest;
import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheMultinodeTest;
@@ -223,9 +231,8 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(GridCacheVersionMultinodeTest.class);
suite.addTestSuite(IgniteCacheNearReadCommittedTest.class);
- // TODO GG-11148 need decide if CopyOnRead flag makes sense.
-// suite.addTestSuite(IgniteCacheAtomicCopyOnReadDisabledTest.class);
-// suite.addTestSuite(IgniteCacheTxCopyOnReadDisabledTest.class);
+ suite.addTestSuite(IgniteCacheAtomicCopyOnReadDisabledTest.class);
+ suite.addTestSuite(IgniteCacheTxCopyOnReadDisabledTest.class);
suite.addTestSuite(IgniteCacheTxPreloadNoWriteTest.class);
@@ -255,15 +262,12 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(IgniteCacheJdbcBlobStoreNodeRestartTest.class);
- // TODO GG-11148 need decide if CopyOnRead flag makes sense.
-// suite.addTestSuite(IgniteCacheAtomicLocalStoreValueTest.class);
-// suite.addTestSuite(IgniteCacheAtomicStoreValueTest.class);
-// suite.addTestSuite(IgniteCacheAtomicNearEnabledStoreValueTest.class);
-// suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.class);
-// suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.class);
-// suite.addTestSuite(IgniteCacheTxLocalStoreValueTest.class);
-// suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
-// suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
suite.addTestSuite(IgniteCacheLockFailoverSelfTest.class);
suite.addTestSuite(IgniteCacheMultiTxLockSelfTest.class);
@@ -289,7 +293,7 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(CacheOffheapMapEntrySelfTest.class);
suite.addTestSuite(CacheJdbcStoreSessionListenerSelfTest.class);
- //suite.addTestSuite(CacheStoreSessionListenerLifecycleSelfTest.class);
+ suite.addTestSuite(CacheStoreSessionListenerLifecycleSelfTest.class);
suite.addTestSuite(CacheStoreListenerRWThroughDisabledAtomicCacheTest.class);
suite.addTestSuite(CacheStoreListenerRWThroughDisabledTransactionalCacheTest.class);
suite.addTestSuite(CacheStoreSessionListenerWriteBehindEnabledTest.class);
@@ -322,10 +326,6 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(CacheVersionedEntryReplicatedAtomicSelfTest.class);
suite.addTestSuite(CacheVersionedEntryReplicatedTransactionalSelfTest.class);
- // TODO GG-11148.
- // suite.addTestSuite(CacheSwapUnswapGetTest.class);
- // suite.addTestSuite(CacheSwapUnswapGetTestSmallQueueSize.class);
-
suite.addTestSuite(GridCacheDhtTxPreloadSelfTest.class);
suite.addTestSuite(GridCacheNearTxPreloadSelfTest.class);
suite.addTestSuite(GridReplicatedTxPreloadTest.class);