IGNITE-10774 Migrate test suites that are fixed lists of test classes from Junit...
authorOleg Ignatenko <oignatenko@gridgain.com>
Thu, 27 Dec 2018 16:35:14 +0000 (19:35 +0300)
committerDmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Thu, 27 Dec 2018 16:35:14 +0000 (19:35 +0300)
Signed-off-by: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
69 files changed:
modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverMvccTestSuite.java
modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinarySimpleNameMapperCacheFullApiTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresBinarySelfTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheLoadConsistencyTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTxRecoverySelfTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java
modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest.java
modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java
modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/communication/HadoopExternalCommunicationSelfTest.java
modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java
modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java
modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java
modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java
modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate53TestSuite.java
modules/hibernate-5.3/src/test/java/org/apache/ignite/testsuites/IgniteHibernate53TestSuite.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java
modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java
modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java
modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java
modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java
modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java
modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java
modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java
modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java
modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java
modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java
modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java
modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java
modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java
modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java
modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java
modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java
modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
modules/yarn/src/test/java/org/apache/ignite/IgniteYarnTestSuite.java
modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTestSuite.java
modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/IgniteCacheEntryListenerWithZkDiscoAtomicTest.java
modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java
modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java
modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java

index f89bc44..8722969 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.jdbc.suite;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.jdbc.JdbcVersionMismatchSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinConnectionMvccEnabledSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinTransactionsClientAutoCommitComplexSelfTest;
@@ -28,28 +26,21 @@ import org.apache.ignite.jdbc.thin.JdbcThinTransactionsServerNoAutoCommitComplex
 import org.apache.ignite.jdbc.thin.JdbcThinTransactionsWithMvccEnabledSelfTest;
 import org.apache.ignite.jdbc.thin.MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /** */
-@RunWith(AllTests.class)
-public class IgniteJdbcDriverMvccTestSuite {
-    /**
-     * @return JDBC Driver Test Suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Ignite JDBC Driver Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(JdbcThinConnectionMvccEnabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcVersionMismatchSelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    JdbcThinConnectionMvccEnabledSelfTest.class,
+    JdbcVersionMismatchSelfTest.class,
 
-        // Transactions
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsWithMvccEnabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsClientAutoCommitComplexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsServerAutoCommitComplexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsClientNoAutoCommitComplexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsServerNoAutoCommitComplexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest.class));
-
-        return suite;
-    }
+    // Transactions
+    JdbcThinTransactionsWithMvccEnabledSelfTest.class,
+    JdbcThinTransactionsClientAutoCommitComplexSelfTest.class,
+    JdbcThinTransactionsServerAutoCommitComplexSelfTest.class,
+    JdbcThinTransactionsClientNoAutoCommitComplexSelfTest.class,
+    JdbcThinTransactionsServerNoAutoCommitComplexSelfTest.class,
+    MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest.class
+})
+public class IgniteJdbcDriverMvccTestSuite {
 }
index 977feed..c4f8065 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.jdbc.suite;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.jdbc2.JdbcBlobTest;
 import org.apache.ignite.internal.jdbc2.JdbcBulkLoadSelfTest;
 import org.apache.ignite.internal.jdbc2.JdbcConnectionReopenTest;
@@ -88,140 +86,132 @@ import org.apache.ignite.jdbc.thin.JdbcThinUpdateStatementSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinUpdateStatementSkipReducerOnUpdateSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinWalModeChangeSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * JDBC driver test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    JdbcConnectionSelfTest.class,
+    JdbcStatementSelfTest.class,
+    JdbcPreparedStatementSelfTest.class,
+    JdbcResultSetSelfTest.class,
+    JdbcComplexQuerySelfTest.class,
+    JdbcMetadataSelfTest.class,
+    JdbcEmptyCacheSelfTest.class,
+    JdbcLocalCachesSelfTest.class,
+    JdbcNoDefaultCacheTest.class,
+    JdbcDefaultNoOpCacheTest.class,
+    JdbcPojoQuerySelfTest.class,
+    JdbcPojoLegacyQuerySelfTest.class,
+    JdbcConnectionReopenTest.class,
+
+    // Ignite client node based driver tests
+    org.apache.ignite.internal.jdbc2.JdbcConnectionSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcSpringSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcStatementSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcPreparedStatementSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcResultSetSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcComplexQuerySelfTest.class,
+    JdbcDistributedJoinsQueryTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcMetadataSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcEmptyCacheSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcLocalCachesSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcNoDefaultCacheTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcDefaultNoOpCacheTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcMergeStatementSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcBinaryMarshallerMergeStatementSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcUpdateStatementSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcInsertStatementSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcBinaryMarshallerInsertStatementSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcDeleteStatementSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcStatementBatchingSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcErrorsSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcStreamingToPublicCacheTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcNoCacheStreamingSelfTest.class,
+    JdbcBulkLoadSelfTest.class,
+
+    JdbcBlobTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcStreamingSelfTest.class,
+    JdbcThinStreamingNotOrderedSelfTest.class,
+    JdbcThinStreamingOrderedSelfTest.class,
+
+    // DDL tests.
+    org.apache.ignite.internal.jdbc2.JdbcDynamicIndexAtomicPartitionedNearSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcDynamicIndexAtomicPartitionedSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcDynamicIndexAtomicReplicatedSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcDynamicIndexTransactionalPartitionedNearSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcDynamicIndexTransactionalPartitionedSelfTest.class,
+    org.apache.ignite.internal.jdbc2.JdbcDynamicIndexTransactionalReplicatedSelfTest.class,
+
+    // New thin JDBC
+    JdbcThinConnectionSelfTest.class,
+    JdbcThinConnectionMvccEnabledSelfTest.class,
+    JdbcThinConnectionMultipleAddressesTest.class,
+    JdbcThinTcpIoTest.class,
+    JdbcThinConnectionSSLTest.class,
+    JdbcThinDataSourceSelfTest.class,
+    JdbcThinPreparedStatementSelfTest.class,
+    JdbcThinResultSetSelfTest.class,
+
+    JdbcThinStatementSelfTest.class,
+    JdbcThinComplexQuerySelfTest.class,
+    JdbcThinNoDefaultSchemaTest.class,
+    JdbcThinSchemaCaseTest.class,
+    JdbcThinEmptyCacheSelfTest.class,
+    JdbcThinMetadataSelfTest.class,
+    JdbcThinMetadataPrimaryKeysSelfTest.class,
+    JdbcThinErrorsSelfTest.class,
+
+    JdbcThinInsertStatementSelfTest.class,
+    JdbcThinUpdateStatementSelfTest.class,
+    JdbcThinMergeStatementSelfTest.class,
+    JdbcThinDeleteStatementSelfTest.class,
+    JdbcThinAutoCloseServerCursorTest.class,
+    JdbcThinBatchSelfTest.class,
+    JdbcThinMissingLongArrayResultsTest.class,
+
+    // New thin JDBC driver, DDL tests
+    JdbcThinDynamicIndexAtomicPartitionedNearSelfTest.class,
+    JdbcThinDynamicIndexAtomicPartitionedSelfTest.class,
+    JdbcThinDynamicIndexAtomicReplicatedSelfTest.class,
+    JdbcThinDynamicIndexTransactionalPartitionedNearSelfTest.class,
+    JdbcThinDynamicIndexTransactionalPartitionedSelfTest.class,
+    JdbcThinDynamicIndexTransactionalReplicatedSelfTest.class,
+
+    // New thin JDBC driver, DML tests
+    JdbcThinBulkLoadAtomicPartitionedNearSelfTest.class,
+    JdbcThinBulkLoadAtomicPartitionedSelfTest.class,
+    JdbcThinBulkLoadAtomicReplicatedSelfTest.class,
+    JdbcThinBulkLoadTransactionalPartitionedNearSelfTest.class,
+    JdbcThinBulkLoadTransactionalPartitionedSelfTest.class,
+    JdbcThinBulkLoadTransactionalReplicatedSelfTest.class,
+
+    // New thin JDBC driver, full SQL tests
+    JdbcThinComplexDmlDdlSelfTest.class,
+
+    JdbcThinSelectAfterAlterTable.class,
+
+    // Update on server
+    JdbcThinInsertStatementSkipReducerOnUpdateSelfTest.class,
+    JdbcThinUpdateStatementSkipReducerOnUpdateSelfTest.class,
+    JdbcThinMergeStatementSkipReducerOnUpdateSelfTest.class,
+    JdbcThinComplexDmlDdlSkipReducerOnUpdateSelfTest.class,
+    JdbcThinComplexDmlDdlCustomSchemaSelfTest.class,
+
+    // Transactions
+    JdbcThinTransactionsSelfTest.class,
+    JdbcThinTransactionsClientAutoCommitComplexSelfTest.class,
+    JdbcThinTransactionsServerAutoCommitComplexSelfTest.class,
+    JdbcThinTransactionsClientNoAutoCommitComplexSelfTest.class,
+    JdbcThinTransactionsServerNoAutoCommitComplexSelfTest.class,
+
+    JdbcThinLocalQueriesSelfTest.class,
+
+    // Various commands.
+    JdbcThinWalModeChangeSelfTest.class,
+    JdbcThinAuthenticateConnectionSelfTest.class
+})
 public class IgniteJdbcDriverTestSuite {
-    /**
-     * @return JDBC Driver Test Suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Ignite JDBC Driver Test Suite");
-
-        // Thin client based driver tests.
-        suite.addTest(new JUnit4TestAdapter(JdbcConnectionSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcPreparedStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcResultSetSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcComplexQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcMetadataSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcEmptyCacheSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcLocalCachesSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcNoDefaultCacheTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcDefaultNoOpCacheTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcPojoQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcPojoLegacyQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcConnectionReopenTest.class));
-
-        // Ignite client node based driver tests
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcConnectionSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcSpringSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcPreparedStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcResultSetSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcComplexQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcDistributedJoinsQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcMetadataSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcEmptyCacheSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcLocalCachesSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcNoDefaultCacheTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcDefaultNoOpCacheTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcMergeStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcBinaryMarshallerMergeStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcUpdateStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcInsertStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcBinaryMarshallerInsertStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcDeleteStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcStatementBatchingSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcErrorsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcStreamingToPublicCacheTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcNoCacheStreamingSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcBulkLoadSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(JdbcBlobTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcStreamingSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinStreamingNotOrderedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinStreamingOrderedSelfTest.class));
-
-        // DDL tests.
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcDynamicIndexAtomicPartitionedNearSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcDynamicIndexAtomicPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcDynamicIndexAtomicReplicatedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcDynamicIndexTransactionalPartitionedNearSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcDynamicIndexTransactionalPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.apache.ignite.internal.jdbc2.JdbcDynamicIndexTransactionalReplicatedSelfTest.class));
-
-        // New thin JDBC
-        suite.addTest(new JUnit4TestAdapter(JdbcThinConnectionSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinConnectionMvccEnabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinConnectionMultipleAddressesTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTcpIoTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinConnectionSSLTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinDataSourceSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinPreparedStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinResultSetSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(JdbcThinStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinComplexQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinNoDefaultSchemaTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinSchemaCaseTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinEmptyCacheSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinMetadataSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinMetadataPrimaryKeysSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinErrorsSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(JdbcThinInsertStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinUpdateStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinMergeStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinDeleteStatementSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinAutoCloseServerCursorTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinBatchSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinMissingLongArrayResultsTest.class));
-
-        // New thin JDBC driver, DDL tests
-        suite.addTest(new JUnit4TestAdapter(JdbcThinDynamicIndexAtomicPartitionedNearSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinDynamicIndexAtomicPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinDynamicIndexAtomicReplicatedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinDynamicIndexTransactionalPartitionedNearSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinDynamicIndexTransactionalPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinDynamicIndexTransactionalReplicatedSelfTest.class));
-
-        // New thin JDBC driver, DML tests
-        suite.addTest(new JUnit4TestAdapter(JdbcThinBulkLoadAtomicPartitionedNearSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinBulkLoadAtomicPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinBulkLoadAtomicReplicatedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinBulkLoadTransactionalPartitionedNearSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinBulkLoadTransactionalPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinBulkLoadTransactionalReplicatedSelfTest.class));
-
-        // New thin JDBC driver, full SQL tests
-        suite.addTest(new JUnit4TestAdapter(JdbcThinComplexDmlDdlSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(JdbcThinSelectAfterAlterTable.class));
-
-        // Update on server
-        suite.addTest(new JUnit4TestAdapter(JdbcThinInsertStatementSkipReducerOnUpdateSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinUpdateStatementSkipReducerOnUpdateSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinMergeStatementSkipReducerOnUpdateSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinComplexDmlDdlSkipReducerOnUpdateSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinComplexDmlDdlCustomSchemaSelfTest.class));
-
-        // Transactions
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsClientAutoCommitComplexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsServerAutoCommitComplexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsClientNoAutoCommitComplexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinTransactionsServerNoAutoCommitComplexSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(JdbcThinLocalQueriesSelfTest.class));
-
-        // Various commands.
-        suite.addTest(new JUnit4TestAdapter(JdbcThinWalModeChangeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JdbcThinAuthenticateConnectionSelfTest.class));
-
-        return suite;
-    }
 }
index f7c434a..9193f3e 100644 (file)
@@ -25,6 +25,7 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -36,17 +37,11 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
  * Tests for local transactions.
  */
 @RunWith(JUnit4.class)
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9470")
 public abstract class IgniteMvccTxMultiThreadedAbstractTest extends IgniteTxAbstractTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-9470");
-
-        super.beforeTestsStarted();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-9470");
+        // No-op.
     }
 
     /**
index 6344c12..8cd6c93 100644 (file)
@@ -43,6 +43,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -59,6 +60,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
  * Tests that new transactions do not start until partition exchange is completed.
  */
 @RunWith(JUnit4.class)
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-807")
 public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstractTest {
     /** Partition does not belong to node. */
     private static final int PARTITION_READER = 0;
@@ -71,7 +73,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-807");
+        // No-op.
     }
 
     /** {@inheritDoc} */
