http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java index 995c686..f2d1556 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java @@ -23,10 +23,6 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheMvccSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredSelfTest; import org.apache.ignite.internal.processors.cache.binary.CacheKeepBinaryWithInterceptorTest; import org.apache.ignite.internal.processors.cache.expiry.IgniteCacheAtomicLocalExpiryPolicyTest; import org.apache.ignite.internal.processors.cache.binary.GridBinaryCacheEntryMemorySizeSelfTest; @@ -37,14 +33,8 @@ import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCa import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultithreadedSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryMultithreadedSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheMemoryModeBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredAtomicBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredEvictionAtomicBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredEvictionBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredBinarySelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesNearPartitionedByteArrayValuesSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest; -import org.apache.ignite.internal.processors.cache.expiry.IgniteCacheAtomicLocalOffheapExpiryPolicyTest; import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSelfTest; import org.apache.ignite.testframework.config.GridTestProperties; @@ -65,13 +55,8 @@ public class IgniteBinaryCacheTestSuite extends TestSuite { // Tests below have a special version for Binary Marshaller ignoredTests.add(DataStreamProcessorSelfTest.class); - ignoredTests.add(GridCacheOffHeapTieredEvictionAtomicSelfTest.class); - ignoredTests.add(GridCacheOffHeapTieredEvictionSelfTest.class); - ignoredTests.add(GridCacheOffHeapTieredSelfTest.class); - ignoredTests.add(GridCacheOffHeapTieredAtomicSelfTest.class); ignoredTests.add(GridCacheAffinityRoutingSelfTest.class); ignoredTests.add(IgniteCacheAtomicLocalExpiryPolicyTest.class); - ignoredTests.add(IgniteCacheAtomicLocalOffheapExpiryPolicyTest.class); ignoredTests.add(GridCacheEntryMemorySizeSelfTest.class); // Tests that are not ready to be used with BinaryMarshaller @@ -81,13 +66,9 @@ public class IgniteBinaryCacheTestSuite extends TestSuite { // TODO GG-11148 // suite.addTestSuite(GridCacheMemoryModeBinarySelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredEvictionBinarySelfTest.class); suite.addTestSuite(GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest.class); suite.addTestSuite(GridCacheBinariesNearPartitionedByteArrayValuesSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredBinarySelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredAtomicBinarySelfTest.class); suite.addTestSuite(GridDataStreamerImplSelfTest.class); suite.addTestSuite(DataStreamProcessorBinarySelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java index 7cc37e8..5cecfac 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java @@ -50,7 +50,6 @@ import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderNonCompac import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderNonCompactSimpleNameLowerCaseMappersSelfTest; import org.apache.ignite.internal.binary.streams.BinaryHeapStreamByteOrderSelfTest; import org.apache.ignite.internal.binary.streams.BinaryOffheapStreamByteOrderSelfTest; -import org.apache.ignite.internal.processors.cache.BinaryObjectOffHeapUnswapTemporaryTest; import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataUpdatesFlowTest; import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryObjectMetadataExchangeMultinodeTest; import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryObjectUserClassloaderSelfTest; @@ -59,17 +58,12 @@ import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreBi import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreObjectsSelfTest; import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataMultinodeTest; import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicOffheapTieredSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.replicated.GridCacheBinaryObjectsReplicatedSelfTest; import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsAtomicLocalSelfTest; -import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalOffheapTieredSelfTest; import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteBinaryMetadataUpdateChangingTopologySelfTest; import org.apache.ignite.internal.processors.cache.portable.BinaryAtomicCacheLocalEntriesSelfTest; @@ -130,13 +124,6 @@ public class IgniteBinaryObjectsTestSuite extends TestSuite { suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsAtomicSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledSelfTest.class); - suite.addTestSuite(BinaryObjectOffHeapUnswapTemporaryTest.class); - - suite.addTestSuite(GridCacheBinaryObjectsLocalOffheapTieredSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsAtomicOffheapTieredSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest.class); suite.addTestSuite(GridCacheBinaryStoreObjectsSelfTest.class); suite.addTestSuite(GridCacheBinaryStoreBinariesDefaultMappersSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index 980d550..84e7953 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@ -24,10 +24,8 @@ import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDa import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDiscoveryDataStructuresTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureUniqueNameTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureWithJobTest; -import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicOffheapSetSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicQueueApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicSetSelfTest; -import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalOffheapQueueApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalQueueApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalSequenceApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalSetSelfTest; @@ -35,9 +33,6 @@ import org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLo import org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalCountDownLatchSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalLockSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalSemaphoreSelfTest; -import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueApiSelfTest; -import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest; -import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest; @@ -51,10 +46,6 @@ import org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicStampedApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedDataStructuresFailoverSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedNodeRestartTxSelfTest; -import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedOffHeapValuesQueueApiSelfTest; -import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedOffHeapValuesSetSelfTest; -import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedOffheapDataStructuresFailoverSelfTest; -import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedOffheapSetFailoverSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueCreateMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueEntryMoveSelfTest; @@ -104,9 +95,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheLocalSequenceApiSelfTest.class)); suite.addTest(new TestSuite(GridCacheLocalSetSelfTest.class)); suite.addTest(new TestSuite(GridCacheLocalAtomicSetSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLocalAtomicOffheapSetSelfTest.class)); suite.addTest(new TestSuite(GridCacheLocalQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLocalOffheapQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCacheLocalAtomicQueueApiSelfTest.class)); suite.addTest(new TestSuite(IgniteLocalCountDownLatchSelfTest.class)); suite.addTest(new TestSuite(IgniteLocalSemaphoreSelfTest.class)); @@ -127,18 +116,13 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedSequenceApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSequenceMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesSetSelfTest.class)); suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class)); suite.addTest(new TestSuite(IgnitePartitionedCountDownLatchSelfTest.class)); @@ -150,7 +134,6 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { // suite.addTest(new TestSuite(IgnitePartitionedLockSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSetFailoverSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedOffheapSetFailoverSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicSetFailoverSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueRotativeMultiNodeTest.class)); @@ -160,7 +143,6 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedQueueEntryMoveSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedDataStructuresFailoverSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedOffheapDataStructuresFailoverSelfTest.class)); suite.addTest(new TestSuite(GridCacheQueueMultiNodeConsistencySelfTest.class)); suite.addTest(new TestSuite(IgniteLocalAtomicLongApiSelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java index 1ad63ee..94e1447 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java @@ -18,21 +18,17 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.cache.GridCacheMemoryModeSelfTest; import org.apache.ignite.internal.processors.cache.GridCachePreloadingEvictionsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEvictionSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearEvictionSelfTest; -import org.apache.ignite.internal.processors.cache.eviction.GridCacheBatchEvictUnswapSelfTest; import org.apache.ignite.internal.processors.cache.eviction.GridCacheConcurrentEvictionConsistencySelfTest; import org.apache.ignite.internal.processors.cache.eviction.GridCacheConcurrentEvictionsSelfTest; -import org.apache.ignite.internal.processors.cache.eviction.GridCacheDistributedEvictionsSelfTest; import org.apache.ignite.internal.processors.cache.eviction.GridCacheEmptyEntriesLocalSelfTest; import org.apache.ignite.internal.processors.cache.eviction.GridCacheEmptyEntriesPartitionedSelfTest; import org.apache.ignite.internal.processors.cache.eviction.GridCacheEvictableEntryEqualsSelfTest; import org.apache.ignite.internal.processors.cache.eviction.GridCacheEvictionFilterSelfTest; import org.apache.ignite.internal.processors.cache.eviction.GridCacheEvictionLockUnlockSelfTest; import org.apache.ignite.internal.processors.cache.eviction.GridCacheEvictionTouchSelfTest; -import org.apache.ignite.internal.processors.cache.eviction.GridCacheSynchronousEvictionsFailoverSelfTest; import org.apache.ignite.internal.processors.cache.eviction.fifo.FifoEvictionPolicySelfTest; import org.apache.ignite.internal.processors.cache.eviction.lru.LruEvictionPolicySelfTest; import org.apache.ignite.internal.processors.cache.eviction.lru.LruNearEvictionPolicySelfTest; @@ -61,14 +57,10 @@ public class IgniteCacheEvictionSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheConcurrentEvictionsSelfTest.class)); suite.addTest(new TestSuite(GridCacheConcurrentEvictionConsistencySelfTest.class)); suite.addTest(new TestSuite(GridCacheEvictionTouchSelfTest.class)); - suite.addTest(new TestSuite(GridCacheDistributedEvictionsSelfTest.class)); suite.addTest(new TestSuite(GridCacheEvictionLockUnlockSelfTest.class)); - suite.addTest(new TestSuite(GridCacheBatchEvictUnswapSelfTest.class)); suite.addTest(new TestSuite(GridCachePreloadingEvictionsSelfTest.class)); suite.addTest(new TestSuite(GridCacheEmptyEntriesPartitionedSelfTest.class)); suite.addTest(new TestSuite(GridCacheEmptyEntriesLocalSelfTest.class)); - suite.addTest(new TestSuite(GridCacheMemoryModeSelfTest.class)); - suite.addTest(new TestSuite(GridCacheSynchronousEvictionsFailoverSelfTest.class)); suite.addTest(new TestSuite(GridCacheEvictableEntryEqualsSelfTest.class)); return suite; http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java index b621ce5..896bb0e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java @@ -30,13 +30,11 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearE import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOffHeapMultiJvmFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOnheapMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest; @@ -44,21 +42,18 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitioned import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedOffHeapMultiJvmFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedOnheapMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedAtomicMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedOnheapMultiJvmFullApiSelfTest; /** * Multi-JVM test suite. @@ -111,20 +106,12 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.class); - // Multi-node with off-heap values. - suite.addTestSuite(GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.class); - - // Multi-node with off-heap tiered mode. - suite.addTestSuite(GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicOnheapMultiJvmFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedOnheapMultiJvmFullApiSelfTest.class); + suite.addTestSuite(GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.class); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java index 96a8a33..fa11f24 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java @@ -22,20 +22,20 @@ import org.apache.ignite.internal.processors.cache.GridCacheClearSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOnheapFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOnheapMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicReloadAllSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedReloadAllSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiNodeFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledFairAffinityMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOffHeapFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOffHeapTieredAtomicFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOffHeapTieredFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOnheapFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.CachePartitionedMultiNodeLongTxTimeoutFullApiTest; import org.apache.ignite.internal.processors.cache.distributed.near.CachePartitionedNearEnabledMultiNodeLongTxTimeoutFullApiTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicClientOnlyFairAffinityMultiNodeFullApiSelfTest; @@ -51,22 +51,18 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAto import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearOnlyMultiNodeP2PDisabledFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapMultiNodeFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapTieredFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyFairAffinityMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearReloadAllSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearTxMultiNodeSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedAtomicOnheapFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedFilteredPutSelfTest; @@ -77,10 +73,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOffHeapFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOffHeapMultiNodeFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOffHeapTieredFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOffHeapTieredMultiNodeFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOnheapFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOnheapMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedFairAffinityMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest; @@ -94,17 +88,9 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeP2PDisabledFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedNearOnlyMultiNodeFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOffHeapFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOffHeapMultiNodeFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOffHeapTieredFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOffHeapTieredMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicOffHeapFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicOffHeapTieredFullApiSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalFullApiMultithreadedSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.local.GridCacheLocalOffHeapFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.local.GridCacheLocalOffHeapTieredFullApiSelfTest; /** * Test suite for cache API. @@ -129,30 +115,18 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheReplicatedAtomicFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicNearEnabledFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicOnheapFullApiSelfTest.class);; + suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest.class);; + + suite.addTestSuite(GridCachePartitionedOnheapFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedAtomicOnheapFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledOnheapFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.class); // No primary. suite.addTestSuite(GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.class); - // One node with off-heap values. - suite.addTestSuite(GridCacheLocalOffHeapFullApiSelfTest.class); - suite.addTestSuite(GridCacheLocalAtomicOffHeapFullApiSelfTest.class); - suite.addTestSuite(GridCacheReplicatedOffHeapFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedOffHeapFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicOffHeapFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapFullApiSelfTest.class); - - // One node with off-heap tiered mode. - suite.addTestSuite(GridCacheLocalOffHeapTieredFullApiSelfTest.class); - suite.addTestSuite(GridCacheLocalAtomicOffHeapTieredFullApiSelfTest.class); - suite.addTestSuite(GridCacheReplicatedOffHeapTieredFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedOffHeapTieredFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicOffHeapTieredFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredAtomicFullApiSelfTest.class); - // Multi-node. suite.addTestSuite(GridCacheReplicatedMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedMultiNodeP2PDisabledFullApiSelfTest.class); @@ -204,20 +178,12 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheNearTxMultiNodeSelfTest.class); suite.addTestSuite(GridCachePartitionedMultiNodeCounterSelfTest.class); - // Multi-node with off-heap values. - suite.addTestSuite(GridCacheReplicatedOffHeapMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedOffHeapMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.class); - - // Multi-node with off-heap tiered mode. - suite.addTestSuite(GridCacheReplicatedOffHeapTieredMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedOffHeapTieredMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedOnheapMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicOnheapMultiNodeFullApiSelfTest.class);; + suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest.class);; // Old affinity assignment mode. suite.addTestSuite(GridCachePartitionedLateAffDisabledMultiNodeFullApiSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java index f3dd1c8..ebcf1df 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java @@ -27,7 +27,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMetricsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheAtomicReplicatedMetricsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMetricsSelfTest; -import org.apache.ignite.internal.processors.cache.local.LocalCacheOffHeapAndSwapMetricsSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalMetricsNoStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalMetricsSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalTckMetricsSelfTestImpl; @@ -49,7 +48,6 @@ public class IgniteCacheMetricsSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheReplicatedMetricsSelfTest.class); suite.addTestSuite(GridCachePartitionedMetricsSelfTest.class); suite.addTestSuite(GridCachePartitionedHitsAndMissesSelfTest.class); - suite.addTestSuite(LocalCacheOffHeapAndSwapMetricsSelfTest.class); // Atomic cache. suite.addTestSuite(GridCacheAtomicLocalMetricsSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 8d668b9..5c1a879 100755 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -19,8 +19,6 @@ package org.apache.ignite.testsuites; import java.util.Set; import junit.framework.TestSuite; -import org.apache.ignite.GridCacheAffinityBackupsSelfTest; -import org.apache.ignite.IgniteCacheAffinitySelfTest; import org.apache.ignite.cache.IgniteWarmupClosureSelfTest; import org.apache.ignite.cache.affinity.AffinityClientNodeSelfTest; import org.apache.ignite.cache.affinity.AffinityHistoryCleanupTest; @@ -49,7 +47,6 @@ import org.apache.ignite.cache.store.jdbc.JdbcTypesDefaultTransformerTest; import org.apache.ignite.internal.processors.cache.CacheAffinityCallSelfTest; import org.apache.ignite.internal.processors.cache.CacheDeferredDeleteQueueTest; import org.apache.ignite.internal.processors.cache.CacheDeferredDeleteSanitySelfTest; -import org.apache.ignite.internal.processors.cache.CacheEntryProcessorCopySelfTest; import org.apache.ignite.internal.processors.cache.CacheFutureExceptionSelfTest; import org.apache.ignite.internal.processors.cache.CacheNamesSelfTest; import org.apache.ignite.internal.processors.cache.CacheNamesWithSpecialCharactersTest; @@ -76,20 +73,13 @@ import org.apache.ignite.internal.processors.cache.GridCacheNearTxStoreException import org.apache.ignite.internal.processors.cache.GridCacheObjectToStringSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheOffHeapAtomicMultiThreadedUpdateSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheOffHeapMultiThreadedUpdateSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheP2PUndeploySelfTest; import org.apache.ignite.internal.processors.cache.GridCachePartitionedLocalStoreSelfTest; -import org.apache.ignite.internal.processors.cache.GridCachePartitionedOffHeapLocalStoreSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheReplicatedLocalStoreSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheReplicatedTxStoreExceptionSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheStopSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheStorePutxSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheStoreValueBytesSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheSwapPreloadSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerEvictionSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheTxPartitionedLocalStoreSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicInvokeTest; @@ -100,14 +90,10 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPrimaryWrite import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicStopBusySelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicLocalTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicOffheapValuesTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicReplicatedTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerEagerTtlDisabledTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerTxLocalTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerTxOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerTxOffheapValuesTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerTxReplicatedTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerTxTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryProcessorCallTest; @@ -185,13 +171,9 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheEntryListenerAtomicReplicatedTest.class); suite.addTestSuite(IgniteCacheEntryListenerAtomicLocalTest.class); suite.addTestSuite(IgniteCacheEntryListenerTxTest.class); - suite.addTestSuite(IgniteCacheEntryListenerTxOffheapTieredTest.class); - suite.addTestSuite(IgniteCacheEntryListenerTxOffheapValuesTest.class); suite.addTestSuite(IgniteCacheEntryListenerTxReplicatedTest.class); suite.addTestSuite(IgniteCacheEntryListenerTxLocalTest.class); suite.addTestSuite(IgniteCacheEntryListenerEagerTtlDisabledTest.class); - suite.addTestSuite(IgniteCacheEntryListenerAtomicOffheapTieredTest.class); - suite.addTestSuite(IgniteCacheEntryListenerAtomicOffheapValuesTest.class); suite.addTestSuite(IgniteClientAffinityAssignmentSelfTest.class); @@ -276,8 +258,8 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(GridCacheAsyncOperationsLimitSelfTest.class); suite.addTestSuite(IgniteCacheManyAsyncOperationsTest.class); suite.addTestSuite(GridCacheTtlManagerSelfTest.class); - // TODO GG-11140. - // suite.addTestSuite(GridCacheTtlManagerEvictionSelfTest.class); + // TODO: ignite-4534 +// suite.addTestSuite(GridCacheTtlManagerEvictionSelfTest.class); suite.addTestSuite(GridCacheLifecycleAwareSelfTest.class); suite.addTestSuite(IgniteCacheAtomicStopBusySelfTest.class); suite.addTestSuite(IgniteCacheTransactionalStopBusySelfTest.class); @@ -302,14 +284,9 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheMessageRecoveryIdleConnectionTest.class); suite.addTestSuite(IgniteCacheConnectionRecoveryTest.class); suite.addTestSuite(IgniteCacheConnectionRecovery10ConnectionsTest.class); - GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredEvictionAtomicSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredEvictionSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredAtomicSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredSelfTest.class, ignoredTests); suite.addTestSuite(GridCacheGlobalLoadTest.class); suite.addTestSuite(GridCachePartitionedLocalStoreSelfTest.class); suite.addTestSuite(GridCacheReplicatedLocalStoreSelfTest.class); - suite.addTestSuite(GridCachePartitionedOffHeapLocalStoreSelfTest.class); suite.addTestSuite(GridCacheTxPartitionedLocalStoreSelfTest.class); suite.addTestSuite(IgniteCacheSystemTransactionsSelfTest.class); suite.addTestSuite(CacheDeferredDeleteSanitySelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index a9df142..1c50908 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -50,7 +50,6 @@ import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitio import org.apache.ignite.internal.processors.cache.distributed.GridCacheTransformEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeChangingTopologyTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodePartitionsExchangeTest; -import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheNearOffheapGetSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheServerNodeConcurrentStart; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedOptimisticTransactionSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPreloadRestartSelfTest; @@ -63,7 +62,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtP import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadDelayedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadDisabledSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadOffHeapSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadOnheapSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadPutGetSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadStartStopSelfTest; @@ -73,8 +72,10 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePart import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedTopologyChangeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedUnloadEventsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePartitionedBackupNodeFailureRecoveryTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEvictionEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearReadersSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearEvictionEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearJobExecutionSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearMultiGetSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearMultiNodeSelfTest; @@ -108,7 +109,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxTimeoutSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheRendezvousAffinityClientSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheStoreUpdateTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridNearOffheapCacheStoreUpdateTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridPartitionedBackupLoadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheSyncUpdateTest; import org.apache.ignite.internal.processors.cache.distributed.near.NoneRebalanceModeSelfTest; @@ -118,6 +118,7 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicGet import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicApiSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalEventSelfTest; +import org.apache.ignite.internal.processors.cache.local.GridCacheLocalEvictionEventSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalGetAndTransformStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalIsolatedNodesSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalLoadAllSelfTest; @@ -151,8 +152,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTestSuite(GridCacheLocalTxSingleThreadedSelfTest.class); suite.addTestSuite(GridCacheLocalTxTimeoutSelfTest.class); suite.addTestSuite(GridCacheLocalEventSelfTest.class); - // TODO TODO GG-11140. - // suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class); + suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class); suite.addTestSuite(GridCacheVariableTopologySelfTest.class); suite.addTestSuite(GridCacheLocalTxMultiThreadedSelfTest.class); suite.addTestSuite(GridCacheTransformEventSelfTest.class); @@ -199,7 +199,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedNearDisabledTxMultiThreadedSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class)); - suite.addTest(new TestSuite(GridCacheDhtPreloadOffHeapSelfTest.class)); + suite.addTest(new TestSuite(GridCacheDhtPreloadOnheapSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadBigDataSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadPutGetSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadDisabledSelfTest.class)); @@ -219,13 +219,9 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedLoadCacheSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionNotLoadedEventSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class)); - // TODO GG-11140. - // suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class)); - // suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class)); - // suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class)); - // suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class)); - // suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class)); - // suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class)); + suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class)); + suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedUnloadEventsSelfTest.class)); @@ -233,7 +229,6 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCacheColocatedOptimisticTransactionSelfTest.class)); suite.addTestSuite(GridCacheAtomicMessageCountSelfTest.class); suite.addTest(new TestSuite(GridCacheNearPartitionedClearSelfTest.class)); - suite.addTest(new TestSuite(IgniteCacheNearOffheapGetSelfTest.class)); suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class)); @@ -266,7 +261,6 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(CacheConcurrentReadThroughTest.class)); suite.addTest(new TestSuite(GridNearCacheStoreUpdateTest.class)); - suite.addTest(new TestSuite(GridNearOffheapCacheStoreUpdateTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java index 4b5e2f6..caa18d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java @@ -21,9 +21,6 @@ import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.CacheStartupInDeploymentModesTest; import org.apache.ignite.internal.processors.cache.GridCacheAtomicEntryProcessorDeploymentSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheConditionalDeploymentSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheDeploymentOffHeapSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheDeploymentOffHeapValuesSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheDeploymentSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheEntryVersionSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheOrderedPreloadingSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheReferenceCleanupSelfTest; @@ -80,7 +77,6 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheSyncReplicatedPreloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridReplicatedTxPreloadTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadLifecycleSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadOffHeapSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadStartStopEventsSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheDaemonNodeLocalSelfTest; @@ -122,7 +118,6 @@ public class IgniteCacheTestSuite3 extends TestSuite { suite.addTestSuite(GridCacheReplicatedTxSingleThreadedSelfTest.class); suite.addTestSuite(GridCacheReplicatedTxTimeoutSelfTest.class); suite.addTestSuite(GridCacheReplicatedPreloadSelfTest.class); - suite.addTestSuite(GridCacheReplicatedPreloadOffHeapSelfTest.class); suite.addTestSuite(GridCacheReplicatedPreloadLifecycleSelfTest.class); suite.addTestSuite(GridCacheSyncReplicatedPreloadSelfTest.class); @@ -138,8 +133,7 @@ public class IgniteCacheTestSuite3 extends TestSuite { suite.addTestSuite(GridCachePutArrayValueSelfTest.class); suite.addTestSuite(GridCacheReplicatedUnswapAdvancedSelfTest.class); - // TODO TODO GG-11140. - // suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class); + suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class); suite.addTestSuite(GridCacheReplicatedTxMultiThreadedSelfTest.class); suite.addTestSuite(GridCacheReplicatedPreloadEventsSelfTest.class); suite.addTestSuite(GridCacheReplicatedPreloadStartStopEventsSelfTest.class); @@ -184,8 +178,7 @@ public class IgniteCacheTestSuite3 extends TestSuite { // Memory leak tests. suite.addTestSuite(GridCacheReferenceCleanupSelfTest.class); - // TODO GG-11140. - // suite.addTestSuite(GridCacheReloadSelfTest.class); + suite.addTestSuite(GridCacheReloadSelfTest.class); suite.addTestSuite(GridCacheMixedModeSelfTest.class); @@ -196,8 +189,7 @@ public class IgniteCacheTestSuite3 extends TestSuite { suite.addTest(IgniteTopologyValidatorTestSuit.suite()); // Eviction. - // TODO GG-11140. - // suite.addTest(IgniteCacheEvictionSelfTestSuite.suite()); + suite.addTest(IgniteCacheEvictionSelfTestSuite.suite()); // Iterators. suite.addTest(IgniteCacheIteratorsSelfTestSuite.suite()); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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 3abbdab..bd26f03 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 @@ -41,7 +41,6 @@ import org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeDynam import org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeDynamicStartTxTest; import org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeStaticStartAtomicTest; import org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeStaticStartTxTest; -import org.apache.ignite.internal.processors.cache.CacheSwapUnswapGetTest; import org.apache.ignite.internal.processors.cache.CacheTxNotAllowReadFromBackupTest; import org.apache.ignite.internal.processors.cache.CrossCacheLockTest; import org.apache.ignite.internal.processors.cache.GridCacheMarshallingNodeJoinSelfTest; @@ -131,13 +130,9 @@ import org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxStor import org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxStoreSessionWriteBehindTest; import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryLocalAtomicSwapDisabledSelfTest; import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryLocalTransactionalSelfTest; -import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedAtomicOffHeapSelfTest; import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedTransactionalOffHeapSelfTest; import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedTransactionalSelfTest; -import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedAtomicOffHeapSelfTest; import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedTransactionalOffHeapSelfTest; import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedTransactionalSelfTest; /** @@ -290,12 +285,8 @@ public class IgniteCacheTestSuite4 extends TestSuite { suite.addTestSuite(CacheVersionedEntryLocalTransactionalSelfTest.class); suite.addTestSuite(CacheVersionedEntryPartitionedAtomicSelfTest.class); suite.addTestSuite(CacheVersionedEntryPartitionedTransactionalSelfTest.class); - suite.addTestSuite(CacheVersionedEntryPartitionedAtomicOffHeapSelfTest.class); - suite.addTestSuite(CacheVersionedEntryPartitionedTransactionalOffHeapSelfTest.class); suite.addTestSuite(CacheVersionedEntryReplicatedAtomicSelfTest.class); suite.addTestSuite(CacheVersionedEntryReplicatedTransactionalSelfTest.class); - suite.addTestSuite(CacheVersionedEntryReplicatedAtomicOffHeapSelfTest.class); - suite.addTestSuite(CacheVersionedEntryReplicatedTransactionalOffHeapSelfTest.class); // TODO GG-11148. // suite.addTestSuite(CacheSwapUnswapGetTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java index 76ed440..7efc7de 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java @@ -21,8 +21,6 @@ import junit.framework.TestSuite; import org.apache.ignite.igfs.IgfsFragmentizerSelfTest; import org.apache.ignite.igfs.IgfsFragmentizerTopologySelfTest; import org.apache.ignite.internal.processors.igfs.IgfsAtomicPrimaryMultiNodeSelfTest; -import org.apache.ignite.internal.processors.igfs.IgfsAtomicPrimaryOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.igfs.IgfsAtomicPrimaryOffheapValuesSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsAtomicPrimarySelfTest; import org.apache.ignite.internal.processors.igfs.IgfsAttributesSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsBackupsDualAsyncSelfTest; @@ -48,8 +46,6 @@ import org.apache.ignite.internal.processors.igfs.IgfsModeResolverSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsModesSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsPrimaryMultiNodeSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsOneClientNodeTest; -import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOffheapValuesSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOptimziedMarshallerSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyClientSelfTest; import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyMultiNodeSelfTest; @@ -95,9 +91,6 @@ public class IgniteIgfsTestSuite extends TestSuite { suite.addTest(new TestSuite(IgfsPrimaryOptimziedMarshallerSelfTest.class)); - suite.addTest(new TestSuite(IgfsPrimaryOffheapTieredSelfTest.class)); - suite.addTest(new TestSuite(IgfsPrimaryOffheapValuesSelfTest.class)); - suite.addTest(new TestSuite(IgfsDualSyncSelfTest.class)); suite.addTest(new TestSuite(IgfsDualAsyncSelfTest.class)); @@ -165,8 +158,6 @@ public class IgniteIgfsTestSuite extends TestSuite { suite.addTestSuite(IgfsAtomicPrimarySelfTest.class); suite.addTestSuite(IgfsAtomicPrimaryMultiNodeSelfTest.class); - suite.addTestSuite(IgfsAtomicPrimaryOffheapTieredSelfTest.class); - suite.addTestSuite(IgfsAtomicPrimaryOffheapValuesSelfTest.class); suite.addTestSuite(IgfsSecondaryFileSystemInjectionSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java index 12e1257..4928e3d 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java @@ -376,7 +376,6 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest { dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2)); dataCacheCfg.setBackups(0); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); - dataCacheCfg.setOffHeapMaxMemory(0); CacheConfiguration metaCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java index 2e3a2a3..6b5690c 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java @@ -235,7 +235,6 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest { dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2)); dataCacheCfg.setBackups(0); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); - dataCacheCfg.setOffHeapMaxMemory(0); CacheConfiguration metaCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java index ad6a9f4..3ffdf23 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java @@ -169,7 +169,6 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2)); dataCacheCfg.setBackups(0); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); - dataCacheCfg.setOffHeapMaxMemory(0); CacheConfiguration metaCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java index 7477341..d5065e1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java @@ -36,7 +36,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** @@ -139,8 +138,6 @@ public class CacheIndexStreamerTest extends GridCommonAbstractTest { ccfg.setAtomicityMode(atomicityMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setMemoryMode(OFFHEAP_TIERED); - ccfg.setOffHeapMaxMemory(0); ccfg.setBackups(1); ccfg.setIndexedTypes(Integer.class, String.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java deleted file mode 100644 index 70c0d49..0000000 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache; - -import java.util.Map; -import java.util.concurrent.ThreadLocalRandom; -import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.query.annotations.QuerySqlField; -import org.apache.ignite.cache.query.annotations.QueryTextField; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.internal.IgniteKernal; -import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory; -import org.apache.ignite.testframework.GridTestUtils; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; - -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; - -/** - * - */ -public class CacheIndexingOffheapCleanupTest extends GridCommonAbstractTest { - /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { - startGrid(0); - } - - /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { - stopAllGrids(); - - super.afterTest(); - } - - /** - * @throws Exception If failed. - */ - public void testCacheDestroy() throws Exception { - Ignite ignite = ignite(0); - - for (int i = 0; i < 5; i++) { - log.info("Iteration: " + i); - - IgniteCache cache = ignite.createCache(cacheConfiguration()); - - for (int k = 0; k < 100; k++) - cache.put(k, new TestType()); - - GridUnsafeMemory mem = schemaMemory(ignite, cache.getName()); - - assertTrue(mem.allocatedSize() > 0); - - ignite.destroyCache(cache.getName()); - - assertEquals(0, mem.allocatedSize()); - } - } - - /** - * @throws Exception If failed. - */ - public void testStopNode() throws Exception { - Ignite ignite = ignite(0); - - IgniteCache cache = ignite.createCache(cacheConfiguration()); - - for (int k = 0; k < 100; k++) - cache.put(k, new TestType()); - - GridUnsafeMemory mem = schemaMemory(ignite, cache.getName()); - - assertTrue(mem.allocatedSize() > 0); - - stopGrid(0); - - assertEquals(0, mem.allocatedSize()); - } - - /** - * @param ignite Node. - * @param cacheName Cache name. - * @return Memory. - */ - private GridUnsafeMemory schemaMemory(Ignite ignite, String cacheName) { - Map<String, Object> schemas = GridTestUtils.getFieldValue(((IgniteKernal)ignite).context().query(), - "idx", - "schemas"); - - assertNotNull(schemas); - - Object schema = schemas.get("\"" + cacheName + "\""); - - assertNotNull(schema); - - GridUnsafeMemory mem = GridTestUtils.getFieldValue(schema, "offheap"); - - assertNotNull(mem); - - return mem; - } - - /** - * @return Cache configuration. - */ - private CacheConfiguration cacheConfiguration() { - CacheConfiguration ccfg = new CacheConfiguration(); - - ccfg.setName("cache"); - ccfg.setMemoryMode(OFFHEAP_TIERED); - ccfg.setIndexedTypes(Integer.class, TestType.class); - - return ccfg; - } - - /** - * - */ - static class TestType { - /** */ - @QuerySqlField(index = true) - private int v1; - - /** */ - @QuerySqlField(index = true) - private String v2; - - /** */ - @QueryTextField - private String v3; - - /** - * - */ - public TestType() { - int v = ThreadLocalRandom.current().nextInt(); - - v1 = v; - v2 = String.valueOf(v); - v3 = v2; - } - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java index 1012f34..41b6c83 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java @@ -31,7 +31,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** @@ -87,17 +86,14 @@ public abstract class CacheOffheapBatchIndexingBaseTest extends GridCommonAbstra } /** - * @param onHeapRowCacheSize on heap row cache size. * @param indexedTypes indexed types for cache. * @return Cache configuration. */ - protected CacheConfiguration<Object, Object> cacheConfiguration(int onHeapRowCacheSize, Class<?>[] indexedTypes) { + protected CacheConfiguration<Object, Object> cacheConfiguration(Class<?>[] indexedTypes) { CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(); ccfg.setAtomicityMode(ATOMIC); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setMemoryMode(OFFHEAP_TIERED); - ccfg.setSqlOnheapRowCacheSize(onHeapRowCacheSize); ccfg.setIndexedTypes(indexedTypes); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java index 602fc1c..87d10a1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java @@ -35,18 +35,6 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd doStreamerBatchTest(50, 1_000, new Class<?>[] { Integer.class, CacheOffheapBatchIndexingBaseTest.Person.class, Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class}, - 1, - true); - } - - /** - * Tests putAll with multiple indexed entities and streamer preloading with default off-heap cache size. - */ - public void testPutAllMultupleEntitiesAndStreamerDfltOffHeapRowCacheSize() { - doStreamerBatchTest(50, 1_000, new Class<?>[] { - Integer.class, CacheOffheapBatchIndexingBaseTest.Person.class, - Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class}, - CacheConfiguration.DFLT_SQL_ONHEAP_ROW_CACHE_SIZE, true); } @@ -57,7 +45,6 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd doStreamerBatchTest(50, 1_000, new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class}, - 1, false); } @@ -65,18 +52,16 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd * @param iterations Number of iterations. * @param entitiesCnt Number of entities to put. * @param entityClasses Entity classes. - * @param onHeapRowCacheSize Cache size. * @param preloadInStreamer Data preload flag. */ private void doStreamerBatchTest(int iterations, int entitiesCnt, Class<?>[] entityClasses, - int onHeapRowCacheSize, boolean preloadInStreamer) { Ignite ignite = grid(0); final IgniteCache<Object, Object> cache = - ignite.createCache(cacheConfiguration(onHeapRowCacheSize, entityClasses)); + ignite.createCache(cacheConfiguration(entityClasses)); try { if (preloadInStreamer)
