Merge remote-tracking branch 'remotes/origin/ignite-1009-v4' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d28fea0b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d28fea0b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d28fea0b Branch: refs/heads/ignite-gg-10411 Commit: d28fea0b9f30bf09c37b09218fa41fe819b85c13 Parents: 5d8a5e6 7c51a14 Author: sboikov <sboi...@gridgain.com> Authored: Tue Jun 16 09:56:47 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jun 16 09:56:47 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheProcessor.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/CacheClientStoreSelfTest.java | 228 +++++++++++++ ...acheReadOnlyTransactionalClientSelfTest.java | 327 ------------------- ...CacheClientWriteBehindStoreAbstractTest.java | 104 ++++++ ...teCacheClientWriteBehindStoreAtomicTest.java | 38 +++ .../IgnteCacheClientWriteBehindStoreTxTest.java | 32 ++ .../testsuites/IgniteCacheTestSuite4.java | 2 +- .../IgniteCacheWriteBehindTestSuite.java | 2 + 9 files changed, 411 insertions(+), 339 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d28fea0b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index fed5efe,83a30bd..d155330 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@@ -134,8 -134,10 +134,8 @@@ public class IgniteCacheTestSuite4 exte suite.addTestSuite(CacheJdbcStoreSessionListenerSelfTest.class); - suite.addTestSuite(CacheReadOnlyTransactionalClientSelfTest.class); + suite.addTestSuite(CacheClientStoreSelfTest.class); - suite.addTestSuite(IgniteCacheManyClientsTest.class); - suite.addTestSuite(IgniteStartCacheInTransactionSelfTest.class); suite.addTestSuite(IgniteStartCacheInTransactionAtomicSelfTest.class);
