You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/11/09 12:34:10 UTC
ignite git commit: IGNITE-9930 Split ZK Discovery 2 suite into
several configs - Fixes #5021.
Repository: ignite
Updated Branches:
refs/heads/master 70952fe92 -> f6d6a47f5
IGNITE-9930 Split ZK Discovery 2 suite into several configs - Fixes #5021.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6d6a47f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6d6a47f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6d6a47f
Branch: refs/heads/master
Commit: f6d6a47f546b02774ca31c587d9bbaeecb4abc42
Parents: 70952fe
Author: Alexey Platonov <ap...@gmail.com>
Authored: Fri Nov 9 15:33:27 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Nov 9 15:33:27 2018 +0300
----------------------------------------------------------------------
.../zk/ZookeeperDiscoverySpiTestSuite2.java | 46 +--------------
.../zk/ZookeeperDiscoverySpiTestSuite3.java | 62 ++++++++++++++++++++
.../zk/ZookeeperDiscoverySpiTestSuite4.java | 57 ++++++++++++++++++
3 files changed, 120 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f6d6a47f/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 3b8ddee..f64c57e 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
@@ -18,26 +18,11 @@
package org.apache.ignite.spi.discovery.zk;
import junit.framework.TestSuite;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
-import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest;
import org.apache.ignite.internal.IgniteClientReconnectCacheTest;
-import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDataStructuresTest;
-import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedNodeRestartTxSelfTest;
-import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSequenceApiSelfTest;
-import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSequenceApiSelfTest;
-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.distributed.replicated.IgniteCacheReplicatedQuerySelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicMultiJvmFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmFullApiSelfTest;
-import org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest;
-import org.apache.ignite.p2p.GridP2PContinuousDeploymentSelfTest;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
import org.apache.ignite.util.GridCommandHandlerTest;
/**
@@ -58,42 +43,13 @@ public class ZookeeperDiscoverySpiTestSuite2 extends ZookeeperDiscoverySpiAbstra
TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
- suite.addTestSuite(ZookeeperDiscoverySuitePreprocessorTest.class);
-
- suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class);
suite.addTestSuite(GridCachePartitionedNodeRestartTest.class);
-
suite.addTestSuite(IgniteCacheEntryListenerWithZkDiscoAtomicTest.class);
-
- suite.addTestSuite(GridEventConsumeSelfTest.class);
-
suite.addTestSuite(IgniteClientReconnectCacheTest.class);
-
- suite.addTestSuite(IgniteCachePutRetryAtomicSelfTest.class);
- suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
-
- suite.addTestSuite(ClusterNodeMetricsUpdateTest.class);
-
suite.addTestSuite(GridCachePartitionedMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheReplicatedMultiNodeFullApiSelfTest.class);
-
- suite.addTestSuite(GridCacheAtomicMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class);
-
- suite.addTestSuite(GridCachePartitionedNodeRestartTxSelfTest.class);
- suite.addTestSuite(IgniteClientDataStructuresTest.class);
- suite.addTestSuite(GridCacheReplicatedSequenceApiSelfTest.class);
- suite.addTestSuite(GridCachePartitionedSequenceApiSelfTest.class);
-
- suite.addTestSuite(IgniteCacheReplicatedQuerySelfTest.class);
-
- suite.addTestSuite(GridCacheAtomicMultiJvmFullApiSelfTest.class);
- suite.addTestSuite(GridCachePartitionedMultiJvmFullApiSelfTest.class);
-
suite.addTestSuite(GridCommandHandlerTest.class);
- suite.addTestSuite(GridP2PContinuousDeploymentSelfTest.class);
-
return suite;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f6d6a47f/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
new file mode 100644
index 0000000..c988205
--- /dev/null
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
@@ -0,0 +1,62 @@
+/*
+ * 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.spi.discovery.zk;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDataStructuresTest;
+import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedNodeRestartTxSelfTest;
+import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSequenceApiSelfTest;
+import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSequenceApiSelfTest;
+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.GridCachePartitionedMultiJvmFullApiSelfTest;
+import org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest;
+import org.apache.ignite.p2p.GridP2PContinuousDeploymentSelfTest;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
+
+/**
+ * Regular Ignite tests executed with {@link ZookeeperDiscoverySpi}.
+ */
+public class ZookeeperDiscoverySpiTestSuite3 extends ZookeeperDiscoverySpiAbstractTestSuite {
+ /** */
+ private static TestingCluster testingCluster;
+
+ /**
+ * @return Test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite() throws Exception {
+ System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm tests.
+
+ initSuite();
+
+ TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
+
+ suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class);
+ suite.addTestSuite(GridEventConsumeSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedNodeRestartTxSelfTest.class);
+ suite.addTestSuite(IgniteClientDataStructuresTest.class);
+ suite.addTestSuite(GridCacheReplicatedSequenceApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedSequenceApiSelfTest.class);
+ suite.addTestSuite(GridCacheAtomicMultiJvmFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedMultiJvmFullApiSelfTest.class);
+ suite.addTestSuite(GridP2PContinuousDeploymentSelfTest.class);
+
+ return suite;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f6d6a47f/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
new file mode 100644
index 0000000..cb8010b
--- /dev/null
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
@@ -0,0 +1,57 @@
+/*
+ * 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.spi.discovery.zk;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest;
+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.replicated.GridCacheReplicatedAtomicMultiNodeFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQuerySelfTest;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
+
+/**
+ * Regular Ignite tests executed with {@link ZookeeperDiscoverySpi}.
+ */
+public class ZookeeperDiscoverySpiTestSuite4 extends ZookeeperDiscoverySpiAbstractTestSuite {
+ /** */
+ private static TestingCluster testingCluster;
+
+ /**
+ * @return Test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite() throws Exception {
+ System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm tests.
+
+ initSuite();
+
+ TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
+
+ suite.addTestSuite(ZookeeperDiscoverySuitePreprocessorTest.class);
+ suite.addTestSuite(IgniteCachePutRetryAtomicSelfTest.class);
+ suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
+ suite.addTestSuite(ClusterNodeMetricsUpdateTest.class);
+ suite.addTestSuite(GridCacheAtomicMultiNodeFullApiSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class);
+ suite.addTestSuite(IgniteCacheReplicatedQuerySelfTest.class);
+
+ return suite;
+ }
+}