http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTxRecoverySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTxRecoverySelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTxRecoverySelfTestSuite.java index 2cceda3..2e0163b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTxRecoverySelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTxRecoverySelfTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedTxOriginatingNodeFailureSelfTest; @@ -32,36 +30,29 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNea import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxOriginatingNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Tx recovery self test suite. */ -@RunWith(AllTests.class) -public class IgniteCacheTxRecoverySelfTestSuite { - /** - * @return Cache API test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Cache tx recovery test suite"); - - suite.addTest(new JUnit4TestAdapter(IgniteCacheCommitDelayTxRecoveryTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteCacheCommitDelayTxRecoveryTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedPrimaryNodeFailureRecoveryTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedNearDisabledPrimaryNodeFailureRecoveryTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedTwoBackupsPrimaryNodeFailureRecoveryTest.class)); + IgniteCachePartitionedPrimaryNodeFailureRecoveryTest.class, + IgniteCachePartitionedNearDisabledPrimaryNodeFailureRecoveryTest.class, + IgniteCachePartitionedTwoBackupsPrimaryNodeFailureRecoveryTest.class, - suite.addTest(new JUnit4TestAdapter(GridCachePartitionedTxOriginatingNodeFailureSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedTxOriginatingNodeFailureSelfTest.class)); + GridCachePartitionedTxOriginatingNodeFailureSelfTest.class, + GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.class, + GridCacheReplicatedTxOriginatingNodeFailureSelfTest.class, - suite.addTest(new JUnit4TestAdapter(GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.class)); + GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.class, + GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.class, + GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteCacheTxRecoveryRollbackTest.class)); - suite.addTest(new JUnit4TestAdapter(TxRecoveryStoreEnabledTest.class)); - - return suite; - } + IgniteCacheTxRecoveryRollbackTest.class, + TxRecoveryStoreEnabledTest.class +}) +public class IgniteCacheTxRecoverySelfTestSuite { }
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java index 58e485d..6eef3f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java @@ -17,31 +17,18 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeConcurrentStart; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientReconnectTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheManyClientsTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; -/** - * - */ -@RunWith(AllTests.class) +/** */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteCacheManyClientsTest.class, + IgniteCacheClientNodeConcurrentStart.class, + IgniteCacheClientReconnectTest.class +}) public class IgniteClientNodesTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Client Nodes Reconnect Test Suite"); - - suite.addTest(IgniteClientReconnectTestSuite.suite()); - - suite.addTest(new JUnit4TestAdapter(IgniteCacheManyClientsTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheClientNodeConcurrentStart.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheClientReconnectTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java index 908aa36..4c07262 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.IgniteClientConnectAfterCommunicationFailureTest; import org.apache.ignite.internal.IgniteClientReconnectApiExceptionTest; import org.apache.ignite.internal.IgniteClientReconnectAtomicsTest; @@ -35,35 +33,26 @@ import org.apache.ignite.internal.IgniteClientReconnectStopTest; import org.apache.ignite.internal.IgniteClientReconnectStreamerTest; import org.apache.ignite.internal.IgniteClientRejoinTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; -/** - * - */ -@RunWith(AllTests.class) +/** */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteClientConnectAfterCommunicationFailureTest.class, + IgniteClientReconnectStopTest.class, + IgniteClientReconnectApiExceptionTest.class, + IgniteClientReconnectDiscoveryStateTest.class, + IgniteClientReconnectCacheTest.class, + IgniteClientReconnectDelayedSpiTest.class, + IgniteClientReconnectBinaryContexTest.class, + IgniteClientReconnectContinuousProcessorTest.class, + IgniteClientReconnectComputeTest.class, + IgniteClientReconnectAtomicsTest.class, + IgniteClientReconnectCollectionsTest.class, + IgniteClientReconnectServicesTest.class, + IgniteClientReconnectStreamerTest.class, + IgniteClientReconnectFailoverTest.class, + IgniteClientRejoinTest.class +}) public class IgniteClientReconnectTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Client Reconnect Test Suite"); - - suite.addTest(new JUnit4TestAdapter(IgniteClientConnectAfterCommunicationFailureTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectStopTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectApiExceptionTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectDiscoveryStateTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectCacheTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectDelayedSpiTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectBinaryContexTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectContinuousProcessorTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectComputeTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectAtomicsTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectCollectionsTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectServicesTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectStreamerTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectFailoverTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientRejoinTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest.java index edf0279..b635ac0 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.processors.hadoop.impl.igfs; +import org.junit.Ignore; + import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC; /** * IGFS Hadoop file system IPC shmem self test in DUAL_ASYNC mode. */ +@Ignore("https://issues.apache.org/jira/browse/IGNITE-5691";) public class IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest extends IgniteHadoopFileSystemShmemAbstractSelfTest { /** @@ -32,7 +35,7 @@ public class IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest } /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5691";); + @Override protected void beforeTest() { + // No-op. } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java index 84fb7fc..4a34153 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java @@ -41,6 +41,7 @@ import org.apache.ignite.internal.processors.hadoop.impl.HadoopAbstractSelfTest; import org.apache.ignite.internal.processors.hadoop.HadoopJobId; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.marshaller.jdk.JdkMarshaller; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -51,6 +52,7 @@ import static org.apache.ignite.internal.processors.hadoop.impl.HadoopUtils.crea * Job tracker self test. */ @RunWith(JUnit4.class) +@Ignore("https://issues.apache.org/jira/browse/IGNITE-404";) public class HadoopExternalTaskExecutionSelfTest extends HadoopAbstractSelfTest { /** {@inheritDoc} */ @Override protected boolean igfsEnabled() { @@ -59,8 +61,6 @@ public class HadoopExternalTaskExecutionSelfTest extends HadoopAbstractSelfTest /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-404";); - super.beforeTest(); startGrids(gridCount()); http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/communication/HadoopExternalCommunicationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/communication/HadoopExternalCommunicationSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/communication/HadoopExternalCommunicationSelfTest.java index d663fa1..984f6dd 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/communication/HadoopExternalCommunicationSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/communication/HadoopExternalCommunicationSelfTest.java @@ -36,6 +36,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -44,10 +45,11 @@ import org.junit.runners.JUnit4; * Tests Hadoop external communication component. */ @RunWith(JUnit4.class) +@Ignore("https://issues.apache.org/jira/browse/IGNITE-404";) public class HadoopExternalCommunicationSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-404";); + @Override protected void beforeTest() { + // No-op. } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java index 84f2f7b..7425238 100644 --- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java +++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java @@ -17,23 +17,21 @@ package org.apache.ignite.testsuites; -import junit.framework.TestSuite; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; +import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; -/** - * - */ -@RunWith(AllTests.class) +/** */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteHibernateTestSuite.class +}) public class IgniteBinaryHibernateTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { + /** */ + @BeforeClass + public static void init() { GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteHibernateTestSuite.suite(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java index 436203a..9f83514 100644 --- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java +++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.cache.hibernate.HibernateL2CacheConfigurationSelfTest; import org.apache.ignite.cache.hibernate.HibernateL2CacheMultiJvmTest; import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest; @@ -30,35 +28,27 @@ import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreSelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListenerSelfTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Hibernate integration tests. */ -@RunWith(AllTests.class) -public class IgniteHibernateTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Hibernate Integration Test Suite"); - - // Hibernate L2 cache. - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheTransactionalSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheTransactionalUseSyncSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheConfigurationSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheStrategySelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheMultiJvmTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + HibernateL2CacheSelfTest.class, + HibernateL2CacheTransactionalSelfTest.class, + HibernateL2CacheTransactionalUseSyncSelfTest.class, + HibernateL2CacheConfigurationSelfTest.class, + HibernateL2CacheStrategySelfTest.class, + HibernateL2CacheMultiJvmTest.class, - suite.addTest(new JUnit4TestAdapter(CacheHibernateBlobStoreSelfTest.class)); + CacheHibernateBlobStoreSelfTest.class, - suite.addTest(new JUnit4TestAdapter(CacheHibernateBlobStoreNodeRestartTest.class)); + CacheHibernateBlobStoreNodeRestartTest.class, - suite.addTest(new JUnit4TestAdapter(CacheHibernateStoreSessionListenerSelfTest.class)); + CacheHibernateStoreSessionListenerSelfTest.class, - suite.addTest(new JUnit4TestAdapter(CacheHibernateStoreFactorySelfTest.class)); - - return suite; - } + CacheHibernateStoreFactorySelfTest.class +}) +public class IgniteHibernateTestSuite { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java index 40ee896..2a33e08 100644 --- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java +++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java @@ -17,23 +17,21 @@ package org.apache.ignite.testsuites; -import junit.framework.TestSuite; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; +import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; -/** - * - */ -@RunWith(AllTests.class) +/** */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteHibernate5TestSuite.class +}) public class IgniteBinaryHibernate5TestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { + /** */ + @BeforeClass + public static void init() { GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteHibernate5TestSuite.suite(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java index f87e676..03442ae 100644 --- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java +++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.cache.hibernate.HibernateL2CacheConfigurationSelfTest; import org.apache.ignite.cache.hibernate.HibernateL2CacheMultiJvmTest; import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest; @@ -30,35 +28,27 @@ import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreSelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListenerSelfTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Hibernate integration tests. */ -@RunWith(AllTests.class) -public class IgniteHibernate5TestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Hibernate5 Integration Test Suite"); - - // Hibernate L2 cache. - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheTransactionalSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheTransactionalUseSyncSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheConfigurationSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheStrategySelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheMultiJvmTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + HibernateL2CacheSelfTest.class, + HibernateL2CacheTransactionalSelfTest.class, + HibernateL2CacheTransactionalUseSyncSelfTest.class, + HibernateL2CacheConfigurationSelfTest.class, + HibernateL2CacheStrategySelfTest.class, + HibernateL2CacheMultiJvmTest.class, - suite.addTest(new JUnit4TestAdapter(CacheHibernateBlobStoreSelfTest.class)); + CacheHibernateBlobStoreSelfTest.class, - suite.addTest(new JUnit4TestAdapter(CacheHibernateBlobStoreNodeRestartTest.class)); + CacheHibernateBlobStoreNodeRestartTest.class, - suite.addTest(new JUnit4TestAdapter(CacheHibernateStoreSessionListenerSelfTest.class)); + CacheHibernateStoreSessionListenerSelfTest.class, - suite.addTest(new JUnit4TestAdapter(CacheHibernateStoreFactorySelfTest.class)); - - return suite; - } + CacheHibernateStoreFactorySelfTest.class +}) +public class IgniteHibernate5TestSuite { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate53TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate53TestSuite.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate53TestSuite.java index 51842a8..6ce688c 100644 --- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate53TestSuite.java +++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate53TestSuite.java @@ -17,21 +17,21 @@ package org.apache.ignite.testsuites; -import junit.framework.TestSuite; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -/** - * - */ -public class IgniteBinaryHibernate53TestSuite extends TestSuite { - /** - * @return Test suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { +/** */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteHibernate53TestSuite.class +}) +public class IgniteBinaryHibernate53TestSuite { + /** */ + @BeforeClass + public static void init() { GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteHibernate53TestSuite.suite(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteHibernate53TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteHibernate53TestSuite.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteHibernate53TestSuite.java index 794cffe..bd0c003 100644 --- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteHibernate53TestSuite.java +++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteHibernate53TestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.cache.hibernate.HibernateL2CacheConfigurationSelfTest; import org.apache.ignite.cache.hibernate.HibernateL2CacheMultiJvmTest; import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest; @@ -29,33 +27,24 @@ import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreNodeRestar import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreSelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListenerSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Hibernate integration tests. */ -public class IgniteHibernate53TestSuite extends TestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Hibernate5 Integration Test Suite"); - - // Hibernate L2 cache. - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheTransactionalSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheTransactionalUseSyncSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheConfigurationSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheStrategySelfTest.class)); - suite.addTest(new JUnit4TestAdapter(HibernateL2CacheMultiJvmTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheHibernateBlobStoreSelfTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheHibernateBlobStoreNodeRestartTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheHibernateStoreSessionListenerSelfTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheHibernateStoreFactorySelfTest.class)); - - return suite; - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ + HibernateL2CacheSelfTest.class, + HibernateL2CacheTransactionalSelfTest.class, + HibernateL2CacheTransactionalUseSyncSelfTest.class, + HibernateL2CacheConfigurationSelfTest.class, + HibernateL2CacheStrategySelfTest.class, + HibernateL2CacheMultiJvmTest.class, + CacheHibernateBlobStoreSelfTest.class, + CacheHibernateBlobStoreNodeRestartTest.class, + CacheHibernateStoreSessionListenerSelfTest.class, + CacheHibernateStoreFactorySelfTest.class +}) +public class IgniteHibernate53TestSuite { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java index 9b470f7..2b1d304 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest; import org.apache.ignite.internal.processors.cache.IgniteCacheLockPartitionOnAffinityRunTest; import org.apache.ignite.internal.processors.cache.IgniteCacheLockPartitionOnAffinityRunTxCacheOpTest; @@ -26,27 +24,20 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheLockPartitionOnAff import org.apache.ignite.internal.processors.database.baseline.IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest; import org.apache.ignite.internal.processors.database.baseline.IgniteBaselineLockPartitionOnAffinityRunTxCacheTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Compute and Cache tests for affinityRun/Call. These tests is extracted into separate suite * because ones take a lot of time. */ -@RunWith(AllTests.class) +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteCacheLockPartitionOnAffinityRunTest.class, + IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.class, + IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.class, + IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.class, + IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.class, + IgniteCacheLockPartitionOnAffinityRunTxCacheOpTest.class +}) public class IgniteCacheAffinityRunTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Compute and Cache Affinity Run Test Suite"); - - suite.addTest(new JUnit4TestAdapter(IgniteCacheLockPartitionOnAffinityRunTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheLockPartitionOnAffinityRunTxCacheOpTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java index c9cd54c..bdc7664 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest; @@ -74,98 +72,88 @@ import org.apache.ignite.internal.processors.query.h2.GridIndexRebuildWithMvccEn import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT; -/** - * - */ -@RunWith(AllTests.class) +/** */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + // Simple tests. + MvccEmptyTransactionSelfTest.class, + CacheMvccSqlConfigurationValidationTest.class, + CacheMvccDmlSimpleTest.class, + SqlTransactionsCommandsWithMvccEnabledSelfTest.class, + CacheMvccSizeTest.class, + CacheMvccSqlUpdateCountersTest.class, + CacheMvccSqlLockTimeoutTest.class, + + GridIndexRebuildWithMvccEnabledSelfTest.class, + + CacheMvccTxNodeMappingTest.class, + + // SQL vs CacheAPI consistency. + MvccRepeatableReadOperationsTest.class, + MvccRepeatableReadBulkOpsTest.class, + + // JDBC tests. + CacheMvccSizeWithConcurrentJdbcTransactionTest.class, + CacheMvccScanQueryWithConcurrentJdbcTransactionTest.class, + CacheMvccLocalEntriesWithConcurrentJdbcTransactionTest.class, + CacheMvccIteratorWithConcurrentJdbcTransactionTest.class, + + // Load tests. + CacheMvccBulkLoadTest.class, + CacheMvccStreamingInsertTest.class, + + CacheMvccPartitionedSqlQueriesTest.class, + CacheMvccReplicatedSqlQueriesTest.class, + CacheMvccPartitionedSqlTxQueriesTest.class, + CacheMvccReplicatedSqlTxQueriesTest.class, + + CacheMvccPartitionedSqlTxQueriesWithReducerTest.class, + CacheMvccReplicatedSqlTxQueriesWithReducerTest.class, + CacheMvccPartitionedSelectForUpdateQueryTest.class, + CacheMvccReplicatedSelectForUpdateQueryTest.class, + + // Failover tests. + CacheMvccPartitionedBackupsTest.class, + CacheMvccReplicatedBackupsTest.class, + + CacheMvccPartitionedSqlCoordinatorFailoverTest.class, + CacheMvccReplicatedSqlCoordinatorFailoverTest.class, + + // Continuous queries. + CacheMvccBasicContinuousQueryTest.class, + CacheMvccContinuousQueryPartitionedSelfTest.class, + CacheMvccContinuousQueryReplicatedSelfTest.class, + CacheMvccSqlContinuousQueryPartitionedSelfTest.class, + CacheMvccSqlContinuousQueryReplicatedSelfTest.class, + + CacheMvccContinuousQueryPartitionedTxOneNodeTest.class, + CacheMvccContinuousQueryReplicatedTxOneNodeTest.class, + + CacheMvccContinuousQueryClientReconnectTest.class, + CacheMvccContinuousQueryClientTest.class, + + CacheMvccContinuousQueryMultiNodesFilteringTest.class, + CacheMvccContinuousQueryBackupQueueTest.class, + CacheMvccContinuousQueryImmutableEntryTest.class, + CacheMvccClientReconnectContinuousQueryTest.class, + + CacheMvccContinuousWithTransformerClientSelfTest.class, + CacheMvccContinuousWithTransformerPartitionedSelfTest.class, + CacheMvccContinuousWithTransformerReplicatedSelfTest.class, + + // Transaction recovery. + CacheMvccTxRecoveryTest.class, + + IgniteCacheMvccSqlTestSuite.MvccPartitionedPrimaryNodeFailureRecoveryTest.class, + IgniteCacheMvccSqlTestSuite.MvccPartitionedTwoBackupsPrimaryNodeFailureRecoveryTest.class, + IgniteCacheMvccSqlTestSuite.MvccColocatedTxPessimisticOriginatingNodeFailureRecoveryTest.class, + IgniteCacheMvccSqlTestSuite.MvccReplicatedTxPessimisticOriginatingNodeFailureRecoveryTest.class +}) public class IgniteCacheMvccSqlTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("IgniteCache SQL MVCC Test Suite"); - - // Simple tests. - suite.addTest(new JUnit4TestAdapter(MvccEmptyTransactionSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccSqlConfigurationValidationTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccDmlSimpleTest.class)); - suite.addTest(new JUnit4TestAdapter(SqlTransactionsCommandsWithMvccEnabledSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccSizeTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccSqlUpdateCountersTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccSqlLockTimeoutTest.class)); - - suite.addTest(new JUnit4TestAdapter(GridIndexRebuildWithMvccEnabledSelfTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheMvccTxNodeMappingTest.class)); - - // SQL vs CacheAPI consistency. - suite.addTest(new JUnit4TestAdapter(MvccRepeatableReadOperationsTest.class)); - suite.addTest(new JUnit4TestAdapter(MvccRepeatableReadBulkOpsTest.class)); - - // JDBC tests. - suite.addTest(new JUnit4TestAdapter(CacheMvccSizeWithConcurrentJdbcTransactionTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccScanQueryWithConcurrentJdbcTransactionTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccLocalEntriesWithConcurrentJdbcTransactionTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccIteratorWithConcurrentJdbcTransactionTest.class)); - - // Load tests. - suite.addTest(new JUnit4TestAdapter(CacheMvccBulkLoadTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccStreamingInsertTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSqlQueriesTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSqlQueriesTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSqlTxQueriesTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSqlTxQueriesTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSqlTxQueriesWithReducerTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSqlTxQueriesWithReducerTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSelectForUpdateQueryTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSelectForUpdateQueryTest.class)); - - // Failover tests. - suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedBackupsTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedBackupsTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSqlCoordinatorFailoverTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSqlCoordinatorFailoverTest.class)); - - // Continuous queries. - suite.addTest(new JUnit4TestAdapter(CacheMvccBasicContinuousQueryTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryPartitionedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryReplicatedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccSqlContinuousQueryPartitionedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccSqlContinuousQueryReplicatedSelfTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryPartitionedTxOneNodeTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryReplicatedTxOneNodeTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryClientReconnectTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryClientTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryMultiNodesFilteringTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryBackupQueueTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryImmutableEntryTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccClientReconnectContinuousQueryTest.class)); - - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousWithTransformerClientSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousWithTransformerPartitionedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousWithTransformerReplicatedSelfTest.class)); - - // Transaction recovery. - suite.addTest(new JUnit4TestAdapter(CacheMvccTxRecoveryTest.class)); - - suite.addTest(new JUnit4TestAdapter(MvccPartitionedPrimaryNodeFailureRecoveryTest.class)); - suite.addTest(new JUnit4TestAdapter(MvccPartitionedTwoBackupsPrimaryNodeFailureRecoveryTest.class)); - suite.addTest(new JUnit4TestAdapter(MvccColocatedTxPessimisticOriginatingNodeFailureRecoveryTest.class)); - suite.addTest(new JUnit4TestAdapter(MvccReplicatedTxPessimisticOriginatingNodeFailureRecoveryTest.class)); - - return suite; - } - /** */ public static class MvccPartitionedPrimaryNodeFailureRecoveryTest extends IgniteCachePartitionedNearDisabledPrimaryNodeFailureRecoveryTest { http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java index 9b87bc6..e4f40a3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchForceServerModeAckTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryConcurrentPartitionUpdateTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryCounterPartitionedAtomicTest; @@ -43,54 +41,47 @@ import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheC import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryNoUnsubscribeTest; import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryReconnectTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Test suite for cache queries. */ -@RunWith(AllTests.class) -public class IgniteCacheQuerySelfTestSuite3 { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Cache Continuous Queries Test Suite"); - - // Continuous queries 1. - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryNodesFilteringTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionTxOneNodeTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerReplicatedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryExecuteInPrimaryTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerClientSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(ClientReconnectContinuousQueryTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryNoUnsubscribeTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientTxReconnectTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientReconnectTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryAtomicSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionTxOneNodeTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientReconnectTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientTxReconnectTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousBatchForceServerModeAckTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryExecuteInPrimaryTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryNodesFilteringTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryNoUnsubscribeTest.class)); - suite.addTest(new JUnit4TestAdapter(ClientReconnectContinuousQueryTest.class)); - suite.addTest(new JUnit4TestAdapter(ContinuousQueryReassignmentTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryConcurrentPartitionUpdateTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + // Continuous queries 1. + GridCacheContinuousQueryNodesFilteringTest.class, + GridCacheContinuousQueryPartitionTxOneNodeTest.class, + CacheContinuousWithTransformerReplicatedSelfTest.class, + CacheContinuousQueryExecuteInPrimaryTest.class, + CacheContinuousWithTransformerClientSelfTest.class, + ClientReconnectContinuousQueryTest.class, + IgniteCacheContinuousQueryNoUnsubscribeTest.class, + IgniteCacheContinuousQueryClientTxReconnectTest.class, + IgniteCacheContinuousQueryClientReconnectTest.class, + GridCacheContinuousQueryAtomicSelfTest.class, + GridCacheContinuousQueryAtomicNearEnabledSelfTest.class, + GridCacheContinuousQueryPartitionTxOneNodeTest.class, + IgniteCacheContinuousQueryClientReconnectTest.class, + IgniteCacheContinuousQueryClientTxReconnectTest.class, + GridCacheContinuousQueryReplicatedSelfTest.class, + CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class, + GridCacheContinuousQueryPartitionedSelfTest.class, + CacheContinuousBatchForceServerModeAckTest.class, + CacheContinuousQueryExecuteInPrimaryTest.class, + GridCacheContinuousQueryNodesFilteringTest.class, + IgniteCacheContinuousQueryNoUnsubscribeTest.class, + ClientReconnectContinuousQueryTest.class, + ContinuousQueryReassignmentTest.class, + CacheContinuousQueryConcurrentPartitionUpdateTest.class, + CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class, - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryCounterPartitionedAtomicTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryCounterPartitionedTxTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryCounterReplicatedAtomicTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryCounterReplicatedTxTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.class)); + CacheContinuousQueryCounterPartitionedAtomicTest.class, + CacheContinuousQueryCounterPartitionedTxTest.class, + CacheContinuousQueryCounterReplicatedAtomicTest.class, + CacheContinuousQueryCounterReplicatedTxTest.class, + CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryReconnectTest.class)); - - return suite; - } + IgniteCacheContinuousQueryReconnectTest.class +}) +public class IgniteCacheQuerySelfTestSuite3 { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java index b07d168..7056ba1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverAtomicSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverMvccTxSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest; @@ -30,32 +28,25 @@ import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinu import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxReplicatedSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxSelfTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Test suite for cache queries. */ -@RunWith(AllTests.class) -public class IgniteCacheQuerySelfTestSuite4 { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite 4"); - - // Continuous queries failover tests. - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverAtomicSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverTxSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverTxReplicatedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverMvccTxSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverMvccTxReplicatedSelfTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + // Continuous queries failover tests. + CacheContinuousQueryFailoverAtomicSelfTest.class, + CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class, + CacheContinuousQueryFailoverTxSelfTest.class, + CacheContinuousQueryFailoverTxReplicatedSelfTest.class, + CacheContinuousQueryFailoverMvccTxSelfTest.class, + CacheContinuousQueryFailoverMvccTxReplicatedSelfTest.class, - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFailoverAtomicSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFailoverTxSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFailoverMvccTxSelfTest.class)); - - return suite; - } + CacheContinuousQueryAsyncFailoverAtomicSelfTest.class, + CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest.class, + CacheContinuousQueryAsyncFailoverTxSelfTest.class, + CacheContinuousQueryAsyncFailoverMvccTxSelfTest.class +}) +public class IgniteCacheQuerySelfTestSuite4 { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java index c6e1550..3ad19c7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEventBufferTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFactoryFilterRandomOperationTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryLostPartitionTest; @@ -38,39 +36,31 @@ import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheCon import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryBackupQueueTest; import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryImmutableEntryTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Test suite for cache queries. */ -@RunWith(AllTests.class) +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteCacheContinuousQueryImmutableEntryTest.class, + CacheContinuousWithTransformerLocalSelfTest.class, + CacheContinuousQueryEventBufferTest.class, + GridCacheContinuousQueryReplicatedTxOneNodeTest.class, + GridCacheContinuousQueryLocalSelfTest.class, + CacheContinuousWithTransformerFailoverTest.class, + ContinuousQueryRemoteFilterMissingInClassPathSelfTest.class, + ContinuousQueryPeerClassLoadingTest.class, + GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class, + GridCacheContinuousQueryTxSelfTest.class, + GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class, + GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class, + CacheContinuousQueryLostPartitionTest.class, + GridCacheContinuousQueryConcurrentTest.class, + CacheContinuousQueryRandomOperationsTwoNodesTest.class, + IgniteCacheContinuousQueryBackupQueueTest.class, + CacheContinuousQueryOperationFromCallbackTest.class, + CacheContinuousQueryFactoryFilterRandomOperationTest.class +}) public class IgniteCacheQuerySelfTestSuite5 { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Cache Continuous Queries Test Suite 2"); - - // Continuous queries 2. - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryImmutableEntryTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerLocalSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryEventBufferTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedTxOneNodeTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryLocalSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerFailoverTest.class)); - suite.addTest(new JUnit4TestAdapter(ContinuousQueryRemoteFilterMissingInClassPathSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(ContinuousQueryPeerClassLoadingTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryTxSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryLostPartitionTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryConcurrentTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryRandomOperationsTwoNodesTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryBackupQueueTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryOperationFromCallbackTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFactoryFilterRandomOperationTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java index 6c8ad7e..cb5eeb2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchAckTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFilterListenerTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryOperationP2PTest; @@ -38,39 +36,31 @@ import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheCon import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedAtomicSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Test suite for cache queries. */ -@RunWith(AllTests.class) +@RunWith(Suite.class) +@Suite.SuiteClasses({ + GridCacheContinuousQueryPartitionAtomicOneNodeTest.class, + CacheContinuousWithTransformerPartitionedSelfTest.class, + GridCacheContinuousQueryLocalAtomicSelfTest.class, + GridCacheContinuousQueryReplicatedAtomicOneNodeTest.class, + ContinuousQueryMarshallerTest.class, + GridCacheContinuousQueryReplicatedAtomicSelfTest.class, + CacheKeepBinaryIterationTest.class, + GridCacheContinuousQueryMultiNodesFilteringTest.class, + CacheKeepBinaryIterationStoreEnabledTest.class, + CacheKeepBinaryIterationNearEnabledTest.class, + GridCacheContinuousQueryPartitionedOnlySelfTest.class, + CacheContinuousQueryOperationP2PTest.class, + CacheContinuousBatchAckTest.class, + CacheContinuousQueryOrderingEventTest.class, + IgniteCacheContinuousQueryClientTest.class, + CacheContinuousQueryAsyncFilterListenerTest.class, + CacheContinuousWithTransformerRandomOperationsTest.class, + CacheContinuousQueryRandomOperationsTest.class +}) public class IgniteCacheQuerySelfTestSuite6 { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Cache Continuous Queries Test Suite 3"); - - // Continuous queries 3. - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionAtomicOneNodeTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerPartitionedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryLocalAtomicSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedAtomicOneNodeTest.class)); - suite.addTest(new JUnit4TestAdapter(ContinuousQueryMarshallerTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedAtomicSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheKeepBinaryIterationTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryMultiNodesFilteringTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheKeepBinaryIterationStoreEnabledTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheKeepBinaryIterationNearEnabledTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionedOnlySelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryOperationP2PTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousBatchAckTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryOrderingEventTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFilterListenerTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerRandomOperationsTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryRandomOperationsTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java index 540d100..487ec68 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java @@ -17,27 +17,18 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.StartCachesInParallelTest; import org.apache.ignite.util.GridCommandHandlerIndexingTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Cache tests using indexing. */ -@RunWith(AllTests.class) +@RunWith(Suite.class) +@Suite.SuiteClasses({ + GridCommandHandlerIndexingTest.class, + StartCachesInParallelTest.class +}) public class IgniteCacheWithIndexingAndPersistenceTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Cache With Indexing And Persistence Test Suite"); - - suite.addTest(new JUnit4TestAdapter(GridCommandHandlerIndexingTest.class)); - suite.addTest(new JUnit4TestAdapter(StartCachesInParallelTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java index 55d129b..de9f96e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.BinaryTypeMismatchLoggingTest; import org.apache.ignite.internal.processors.cache.CacheBinaryKeyConcurrentQueryTest; import org.apache.ignite.internal.processors.cache.CacheConfigurationP2PTest; @@ -44,55 +42,48 @@ import org.apache.ignite.internal.processors.cache.ttl.CacheTtlTransactionalPart import org.apache.ignite.internal.processors.client.IgniteDataStreamerTest; import org.apache.ignite.internal.processors.query.h2.database.InlineIndexHelperTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Cache tests using indexing. */ -@RunWith(AllTests.class) -public class IgniteCacheWithIndexingTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Cache With Indexing Test Suite"); - - suite.addTest(new JUnit4TestAdapter(InlineIndexHelperTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + InlineIndexHelperTest.class, - suite.addTest(new JUnit4TestAdapter(GridIndexingWithNoopSwapSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheOffHeapSelfTest.class)); + GridIndexingWithNoopSwapSelfTest.class, + GridCacheOffHeapSelfTest.class, - suite.addTest(new JUnit4TestAdapter(CacheTtlTransactionalLocalSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheTtlTransactionalPartitionedSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheTtlAtomicLocalSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheTtlAtomicPartitionedSelfTest.class)); + CacheTtlTransactionalLocalSelfTest.class, + CacheTtlTransactionalPartitionedSelfTest.class, + CacheTtlAtomicLocalSelfTest.class, + CacheTtlAtomicPartitionedSelfTest.class, - suite.addTest(new JUnit4TestAdapter(GridCacheOffheapIndexGetSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheOffheapIndexEntryEvictTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheIndexStreamerTest.class)); + GridCacheOffheapIndexGetSelfTest.class, + GridCacheOffheapIndexEntryEvictTest.class, + CacheIndexStreamerTest.class, - suite.addTest(new JUnit4TestAdapter(CacheConfigurationP2PTest.class)); + CacheConfigurationP2PTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteCacheConfigurationPrimitiveTypesSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectQueriesTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheRandomOperationsMultithreadedTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteCacheStarvationOnRebalanceTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheOperationsWithExpirationTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheBinaryKeyConcurrentQueryTest.class)); - suite.addTest(new JUnit4TestAdapter(CacheQueryFilterExpiredTest.class)); + IgniteCacheConfigurationPrimitiveTypesSelfTest.class, + IgniteClientReconnectQueriesTest.class, + CacheRandomOperationsMultithreadedTest.class, + IgniteCacheStarvationOnRebalanceTest.class, + CacheOperationsWithExpirationTest.class, + CacheBinaryKeyConcurrentQueryTest.class, + CacheQueryFilterExpiredTest.class, - suite.addTest(new JUnit4TestAdapter(ClientReconnectAfterClusterRestartTest.class)); + ClientReconnectAfterClusterRestartTest.class, - suite.addTest(new JUnit4TestAdapter(CacheQueryAfterDynamicCacheStartFailureTest.class)); + CacheQueryAfterDynamicCacheStartFailureTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsSqlTest.class)); + IgniteCacheGroupsSqlTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteDataStreamerTest.class)); + IgniteDataStreamerTest.class, - suite.addTest(new JUnit4TestAdapter(BinaryTypeMismatchLoggingTest.class)); + BinaryTypeMismatchLoggingTest.class, - suite.addTest(new JUnit4TestAdapter(ClusterReadOnlyModeSqlTest.class)); - - return suite; - } + ClusterReadOnlyModeSqlTest.class +}) +public class IgniteCacheWithIndexingTestSuite { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java index 9946f94..68104ce 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java @@ -17,27 +17,18 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.database.IgniteDbMemoryLeakIndexedTest; import org.apache.ignite.internal.processors.database.IgniteDbMemoryLeakSqlQueryTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Page memory leaks tests using indexing. */ -@RunWith(AllTests.class) +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteDbMemoryLeakSqlQueryTest.class, + IgniteDbMemoryLeakIndexedTest.class +}) public class IgniteDbMemoryLeakWithIndexingTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Db Memory Leaks With Indexing Test Suite"); - - suite.addTest(new JUnit4TestAdapter(IgniteDbMemoryLeakSqlQueryTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteDbMemoryLeakIndexedTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java index fdd3a47..e52f7ec 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java @@ -16,8 +16,6 @@ */ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsAtomicCacheHistoricalRebalancingTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsAtomicCacheRebalancingTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsBinaryMetadataOnClusterRestartTest; @@ -46,57 +44,50 @@ import org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRecover import org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRolloverRecordLoggingFsyncTest; import org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRolloverRecordLoggingLogOnlyTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Test suite for tests that cover core PDS features and depend on indexing module. */ -@RunWith(AllTests.class) -public class IgnitePdsWithIndexingCoreTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Persistent Store With Indexing Test Suite"); - - suite.addTest(new JUnit4TestAdapter(IgnitePdsCacheIntegrationTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsPageEvictionTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsMultiNodePutGetRestartTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePersistentStoreCacheGroupsTest.class)); - suite.addTest(new JUnit4TestAdapter(PersistenceDirectoryWarningLoggingTest.class)); - suite.addTest(new JUnit4TestAdapter(WalPathsTest.class)); - suite.addTest(new JUnit4TestAdapter(WalRecoveryTxLogicalRecordsTest.class)); - suite.addTest(new JUnit4TestAdapter(WalRolloverRecordLoggingFsyncTest.class)); - suite.addTest(new JUnit4TestAdapter(WalRolloverRecordLoggingLogOnlyTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgnitePdsCacheIntegrationTest.class, + IgnitePdsPageEvictionTest.class, + IgnitePdsMultiNodePutGetRestartTest.class, + IgnitePersistentStoreCacheGroupsTest.class, + PersistenceDirectoryWarningLoggingTest.class, + WalPathsTest.class, + WalRecoveryTxLogicalRecordsTest.class, + WalRolloverRecordLoggingFsyncTest.class, + WalRolloverRecordLoggingLogOnlyTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteWalRecoveryTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteWalRecoveryWithCompactionTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsNoActualWalHistoryTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteWalRebalanceTest.class)); + IgniteWalRecoveryTest.class, + IgniteWalRecoveryWithCompactionTest.class, + IgnitePdsNoActualWalHistoryTest.class, + IgniteWalRebalanceTest.class, - suite.addTest(new JUnit4TestAdapter(IgnitePdsAtomicCacheRebalancingTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsAtomicCacheHistoricalRebalancingTest.class)); + IgnitePdsAtomicCacheRebalancingTest.class, + IgnitePdsAtomicCacheHistoricalRebalancingTest.class, - suite.addTest(new JUnit4TestAdapter(IgnitePdsTxCacheRebalancingTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsTxHistoricalRebalancingTest.class)); + IgnitePdsTxCacheRebalancingTest.class, + IgnitePdsTxHistoricalRebalancingTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteWalRecoveryPPCTest.class)); + IgniteWalRecoveryPPCTest.class, - suite.addTest(new JUnit4TestAdapter(IgnitePdsDiskErrorsRecoveringTest.class)); + IgnitePdsDiskErrorsRecoveringTest.class, - suite.addTest(new JUnit4TestAdapter(IgnitePdsCacheDestroyDuringCheckpointTest.class)); + IgnitePdsCacheDestroyDuringCheckpointTest.class, - suite.addTest(new JUnit4TestAdapter(IgnitePdsBinaryMetadataOnClusterRestartTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsMarshallerMappingRestoreOnNodeStartTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsThreadInterruptionTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsBinarySortObjectFieldsTest.class)); + IgnitePdsBinaryMetadataOnClusterRestartTest.class, + IgnitePdsMarshallerMappingRestoreOnNodeStartTest.class, + IgnitePdsThreadInterruptionTest.class, + IgnitePdsBinarySortObjectFieldsTest.class, - suite.addTest(new JUnit4TestAdapter(IgnitePdsCorruptedIndexTest.class)); + IgnitePdsCorruptedIndexTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteLogicalRecoveryTest.class)); + IgniteLogicalRecoveryTest.class, - suite.addTest(new JUnit4TestAdapter(IgniteSequentialNodeCrashRecoveryTest.class)); - - return suite; - } + IgniteSequentialNodeCrashRecoveryTest.class +}) +public class IgnitePdsWithIndexingCoreTestSuite { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java index 1db34b0..41fb55f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.IgnitePdsSingleNodeWithIndexingAndGroupPutGetPersistenceSelfTest; import org.apache.ignite.internal.processors.cache.IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest; import org.apache.ignite.internal.processors.database.IgniteDbMultiNodeWithIndexingPutGetTest; @@ -28,28 +26,19 @@ import org.apache.ignite.internal.processors.database.IgnitePersistentStoreQuery import org.apache.ignite.internal.processors.database.IgnitePersistentStoreSchemaLoadTest; import org.apache.ignite.internal.processors.database.IgniteTwoRegionsRebuildIndexTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; -/** - * - */ -@RunWith(AllTests.class) +/** */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + IgniteDbSingleNodeWithIndexingWalRestoreTest.class, + IgniteDbSingleNodeWithIndexingPutGetTest.class, + IgniteDbMultiNodeWithIndexingPutGetTest.class, + IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.class, + IgnitePdsSingleNodeWithIndexingAndGroupPutGetPersistenceSelfTest.class, + IgnitePersistentStoreSchemaLoadTest.class, + IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.class, + IgniteTwoRegionsRebuildIndexTest.class +}) public class IgnitePdsWithIndexingTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Ignite Db Memory Leaks With Indexing Test Suite"); - - suite.addTest(new JUnit4TestAdapter(IgniteDbSingleNodeWithIndexingWalRestoreTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteDbSingleNodeWithIndexingPutGetTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteDbMultiNodeWithIndexingPutGetTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePdsSingleNodeWithIndexingAndGroupPutGetPersistenceSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePersistentStoreSchemaLoadTest.class)); - suite.addTest(new JUnit4TestAdapter(IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteTwoRegionsRebuildIndexTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java b/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java index 5736006..0877e2d 100644 --- a/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java +++ b/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java @@ -17,25 +17,16 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.logger.jcl.JclLoggerTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Commons logging test. */ -@RunWith(AllTests.class) +@RunWith(Suite.class) +@Suite.SuiteClasses({ + JclLoggerTest.class +}) public class IgniteJclTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Commons Logging Test Suite"); - - suite.addTest(new JUnit4TestAdapter(JclLoggerTest.class)); - - return suite; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java b/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java index 82350b2..27d14d1 100644 --- a/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java +++ b/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.CacheJndiTmFactorySelfTest; import org.apache.ignite.internal.processors.cache.GridCacheJtaConfigurationValidationSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheJtaFactoryConfigValidationSelfTest; @@ -30,39 +28,31 @@ import org.apache.ignite.internal.processors.cache.jta.GridReplicatedCacheJtaFac import org.apache.ignite.internal.processors.cache.jta.GridReplicatedCacheJtaFactoryUseSyncSelfTest; import org.apache.ignite.internal.processors.cache.jta.GridReplicatedCacheJtaLookupClassNameSelfTest; import org.apache.ignite.internal.processors.cache.GridJtaLifecycleAwareSelfTest; -import org.apache.ignite.testframework.IgniteTestSuite; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * JTA integration tests. */ -@RunWith(AllTests.class) -public class IgniteJtaTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new IgniteTestSuite("JTA Integration Test Suite"); - - suite.addTest(new JUnit4TestAdapter(GridPartitionedCacheJtaFactorySelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridReplicatedCacheJtaFactorySelfTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + GridPartitionedCacheJtaFactorySelfTest.class, + GridReplicatedCacheJtaFactorySelfTest.class, - suite.addTest(new JUnit4TestAdapter(GridPartitionedCacheJtaLookupClassNameSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridReplicatedCacheJtaLookupClassNameSelfTest.class)); + GridPartitionedCacheJtaLookupClassNameSelfTest.class, + GridReplicatedCacheJtaLookupClassNameSelfTest.class, - suite.addTest(new JUnit4TestAdapter(GridPartitionedCacheJtaFactoryUseSyncSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridReplicatedCacheJtaFactoryUseSyncSelfTest.class)); + GridPartitionedCacheJtaFactoryUseSyncSelfTest.class, + GridReplicatedCacheJtaFactoryUseSyncSelfTest.class, - suite.addTest(new JUnit4TestAdapter(GridJtaLifecycleAwareSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheJtaConfigurationValidationSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(GridCacheJtaFactoryConfigValidationSelfTest.class)); + GridJtaLifecycleAwareSelfTest.class, + GridCacheJtaConfigurationValidationSelfTest.class, + GridCacheJtaFactoryConfigValidationSelfTest.class, - suite.addTest(new JUnit4TestAdapter(GridJtaTransactionManagerSelfTest.class)); + GridJtaTransactionManagerSelfTest.class, - // Factory - suite.addTest(new JUnit4TestAdapter(CacheJndiTmFactorySelfTest.class)); - - return suite; - } + // Factory + CacheJndiTmFactorySelfTest.class +}) +public class IgniteJtaTestSuite { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java index f86f7a7..c88fba8 100644 --- a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java +++ b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java @@ -17,31 +17,22 @@ package org.apache.ignite.stream.kafka; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.stream.kafka.connect.IgniteSinkConnectorTest; import org.apache.ignite.stream.kafka.connect.IgniteSourceConnectorTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Apache Kafka streamers tests. */ -@RunWith(AllTests.class) -public class IgniteKafkaStreamerSelfTestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Apache Kafka streamer Test Suite"); - - // Kafka streamer. - suite.addTest(new JUnit4TestAdapter(KafkaIgniteStreamerSelfTest.class)); +@RunWith(Suite.class) +@Suite.SuiteClasses({ + // Kafka streamer. + KafkaIgniteStreamerSelfTest.class, - // Kafka streamers via Connect API. - suite.addTest(new JUnit4TestAdapter(IgniteSinkConnectorTest.class)); - suite.addTest(new JUnit4TestAdapter(IgniteSourceConnectorTest.class)); - - return suite; - } + // Kafka streamers via Connect API. + IgniteSinkConnectorTest.class, + IgniteSourceConnectorTest.class +}) +public class IgniteKafkaStreamerSelfTestSuite { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java b/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java index 665ae31..eb1cd71 100644 --- a/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java +++ b/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java @@ -17,31 +17,22 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.logger.log4j2.Log4j2ConfigUpdateTest; import org.apache.ignite.logger.log4j2.Log4j2LoggerMarkerTest; import org.apache.ignite.logger.log4j2.Log4j2LoggerSelfTest; import org.apache.ignite.logger.log4j2.Log4j2LoggerVerboseModeSelfTest; import org.junit.runner.RunWith; -import org.junit.runners.AllTests; +import org.junit.runners.Suite; /** * Log4j2 logging tests. */ -@RunWith(AllTests.class) +@RunWith(Suite.class) +@Suite.SuiteClasses({ + Log4j2LoggerSelfTest.class, + Log4j2LoggerVerboseModeSelfTest.class, + Log4j2LoggerMarkerTest.class, + Log4j2ConfigUpdateTest.class +}) public class IgniteLog4j2TestSuite { - /** - * @return Test suite. - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite("Log4j2 Logging Test Suite"); - - suite.addTest(new JUnit4TestAdapter(Log4j2LoggerSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(Log4j2LoggerVerboseModeSelfTest.class)); - suite.addTest(new JUnit4TestAdapter(Log4j2LoggerMarkerTest.class)); - suite.addTest(new JUnit4TestAdapter(Log4j2ConfigUpdateTest.class)); - - return suite; - } }