index 75263b0..a126843 100644 (file)
@@ -23,6 +23,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.processors.cache.distributed.GridCacheAbstractNodeRestartSelfTest;
 import org.apache.ignite.transactions.TransactionConcurrency;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -38,8 +39,7 @@ import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
 public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAbstractNodeRestartSelfTest {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        if (nearEnabled())
-            fail("https://issues.apache.org/jira/browse/IGNITE-1090");
+        Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-1090", nearEnabled());
     }
 
     /** {@inheritDoc} */
index dc362b8..90fa9e0 100644 (file)
 
 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;
 
 /**
  * Cache full API suite with binary marshaller and simple name mapper.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteCacheFullApiSelfTestSuite.class
+})
 public class IgniteBinarySimpleNameMapperCacheFullApiTestSuite {
-    /**
-     * @return Suite.
-     */
-    public static TestSuite suite() {
+    /** */
+    @BeforeClass
+    public static void init() {
         GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName());
         GridTestProperties.setProperty(GridTestProperties.BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER, "true");
-
-        return IgniteCacheFullApiSelfTestSuite.suite();
-
     }
 }
index a9162c2..8654cf6 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueApiSelfAbstractTest;
 import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicQueueApiSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalQueueApiSelfTest;
@@ -26,29 +24,26 @@ import org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueApiSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest;
 import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedQueueApiSelfTest;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for binary cache data structures.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCacheLocalQueueApiSelfTest.class,
+    GridCacheLocalAtomicQueueApiSelfTest.class,
+    GridCacheReplicatedQueueApiSelfTest.class,
+    GridCachePartitionedQueueApiSelfTest.class,
+    GridCachePartitionedAtomicQueueApiSelfTest.class,
+    IgnitePartitionedQueueNoBackupsTest.class
+})
 public class IgniteCacheDataStructuresBinarySelfTestSuite {
-    /**
-     * @return Cache test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Ignite Cache Data Structures Binary Test Suite");
-
+    /** */
+    @BeforeClass
+    public static void init() {
         System.setProperty(GridCacheQueueApiSelfAbstractTest.BINARY_QUEUE, "true");
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalAtomicQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgnitePartitionedQueueNoBackupsTest.class));
-
-        return suite;
     }
 }
index 4d1c179..f7f6e22 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.AtomicCacheAffinityConfigurationTest;
 import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueCleanupSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueClientDisconnectTest;
@@ -87,114 +85,106 @@ import org.apache.ignite.internal.processors.cache.datastructures.replicated.Ign
 import org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedSemaphoreSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheAtomicReplicatedNodeRestartSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for cache data structures.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCachePartitionedQueueFailoverDataConsistencySelfTest.class,
