This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new ceb22d20cab IGNITE-20595 Snapshot suite split in three (#10987)
ceb22d20cab is described below
commit ceb22d20cab407b038570c81be022d7233a6e12d
Author: Nikolay <nizhi...@apache.org>
AuthorDate: Tue Oct 10 11:28:43 2023 +0300
IGNITE-20595 Snapshot suite split in three (#10987)
---
.../ignite/testsuites/IgniteSnapshotTestSuite.java | 19 ---------
...estSuite.java => IgniteSnapshotTestSuite2.java} | 26 +-----------
.../testsuites/IgniteSnapshotTestSuite3.java | 48 ++++++++++++++++++++++
3 files changed, 49 insertions(+), 44 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
index ced347b5c00..4b4398fc1dd 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
@@ -20,24 +20,15 @@ package org.apache.ignite.testsuites;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotCheckTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotDeltaTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotHandlerTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotRestoreSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotStreamerTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotWalRecordTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotConsistencyTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotMXBeanTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManagerSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRemoteRequestTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRestoreFromRemoteTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotWithMetastorageTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.PlainSnapshotTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelf2Test;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteConcurrentCacheDumpTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
@@ -65,15 +56,5 @@ public class IgniteSnapshotTestSuite {
GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotRestoreSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotHandlerTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotRestoreFromRemoteTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, PlainSnapshotTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, EncryptedSnapshotTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotWalRecordTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotStreamerTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotConsistencyTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotDeltaTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotsTestSuite.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelfTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelf2Test.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteConcurrentCacheDumpTest.class, ignoredTests);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
similarity index 51%
copy from
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
copy to
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
index ced347b5c00..d4a5716619d 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
@@ -21,30 +21,18 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotCheckTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotDeltaTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotHandlerTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotRestoreSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotStreamerTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotWalRecordTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotConsistencyTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotMXBeanTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManagerSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRemoteRequestTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRestoreFromRemoteTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotWithMetastorageTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.PlainSnapshotTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelf2Test;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteConcurrentCacheDumpTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
/** */
@RunWith(DynamicSuite.class)
-public class IgniteSnapshotTestSuite {
+public class IgniteSnapshotTestSuite2 {
/** */
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
@@ -56,15 +44,6 @@ public class IgniteSnapshotTestSuite {
/** */
public static void addSnapshotTests(List<Class<?>> suite,
Collection<Class> ignoredTests) {
- GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotManagerSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotRemoteRequestTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotCheckTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotWithMetastorageTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotMXBeanTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotRestoreSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotHandlerTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotRestoreFromRemoteTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, PlainSnapshotTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite, EncryptedSnapshotTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotWalRecordTest.class, ignoredTests);
@@ -72,8 +51,5 @@ public class IgniteSnapshotTestSuite {
GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotConsistencyTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotDeltaTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotsTestSuite.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelfTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelf2Test.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteConcurrentCacheDumpTest.class, ignoredTests);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java
new file mode 100644
index 00000000000..c514882c8be
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java
@@ -0,0 +1,48 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelf2Test;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelfTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteConcurrentCacheDumpTest;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.DynamicSuite;
+import org.junit.runner.RunWith;
+
+/** */
+@RunWith(DynamicSuite.class)
+public class IgniteSnapshotTestSuite3 {
+ /** */
+ public static List<Class<?>> suite() {
+ List<Class<?>> suite = new ArrayList<>();
+
+ addSnapshotTests(suite, null);
+
+ return suite;
+ }
+
+ /** */
+ public static void addSnapshotTests(List<Class<?>> suite,
Collection<Class> ignoredTests) {
+ GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelfTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelf2Test.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteConcurrentCacheDumpTest.class, ignoredTests);
+ }
+}
