Repository: incubator-ignite Updated Branches: refs/heads/ignite-471-2 c3f8d0bb0 -> d41d61853
ignite-471-2: fixed remaining tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d41d6185 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d41d6185 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d41d6185 Branch: refs/heads/ignite-471-2 Commit: d41d61853a4aaf326ce75a89413a5d4914e0e5c6 Parents: c3f8d0b Author: Denis Magda <[email protected]> Authored: Thu Jun 4 12:38:23 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Thu Jun 4 12:38:23 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheEntryMemorySizeSelfTest.java | 2 +- .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d41d6185/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index 25c7c85..981ba78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -126,7 +126,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { * * @return */ - protected Marshaller createMarshaller() { + protected Marshaller createMarshaller() throws IgniteCheckedException { Marshaller marsh = new OptimizedMarshaller(); marsh.setContext(new MarshallerContext() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d41d6185/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 7678fcc..2a0065c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -106,7 +106,7 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(GridCacheConcurrentMapSelfTest.class); suite.addTestSuite(GridCacheAffinityMapperSelfTest.class); GridTestUtils.addTestIfNeeded(suite, GridCacheAffinityRoutingSelfTest.class, ignoredTests); - suite.addTestSuite(GridCacheMvccSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridCacheMvccSelfTest.class, ignoredTests); suite.addTestSuite(GridCacheMvccPartitionedSelfTest.class); suite.addTestSuite(GridCacheMvccManagerSelfTest.class); // suite.addTestSuite(GridCacheP2PUndeploySelfTest.class); TODO uncomment in DR branch.