+    GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.class,
+
+    GridCacheLocalSequenceApiSelfTest.class,
+    GridCacheLocalSetSelfTest.class,
+    GridCacheLocalAtomicSetSelfTest.class,
+    GridCacheLocalQueueApiSelfTest.class,
+    GridCacheLocalAtomicQueueApiSelfTest.class,
+    IgniteLocalCountDownLatchSelfTest.class,
+    IgniteLocalSemaphoreSelfTest.class,
+    IgniteLocalLockSelfTest.class,
+
+    GridCacheReplicatedSequenceApiSelfTest.class,
+    GridCacheReplicatedSequenceMultiNodeSelfTest.class,
+    GridCacheReplicatedQueueApiSelfTest.class,
+    GridCacheReplicatedQueueMultiNodeSelfTest.class,
+    GridCacheReplicatedQueueRotativeMultiNodeTest.class,
+    GridCacheReplicatedSetSelfTest.class,
+    GridCacheReplicatedSetWithClientSelfTest.class,
+    GridCacheReplicatedSetWithNodeFilterSelfTest.class,
+    GridCacheReplicatedDataStructuresFailoverSelfTest.class,
+    IgniteReplicatedCountDownLatchSelfTest.class,
+    IgniteReplicatedSemaphoreSelfTest.class,
+    IgniteReplicatedLockSelfTest.class,
+    IgniteCacheAtomicReplicatedNodeRestartSelfTest.class,
+
+    GridCachePartitionedSequenceApiSelfTest.class,
+    GridCachePartitionedSequenceMultiNodeSelfTest.class,
+    GridCachePartitionedQueueApiSelfTest.class,
+    GridCachePartitionedAtomicQueueApiSelfTest.class,
+    GridCachePartitionedQueueMultiNodeSelfTest.class,
+    GridCachePartitionedAtomicQueueMultiNodeSelfTest.class,
+    GridCacheQueueClientDisconnectTest.class,
+
+    GridCachePartitionedQueueCreateMultiNodeSelfTest.class,
+    GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class,
+    GridCachePartitionedSetSelfTest.class,
+    GridCachePartitionedSetWithClientSelfTest.class,
+    GridCachePartitionedSetWithNodeFilterSelfTest.class,
+    IgnitePartitionedSetNoBackupsSelfTest.class,
+    GridCachePartitionedAtomicSetSelfTest.class,
+    IgnitePartitionedCountDownLatchSelfTest.class,
+    IgniteDataStructureWithJobTest.class,
+    IgnitePartitionedSemaphoreSelfTest.class,
+    SemaphoreFailoverSafeReleasePermitsTest.class,
+    SemaphoreFailoverNoWaitingAcquirerTest.class,
+    // TODO IGNITE-3141, enabled when fixed.
+    // suite.addTest(new JUnit4TestAdapter(IgnitePartitionedLockSelfTest.class,
+
+    GridCachePartitionedSetFailoverSelfTest.class,
+    GridCachePartitionedAtomicSetFailoverSelfTest.class,
+
+    GridCachePartitionedQueueRotativeMultiNodeTest.class,
+    GridCachePartitionedAtomicQueueRotativeMultiNodeTest.class,
+    GridCacheQueueCleanupSelfTest.class,
+
+    GridCachePartitionedQueueEntryMoveSelfTest.class,
+
+    GridCachePartitionedDataStructuresFailoverSelfTest.class,
+    GridCacheQueueMultiNodeConsistencySelfTest.class,
+
+    IgniteLocalAtomicLongApiSelfTest.class,
+    IgnitePartitionedAtomicLongApiSelfTest.class,
+    IgniteReplicatedAtomicLongApiSelfTest.class,
+
+    GridCachePartitionedAtomicSequenceMultiThreadedTest.class,
+    GridCachePartitionedAtomicSequenceTxSelfTest.class,
+
+    GridCachePartitionedAtomicStampedApiSelfTest.class,
+    GridCacheReplicatedAtomicStampedApiSelfTest.class,
+
+    GridCachePartitionedAtomicReferenceApiSelfTest.class,
+    GridCacheReplicatedAtomicReferenceApiSelfTest.class,
+
+    //suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicReferenceMultiNodeTest.class,
+    //suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicReferenceMultiNodeTest.class,
+
+    GridCachePartitionedNodeRestartTxSelfTest.class,
+    GridCachePartitionedQueueJoinedNodeSelfTest.class,
+
+    IgniteDataStructureUniqueNameTest.class,
+    //suite.addTest(new JUnit4TestAdapter(IgniteDataStructuresNoClassOnServerTest.class,
+
+    IgniteClientDataStructuresTest.class,
+    IgniteClientDiscoveryDataStructuresTest.class,
+
+    IgnitePartitionedQueueNoBackupsTest.class,
+
+    IgniteSequenceInternalCleanupTest.class,
+
+    AtomicCacheAffinityConfigurationTest.class,
+
+    IgniteCacheDataStructuresBinarySelfTestSuite.class
+})
 public class IgniteCacheDataStructuresSelfTestSuite {
-    /**
-     * @return Cache test suite.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Ignite Cache Data Structures Test Suite");
-
-        // Data structures.
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedQueueFailoverDataConsistencySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalSequenceApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalSetSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalAtomicSetSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalAtomicQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteLocalCountDownLatchSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteLocalSemaphoreSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteLocalLockSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedSequenceApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedSequenceMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedQueueMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedQueueRotativeMultiNodeTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedSetSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedSetWithClientSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedSetWithNodeFilterSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedDataStructuresFailoverSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteReplicatedCountDownLatchSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteReplicatedSemaphoreSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteReplicatedLockSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedSequenceApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedSequenceMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicQueueApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedQueueMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQueueClientDisconnectTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedSetSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedSetWithClientSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedSetWithNodeFilterSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgnitePartitionedSetNoBackupsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicSetSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgnitePartitionedCountDownLatchSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteDataStructureWithJobTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgnitePartitionedSemaphoreSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SemaphoreFailoverSafeReleasePermitsTest.class));
-        suite.addTest(new JUnit4TestAdapter(SemaphoreFailoverNoWaitingAcquirerTest.class));
-        // TODO IGNITE-3141, enabled when fixed.
-        // suite.addTest(new JUnit4TestAdapter(IgnitePartitionedLockSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedSetFailoverSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicSetFailoverSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedQueueRotativeMultiNodeTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicQueueRotativeMultiNodeTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQueueCleanupSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedQueueEntryMoveSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedDataStructuresFailoverSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQueueMultiNodeConsistencySelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteLocalAtomicLongApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgnitePartitionedAtomicLongApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteReplicatedAtomicLongApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicSequenceMultiThreadedTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicSequenceTxSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicStampedApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicStampedApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicReferenceApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicReferenceApiSelfTest.class));
-
-        //suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicReferenceMultiNodeTest.class));
-        //suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicReferenceMultiNodeTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNodeRestartTxSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedQueueJoinedNodeSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteDataStructureUniqueNameTest.class));
-        //suite.addTest(new JUnit4TestAdapter(IgniteDataStructuresNoClassOnServerTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteClientDataStructuresTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteClientDiscoveryDataStructuresTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgnitePartitionedQueueNoBackupsTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteSequenceInternalCleanupTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(AtomicCacheAffinityConfigurationTest.class));
-
-        suite.addTest(IgniteCacheDataStructuresBinarySelfTestSuite.suite());
-
-        return suite;
-    }
 }
index ecc6c25..87b09fe 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.CacheGetFromJobTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheAsyncOperationsFailoverAtomicTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheAsyncOperationsFailoverTxTest;
@@ -34,41 +32,32 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa
 import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteChangingBaselineDownCachePutAllFailoverTest;
 import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteChangingBaselineUpCachePutAllFailoverTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
-/**
- *
- */
-@RunWith(AllTests.class)
-public class IgniteCacheFailoverTestSuite2 {
-    /**
-     * @return Suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Cache Failover Test Suite2");
+/** */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCachePartitionedTxSalvageSelfTest.class,
+    CacheGetFromJobTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedTxSalvageSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheGetFromJobTest.class));
+    GridCacheAtomicFailoverSelfTest.class,
+    GridCacheAtomicReplicatedFailoverSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicFailoverSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicReplicatedFailoverSelfTest.class));
+    GridCachePartitionedFailoverSelfTest.class,
+    GridCacheColocatedFailoverSelfTest.class,
+    GridCacheReplicatedFailoverSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedFailoverSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheColocatedFailoverSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedFailoverSelfTest.class));
+    IgniteCacheCrossCacheTxFailoverTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheCrossCacheTxFailoverTest.class));
+    CacheAsyncOperationsFailoverAtomicTest.class,
+    CacheAsyncOperationsFailoverTxTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(CacheAsyncOperationsFailoverAtomicTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheAsyncOperationsFailoverTxTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(CachePutAllFailoverAtomicTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePutAllFailoverTxTest.class));
-        //suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineCachePutAllFailoverTest.class));
-        //suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineCacheRemoveFailoverTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteChangingBaselineDownCachePutAllFailoverTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteChangingBaselineUpCachePutAllFailoverTest.class));
-
-        return suite;
-    }
+    CachePutAllFailoverAtomicTest.class,
+    CachePutAllFailoverTxTest.class,
+    //suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineCachePutAllFailoverTest.class,
+    //suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineCacheRemoveFailoverTest.class,
+    IgniteChangingBaselineDownCachePutAllFailoverTest.class,
+    IgniteChangingBaselineUpCachePutAllFailoverTest.class
+})
+public class IgniteCacheFailoverTestSuite2 {
 }
