Repository: incubator-ignite Updated Branches: refs/heads/ignite-664 6b5259a99 -> b96d6a6af
# ignite-676: move offheap tests from partitioned Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b96d6a6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b96d6a6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b96d6a6a Branch: refs/heads/ignite-664 Commit: b96d6a6afdb024276d4a76632d3b6f6ea9647832 Parents: 6b5259a Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue May 5 19:09:49 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue May 5 19:09:49 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/testsuites/IgniteCacheOffHeapTestSuite.java | 4 ++++ .../ignite/testsuites/IgnitePartitionedCacheTestSuite.java | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b96d6a6a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheOffHeapTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheOffHeapTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheOffHeapTestSuite.java index 918463e..095a78f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheOffHeapTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheOffHeapTestSuite.java @@ -19,6 +19,7 @@ package org.apache.ignite.testsuites; import junit.framework.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.*; /** @@ -42,6 +43,9 @@ public class IgniteCacheOffHeapTestSuite extends TestSuite { suite.addTestSuite(GridCacheReplicatedPreloadOffHeapSelfTest.class); suite.addTestSuite(GridCacheDeploymentOffHeapSelfTest.class); + suite.addTest(new TestSuite(GridCacheDhtPreloadOffHeapSelfTest.class)); + suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class)); + return suite; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b96d6a6a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePartitionedCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePartitionedCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePartitionedCacheTestSuite.java index 029b7d5..4c88f9d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePartitionedCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePartitionedCacheTestSuite.java @@ -71,7 +71,6 @@ public class IgnitePartitionedCacheTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheDhtMappingSelfTest.class)); // suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class)); TODO-gg-4066 suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class)); - suite.addTest(new TestSuite(GridCacheDhtPreloadOffHeapSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadBigDataSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadPutGetSelfTest.class)); suite.addTest(new TestSuite(GridCacheDhtPreloadDisabledSelfTest.class)); @@ -106,8 +105,6 @@ public class IgnitePartitionedCacheTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheNearExpiredEntriesPreloadSelfTest.class)); suite.addTest(new TestSuite(GridCacheAtomicExpiredEntriesPreloadSelfTest.class)); - suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class)); - // TODO: GG-7242, GG-7243: Enabled when fixed. // suite.addTest(new TestSuite(GridCacheDhtRemoveFailureTest.class)); // suite.addTest(new TestSuite(GridCacheNearRemoveFailureTest.class));
