You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/19 07:36:20 UTC
ignite git commit: Fixed validator suite name.
Repository: ignite
Updated Branches:
refs/heads/master 9193c58b6 -> 9e88f979b
Fixed validator suite name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e88f979
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e88f979
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e88f979
Branch: refs/heads/master
Commit: 9e88f979b20acd8333351ceea58d67182ee06d60
Parents: 9193c58
Author: sboikov <sb...@gridgain.com>
Authored: Fri May 19 10:36:12 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri May 19 10:36:12 2017 +0300
----------------------------------------------------------------------
.../ignite/configuration/TopologyValidator.java | 10 ++--
.../testsuites/IgniteCacheTestSuite3.java | 2 +-
.../IgniteTopologyValidatorTestSuit.java | 44 -----------------
.../IgniteTopologyValidatorTestSuite.java | 50 ++++++++++++++++++++
4 files changed, 56 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
index abd69be..320be10 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
@@ -17,12 +17,11 @@
package org.apache.ignite.configuration;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.cluster.ClusterNode;
-
-import javax.cache.CacheException;
import java.io.Serializable;
import java.util.Collection;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
/**
* Topology validator is used to verify that cluster topology is valid for further cache operations.
@@ -57,8 +56,9 @@ import java.util.Collection;
public interface TopologyValidator extends Serializable {
/**
* Validates topology.
+ *
* @param nodes Collection of nodes.
* @return {@code true} in case topology is valid for specific cache, otherwise {@code false}
*/
- boolean validate(Collection<ClusterNode> nodes);
+ public boolean validate(Collection<ClusterNode> nodes);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index d0b74d6..222ac30 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -180,7 +180,7 @@ public class IgniteCacheTestSuite3 extends TestSuite {
suite.addTest(IgniteCacheMetricsSelfTestSuite.suite());
// Topology validator.
- suite.addTest(IgniteTopologyValidatorTestSuit.suite());
+ suite.addTest(IgniteTopologyValidatorTestSuite.suite());
// Eviction.
suite.addTest(IgniteCacheEvictionSelfTestSuite.suite());
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
deleted file mode 100644
index 8c4cd11..0000000
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.testsuites;
-
-import junit.framework.*;
-import org.apache.ignite.internal.processors.cache.*;
-
-/**
- * Topology validator test suite.
- */
-public class IgniteTopologyValidatorTestSuit extends TestSuite {
- /**
- * @return Topology validator tests suite.
- * @throws Exception If failed.
- */
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite("Topology validator Test Suite");
-
- suite.addTest(new TestSuite(IgniteTopologyValidatorNearPartitionedAtomicCacheTest.class));
- suite.addTest(new TestSuite(IgniteTopologyValidatorNearPartitionedTxCacheTest.class));
- suite.addTest(new TestSuite(IgniteTopologyValidatorPartitionedAtomicCacheTest.class));
- suite.addTest(new TestSuite(IgniteTopologyValidatorPartitionedTxCacheTest.class));
- suite.addTest(new TestSuite(IgniteTopologyValidatorReplicatedAtomicCacheTest.class));
- suite.addTest(new TestSuite(IgniteTopologyValidatorReplicatedTxCacheTest.class));
- suite.addTest(new TestSuite(IgniteTopologyValidatorGridSplitCacheTest.class));
-
- return suite;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java
new file mode 100644
index 0000000..58c754e
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java
@@ -0,0 +1,50 @@
+/*
+ * 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.testsuites;
+
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorGridSplitCacheTest;
+import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorNearPartitionedAtomicCacheTest;
+import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorNearPartitionedTxCacheTest;
+import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorPartitionedAtomicCacheTest;
+import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorPartitionedTxCacheTest;
+import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorReplicatedAtomicCacheTest;
+import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorReplicatedTxCacheTest;
+
+/**
+ * Topology validator test suite.
+ */
+public class IgniteTopologyValidatorTestSuite extends TestSuite {
+ /**
+ * @return Topology validator tests suite.
+ * @throws Exception If failed.
+ */
+ public static TestSuite suite() throws Exception {
+ TestSuite suite = new TestSuite("Topology validator Test Suite");
+
+ suite.addTest(new TestSuite(IgniteTopologyValidatorNearPartitionedAtomicCacheTest.class));
+ suite.addTest(new TestSuite(IgniteTopologyValidatorNearPartitionedTxCacheTest.class));
+ suite.addTest(new TestSuite(IgniteTopologyValidatorPartitionedAtomicCacheTest.class));
+ suite.addTest(new TestSuite(IgniteTopologyValidatorPartitionedTxCacheTest.class));
+ suite.addTest(new TestSuite(IgniteTopologyValidatorReplicatedAtomicCacheTest.class));
+ suite.addTest(new TestSuite(IgniteTopologyValidatorReplicatedTxCacheTest.class));
+ suite.addTest(new TestSuite(IgniteTopologyValidatorGridSplitCacheTest.class));
+
+ return suite;
+ }
+}
\ No newline at end of file