index 6c53c8c..3c829a7 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.distributed.CacheGetInsideLockChangingTopologyTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteCachePutRetryAtomicSelfTest.class,
+    IgniteCachePutRetryTransactionalSelfTest.class,
+    CacheGetInsideLockChangingTopologyTest.class
+})
 public class IgniteCacheFailoverTestSuite3 {
-    /**
-     * @return Ignite Cache Failover test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Cache Failover Test Suite3");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePutRetryAtomicSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePutRetryTransactionalSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheGetInsideLockChangingTopologyTest.class));
-
-        return suite;
-    }
 }
index b62e9ba..4f1d6f6 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest;
@@ -43,54 +41,50 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedM
 import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedOnheapMultiJvmFullApiSelfTest;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Multi-JVM test suite.
  */
-@RunWith(AllTests.class)
-public class IgniteCacheFullApiMultiJvmSelfTestSuite {
-    /**
-     * @return Multi-JVM tests suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Cache Full API Multi Jvm Test Suite");
-
-        System.setProperty("H2_JDBC_CONNECTIONS", "500");
-
-        // Multi-node.
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCacheReplicatedMultiJvmFullApiSelfTest.class,
+    GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.class,
+    GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.class));
+    GridCachePartitionedMultiJvmFullApiSelfTest.class,
+    GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest.class,
+    GridCacheAtomicMultiJvmFullApiSelfTest.class,
+    GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.class,
+    GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.class,
+    GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.class,
+    GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.class));
+    GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCacheNearOnlyMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.class));
+    GridCacheNearOnlyMultiJvmFullApiSelfTest.class,
+    GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest.class,
+    GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.class));
+    GridCacheAtomicClientOnlyMultiJvmFullApiSelfTest.class,
+    GridCacheAtomicClientOnlyMultiJvmP2PDisabledFullApiSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.class));
+    GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest.class,
+    GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicOnheapMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedOnheapMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.class));
-
-        return suite;
+    GridCacheAtomicOnheapMultiJvmFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.class,
+    GridCachePartitionedOnheapMultiJvmFullApiSelfTest.class,
+    GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.class
+})
+public class IgniteCacheFullApiMultiJvmSelfTestSuite {
+    /** */
+    @BeforeClass
+    public static void init() {
+        System.setProperty("H2_JDBC_CONNECTIONS", "500");
     }
 }
index 3875475..30d8d63 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.GridCacheClearSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledFullApiSelfTest;
@@ -80,101 +78,93 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalFullApiMu
 import org.apache.ignite.internal.processors.cache.local.GridCacheLocalFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.local.GridCacheLocalWithGroupFullApiSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for cache API.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCacheLocalFullApiSelfTest.class,
+    GridCacheLocalAtomicFullApiSelfTest.class,
+    GridCacheReplicatedFullApiSelfTest.class,
+    GridCachePartitionedFullApiSelfTest.class,
+    GridCacheAtomicFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledFullApiSelfTest.class,
+    GridCachePartitionedFilteredPutSelfTest.class,
+    GridCacheReplicatedAtomicFullApiSelfTest.class,
+    GridCacheAtomicNearEnabledFullApiSelfTest.class,
+    GridCacheAtomicOnheapFullApiSelfTest.class,
+
+    GridCachePartitionedOnheapFullApiSelfTest.class,
+    GridCachePartitionedAtomicOnheapFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledOnheapFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.class,
+
+    // No primary.
+    GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.class,
+    GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.class,
+
+    // Multi-node.
+    GridCacheReplicatedMultiNodeFullApiSelfTest.class,
+    GridCacheReplicatedMultiNodeP2PDisabledFullApiSelfTest.class,
+    GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class,
+
+    GridCachePartitionedMultiNodeFullApiSelfTest.class,
+    GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest.class,
+    GridCacheAtomicMultiNodeFullApiSelfTest.class,
+    GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest.class,
+    GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest.class,
+    GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.class,
+    GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest.class,
+    CachePartitionedMultiNodeLongTxTimeoutFullApiTest.class,
+    CachePartitionedMultiNodeLongTxTimeout2FullApiTest.class,
+    CachePartitionedNearEnabledMultiNodeLongTxTimeoutFullApiTest.class,
+
+    GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.class,
+
+    GridCacheNearOnlyMultiNodeFullApiSelfTest.class,
+    GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest.class,
+    GridCacheReplicatedNearOnlyMultiNodeFullApiSelfTest.class,
+
+    GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.class,
+    GridCacheAtomicClientOnlyMultiNodeP2PDisabledFullApiSelfTest.class,
+
+    GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.class,
+    GridCacheAtomicNearOnlyMultiNodeP2PDisabledFullApiSelfTest.class,
+
+    CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest.class,
+    CacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.class,
+
+    GridCacheNearReloadAllSelfTest.class,
+    GridCacheColocatedReloadAllSelfTest.class,
+    GridCacheAtomicReloadAllSelfTest.class,
+    GridCacheNearTxMultiNodeSelfTest.class,
+    GridCachePartitionedMultiNodeCounterSelfTest.class,
+
+    GridCachePartitionedOnheapMultiNodeFullApiSelfTest.class,
+    GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.class,
+    GridCacheAtomicOnheapMultiNodeFullApiSelfTest.class,
+
+    // Multithreaded.
+    GridCacheLocalFullApiMultithreadedSelfTest.class,
+    GridCacheReplicatedFullApiMultithreadedSelfTest.class,
+    GridCachePartitionedFullApiMultithreadedSelfTest.class,
+
+    // Other.
+    GridCacheClearSelfTest.class,
+
+    GridCacheLocalWithGroupFullApiSelfTest.class,
+    GridCacheLocalAtomicWithGroupFullApiSelfTest.class,
+    GridCacheAtomicMultiNodeWithGroupFullApiSelfTest.class,
+    GridCacheAtomicNearEnabledMultiNodeWithGroupFullApiSelfTest.class,
+    GridCachePartitionedMultiNodeWithGroupFullApiSelfTest.class,
+    GridCachePartitionedNearDisabledMultiNodeWithGroupFullApiSelfTest.class,
+
+    //suite.addTest(new JUnit4TestAdapter(GridActivateExtensionTest.class));
+})
 public class IgniteCacheFullApiSelfTestSuite {
-    /**
-     * @return Cache API test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Cache Full API Test Suite");
-
-        // One node.
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalAtomicFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedFilteredPutSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicNearEnabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicOnheapFullApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedOnheapFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicOnheapFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledOnheapFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.class));
-
-        // No primary.
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.class));
-
-        // Multi-node.
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedMultiNodeP2PDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePartitionedMultiNodeLongTxTimeoutFullApiTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePartitionedMultiNodeLongTxTimeout2FullApiTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePartitionedNearEnabledMultiNodeLongTxTimeoutFullApiTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheNearOnlyMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedNearOnlyMultiNodeFullApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicClientOnlyMultiNodeP2PDisabledFullApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicNearOnlyMultiNodeP2PDisabledFullApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheNearReloadAllSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheColocatedReloadAllSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicReloadAllSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheNearTxMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedMultiNodeCounterSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedOnheapMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicOnheapMultiNodeFullApiSelfTest.class));
-
-        // Multithreaded.
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalFullApiMultithreadedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedFullApiMultithreadedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedFullApiMultithreadedSelfTest.class));
-
-        // Other.
-        suite.addTest(new JUnit4TestAdapter(GridCacheClearSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalWithGroupFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheLocalAtomicWithGroupFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicMultiNodeWithGroupFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicNearEnabledMultiNodeWithGroupFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedMultiNodeWithGroupFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledMultiNodeWithGroupFullApiSelfTest.class));
-
-        //suite.addTest(new JUnit4TestAdapter(GridActivateExtensionTest.class));
-
-        return suite;
-    }
 }
index ef44239..02c2f49 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.distributed.CacheNearDisabledAtomicInvokeRestartSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheNearDisabledTransactionalInvokeRestartSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheNearDisabledTransactionalWriteReadRestartSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    CacheNearDisabledAtomicInvokeRestartSelfTest.class,
+    CacheNearDisabledTransactionalInvokeRestartSelfTest.class,
+    CacheNearDisabledTransactionalWriteReadRestartSelfTest.class
+})
 public class IgniteCacheLoadConsistencyTestSuite {
-    /**
-     * @return Ignite Cache Failover test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Cache Load Consistency Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(CacheNearDisabledAtomicInvokeRestartSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheNearDisabledTransactionalInvokeRestartSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheNearDisabledTransactionalWriteReadRestartSelfTest.class));
-
-        return suite;
-    }
 }
index f9dd947..75d7174 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.mvcc.CacheMvccClusterRestartTest;
 import org.apache.ignite.internal.processors.cache.mvcc.CacheMvccConfigurationValidationTest;
 import org.apache.ignite.internal.processors.cache.mvcc.CacheMvccIteratorWithConcurrentTransactionTest;
@@ -39,48 +37,38 @@ import org.apache.ignite.internal.processors.cache.mvcc.MvccUnsupportedTxModesTe
 import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorMvccPersistenceSelfTest;
 import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorMvccSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
-/**
- *
- */
-@RunWith(AllTests.class)
-public class IgniteCacheMvccTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("IgniteCache MVCC Test Suite");
+/** */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    CacheMvccTransactionsTest.class,
+    CacheMvccProcessorTest.class,
+    CacheMvccVacuumTest.class,
+    CacheMvccConfigurationValidationTest.class,
 
-        // Basic tests.
-        suite.addTest(new JUnit4TestAdapter(CacheMvccTransactionsTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccProcessorTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccVacuumTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccConfigurationValidationTest.class));
+    DataStreamProcessorMvccSelfTest.class,
+    DataStreamProcessorMvccPersistenceSelfTest.class,
+    CacheMvccOperationChecksTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(DataStreamProcessorMvccSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DataStreamProcessorMvccPersistenceSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccOperationChecksTest.class));
+    CacheMvccRemoteTxOnNearNodeStartTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(CacheMvccRemoteTxOnNearNodeStartTest.class));
+    MvccUnsupportedTxModesTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(MvccUnsupportedTxModesTest.class));
+    MvccCachePeekTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(MvccCachePeekTest.class));
+    // Concurrent ops tests.
+    CacheMvccIteratorWithConcurrentTransactionTest.class,
+    CacheMvccLocalEntriesWithConcurrentTransactionTest.class,
+    CacheMvccScanQueryWithConcurrentTransactionTest.class,
+    CacheMvccSizeWithConcurrentTransactionTest.class,
 
