This is an automated email from the ASF dual-hosted git repository.
zstan 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 8078434198c IGNITE-28275 Split long running suites to achieve 30 min
per suite run (#12904)
8078434198c is described below
commit 8078434198c92161574cda78a7f511758bfc9b84
Author: Maksim Davydov <[email protected]>
AuthorDate: Tue Mar 24 12:11:14 2026 +0300
IGNITE-28275 Split long running suites to achieve 30 min per suite run
(#12904)
---
... => AbstractIgnitePdsCompressionTestSuite.java} | 28 ++--
.../testsuites/IgnitePdsCompressionTestSuite.java | 56 +-------
.../testsuites/IgnitePdsCompressionTestSuite2.java | 4 +-
...e2.java => IgnitePdsCompressionTestSuite3.java} | 6 +-
...e2.java => IgnitePdsCompressionTestSuite4.java} | 6 +-
...e2.java => IgnitePdsCompressionTestSuite5.java} | 18 ++-
...te.java => IgnitePdsCompressionTestSuite6.java} | 35 +----
...e2.java => IgnitePdsCompressionTestSuite7.java} | 6 +-
...e2.java => IgnitePdsCompressionTestSuite8.java} | 6 +-
...dsTestSuite2.java => IgnitePdsTestSuite10.java} | 139 ++++---------------
.../ignite/testsuites/IgnitePdsTestSuite2.java | 147 ++-------------------
.../ignite/testsuites/IgnitePdsTestSuite9.java | 93 +++++++++++++
.../ignite/testsuites/IgniteSnapshotTestSuite.java | 12 +-
.../testsuites/IgniteSnapshotTestSuite2.java | 30 ++---
.../testsuites/IgniteSnapshotTestSuite3.java | 24 ++--
...stSuite3.java => IgniteSnapshotTestSuite4.java} | 2 +-
...stSuite2.java => IgniteSnapshotTestSuite5.java} | 31 ++---
...estSuite.java => IgniteSnapshotTestSuite6.java} | 56 ++++----
.../testsuites/IgnitePdsNativeIoTestSuite2.java | 6 -
...uite2.java => IgnitePdsNativeIoTestSuite3.java} | 12 +-
.../testsuites/IgnitePdsNativeIoTestSuite4.java} | 11 +-
21 files changed, 246 insertions(+), 482 deletions(-)
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/AbstractIgnitePdsCompressionTestSuite.java
similarity index 58%
copy from
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
copy to
modules/compress/src/test/java/org/apache/ignite/testsuites/AbstractIgnitePdsCompressionTestSuite.java
index d86f20edc5a..90f98493d96 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/AbstractIgnitePdsCompressionTestSuite.java
@@ -17,25 +17,15 @@
package org.apache.ignite.testsuites;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.ignite.testframework.junits.DynamicSuite;
-import org.junit.runner.RunWith;
+import static
org.apache.ignite.IgniteSystemProperties.IGNITE_DEFAULT_DATA_STORAGE_PAGE_SIZE;
+import static
org.apache.ignite.IgniteSystemProperties.IGNITE_DEFAULT_DISK_PAGE_COMPRESSION;
+import static org.apache.ignite.configuration.DiskPageCompression.ZSTD;
-import static
org.apache.ignite.testsuites.IgnitePdsCompressionTestSuite.enableCompressionByDefault;
-
-/** */
-@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite2 {
- /**
- * @return Suite.
- */
- public static List<Class<?>> suite() {
- List<Class<?>> suite = new ArrayList<>();
-
- enableCompressionByDefault();
- IgnitePdsTestSuite2.addRealPageStoreTests(suite, null);
-
- return suite;
+/** Abstract class for Ignite PDS compression test suites. */
+public class AbstractIgnitePdsCompressionTestSuite {
+ /** */
+ static void enableCompressionByDefault() {
+ System.setProperty(IGNITE_DEFAULT_DISK_PAGE_COMPRESSION, ZSTD.name());
+ System.setProperty(IGNITE_DEFAULT_DATA_STORAGE_PAGE_SIZE,
String.valueOf(8 * 1024));
}
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java
index d9fb9221215..95f0c1e10fd 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java
@@ -18,74 +18,22 @@
package org.apache.ignite.testsuites;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsCheckpointRecoveryWithCompressionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgnitePdsCheckpointSimulationWithRealCpDisabledAndWalCompressionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionAndPageCompressionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRecoveryWithPageCompressionAndTdeTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRecoveryWithPageCompressionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.PlainSnapshotTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCompressionBasicTest;
-import
org.apache.ignite.internal.processors.compress.CompressionConfigurationTest;
-import org.apache.ignite.internal.processors.compress.CompressionProcessorTest;
-import
org.apache.ignite.internal.processors.compress.DiskPageCompressionConfigValidationTest;
-import
org.apache.ignite.internal.processors.compress.DiskPageCompressionIntegrationAsyncTest;
-import
org.apache.ignite.internal.processors.compress.DiskPageCompressionIntegrationTest;
-import org.apache.ignite.internal.processors.compress.FileSystemUtilsTest;
-import
org.apache.ignite.internal.processors.compress.WalPageCompressionIntegrationTest;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.IgniteSystemProperties.IGNITE_DEFAULT_DATA_STORAGE_PAGE_SIZE;
-import static
org.apache.ignite.IgniteSystemProperties.IGNITE_DEFAULT_DISK_PAGE_COMPRESSION;
-import static org.apache.ignite.configuration.DiskPageCompression.ZSTD;
-
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite {
+public class IgnitePdsCompressionTestSuite extends
AbstractIgnitePdsCompressionTestSuite {
/**
* @return Suite.
*/
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
- suite.add(CompressionConfigurationTest.class);
- suite.add(CompressionProcessorTest.class);
- suite.add(FileSystemUtilsTest.class);
- suite.add(DiskPageCompressionIntegrationTest.class);
- suite.add(DiskPageCompressionConfigValidationTest.class);
- suite.add(DiskPageCompressionIntegrationAsyncTest.class);
-
- // WAL page records compression.
- suite.add(WalPageCompressionIntegrationTest.class);
- suite.add(WalRecoveryWithPageCompressionTest.class);
- suite.add(WalRecoveryWithPageCompressionAndTdeTest.class);
-
suite.add(IgnitePdsCheckpointSimulationWithRealCpDisabledAndWalCompressionTest.class);
- suite.add(WalCompactionAndPageCompressionTest.class);
-
- // Checkpoint recovery.
- suite.add(IgnitePdsCheckpointRecoveryWithCompressionTest.class);
-
- // Snapshots.
- suite.add(SnapshotCompressionBasicTest.class);
-
- //Snapshot tests from common suites.
enableCompressionByDefault();
- IgniteSnapshotTestSuite.addSnapshotTests(suite,
Arrays.asList(PlainSnapshotTest.class, EncryptedSnapshotTest.class));
- IgniteSnapshotWithIndexingTestSuite.addSnapshotTests(suite, null);
-
- // PDS test suite with compression.
- IgnitePdsTestSuite.addRealPageStoreTests(suite, null);
+ IgniteSnapshotTestSuite.addSnapshotTests(suite, null);
return suite;
}
-
- /**
- */
- static void enableCompressionByDefault() {
- System.setProperty(IGNITE_DEFAULT_DISK_PAGE_COMPRESSION, ZSTD.name());
- System.setProperty(IGNITE_DEFAULT_DATA_STORAGE_PAGE_SIZE,
String.valueOf(8 * 1024));
- }
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
index d86f20edc5a..e14c9aa8843 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
@@ -22,11 +22,9 @@ import java.util.List;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.testsuites.IgnitePdsCompressionTestSuite.enableCompressionByDefault;
-
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite2 {
+public class IgnitePdsCompressionTestSuite2 extends
AbstractIgnitePdsCompressionTestSuite {
/**
* @return Suite.
*/
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite3.java
similarity index 85%
copy from
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
copy to
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite3.java
index d86f20edc5a..7b36e06c8df 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite3.java
@@ -22,11 +22,9 @@ import java.util.List;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.testsuites.IgnitePdsCompressionTestSuite.enableCompressionByDefault;
-
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite2 {
+public class IgnitePdsCompressionTestSuite3 extends
AbstractIgnitePdsCompressionTestSuite {
/**
* @return Suite.
*/
@@ -34,7 +32,7 @@ public class IgnitePdsCompressionTestSuite2 {
List<Class<?>> suite = new ArrayList<>();
enableCompressionByDefault();
- IgnitePdsTestSuite2.addRealPageStoreTests(suite, null);
+ IgnitePdsTestSuite.addRealPageStoreTests(suite, null);
return suite;
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite4.java
similarity index 85%
copy from
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
copy to
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite4.java
index d86f20edc5a..e4dbfc9c576 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite4.java
@@ -22,11 +22,9 @@ import java.util.List;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.testsuites.IgnitePdsCompressionTestSuite.enableCompressionByDefault;
-
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite2 {
+public class IgnitePdsCompressionTestSuite4 extends
AbstractIgnitePdsCompressionTestSuite {
/**
* @return Suite.
*/
@@ -34,7 +32,7 @@ public class IgnitePdsCompressionTestSuite2 {
List<Class<?>> suite = new ArrayList<>();
enableCompressionByDefault();
- IgnitePdsTestSuite2.addRealPageStoreTests(suite, null);
+ IgniteSnapshotTestSuite2.addSnapshotTests2(suite, null);
return suite;
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite5.java
similarity index 57%
copy from
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
copy to
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite5.java
index d86f20edc5a..981290a3b1f 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite5.java
@@ -19,22 +19,32 @@ package org.apache.ignite.testsuites;
import java.util.ArrayList;
import java.util.List;
+import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsCheckpointRecoveryWithCompressionTest;
+import
org.apache.ignite.internal.processors.compress.CompressionConfigurationTest;
+import org.apache.ignite.internal.processors.compress.CompressionProcessorTest;
+import
org.apache.ignite.internal.processors.compress.DiskPageCompressionIntegrationAsyncTest;
+import org.apache.ignite.internal.processors.compress.FileSystemUtilsTest;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.testsuites.IgnitePdsCompressionTestSuite.enableCompressionByDefault;
-
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite2 {
+public class IgnitePdsCompressionTestSuite5 extends
AbstractIgnitePdsCompressionTestSuite {
/**
* @return Suite.
*/
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
+ suite.add(CompressionConfigurationTest.class);
+ suite.add(CompressionProcessorTest.class);
+ suite.add(FileSystemUtilsTest.class);
+ suite.add(DiskPageCompressionIntegrationAsyncTest.class);
+
+ suite.add(IgnitePdsCheckpointRecoveryWithCompressionTest.class);
+
enableCompressionByDefault();
- IgnitePdsTestSuite2.addRealPageStoreTests(suite, null);
+ IgniteSnapshotTestSuite2.addSnapshotTests1(suite, null);
return suite;
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite6.java
similarity index 58%
copy from
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java
copy to
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite6.java
index d9fb9221215..fd83d54c24d 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite6.java
@@ -18,74 +18,41 @@
package org.apache.ignite.testsuites;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsCheckpointRecoveryWithCompressionTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgnitePdsCheckpointSimulationWithRealCpDisabledAndWalCompressionTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionAndPageCompressionTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRecoveryWithPageCompressionAndTdeTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRecoveryWithPageCompressionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.PlainSnapshotTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCompressionBasicTest;
-import
org.apache.ignite.internal.processors.compress.CompressionConfigurationTest;
-import org.apache.ignite.internal.processors.compress.CompressionProcessorTest;
import
org.apache.ignite.internal.processors.compress.DiskPageCompressionConfigValidationTest;
-import
org.apache.ignite.internal.processors.compress.DiskPageCompressionIntegrationAsyncTest;
import
org.apache.ignite.internal.processors.compress.DiskPageCompressionIntegrationTest;
-import org.apache.ignite.internal.processors.compress.FileSystemUtilsTest;
import
org.apache.ignite.internal.processors.compress.WalPageCompressionIntegrationTest;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.IgniteSystemProperties.IGNITE_DEFAULT_DATA_STORAGE_PAGE_SIZE;
-import static
org.apache.ignite.IgniteSystemProperties.IGNITE_DEFAULT_DISK_PAGE_COMPRESSION;
-import static org.apache.ignite.configuration.DiskPageCompression.ZSTD;
-
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite {
+public class IgnitePdsCompressionTestSuite6 extends
AbstractIgnitePdsCompressionTestSuite {
/**
* @return Suite.
*/
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
- suite.add(CompressionConfigurationTest.class);
- suite.add(CompressionProcessorTest.class);
- suite.add(FileSystemUtilsTest.class);
suite.add(DiskPageCompressionIntegrationTest.class);
suite.add(DiskPageCompressionConfigValidationTest.class);
- suite.add(DiskPageCompressionIntegrationAsyncTest.class);
- // WAL page records compression.
suite.add(WalPageCompressionIntegrationTest.class);
suite.add(WalRecoveryWithPageCompressionTest.class);
suite.add(WalRecoveryWithPageCompressionAndTdeTest.class);
suite.add(IgnitePdsCheckpointSimulationWithRealCpDisabledAndWalCompressionTest.class);
suite.add(WalCompactionAndPageCompressionTest.class);
- // Checkpoint recovery.
- suite.add(IgnitePdsCheckpointRecoveryWithCompressionTest.class);
-
- // Snapshots.
suite.add(SnapshotCompressionBasicTest.class);
- //Snapshot tests from common suites.
enableCompressionByDefault();
- IgniteSnapshotTestSuite.addSnapshotTests(suite,
Arrays.asList(PlainSnapshotTest.class, EncryptedSnapshotTest.class));
IgniteSnapshotWithIndexingTestSuite.addSnapshotTests(suite, null);
- // PDS test suite with compression.
- IgnitePdsTestSuite.addRealPageStoreTests(suite, null);
-
return suite;
}
-
- /**
- */
- static void enableCompressionByDefault() {
- System.setProperty(IGNITE_DEFAULT_DISK_PAGE_COMPRESSION, ZSTD.name());
- System.setProperty(IGNITE_DEFAULT_DATA_STORAGE_PAGE_SIZE,
String.valueOf(8 * 1024));
- }
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite7.java
similarity index 85%
copy from
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
copy to
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite7.java
index d86f20edc5a..6716bec9021 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite7.java
@@ -22,11 +22,9 @@ import java.util.List;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.testsuites.IgnitePdsCompressionTestSuite.enableCompressionByDefault;
-
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite2 {
+public class IgnitePdsCompressionTestSuite7 extends
AbstractIgnitePdsCompressionTestSuite {
/**
* @return Suite.
*/
@@ -34,7 +32,7 @@ public class IgnitePdsCompressionTestSuite2 {
List<Class<?>> suite = new ArrayList<>();
enableCompressionByDefault();
- IgnitePdsTestSuite2.addRealPageStoreTests(suite, null);
+ IgnitePdsTestSuite9.addRealPageStoreTests(suite, null);
return suite;
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite8.java
similarity index 85%
copy from
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
copy to
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite8.java
index d86f20edc5a..c8bf3936e49 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
+++
b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite8.java
@@ -22,11 +22,9 @@ import java.util.List;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.testsuites.IgnitePdsCompressionTestSuite.enableCompressionByDefault;
-
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite2 {
+public class IgnitePdsCompressionTestSuite8 extends
AbstractIgnitePdsCompressionTestSuite {
/**
* @return Suite.
*/
@@ -34,7 +32,7 @@ public class IgnitePdsCompressionTestSuite2 {
List<Class<?>> suite = new ArrayList<>();
enableCompressionByDefault();
- IgnitePdsTestSuite2.addRealPageStoreTests(suite, null);
+ IgnitePdsTestSuite10.addRealPageStoreTests(suite, null);
return suite;
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite10.java
similarity index 56%
copy from
modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
copy to
modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite10.java
index de17138ef67..3d7d09f4fdf 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite10.java
@@ -20,83 +20,48 @@ package org.apache.ignite.testsuites;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.ignite.cdc.CdcCacheConfigOnRestartTest;
import org.apache.ignite.cdc.CdcCacheVersionTest;
-import org.apache.ignite.cdc.CdcIgniteNodeActiveModeTest;
import org.apache.ignite.cdc.CdcManagerTest;
-import org.apache.ignite.cdc.CdcNonDefaultWorkDirTest;
-import org.apache.ignite.cdc.CdcPushMetricsExporterTest;
-import org.apache.ignite.cdc.CdcSelfTest;
-import org.apache.ignite.cdc.CorruptedCdcConsumerStateTest;
-import org.apache.ignite.cdc.RestartWithWalForceArchiveTimeoutTest;
-import org.apache.ignite.cdc.TransformedCdcSelfTest;
import org.apache.ignite.cdc.WalForCdcTest;
-import org.apache.ignite.cdc.WalRolloverOnStopTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.HistoricalRebalanceCheckpointTest;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.HistoricalRebalanceHeuristicsTest;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.HistoricalRebalanceTwoPartsInDifferentCheckpointsTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgniteDataStorageMetricsSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCorruptedStoreTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsExchangeDuringCheckpointTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsNoSpaceLeftOnDeviceTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsPageSizesTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsPartitionsStateRecoveryTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePersistentStoreDataStructuresTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgniteRebalanceScheduleResendPartitionsTest;
-import
org.apache.ignite.internal.processors.cache.persistence.WALPreloadingWithCompactionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.WalPreloadingConcurrentTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.FullHistRebalanceOnClientStopTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsRebalancingOnNotStableTopologyTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsReserveWalSegmentsTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsReserveWalSegmentsWithCompactionTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsWholeClusterRestartTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.IgniteShutdownOnSupplyMessageFailureTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.SlowHistoricalRebalanceSmallHistoryTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointFailBeforeWriteMarkTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointFreeListTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointListenerForRegionTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointStartLoggingTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointTimeoutLockTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.IgniteCheckpointDirtyPagesForLowLoadTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.LightweightCheckpointTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.filename.IgniteUidAsConsistentIdMigrationTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.FsyncWalRolloverDoesNotBlockTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteLocalWalSizeTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteNodeStoppedDuringDisableWALTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWALTailIsReachedDuringIterationOverArchiveTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushBackgroundSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushBackgroundWithMmapBufferSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushFailoverTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushLogOnlySelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushLogOnlyWithMmapBufferSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFormatFileFailoverTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalHistoryReservationsTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalIteratorExceptionDuringReadTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalIteratorSwitchSegmentTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRebalanceLoggingTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRecoverySeveralRestartsTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalReplayingAfterRestartTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalSerializerVersionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionNoArchiverTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionSwitchOnTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalDeletionArchiveFsyncTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalDeletionArchiveLogOnlyTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRolloverTypesTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WriteAheadLogManagerSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.reader.IgniteWalReaderTest;
-import
org.apache.ignite.internal.processors.cache.persistence.freelist.FreeListCachingTest;
-import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.FilteredWalIteratorTest;
import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneWalRecordsIteratorTest;
import
org.apache.ignite.internal.processors.cache.persistence.wal.scanner.WalScannerTest;
-import org.apache.ignite.internal.util.io.GridFileUtilsTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
/** */
@RunWith(DynamicSuite.class)
-public class IgnitePdsTestSuite2 {
+public class IgnitePdsTestSuite10 {
/**
* @return Suite.
*/
@@ -125,96 +90,40 @@ public class IgnitePdsTestSuite2 {
* @param ignoredTests Ignored tests.
*/
public static void addRealPageStoreTests(List<Class<?>> suite,
Collection<Class> ignoredTests) {
- GridTestUtils.addTestIfNeeded(suite,
StandaloneWalRecordsIteratorTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite, IgnitePdsPageSizesTest.class,
ignoredTests);
-
- // Metrics test.
+ GridTestUtils.addTestIfNeeded(suite, CdcCacheVersionTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, CdcManagerTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
CheckpointFailBeforeWriteMarkTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, CheckpointFreeListTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, CheckpointStartLoggingTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, CheckpointTimeoutLockTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
FullHistRebalanceOnClientStopTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceCheckpointTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteDataStorageMetricsSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IgniteLocalWalSizeTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteNodeStoppedDuringDisableWALTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsExchangeDuringCheckpointTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IgnitePdsPageSizesTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsPartitionsStateRecoveryTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsRebalancingOnNotStableTopologyTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsReserveWalSegmentsTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsWholeClusterRestartTest.class, ignoredTests);
-
- // Rebalancing test
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalHistoryReservationsTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
SlowHistoricalRebalanceSmallHistoryTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteShutdownOnSupplyMessageFailureTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgnitePersistentStoreDataStructuresTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
FullHistRebalanceOnClientStopTest.class, ignoredTests);
-
- // Failover test
- GridTestUtils.addTestIfNeeded(suite, IgniteWalFlushFailoverTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushBackgroundSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteRebalanceScheduleResendPartitionsTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteShutdownOnSupplyMessageFailureTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteUidAsConsistentIdMigrationTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWALTailIsReachedDuringIterationOverArchiveTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushBackgroundWithMmapBufferSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushLogOnlySelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushLogOnlyWithMmapBufferSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFormatFileFailoverTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsNoSpaceLeftOnDeviceTest.class, ignoredTests);
-
- // Test suite uses Standalone WAL iterator to verify PDS content.
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalHistoryReservationsTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, IgniteWalReaderTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsExchangeDuringCheckpointTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsReserveWalSegmentsTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsReserveWalSegmentsWithCompactionTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalRecoverySeveralRestartsTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteWalReplayingAfterRestartTest.class, ignoredTests);
-
- // CDC tests.
- GridTestUtils.addTestIfNeeded(suite, CdcSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, TransformedCdcSelfTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CdcCacheVersionTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
RestartWithWalForceArchiveTimeoutTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
CorruptedCdcConsumerStateTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalRolloverOnStopTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalForCdcTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
CdcCacheConfigOnRestartTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CdcNonDefaultWorkDirTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CdcManagerTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
CdcIgniteNodeActiveModeTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CdcPushMetricsExporterTest.class,
ignoredTests);
-
- // new style folders with generated consistent ID test
- GridTestUtils.addTestIfNeeded(suite,
IgniteUidAsConsistentIdMigrationTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteWalSerializerVersionTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalCompactionTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WalCompactionNoArchiverTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalCompactionSwitchOnTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
StandaloneWalRecordsIteratorTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
WalDeletionArchiveFsyncTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WalDeletionArchiveLogOnlyTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
IgniteCheckpointDirtyPagesForLowLoadTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCorruptedStoreTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
CheckpointFailBeforeWriteMarkTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CheckpointFreeListTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
CheckpointListenerForRegionTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, LightweightCheckpointTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CheckpointStartLoggingTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CheckpointTimeoutLockTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, FreeListCachingTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalIteratorSwitchSegmentTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalIteratorExceptionDuringReadTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteNodeStoppedDuringDisableWALTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, FilteredWalIteratorTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalScannerTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalRecoverySeveralRestartsTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteRebalanceScheduleResendPartitionsTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWALTailIsReachedDuringIterationOverArchiveTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, WalForCdcTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite, WalRolloverTypesTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
FsyncWalRolloverDoesNotBlockTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsPartitionsStateRecoveryTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WalPreloadingConcurrentTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WALPreloadingWithCompactionTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalRebalanceLoggingTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceHeuristicsTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite, IgniteLocalWalSizeTest.class,
ignoredTests);
-
+ GridTestUtils.addTestIfNeeded(suite, WalScannerTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
WriteAheadLogManagerSelfTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceTwoPartsInDifferentCheckpointsTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceCheckpointTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite, GridFileUtilsTest.class,
ignoredTests);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
index de17138ef67..cc0cc9e7ebc 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
@@ -21,74 +21,22 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.ignite.cdc.CdcCacheConfigOnRestartTest;
-import org.apache.ignite.cdc.CdcCacheVersionTest;
-import org.apache.ignite.cdc.CdcIgniteNodeActiveModeTest;
-import org.apache.ignite.cdc.CdcManagerTest;
import org.apache.ignite.cdc.CdcNonDefaultWorkDirTest;
import org.apache.ignite.cdc.CdcPushMetricsExporterTest;
import org.apache.ignite.cdc.CdcSelfTest;
-import org.apache.ignite.cdc.CorruptedCdcConsumerStateTest;
import org.apache.ignite.cdc.RestartWithWalForceArchiveTimeoutTest;
-import org.apache.ignite.cdc.TransformedCdcSelfTest;
-import org.apache.ignite.cdc.WalForCdcTest;
-import org.apache.ignite.cdc.WalRolloverOnStopTest;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.HistoricalRebalanceCheckpointTest;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.HistoricalRebalanceHeuristicsTest;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.HistoricalRebalanceTwoPartsInDifferentCheckpointsTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgniteDataStorageMetricsSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCorruptedStoreTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsExchangeDuringCheckpointTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsNoSpaceLeftOnDeviceTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsPageSizesTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsPartitionsStateRecoveryTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgnitePersistentStoreDataStructuresTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgniteRebalanceScheduleResendPartitionsTest;
import
org.apache.ignite.internal.processors.cache.persistence.WALPreloadingWithCompactionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.WalPreloadingConcurrentTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.FullHistRebalanceOnClientStopTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsRebalancingOnNotStableTopologyTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsReserveWalSegmentsTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsReserveWalSegmentsWithCompactionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsWholeClusterRestartTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.IgniteShutdownOnSupplyMessageFailureTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.SlowHistoricalRebalanceSmallHistoryTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointFailBeforeWriteMarkTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointFreeListTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointListenerForRegionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointStartLoggingTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.CheckpointTimeoutLockTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.IgniteCheckpointDirtyPagesForLowLoadTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.LightweightCheckpointTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.filename.IgniteUidAsConsistentIdMigrationTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.FsyncWalRolloverDoesNotBlockTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteLocalWalSizeTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteNodeStoppedDuringDisableWALTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWALTailIsReachedDuringIterationOverArchiveTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushBackgroundSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushBackgroundWithMmapBufferSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushFailoverTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushLogOnlySelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushLogOnlyWithMmapBufferSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFormatFileFailoverTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalHistoryReservationsTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalIteratorExceptionDuringReadTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalIteratorSwitchSegmentTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRebalanceLoggingTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRecoverySeveralRestartsTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalReplayingAfterRestartTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalSerializerVersionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionNoArchiverTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionSwitchOnTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalDeletionArchiveFsyncTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalDeletionArchiveLogOnlyTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRolloverTypesTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WriteAheadLogManagerSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.reader.IgniteWalReaderTest;
-import
org.apache.ignite.internal.processors.cache.persistence.freelist.FreeListCachingTest;
import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.FilteredWalIteratorTest;
-import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneWalRecordsIteratorTest;
-import
org.apache.ignite.internal.processors.cache.persistence.wal.scanner.WalScannerTest;
import org.apache.ignite.internal.util.io.GridFileUtilsTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
@@ -125,96 +73,23 @@ public class IgnitePdsTestSuite2 {
* @param ignoredTests Ignored tests.
*/
public static void addRealPageStoreTests(List<Class<?>> suite,
Collection<Class> ignoredTests) {
- GridTestUtils.addTestIfNeeded(suite,
StandaloneWalRecordsIteratorTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite, IgnitePdsPageSizesTest.class,
ignoredTests);
-
- // Metrics test.
- GridTestUtils.addTestIfNeeded(suite,
IgniteDataStorageMetricsSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsRebalancingOnNotStableTopologyTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsWholeClusterRestartTest.class, ignoredTests);
-
- // Rebalancing test
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalHistoryReservationsTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
SlowHistoricalRebalanceSmallHistoryTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteShutdownOnSupplyMessageFailureTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePersistentStoreDataStructuresTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
FullHistRebalanceOnClientStopTest.class, ignoredTests);
-
- // Failover test
- GridTestUtils.addTestIfNeeded(suite, IgniteWalFlushFailoverTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushBackgroundSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushBackgroundWithMmapBufferSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushLogOnlySelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushLogOnlyWithMmapBufferSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalFormatFileFailoverTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsNoSpaceLeftOnDeviceTest.class, ignoredTests);
-
- // Test suite uses Standalone WAL iterator to verify PDS content.
- GridTestUtils.addTestIfNeeded(suite, IgniteWalReaderTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsExchangeDuringCheckpointTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsReserveWalSegmentsTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsReserveWalSegmentsWithCompactionTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalReplayingAfterRestartTest.class, ignoredTests);
-
- // CDC tests.
- GridTestUtils.addTestIfNeeded(suite, CdcSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, TransformedCdcSelfTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CdcCacheVersionTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
RestartWithWalForceArchiveTimeoutTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
CorruptedCdcConsumerStateTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalRolloverOnStopTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalForCdcTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
CdcCacheConfigOnRestartTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, CdcNonDefaultWorkDirTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CdcManagerTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
CdcIgniteNodeActiveModeTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, CdcPushMetricsExporterTest.class,
ignoredTests);
-
- // new style folders with generated consistent ID test
- GridTestUtils.addTestIfNeeded(suite,
IgniteUidAsConsistentIdMigrationTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalSerializerVersionTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalCompactionTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WalCompactionNoArchiverTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalCompactionSwitchOnTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WalDeletionArchiveFsyncTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WalDeletionArchiveLogOnlyTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
IgniteCheckpointDirtyPagesForLowLoadTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCorruptedStoreTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
CheckpointFailBeforeWriteMarkTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CheckpointFreeListTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, CdcSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
CheckpointListenerForRegionTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, LightweightCheckpointTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CheckpointStartLoggingTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, CheckpointTimeoutLockTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, FreeListCachingTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalIteratorSwitchSegmentTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalIteratorExceptionDuringReadTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteNodeStoppedDuringDisableWALTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, FilteredWalIteratorTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalScannerTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalRecoverySeveralRestartsTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteRebalanceScheduleResendPartitionsTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteWALTailIsReachedDuringIterationOverArchiveTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, WalRolloverTypesTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
FsyncWalRolloverDoesNotBlockTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgnitePdsPartitionsStateRecoveryTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WalPreloadingConcurrentTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
WALPreloadingWithCompactionTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
IgniteWalRebalanceLoggingTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceHeuristicsTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite, IgniteLocalWalSizeTest.class,
ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
WriteAheadLogManagerSelfTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceTwoPartsInDifferentCheckpointsTest.class, ignoredTests);
-
- GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceCheckpointTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite, GridFileUtilsTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCheckpointDirtyPagesForLowLoadTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCorruptedStoreTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsNoSpaceLeftOnDeviceTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushBackgroundSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalIteratorExceptionDuringReadTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalRebalanceLoggingTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
RestartWithWalForceArchiveTimeoutTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
SlowHistoricalRebalanceSmallHistoryTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
WALPreloadingWithCompactionTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, WalCompactionTest.class,
ignoredTests);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite9.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite9.java
new file mode 100644
index 00000000000..08dd3f17267
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite9.java
@@ -0,0 +1,93 @@
+/*
+ * 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.cdc.CdcIgniteNodeActiveModeTest;
+import org.apache.ignite.cdc.CorruptedCdcConsumerStateTest;
+import org.apache.ignite.cdc.TransformedCdcSelfTest;
+import org.apache.ignite.cdc.WalRolloverOnStopTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.HistoricalRebalanceHeuristicsTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.HistoricalRebalanceTwoPartsInDifferentCheckpointsTest;
+import
org.apache.ignite.internal.processors.cache.persistence.WalPreloadingConcurrentTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsReserveWalSegmentsWithCompactionTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.LightweightCheckpointTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushFailoverTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushLogOnlySelfTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushLogOnlyWithMmapBufferSelfTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalIteratorSwitchSegmentTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionNoArchiverTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionSwitchOnTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalDeletionArchiveLogOnlyTest;
+import
org.apache.ignite.internal.processors.cache.persistence.freelist.FreeListCachingTest;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.DynamicSuite;
+import org.junit.runner.RunWith;
+
+/** */
+@RunWith(DynamicSuite.class)
+public class IgnitePdsTestSuite9 {
+ /**
+ * @return Suite.
+ */
+ public static List<Class<?>> suite() {
+ return suite(null);
+ }
+
+ /**
+ * @param ignoredTests Tests to ignore.
+ * @return Test suite.
+ */
+ public static List<Class<?>> suite(Collection<Class> ignoredTests) {
+ List<Class<?>> suite = new ArrayList<>();
+
+ addRealPageStoreTests(suite, ignoredTests);
+
+ return suite;
+ }
+
+ /**
+ * Fills {@code suite} with PDS test subset, which operates with real page
store and does actual disk operations.
+ *
+ * NOTE: These tests are also executed using I/O plugins.
+ *
+ * @param suite suite to add tests into.
+ * @param ignoredTests Ignored tests.
+ */
+ public static void addRealPageStoreTests(List<Class<?>> suite,
Collection<Class> ignoredTests) {
+ GridTestUtils.addTestIfNeeded(suite,
CdcIgniteNodeActiveModeTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
CorruptedCdcConsumerStateTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, FreeListCachingTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceHeuristicsTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
HistoricalRebalanceTwoPartsInDifferentCheckpointsTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsReserveWalSegmentsWithCompactionTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IgniteWalFlushFailoverTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushLogOnlySelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushLogOnlyWithMmapBufferSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalIteratorSwitchSegmentTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, LightweightCheckpointTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, TransformedCdcSelfTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
WalCompactionNoArchiverTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, WalCompactionSwitchOnTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
WalDeletionArchiveLogOnlyTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
WalPreloadingConcurrentTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, WalRolloverOnStopTest.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/IgniteSnapshotTestSuite.java
index a3c2567e3d2..75f4a6d9392 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,11 +20,7 @@ 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.IgniteClusterSnapshotCheckTest;
-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.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.IgniteSnapshotRestoreFromRemoteMdcTest;
@@ -49,16 +45,12 @@ 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,
IgniteSnapshotManagerSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotRemoteRequestTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotRestoreFromRemoteMdcTest.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,
IgniteSnapshotRollingUpgradeTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotWithMetastorageTest.class, ignoredTests);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
index d4a5716619d..71165886a9d 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
@@ -20,12 +20,10 @@ 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.IgniteClusterSnapshotDeltaTest;
-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.PlainSnapshotTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotCheckTest;
+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.IgniteSnapshotMXBeanTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
@@ -37,19 +35,21 @@ public class IgniteSnapshotTestSuite2 {
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
- addSnapshotTests(suite, null);
+ addSnapshotTests1(suite, null);
+ addSnapshotTests2(suite, null);
return suite;
}
/** */
- public static void addSnapshotTests(List<Class<?>> suite,
Collection<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);
+ public static void addSnapshotTests1(List<Class<?>> suite,
Collection<Class> ignoredTests) {
+ GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotCheckTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotHandlerTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IgniteSnapshotMXBeanTest.class,
ignoredTests);
+ }
+
+ /** */
+ public static void addSnapshotTests2(List<Class<?>> suite,
Collection<Class> ignoredTests) {
+ GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotRestoreSelfTest.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
index 82626fde340..c02b0fee4b3 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java
@@ -20,12 +20,12 @@ 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.BufferedFileIOTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpDataStructuresTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpFilterTest;
-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.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotDeltaTest;
+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.PlainSnapshotTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
@@ -44,11 +44,11 @@ public class IgniteSnapshotTestSuite3 {
/** */
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,
IgniteCacheDumpDataStructuresTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
IgniteConcurrentCacheDumpTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpFilterTest.class,
ignoredTests);
- GridTestUtils.addTestIfNeeded(suite, BufferedFileIOTest.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);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite4.java
similarity index 98%
copy from
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java
copy to
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite4.java
index 82626fde340..633db0b11c8 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite3.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite4.java
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
/** */
@RunWith(DynamicSuite.class)
-public class IgniteSnapshotTestSuite3 {
+public class IgniteSnapshotTestSuite4 {
/** */
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite5.java
similarity index 63%
copy from
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
copy to
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite5.java
index d4a5716619d..a73b223cb29 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite5.java
@@ -20,19 +20,21 @@ 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.IgniteClusterSnapshotDeltaTest;
-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.PlainSnapshotTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotMetricTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotJoiningClientTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotNoBackupMessagesBlockingTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotSingleBackupMessagesBlockingTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotTwoBackupMessagesBlockingTest;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotTxRecoveryTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-/** */
+/**
+ * Test suite for incremental snapshots.
+ */
@RunWith(DynamicSuite.class)
-public class IgniteSnapshotTestSuite2 {
+public class IgniteSnapshotTestSuite5 {
/** */
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
@@ -44,12 +46,11 @@ public class IgniteSnapshotTestSuite2 {
/** */
public static void addSnapshotTests(List<Class<?>> suite,
Collection<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,
IncrementalSnapshotJoiningClientTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotMetricTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotNoBackupMessagesBlockingTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotSingleBackupMessagesBlockingTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotTwoBackupMessagesBlockingTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotTxRecoveryTest.class, ignoredTests);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IncrementalSnapshotsTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite6.java
similarity index 56%
rename from
modules/core/src/test/java/org/apache/ignite/testsuites/IncrementalSnapshotsTestSuite.java
rename to
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite6.java
index c81f3daa608..77b41aef682 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IncrementalSnapshotsTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite6.java
@@ -17,46 +17,48 @@
package org.apache.ignite.testsuites;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotMetricTest;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotRebalanceTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.ConcurrentTxsIncrementalSnapshotTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotCheckBeforeRestoreTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotJoiningClientTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotNoBackupMessagesBlockingTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotNoBackupWALBlockingTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotNodeFailureTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotRestoreTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotSingleBackupMessagesBlockingTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotSingleBackupWALBlockingTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotTwoBackupMessagesBlockingTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotTwoBackupWALBlockingTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotTxRecoveryTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.incremental.IncrementalSnapshotWarnAtomicCachesTest;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
/**
* Test suite for incremental snapshots.
*/
-@RunWith(Suite.class)
[email protected]({
- IncrementalSnapshotNoBackupMessagesBlockingTest.class,
- IncrementalSnapshotSingleBackupMessagesBlockingTest.class,
- IncrementalSnapshotTwoBackupMessagesBlockingTest.class,
- IncrementalSnapshotNoBackupWALBlockingTest.class,
- IncrementalSnapshotSingleBackupWALBlockingTest.class,
- IncrementalSnapshotTwoBackupWALBlockingTest.class,
- ConcurrentTxsIncrementalSnapshotTest.class,
- IncrementalSnapshotNodeFailureTest.class,
- IncrementalSnapshotTxRecoveryTest.class,
- IncrementalSnapshotTest.class,
- IncrementalSnapshotJoiningClientTest.class,
- IncrementalSnapshotRestoreTest.class,
- IncrementalSnapshotCheckBeforeRestoreTest.class,
- IncrementalSnapshotWarnAtomicCachesTest.class,
- IncrementalSnapshotRebalanceTest.class,
- IncrementalSnapshotMetricTest.class
-})
-public class IncrementalSnapshotsTestSuite {
+@RunWith(DynamicSuite.class)
+public class IgniteSnapshotTestSuite6 {
+ /** */
+ 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,
ConcurrentTxsIncrementalSnapshotTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotCheckBeforeRestoreTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotNoBackupWALBlockingTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotNodeFailureTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotRebalanceTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotRestoreTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotSingleBackupWALBlockingTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IncrementalSnapshotTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotTwoBackupWALBlockingTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotWarnAtomicCachesTest.class, ignoredTests);
+ }
}
diff --git
a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java
b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java
index 714b562146a..8a209e033f2 100644
---
a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java
+++
b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java
@@ -19,8 +19,6 @@ package org.apache.ignite.testsuites;
import java.util.ArrayList;
import java.util.List;
import
org.apache.ignite.internal.processors.cache.persistence.DiskPageCompressionIntegrationDirectIOTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoPdsRecoveryAfterFileCorruptionTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteNativeIoWalFlushFsyncSelfTest;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
@@ -42,10 +40,6 @@ public class IgnitePdsNativeIoTestSuite2 {
suite.add(DiskPageCompressionIntegrationDirectIOTest.class);
//Integrity test with reduced count of pages.
- suite.add(IgniteNativeIoPdsRecoveryAfterFileCorruptionTest.class);
-
-
suite.add(IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.class);
-
suite.add(IgniteNativeIoWalFlushFsyncSelfTest.class);
return suite;
diff --git
a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java
b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite3.java
similarity index 77%
copy from
modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java
copy to
modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite3.java
index 714b562146a..fdd41c71902 100644
---
a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java
+++
b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite3.java
@@ -14,14 +14,13 @@
* 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.List;
-import
org.apache.ignite.internal.processors.cache.persistence.DiskPageCompressionIntegrationDirectIOTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoPdsRecoveryAfterFileCorruptionTest;
-import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteNativeIoWalFlushFsyncSelfTest;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
@@ -29,25 +28,20 @@ import org.junit.runner.RunWith;
* Same as {@link IgnitePdsTestSuite2} but is started with direct-oi jar in
classpath.
*/
@RunWith(DynamicSuite.class)
-public class IgnitePdsNativeIoTestSuite2 {
+public class IgnitePdsNativeIoTestSuite3 {
/**
* @return Suite.
*/
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
- IgnitePdsTestSuite2.addRealPageStoreTests(suite, null);
-
- // Direct IO + Page compression.
- suite.add(DiskPageCompressionIntegrationDirectIOTest.class);
+ IgnitePdsTestSuite9.addRealPageStoreTests(suite, null);
//Integrity test with reduced count of pages.
suite.add(IgniteNativeIoPdsRecoveryAfterFileCorruptionTest.class);
suite.add(IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.class);
- suite.add(IgniteNativeIoWalFlushFsyncSelfTest.class);
-
return suite;
}
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite4.java
similarity index 82%
copy from
modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
copy to
modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite4.java
index d86f20edc5a..222cb250e8b 100644
---
a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite2.java
+++
b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite4.java
@@ -22,19 +22,18 @@ import java.util.List;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
-import static
org.apache.ignite.testsuites.IgnitePdsCompressionTestSuite.enableCompressionByDefault;
-
-/** */
+/**
+ * Same as {@link IgnitePdsTestSuite2} but is started with direct-oi jar in
classpath.
+ */
@RunWith(DynamicSuite.class)
-public class IgnitePdsCompressionTestSuite2 {
+public class IgnitePdsNativeIoTestSuite4 {
/**
* @return Suite.
*/
public static List<Class<?>> suite() {
List<Class<?>> suite = new ArrayList<>();
- enableCompressionByDefault();
- IgnitePdsTestSuite2.addRealPageStoreTests(suite, null);
+ IgnitePdsTestSuite10.addRealPageStoreTests(suite, null);
return suite;
}
