Repository: ignite Updated Branches: refs/heads/ignite-zk 8962daa8a -> 2d52c34fe
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d52c34f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d52c34f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d52c34f Branch: refs/heads/ignite-zk Commit: 2d52c34fe96e1432c678898ab1ba54ce5c5b6576 Parents: 8962daa Author: sboikov <[email protected]> Authored: Fri Jan 12 14:01:50 2018 +0300 Committer: sboikov <[email protected]> Committed: Fri Jan 12 14:01:50 2018 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractSelfTest.java | 2 ++ .../ignite/internal/util/GridTestClockTimer.java | 9 +++++++++ .../testframework/junits/GridAbstractTest.java | 10 ++++++---- modules/zookeeper/pom.xml | 7 +++++++ .../zk/ZookeeperDiscoverySpiTestSuite2.java | 18 ++++++++++++++++++ 5 files changed, 42 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2d52c34f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index 81aadb9..3fec03f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -116,6 +116,8 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { void initStoreStrategy() throws IgniteCheckedException { if (storeStgy == null) storeStgy = isMultiJvm() ? new H2CacheStoreStrategy() : new MapCacheStoreStrategy(); + else if (isMultiJvm() && !(storeStgy instanceof H2CacheStoreStrategy)) + storeStgy = new H2CacheStoreStrategy(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2d52c34f/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java index 5da9042..2d26b72 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java @@ -32,6 +32,15 @@ public class GridTestClockTimer implements Runnable { } } + /** + * @return {@code True} if need start test time. + */ + public static boolean startTestTimer() { + synchronized (IgniteUtils.mux) { + return IgniteUtils.gridCnt == 0; + } + } + /** {@inheritDoc} */ @Override public void run() { while (true) { http://git-wip-us.apache.org/repos/asf/ignite/blob/2d52c34f/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 93204d2..f6cc1ce 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -204,13 +204,15 @@ public abstract class GridAbstractTest extends TestCase { if (BINARY_MARSHALLER) GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - Thread timer = new Thread(new GridTestClockTimer(), "ignite-clock-for-tests"); + if (GridTestClockTimer.startTestTimer()) { + Thread timer = new Thread(new GridTestClockTimer(), "ignite-clock-for-tests"); - timer.setDaemon(true); + timer.setDaemon(true); - timer.setPriority(10); + timer.setPriority(10); - timer.start(); + timer.start(); + } } /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2d52c34f/modules/zookeeper/pom.xml ---------------------------------------------------------------------- diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml index 26080e0..9b57498 100644 --- a/modules/zookeeper/pom.xml +++ b/modules/zookeeper/pom.xml @@ -128,6 +128,13 @@ </dependency> <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.4.8</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/ignite/blob/2d52c34f/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java index 36ec7c2..a37caaa 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java @@ -29,8 +29,15 @@ import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest; import org.apache.ignite.internal.IgniteClientReconnectCacheTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicMultiNodeFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNodeRestartTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicMultiNodeFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedNodeRestartSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOnheapMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest; import org.apache.ignite.spi.discovery.DiscoverySpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -50,6 +57,8 @@ public class ZookeeperDiscoverySpiTestSuite2 extends TestSuite { public static TestSuite suite() throws Exception { System.setProperty("zookeeper.forceSync", "false"); + System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm tests. + testingCluster = createTestingCluster(3); testingCluster.start(); @@ -67,6 +76,15 @@ public class ZookeeperDiscoverySpiTestSuite2 extends TestSuite { suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class); suite.addTestSuite(ClusterNodeMetricsUpdateTest.class); + suite.addTestSuite(GridCachePartitionedMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCacheReplicatedMultiNodeFullApiSelfTest.class); + + suite.addTestSuite(GridCacheAtomicMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class); + + suite.addTestSuite(GridCacheAtomicMultiJvmFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedMultiJvmFullApiSelfTest.class); + return suite; }