-        // Concurrent ops tests.
-        suite.addTest(new JUnit4TestAdapter(CacheMvccIteratorWithConcurrentTransactionTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccLocalEntriesWithConcurrentTransactionTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccScanQueryWithConcurrentTransactionTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccSizeWithConcurrentTransactionTest.class));
-
-        // Failover tests.
-        suite.addTest(new JUnit4TestAdapter(CacheMvccTxFailoverTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccClusterRestartTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedCoordinatorFailoverTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedCoordinatorFailoverTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheMvccProcessorLazyStartTest.class));
-
-        return suite;
-    }
+    // Failover tests.
+    CacheMvccTxFailoverTest.class,
+    CacheMvccClusterRestartTest.class,
+    CacheMvccPartitionedCoordinatorFailoverTest.class,
+    CacheMvccReplicatedCoordinatorFailoverTest.class,
+    CacheMvccProcessorLazyStartTest.class
+})
+public class IgniteCacheMvccTestSuite {
 }
index 6c0b3a2..4e96305 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.IgniteCacheCreateRestartSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheNearRestartRollbackSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOptimisticTxNodeRestartTest;
@@ -26,27 +24,20 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOptimisticTxNodeRestartTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedNodeRestartSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Cache stability test suite on changing topology.
  */
