IGNITE-10774 Migrate test suites that are fixed lists of test classes from Junit 3 to 4 - Fixes #5732.
Signed-off-by: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc31cbde Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc31cbde Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc31cbde Branch: refs/heads/ignite-601 Commit: cc31cbde56a7ef1330eb27fceaa5c97af843b2cd Parents: ca71fe9 Author: Oleg Ignatenko <oignate...@gridgain.com> Authored: Thu Dec 27 19:35:14 2018 +0300 Committer: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Committed: Thu Dec 27 19:35:14 2018 +0300 ---------------------------------------------------------------------- .../suite/IgniteJdbcDriverMvccTestSuite.java | 37 +-- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 256 +++++++++---------- .../IgniteMvccTxMultiThreadedAbstractTest.java | 11 +- ...dCachePartitionedTopologyChangeSelfTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- ...rySimpleNameMapperCacheFullApiTestSuite.java | 19 +- ...eCacheDataStructuresBinarySelfTestSuite.java | 33 +-- .../IgniteCacheDataStructuresSelfTestSuite.java | 204 +++++++-------- .../IgniteCacheFailoverTestSuite2.java | 55 ++-- .../IgniteCacheFailoverTestSuite3.java | 23 +- ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 74 +++--- .../IgniteCacheFullApiSelfTestSuite.java | 178 ++++++------- .../IgniteCacheLoadConsistencyTestSuite.java | 23 +- .../testsuites/IgniteCacheMvccTestSuite.java | 66 ++--- .../testsuites/IgniteCacheRestartTestSuite.java | 31 +-- .../IgniteCacheRestartTestSuite2.java | 35 +-- .../IgniteCacheTxRecoverySelfTestSuite.java | 43 ++-- .../testsuites/IgniteClientNodesTestSuite.java | 29 +-- .../IgniteClientReconnectTestSuite.java | 51 ++-- ...ileSystemShmemExternalDualAsyncSelfTest.java | 9 +- .../HadoopExternalTaskExecutionSelfTest.java | 4 +- .../HadoopExternalCommunicationSelfTest.java | 6 +- .../IgniteBinaryHibernateTestSuite.java | 22 +- .../testsuites/IgniteHibernateTestSuite.java | 40 ++- .../IgniteBinaryHibernate5TestSuite.java | 22 +- .../testsuites/IgniteHibernate5TestSuite.java | 40 ++- .../IgniteBinaryHibernate53TestSuite.java | 24 +- .../testsuites/IgniteHibernate53TestSuite.java | 43 ++-- .../IgniteCacheAffinityRunTestSuite.java | 29 +-- .../testsuites/IgniteCacheMvccSqlTestSuite.java | 168 ++++++------ .../IgniteCacheQuerySelfTestSuite3.java | 83 +++--- .../IgniteCacheQuerySelfTestSuite4.java | 41 ++- .../IgniteCacheQuerySelfTestSuite5.java | 54 ++-- .../IgniteCacheQuerySelfTestSuite6.java | 54 ++-- ...acheWithIndexingAndPersistenceTestSuite.java | 21 +- .../IgniteCacheWithIndexingTestSuite.java | 67 +++-- ...IgniteDbMemoryLeakWithIndexingTestSuite.java | 21 +- .../IgnitePdsWithIndexingCoreTestSuite.java | 73 +++--- .../IgnitePdsWithIndexingTestSuite.java | 37 +-- .../ignite/testsuites/IgniteJclTestSuite.java | 19 +- .../ignite/testsuites/IgniteJtaTestSuite.java | 44 ++-- .../kafka/IgniteKafkaStreamerSelfTestSuite.java | 29 +-- .../testsuites/IgniteLog4j2TestSuite.java | 25 +- .../org/apache/ignite/IgniteMesosTestSuite.java | 19 +- .../org/apache/ignite/ml/IgniteMLTestSuite.java | 56 ++-- .../ignite/ml/dataset/DatasetTestSuite.java | 37 ++- .../ignite/ml/inference/InferenceTestSuite.java | 25 +- .../org/apache/ignite/ml/nn/MLPTestSuite.java | 23 +- .../ignite/ml/selection/SelectionTestSuite.java | 44 ++-- .../ignite/ml/tree/DecisionTreeTestSuite.java | 37 ++- .../protocols/http/jetty/GridRestSuite.java | 19 +- .../rocketmq/RocketMQStreamerTestSuite.java | 19 +- .../testsuites/IgniteSchedulerTestSuite.java | 19 +- .../ignite/testsuites/IgniteSlf4jTestSuite.java | 19 +- .../ignite/testsuites/IgniteRDDTestSuite.java | 21 +- .../testsuites/IgniteSpringData2TestSuite.java | 21 +- .../testsuites/IgniteSpringDataTestSuite.java | 21 +- .../storm/IgniteStormStreamerSelfTestSuite.java | 19 +- .../twitter/IgniteTwitterStreamerTestSuite.java | 19 +- .../testsuites/IgniteToolsSelfTestSuite.java | 19 +- .../IgniteUriDeploymentTestSuite.java | 52 ++-- .../org/apache/ignite/IgniteYarnTestSuite.java | 19 +- .../zeromq/IgniteZeroMqStreamerTestSuite.java | 19 +- ...CacheEntryListenerWithZkDiscoAtomicTest.java | 4 +- .../ZookeeperDiscoverySpiAbstractTestSuite.java | 3 +- .../zk/ZookeeperDiscoverySpiTestSuite2.java | 35 +-- .../zk/ZookeeperDiscoverySpiTestSuite3.java | 41 ++- .../zk/ZookeeperDiscoverySpiTestSuite4.java | 37 ++- .../zk/internal/ZookeeperDiscoverySpiTest.java | 10 +- 69 files changed, 1149 insertions(+), 1659 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverMvccTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverMvccTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverMvccTestSuite.java index f89bc44..8722969 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverMvccTestSuite.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverMvccTestSuite.java @@ -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 { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java index 977feed..c4f8065 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java @@ -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; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java index f7c434a..9193f3e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java @@ -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. } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index 6344c12..8cd6c93 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -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} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java index 75263b0..a126843 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java @@ -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} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinarySimpleNameMapperCacheFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinarySimpleNameMapperCacheFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinarySimpleNameMapperCacheFullApiTestSuite.java index dc362b8..90fa9e0 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinarySimpleNameMapperCacheFullApiTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinarySimpleNameMapperCacheFullApiTestSuite.java @@ -17,25 +17,24 @@ 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(); - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresBinarySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresBinarySelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresBinarySelfTestSuite.java index a9162c2..8654cf6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresBinarySelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresBinarySelfTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.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; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index 4d1c179..f7f6e22 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.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; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java index ecc6c25..87b09fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.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 { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java index 6c53c8c..3c829a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java @@ -17,29 +17,20 @@ 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; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java index b62e9ba..4f1d6f6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.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"); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java index 3875475..30d8d63 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.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; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheLoadConsistencyTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheLoadConsistencyTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheLoadConsistencyTestSuite.java index ef44239..02c2f49 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheLoadConsistencyTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheLoadConsistencyTestSuite.java @@ -17,29 +17,20 @@ 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; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite.java index f9dd947..75d7174 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.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 { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java index 6c0b3a2..4e96305 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.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 { } http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java index 18c450a..fc73b2b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java @@ -17,8 +17,6 @@ package org.apache.ignite.testsuites; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.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 { }