-@RunWith(AllTests.class)
-public class IgniteCacheRestartTestSuite {
-    /**
-     * @return Suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Cache Restart Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNodeRestartTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedOptimisticTxNodeRestartTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedNodeRestartSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNearDisabledOptimisticTxNodeRestartTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheNearRestartRollbackSelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCachePartitionedNodeRestartTest.class,
+    GridCachePartitionedOptimisticTxNodeRestartTest.class,
+    GridCacheReplicatedNodeRestartSelfTest.class,
+    GridCachePartitionedNearDisabledOptimisticTxNodeRestartTest.class,
+    IgniteCacheNearRestartRollbackSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheCreateRestartSelfTest.class));
-
-        return suite;
-    }
+    IgniteCacheCreateRestartSelfTest.class
+})
+public class IgniteCacheRestartTestSuite {
 }
index 18c450a..fc73b2b 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.GridCachePutAllFailoverSelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPutAllFailoverSelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteCachePutAllRestartTest;
@@ -26,31 +24,24 @@ import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheAtomic
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheGetRestartTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheAtomicReplicatedNodeRestartSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Cache stability test suite on changing topology.
  */
-@RunWith(AllTests.class)
-public class IgniteCacheRestartTestSuite2 {
-    /**
-     * @return Suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Cache Restart Test Suite2");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheAtomicNodeRestartTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteCacheAtomicNodeRestartTest.class,
+    IgniteCacheAtomicReplicatedNodeRestartSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheAtomicPutAllFailoverSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePutAllRestartTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePutAllFailoverSelfTest.class));
+    IgniteCacheAtomicPutAllFailoverSelfTest.class,
+    IgniteCachePutAllRestartTest.class,
+    GridCachePutAllFailoverSelfTest.class,
 
-        // TODO IGNITE-4768.
-        //suite.addTest(new JUnit4TestAdapter(IgniteBinaryMetadataUpdateNodeRestartTest.class));
+    // TODO IGNITE-4768.
+    //suite.addTest(new JUnit4TestAdapter(IgniteBinaryMetadataUpdateNodeRestartTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheGetRestartTest.class));
-
-        return suite;
-    }
+    IgniteCacheGetRestartTest.class
+})
+public class IgniteCacheRestartTestSuite2 {
 }
index 2cceda3..2e0163b 100644 (file)
@@ -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 {
 }
index 58e485d..6eef3f5 100644 (file)
 
 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;
-    }
 }
index 908aa36..4c07262 100644 (file)
@@ -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;
-    }
 }
index edf0279..b635ac0 100644 (file)
 
 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
+}
index 84fb7fc..4a34153 100644 (file)
@@ -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());
index d663fa1..984f6dd 100644 (file)
@@ -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.
     }
 
     /**
index 84f2f7b..7425238 100644 (file)
 
 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();
     }
 }
index 436203a..9f83514 100644 (file)
@@ -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 {
 }
index 40ee896..2a33e08 100644 (file)
 
 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();
     }
 }
index f87e676..03442ae 100644 (file)
@@ -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 {
 }
index 51842a8..6ce688c 100644 (file)
 
 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();
     }
 }
index 794cffe..bd0c003 100644 (file)
@@ -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 {
 }
index 9b470f7..2b1d304 100644 (file)
@@ -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;
-    }
 }
index c9cd54c..bdc7664 100644 (file)
@@ -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 {
index 9b87bc6..e4f40a3 100644 (file)
@@ -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 {
 }
index b07d168..7056ba1 100644 (file)
@@ -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 {
 }
index c6e1550..3ad19c7 100644 (file)
@@ -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;
-    }
 }
index 6c8ad7e..cb5eeb2 100644 (file)
@@ -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;
-    }
 }
index 540d100..487ec68 100644 (file)
 
 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;
-    }
 }
index 55d129b..de9f96e 100644 (file)
@@ -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 {
 }
index 9946f94..68104ce 100644 (file)
 
 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;
-    }
 }
index fdd3a47..e52f7ec 100644 (file)
@@ -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 {
 }
index 1db34b0..41fb55f 100644 (file)
@@ -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;
-    }
 }
index 5736006..0877e2d 100644 (file)
 
 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;
-    }
 }
index 82350b2..27d14d1 100644 (file)
@@ -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 {
 }
index f86f7a7..c88fba8 100644 (file)
 
 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 {
 }
index 665ae31..eb1cd71 100644 (file)
 
 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;
-    }
 }
index 886bc9e..bab4b73 100644 (file)
 
 package org.apache.ignite;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.mesos.IgniteSchedulerSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Apache Mesos integration tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteSchedulerSelfTest.class
+})
 public class IgniteMesosTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache Mesos Integration Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteSchedulerSelfTest.class));
-
-        return suite;
-    }
 }
index d09207c..e6be10b 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.ml;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.clustering.ClusteringTestSuite;
 import org.apache.ignite.ml.common.CommonTestSuite;
 import org.apache.ignite.ml.composition.CompositionTestSuite;
@@ -38,40 +36,34 @@ import org.apache.ignite.ml.structures.StructuresTestSuite;
 import org.apache.ignite.ml.svm.SVMTestSuite;
 import org.apache.ignite.ml.tree.DecisionTreeTestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all module tests. IMPL NOTE tests in {@code org.apache.ignite.ml.tree.performance} are not
  * included here because these are intended only for manual execution.
  */
-@RunWith(AllTests.class)
-public class IgniteMLTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite(IgniteMLTestSuite.class.getSimpleName());
-
-        /** JUnit 4 tests. */
-        suite.addTest(new JUnit4TestAdapter(MathImplMainTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(RegressionsTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(SVMTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(ClusteringTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(KNNTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(PipelineTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(PreprocessingTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(GAGridTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(CompositionTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(EnvironmentTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(StructuresTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(CommonTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(MultiClassTestSuite.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    MathImplMainTestSuite.class,
+    RegressionsTestSuite.class,
+    SVMTestSuite.class,
+    ClusteringTestSuite.class,
+    KNNTestSuite.class,
+    PipelineTestSuite.class,
+    PreprocessingTestSuite.class,
+    GAGridTestSuite.class,
+    CompositionTestSuite.class,
+    EnvironmentTestSuite.class,
+    StructuresTestSuite.class,
+    CommonTestSuite.class,
+    MultiClassTestSuite.class,
 
-        /** JUnit 3 tests. */
-        suite.addTest(DecisionTreeTestSuite.suite());
-        suite.addTest(MLPTestSuite.suite());
-        suite.addTest(InferenceTestSuite.suite());
-        suite.addTest(DatasetTestSuite.suite());
-        suite.addTest(SelectionTestSuite.suite());
-
-        return suite;
-    }
+    /** JUnit 3 tests. */
+    DecisionTreeTestSuite.class,
+    MLPTestSuite.class,
+    InferenceTestSuite.class,
+    DatasetTestSuite.class,
+    SelectionTestSuite.class
+})
+public class IgniteMLTestSuite {
 }
index 8ab41c5..d2b5ce2 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.ml.dataset;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.dataset.feature.ObjectHistogramTest;
 import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetBuilderTest;
 import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetTest;
@@ -30,29 +28,24 @@ import org.apache.ignite.ml.dataset.primitive.DatasetWrapperTest;
 import org.apache.ignite.ml.dataset.primitive.SimpleDatasetTest;
 import org.apache.ignite.ml.dataset.primitive.SimpleLabeledDatasetTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all tests located in org.apache.ignite.ml.dataset.* package.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    DatasetWrapperTest.class,
+    DatasetAffinityFunctionWrapperTest.class,
+    PartitionDataStorageTest.class,
+    LocalDatasetBuilderTest.class,
+    SimpleDatasetTest.class,
+    SimpleLabeledDatasetTest.class,
+    DatasetWrapperTest.class,
+    ObjectHistogramTest.class,
+    ComputeUtilsTest.class,
+    CacheBasedDatasetBuilderTest.class,
+    CacheBasedDatasetTest.class
+})
 public class DatasetTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite(DatasetTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(DatasetWrapperTest.class));
-        suite.addTest(new JUnit4TestAdapter(DatasetAffinityFunctionWrapperTest.class));
-        suite.addTest(new JUnit4TestAdapter(PartitionDataStorageTest.class));
-        suite.addTest(new JUnit4TestAdapter(LocalDatasetBuilderTest.class));
-        suite.addTest(new JUnit4TestAdapter(SimpleDatasetTest.class));
-        suite.addTest(new JUnit4TestAdapter(SimpleLabeledDatasetTest.class));
-        suite.addTest(new JUnit4TestAdapter(DatasetWrapperTest.class));
-        suite.addTest(new JUnit4TestAdapter(ObjectHistogramTest.class));
-        suite.addTest(new JUnit4TestAdapter(ComputeUtilsTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheBasedDatasetBuilderTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheBasedDatasetTest.class));
-
-        return suite;
-    }
 }
index 9908b65..c670629 100644 (file)
 
 package org.apache.ignite.ml.inference;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.inference.builder.IgniteDistributedInfModelBuilderTest;
 import org.apache.ignite.ml.inference.builder.SingleInfModelBuilderTest;
 import org.apache.ignite.ml.inference.builder.ThreadedInfModelBuilderTest;
 import org.apache.ignite.ml.inference.storage.model.DefaultModelStorageTest;
 import org.apache.ignite.ml.inference.util.DirectorySerializerTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all tests located in {@link org.apache.ignite.ml.inference} package.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    SingleInfModelBuilderTest.class,
+    ThreadedInfModelBuilderTest.class,
+    DirectorySerializerTest.class,
+    DefaultModelStorageTest.class,
+    IgniteDistributedInfModelBuilderTest.class
+})
 public class InferenceTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite(InferenceTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(SingleInfModelBuilderTest.class));
-        suite.addTest(new JUnit4TestAdapter(ThreadedInfModelBuilderTest.class));
-        suite.addTest(new JUnit4TestAdapter(DirectorySerializerTest.class));
-        suite.addTest(new JUnit4TestAdapter(DefaultModelStorageTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteDistributedInfModelBuilderTest.class));
-
-        return suite;
-    }
 }
index 58eea8d..6f01b7c 100644 (file)
 
 package org.apache.ignite.ml.nn;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for multilayer perceptrons.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    MLPTest.class,
+    MLPTrainerTest.class,
+    LossFunctionsTest.class,
+    MLPTrainerIntegrationTest.class
+})
 public class MLPTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite(MLPTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(MLPTest.class));
-        suite.addTest(new JUnit4TestAdapter(MLPTrainerTest.class));
-        suite.addTest(new JUnit4TestAdapter(LossFunctionsTest.class));
-        suite.addTest(new JUnit4TestAdapter(MLPTrainerIntegrationTest.class));
-
-        return suite;
-    }
 }
index 0f62c92..135ee64 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.ml.selection;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.selection.cv.CrossValidationTest;
 import org.apache.ignite.ml.selection.paramgrid.ParameterSetGeneratorTest;
 import org.apache.ignite.ml.selection.scoring.cursor.CacheBasedLabelPairCursorTest;
@@ -34,33 +32,27 @@ import org.apache.ignite.ml.selection.scoring.metric.RecallTest;
 import org.apache.ignite.ml.selection.split.TrainTestDatasetSplitterTest;
 import org.apache.ignite.ml.selection.split.mapper.SHA256UniformMapperTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all tests located in org.apache.ignite.ml.selection.* package.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    CrossValidationTest.class,
+    ParameterSetGeneratorTest.class,
+    LocalLabelPairCursorTest.class,
+    AccuracyTest.class,
+    PrecisionTest.class,
+    RecallTest.class,
+    FmeasureTest.class,
+    SHA256UniformMapperTest.class,
+    TrainTestDatasetSplitterTest.class,
+    EvaluatorTest.class,
+    CacheBasedLabelPairCursorTest.class,
+    BinaryClassificationMetricsTest.class,
+    BinaryClassificationMetricsValuesTest.class,
+    BinaryClassificationEvaluatorTest.class,
+})
 public class SelectionTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite(SelectionTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(CrossValidationTest.class));
-        suite.addTest(new JUnit4TestAdapter(ParameterSetGeneratorTest.class));
-        suite.addTest(new JUnit4TestAdapter(LocalLabelPairCursorTest.class));
-        suite.addTest(new JUnit4TestAdapter(AccuracyTest.class));
-        suite.addTest(new JUnit4TestAdapter(PrecisionTest.class));
-        suite.addTest(new JUnit4TestAdapter(RecallTest.class));
-        suite.addTest(new JUnit4TestAdapter(FmeasureTest.class));
-        suite.addTest(new JUnit4TestAdapter(SHA256UniformMapperTest.class));
-        suite.addTest(new JUnit4TestAdapter(TrainTestDatasetSplitterTest.class));
-        suite.addTest(new JUnit4TestAdapter(EvaluatorTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheBasedLabelPairCursorTest.class));
-        suite.addTest(new JUnit4TestAdapter(BinaryClassificationMetricsTest.class));
-        suite.addTest(new JUnit4TestAdapter(BinaryClassificationMetricsValuesTest.class));
-        suite.addTest(new JUnit4TestAdapter(BinaryClassificationEvaluatorTest.class));
-
-
-        return suite;
-    }
 }
index 7c984c1..e344ab3 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.ml.tree;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.tree.data.DecisionTreeDataTest;
 import org.apache.ignite.ml.tree.impurity.gini.GiniImpurityMeasureCalculatorTest;
 import org.apache.ignite.ml.tree.impurity.gini.GiniImpurityMeasureTest;
@@ -27,29 +25,24 @@ import org.apache.ignite.ml.tree.impurity.mse.MSEImpurityMeasureTest;
 import org.apache.ignite.ml.tree.impurity.util.SimpleStepFunctionCompressorTest;
 import org.apache.ignite.ml.tree.impurity.util.StepFunctionTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all tests located in {@link org.apache.ignite.ml.tree} package.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    DecisionTreeClassificationTrainerTest.class,
+    DecisionTreeRegressionTrainerTest.class,
+    DecisionTreeDataTest.class,
+    GiniImpurityMeasureCalculatorTest.class,
+    GiniImpurityMeasureTest.class,
+    MSEImpurityMeasureCalculatorTest.class,
+    MSEImpurityMeasureTest.class,
+    StepFunctionTest.class,
+    SimpleStepFunctionCompressorTest.class,
+    DecisionTreeRegressionTrainerIntegrationTest.class,
+    DecisionTreeClassificationTrainerIntegrationTest.class
+})
 public class DecisionTreeTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite(DecisionTreeTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(DecisionTreeClassificationTrainerTest.class));
-        suite.addTest(new JUnit4TestAdapter(DecisionTreeRegressionTrainerTest.class));
-        suite.addTest(new JUnit4TestAdapter(DecisionTreeDataTest.class));
-        suite.addTest(new JUnit4TestAdapter(GiniImpurityMeasureCalculatorTest.class));
-        suite.addTest(new JUnit4TestAdapter(GiniImpurityMeasureTest.class));
-        suite.addTest(new JUnit4TestAdapter(MSEImpurityMeasureCalculatorTest.class));
-        suite.addTest(new JUnit4TestAdapter(MSEImpurityMeasureTest.class));
-        suite.addTest(new JUnit4TestAdapter(StepFunctionTest.class));
-        suite.addTest(new JUnit4TestAdapter(SimpleStepFunctionCompressorTest.class));
-        suite.addTest(new JUnit4TestAdapter(DecisionTreeRegressionTrainerIntegrationTest.class));
-        suite.addTest(new JUnit4TestAdapter(DecisionTreeClassificationTrainerIntegrationTest.class));
-
-        return suite;
-    }
 }
index 8a53e51..069726c 100644 (file)
  */
 package org.apache.ignite.internal.processors.rest.protocols.http.jetty;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Integration tests for Grid REST functionality; Jetty is under the hood.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    RestSetupSimpleTest.class
+})
 public class GridRestSuite {
-    /**
-     * @return Suite that contains all tests for REST.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache Ignite REST Api suite");
-
-        suite.addTest(new JUnit4TestAdapter(RestSetupSimpleTest.class));
-
-        return suite;
-    }
 }
index 8649a13..c0d502b 100644 (file)
 
 package org.apache.ignite.stream.rocketmq;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Apache RocketMQ streamers tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    RocketMQStreamerTest.class
+})
 public class RocketMQStreamerTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache RocketMQ streamer Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(RocketMQStreamerTest.class));
-
-        return suite;
-    }
 }
index e1b95a7..2476acf 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.schedule.GridScheduleSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Scheduler tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridScheduleSelfTest.class
+})
 public class IgniteSchedulerTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Grid Scheduler Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridScheduleSelfTest.class));
-
-        return suite;
-    }
 }
index 25deaea..d8088bf 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.logger.slf4j.Slf4jLoggerMarkerTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Slf4j logging tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    Slf4jLoggerMarkerTest.class
+})
 public class IgniteSlf4jTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Slf4j Logging Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(Slf4jLoggerMarkerTest.class));
-
-        return suite;
-    }
 }
index e963dd1..b1ec515 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.spark.JavaEmbeddedIgniteRDDSelfTest;
 import org.apache.ignite.spark.JavaStandaloneIgniteRDDSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suit for Ignite RDD
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    JavaEmbeddedIgniteRDDSelfTest.class,
+    JavaStandaloneIgniteRDDSelfTest.class
+})
 public class IgniteRDDTestSuite {
-    /**
-     * @return Java Ignite RDD test suit.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Java Ignite RDD tests (standalone and embedded modes");
-
-        suite.addTest(new JUnit4TestAdapter(JavaEmbeddedIgniteRDDSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JavaStandaloneIgniteRDDSelfTest.class));
-
-        return suite;
-    }
 }
index 4fb9605..4b7d7f3 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.springdata.IgniteSpringDataCrudSelfTest;
 import org.apache.ignite.springdata.IgniteSpringDataQueriesSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Ignite Spring Data 2.0 test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteSpringDataCrudSelfTest.class,
+    IgniteSpringDataQueriesSelfTest.class
+})
 public class IgniteSpringData2TestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Spring Data 2.0 Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteSpringDataCrudSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSpringDataQueriesSelfTest.class));
-
-        return suite;
-    }
 }
index 503c820..1b6c967 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.springdata.IgniteSpringDataCrudSelfTest;
 import org.apache.ignite.springdata.IgniteSpringDataQueriesSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Ignite Spring Data test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteSpringDataCrudSelfTest.class,
+    IgniteSpringDataQueriesSelfTest.class
+})
 public class IgniteSpringDataTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Spring Data Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteSpringDataCrudSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSpringDataQueriesSelfTest.class));
-
-        return suite;
-    }
 }
 
index 085b755..94d4437 100644 (file)
 
 package org.apache.ignite.stream.storm;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Apache Storm streamer tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    StormIgniteStreamerSelfTest.class
+})
 public class IgniteStormStreamerSelfTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache Storm streamer Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(StormIgniteStreamerSelfTest.class));
-
-        return suite;
-    }
 }
index 5a0730a..5234af7 100644 (file)
 
 package org.apache.ignite.stream.twitter;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Twitter streamer tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteTwitterStreamerTest.class
+})
 public class IgniteTwitterStreamerTestSuite {
-    /**
-     * @return Twitter streamer tests suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Twitter streamed Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteTwitterStreamerTest.class));
-
-        return suite;
-    }
 }
index 0cc6b17..6c8d923 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.tools.GridToolsSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Tools self-test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridToolsSelfTest.class
+})
 public class IgniteToolsSelfTestSuite {
-    /**
-     * @return Grid ant tasks tests suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Ignite Ant Tasks Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridToolsSelfTest.class));
-
-        return suite;
-    }
 }
index 41cb70f..1741179 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.GridTaskUriDeploymentDeadlockSelfTest;
 import org.apache.ignite.p2p.GridP2PDisabledSelfTest;
 import org.apache.ignite.spi.deployment.uri.GridUriDeploymentClassLoaderMultiThreadedSelfTest;
@@ -33,39 +31,35 @@ import org.apache.ignite.spi.deployment.uri.GridUriDeploymentSimpleSelfTest;
 import org.apache.ignite.spi.deployment.uri.scanners.file.GridFileDeploymentSelfTest;
 import org.apache.ignite.spi.deployment.uri.scanners.file.GridFileDeploymentUndeploySelfTest;
 import org.apache.ignite.spi.deployment.uri.scanners.http.GridHttpDeploymentSelfTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Tests against {@link org.apache.ignite.spi.deployment.uri.UriDeploymentSpi}.
  */
-public class IgniteUriDeploymentTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("URI Deployment Spi Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentConfigSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentSimpleSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentClassloaderRegisterSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentFileProcessorSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentClassLoaderSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentClassLoaderMultiThreadedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentMultiScannersSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentConfigSelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridUriDeploymentConfigSelfTest.class,
+    GridUriDeploymentSimpleSelfTest.class,
+    GridUriDeploymentClassloaderRegisterSelfTest.class,
+    GridUriDeploymentFileProcessorSelfTest.class,
+    GridUriDeploymentClassLoaderSelfTest.class,
+    GridUriDeploymentClassLoaderMultiThreadedSelfTest.class,
+    GridUriDeploymentMultiScannersSelfTest.class,
+    GridUriDeploymentConfigSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridFileDeploymentUndeploySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridHttpDeploymentSelfTest.class));
+    GridFileDeploymentUndeploySelfTest.class,
+    GridHttpDeploymentSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridFileDeploymentSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentMultiScannersErrorThrottlingTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridUriDeploymentMd5CheckSelfTest.class));
+    GridFileDeploymentSelfTest.class,
+    GridUriDeploymentMultiScannersErrorThrottlingTest.class,
+    GridUriDeploymentMd5CheckSelfTest.class,
 
-        // GAR Ant task tests.
-        suite.addTest(IgniteToolsSelfTestSuite.suite());
+    // GAR Ant task tests.
+    IgniteToolsSelfTestSuite.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridTaskUriDeploymentDeadlockSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridP2PDisabledSelfTest.class));
-
-        return suite;
-    }
+    GridTaskUriDeploymentDeadlockSelfTest.class,
+    GridP2PDisabledSelfTest.class
+})
+public class IgniteUriDeploymentTestSuite {
 }
index f144dd6..9bc5c28 100644 (file)
 
 package org.apache.ignite;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.yarn.IgniteApplicationMasterSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Apache Hadoop Yarn integration tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteApplicationMasterSelfTest.class
+})
 public class IgniteYarnTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache Yarn Integration Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteApplicationMasterSelfTest.class));
-
-        return suite;
-    }
 }
index 0e80631..93f4f47 100644 (file)
 
 package org.apache.ignite.stream.zeromq;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * ZeroMQ streamer tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteZeroMqStreamerTest.class
+})
 public class IgniteZeroMqStreamerTestSuite {
-    /**
-     * @return ZeroMQ streamer tests suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("ZeroMQ streamed Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteZeroMqStreamerTest.class));
-
-        return suite;
-    }
 }
index 689daae..7064435 100644 (file)
@@ -17,6 +17,7 @@
 package org.apache.ignite.spi.discovery.zk;
 
 import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicTest;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -30,8 +31,9 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 public class IgniteCacheEntryListenerWithZkDiscoAtomicTest extends IgniteCacheEntryListenerAtomicTest {
     /** {@inheritDoc} */
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-8109")
     @Test
     @Override public void testConcurrentRegisterDeregister() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-8109");
+        // No-op.
     }
 }
index bd2891f..e357477 100644 (file)
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.zk;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import junit.framework.TestSuite;
 import org.apache.curator.test.InstanceSpec;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
 import org.apache.ignite.IgniteException;
@@ -32,7 +31,7 @@ import org.apache.ignite.testframework.config.GridTestProperties;
 /**
  * Allows to run regular Ignite tests with {@link org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi}.
  */
-public abstract class ZookeeperDiscoverySpiAbstractTestSuite extends TestSuite {
+public abstract class ZookeeperDiscoverySpiAbstractTestSuite {
     /** */
     private static TestingCluster testingCluster;
 
index c6a67f3..78c660e 100644 (file)
 
 package org.apache.ignite.spi.discovery.zk;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.IgniteClientReconnectCacheTest;
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNodeRestartTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeFullApiSelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
 import org.apache.ignite.util.GridCommandHandlerTest;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Regular Ignite tests executed with {@link org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi}.
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCachePartitionedNodeRestartTest.class,
+    IgniteCacheEntryListenerWithZkDiscoAtomicTest.class,
+    IgniteClientReconnectCacheTest.class,
+    GridCachePartitionedMultiNodeFullApiSelfTest.class,
+    GridCacheReplicatedMultiNodeFullApiSelfTest.class,
+    GridCommandHandlerTest.class
+})
 public class ZookeeperDiscoverySpiTestSuite2 extends ZookeeperDiscoverySpiAbstractTestSuite {
     /** */
-    private static TestingCluster testingCluster;
-
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
+    @BeforeClass
+    public static void init() throws Exception {
         System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm tests.
 
         initSuite();
-
-        TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNodeRestartTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheEntryListenerWithZkDiscoAtomicTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectCacheTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCommandHandlerTest.class));
-
-        return suite;
     }
 }
index 403232d..35cc6af 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.spi.discovery.zk;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDataStructuresTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedNodeRestartTxSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSequenceApiSelfTest;
@@ -28,36 +26,31 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicMulti
 import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmFullApiSelfTest;
 import org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest;
 import org.apache.ignite.p2p.GridP2PContinuousDeploymentSelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Regular Ignite tests executed with {@link ZookeeperDiscoverySpi}.
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCacheReplicatedNodeRestartSelfTest.class,
+    GridEventConsumeSelfTest.class,
+    GridCachePartitionedNodeRestartTxSelfTest.class,
+    IgniteClientDataStructuresTest.class,
+    GridCacheReplicatedSequenceApiSelfTest.class,
+    GridCachePartitionedSequenceApiSelfTest.class,
+    GridCacheAtomicMultiJvmFullApiSelfTest.class,
+    GridCachePartitionedMultiJvmFullApiSelfTest.class,
+    GridP2PContinuousDeploymentSelfTest.class
+})
 public class ZookeeperDiscoverySpiTestSuite3 extends ZookeeperDiscoverySpiAbstractTestSuite {
     /** */
-    private static TestingCluster testingCluster;
-
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
+    @BeforeClass
+    public static void init() throws Exception {
         System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm tests.
 
         initSuite();
-
-        TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedNodeRestartSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridEventConsumeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedNodeRestartTxSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteClientDataStructuresTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedSequenceApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedSequenceApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCachePartitionedMultiJvmFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridP2PContinuousDeploymentSelfTest.class));
-
-        return suite;
     }
 }
index 5726260..4f1a824 100644 (file)
 
 package org.apache.ignite.spi.discovery.zk;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicMultiNodeFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicMultiNodeFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQuerySelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Regular Ignite tests executed with {@link ZookeeperDiscoverySpi}.
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    ZookeeperDiscoverySuitePreprocessorTest.class,
+    IgniteCachePutRetryAtomicSelfTest.class,
+    IgniteCachePutRetryTransactionalSelfTest.class,
+    ClusterNodeMetricsUpdateTest.class,
+    GridCacheAtomicMultiNodeFullApiSelfTest.class,
+    GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class,
+    IgniteCacheReplicatedQuerySelfTest.class
+})
 public class ZookeeperDiscoverySpiTestSuite4 extends ZookeeperDiscoverySpiAbstractTestSuite {
     /** */
-    private static TestingCluster testingCluster;
-
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
+    @BeforeClass
+    public static void init() throws Exception {
         System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm tests.
 
         initSuite();
-
-        TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(ZookeeperDiscoverySuitePreprocessorTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePutRetryAtomicSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePutRetryTransactionalSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClusterNodeMetricsUpdateTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheAtomicMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedQuerySelfTest.class));
-
-        return suite;
     }
 }
index f9a6fa4..29f9632 100644 (file)
@@ -139,9 +139,8 @@ import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.server.quorum.QuorumPeer;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -164,7 +163,6 @@ import static org.apache.zookeeper.ZooKeeper.ZOOKEEPER_CLIENT_CNXN_SOCKET;
  *
  */
 @SuppressWarnings("deprecation")
-@RunWith(JUnit4.class)
 public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest {
     /** */
     private static final String IGNITE_ZK_ROOT = ZookeeperDiscoverySpi.DFLT_ROOT_PATH;
@@ -3926,20 +3924,18 @@ public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-8178")
     @Test
     public void testReconnectServersRestart_1() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-8178");
-
         reconnectServersRestart(1);
     }
 
     /**
      * @throws Exception If failed.
      */
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-8178")
     @Test
     public void testReconnectServersRestart_2() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-8178");
-
         reconnectServersRestart(3);
     }