IGNITE-10796 Migrate from JUnit 3 to 4 suites involving IgniteTestSuite
authorOleg Ignatenko <oignatenko@gridgain.com>
Tue, 25 Dec 2018 11:01:50 +0000 (14:01 +0300)
committerDmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Wed, 16 Jan 2019 11:05:58 +0000 (14:05 +0300)
Signed-off-by: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
33 files changed:
modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAbstractSelfTest.java
modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteElbTestSuite.java
modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java
modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java
modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDataConsistencyOnCommitFailureTest.java
modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java [deleted file]
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnore.java [deleted file]
modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredBinarySimpleMapperTestSuite.java
modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredBinaryTestSuite.java
modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinarySimpleNameMapperCacheQueryTestSuite.java
modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaLookupClassNameSelfTest.java
modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java
modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java
modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java
modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java

index 7816e7b..b3ef1ef 100644 (file)
@@ -21,8 +21,8 @@ import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManagerAbstractSelfTest;
-import org.apache.ignite.testsuites.IgniteIgnore;
 import org.apache.ignite.testsuites.IgniteS3TestSuite;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -55,7 +55,7 @@ public class S3CheckpointManagerSelfTest extends GridCheckpointManagerAbstractSe
     /**
      * @throws Exception Thrown if any exception occurs.
      */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-2420")
     @Test
     public void testS3Based() throws Exception {
         retries = 6;
@@ -66,7 +66,7 @@ public class S3CheckpointManagerSelfTest extends GridCheckpointManagerAbstractSe
     /**
      * @throws Exception Thrown if any exception occurs.
      */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-2420")
     @Test
     public void testMultiNodeS3Based() throws Exception {
         retries = 6;
index a25b5be..949c12c 100644 (file)
@@ -37,8 +37,8 @@ import org.apache.ignite.spi.checkpoint.GridCheckpointTestState;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest;
 import org.apache.ignite.testframework.junits.spi.GridSpiTest;
-import org.apache.ignite.testsuites.IgniteIgnore;
 import org.apache.ignite.testsuites.IgniteS3TestSuite;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -99,7 +99,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
     /**
      * @throws Exception Thrown in case of any errors.
      */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-2420")
     @Test
     public void testSaveLoadRemoveWithoutExpire() throws Exception {
         String dataPrefix = "Test check point data ";
@@ -159,7 +159,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
     /**
      * @throws Exception Thrown in case of any errors.
      */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-2420")
     @Test
     public void testSaveWithExpire() throws Exception {
         // Save states.
@@ -188,7 +188,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
     /**
      * @throws Exception Thrown in case of any errors.
      */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-2420")
     @Test
     public void testDuplicates() throws Exception {
         int idx1 = 1;
index 5fec502..ce089c8 100644 (file)
@@ -21,8 +21,8 @@ import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import org.apache.ignite.spi.GridSpiStartStopAbstractTest;
 import org.apache.ignite.testframework.junits.spi.GridSpiTest;
-import org.apache.ignite.testsuites.IgniteIgnore;
 import org.apache.ignite.testsuites.IgniteS3TestSuite;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -46,7 +46,7 @@ public class S3CheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTe
     }
 
     /** {@inheritDoc} */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-2420")
     @Test
     @Override public void testStartStop() throws Exception {
         super.testStartStop();
index 99a0cc5..f8ab6ab 100644 (file)
@@ -22,8 +22,8 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.session.GridSessionCheckpointAbstractSelfTest;
 import org.apache.ignite.session.GridSessionCheckpointSelfTest;
-import org.apache.ignite.testsuites.IgniteIgnore;
 import org.apache.ignite.testsuites.IgniteS3TestSuite;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -36,7 +36,7 @@ public class S3SessionCheckpointSelfTest extends GridSessionCheckpointAbstractSe
     /**
      * @throws Exception If failed.
      */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-2420")
     @Test
     public void testS3Checkpoint() throws Exception {
         IgniteConfiguration cfg = getConfiguration();
index 612f84e..a0d5c9d 100644 (file)
@@ -25,9 +25,9 @@ import java.util.concurrent.ThreadLocalRandom;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.encrypt.EncryptionService;
-import org.apache.ignite.testsuites.IgniteIgnore;
 import org.apache.ignite.testsuites.IgniteS3TestSuite;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -91,7 +91,7 @@ public abstract class TcpDiscoveryS3IpFinderAbstractSelfTest
     }
 
     /** {@inheritDoc} */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-2420")
     @Test
     @Override public void testIpFinder() throws Exception {
         super.testIpFinder();
index 5c6566d..f598ac4 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.elb.TcpDiscoveryElbIpFinderSelfTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * ELB IP finder test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({TcpDiscoveryElbIpFinderSelfTest.class})
 public class IgniteElbTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("ELB Integration Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryElbIpFinderSelfTest.class));
-
-        return suite;
-    }
 }
index 9e03db4..0b3a404 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.spi.checkpoint.s3.S3CheckpointManagerSelfTest;
 import org.apache.ignite.spi.checkpoint.s3.S3CheckpointSpiConfigSelfTest;
 import org.apache.ignite.spi.checkpoint.s3.S3CheckpointSpiSelfTest;
@@ -38,49 +36,40 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.encrypt.AsymmetricKeyEncr
 import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.encrypt.AwsKmsEncryptionServiceTest;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.encrypt.MockEncryptionServiceTest;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.encrypt.SymmetricKeyEncryptionServiceTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * S3 integration tests.
  */
-@RunWith(AllTests.class)
-public class IgniteS3TestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("S3 Integration Test Suite");
-
-        // Checkpoint SPI.
-        suite.addTest(new JUnit4TestAdapter(S3CheckpointSpiConfigSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(S3CheckpointSpiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(S3CheckpointSpiStartStopSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(S3CheckpointManagerSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(S3SessionCheckpointSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(S3CheckpointSpiStartStopBucketEndpointSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(S3CheckpointSpiStartStopSSEAlgorithmSelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    // Checkpoint SPI.
+    S3CheckpointSpiConfigSelfTest.class,
+    S3CheckpointSpiSelfTest.class,
+    S3CheckpointSpiStartStopSelfTest.class,
+    S3CheckpointManagerSelfTest.class,
+    S3SessionCheckpointSelfTest.class,
+    S3CheckpointSpiStartStopBucketEndpointSelfTest.class,
+    S3CheckpointSpiStartStopSSEAlgorithmSelfTest.class,
 
-        // S3 Encryption tests.
-        suite.addTest(new JUnit4TestAdapter(MockEncryptionServiceTest.class));
-        suite.addTest(new JUnit4TestAdapter(AwsKmsEncryptionServiceTest.class));
-        suite.addTest(new JUnit4TestAdapter(SymmetricKeyEncryptionServiceTest.class));
-        suite.addTest(new JUnit4TestAdapter(AsymmetricKeyEncryptionServiceTest.class));
-
-        // S3 IP finder.
-        suite.addTest(new JUnit4TestAdapter(DummyS3ClientTest.class));
-        suite.addTest(new JUnit4TestAdapter(DummyObjectListingTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryS3IpFinderAwsCredentialsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryS3IpFinderBucketEndpointSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryS3IpFinderKeyPrefixSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryS3IpFinderClientSideEncryptionSelfTest.class));
-
-        return suite;
-    }
+    // S3 Encryption tests.
+    MockEncryptionServiceTest.class,
+    AwsKmsEncryptionServiceTest.class,
+    SymmetricKeyEncryptionServiceTest.class,
+    AsymmetricKeyEncryptionServiceTest.class,
 
+    // S3 IP finder.
+    DummyS3ClientTest.class,
+    DummyObjectListingTest.class,
+    TcpDiscoveryS3IpFinderAwsCredentialsSelfTest.class,
+    TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.class,
+    TcpDiscoveryS3IpFinderBucketEndpointSelfTest.class,
+    TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest.class,
+    TcpDiscoveryS3IpFinderKeyPrefixSelfTest.class,
+    TcpDiscoveryS3IpFinderClientSideEncryptionSelfTest.class,
+})
+public class IgniteS3TestSuite {
     /**
      * @return Access key.
      */
index 453243c..55341f6 100644 (file)
@@ -24,7 +24,7 @@ import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.apache.ignite.testsuites.IgniteIgnore;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -190,7 +190,7 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-590", forceFailure = true)
+    @Ignore(value = "https://issues.apache.org/jira/browse/IGNITE-590")
     @Test
     public void testIdleConnection() throws Exception {
         int srvsCnt = 4; // TODO: IGNITE-590 it may be wrong value. Need to investigate after IGNITE-590 will be fixed.
index 66bdd80..1534975 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.internal.client.suite;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.TaskEventSubjectIdSelfTest;
 import org.apache.ignite.internal.client.ClientDefaultCacheSelfTest;
 import org.apache.ignite.internal.client.ClientReconnectionSelfTest;
@@ -71,112 +69,104 @@ import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProto
 import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolServerSelfTest;
 import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolStringAtomicDatastructuresSelfTest;
 import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolStringSelfTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite includes all test that concern REST processors.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    RouterFactorySelfTest.class,
+
+    // Parser standalone test.
+    TcpRestParserSelfTest.class,
+
+    // Test memcache protocol with custom test client.
+    RestMemcacheProtocolSelfTest.class,
+
+    // Test custom binary protocol with test client.
+    RestBinaryProtocolSelfTest.class,
+    TcpRestUnmarshalVulnerabilityTest.class,
+
+    // Test jetty rest processor
+    JettyRestProcessorSignedSelfTest.class,
+    JettyRestProcessorUnsignedSelfTest.class,
+    JettyRestProcessorAuthenticationWithCredsSelfTest.class,
+    JettyRestProcessorAuthenticationWithTokenSelfTest.class,
+    JettyRestProcessorGetAllAsArrayTest.class,
+    JettyRestProcessorBaselineSelfTest.class,
+
+    // Test TCP rest processor with original memcache client.
+    ClientMemcachedProtocolSelfTest.class,
+
+    // Test TCP rest processor with original REDIS client.
+    RedisProtocolStringSelfTest.class,
+    RedisProtocolGetAllAsArrayTest.class,
+    RedisProtocolConnectSelfTest.class,
+    RedisProtocolServerSelfTest.class,
+    RedisProtocolStringAtomicDatastructuresSelfTest.class,
+
+    RestProcessorStartSelfTest.class,
+
+    // Test cache flag conversion.
+    ClientCacheFlagsCodecTest.class,
+
+    // Test multi-start.
+    RestProcessorMultiStartSelfTest.class,
+
+    // Test clients.
+    ClientDataImplSelfTest.class,
+    ClientComputeImplSelfTest.class,
+    ClientTcpSelfTest.class,
+    ClientTcpDirectSelfTest.class,
+    ClientTcpSslSelfTest.class,
+    ClientTcpSslDirectSelfTest.class,
+
+    // Test client with many nodes.
+    ClientTcpMultiNodeSelfTest.class,
+    ClientTcpDirectMultiNodeSelfTest.class,
+    ClientTcpSslMultiNodeSelfTest.class,
+    ClientTcpSslDirectMultiNodeSelfTest.class,
+    ClientTcpUnreachableMultiNodeSelfTest.class,
+    ClientPreferDirectSelfTest.class,
+
+    // Test client with many nodes and in multithreaded scenarios
+    ClientTcpMultiThreadedSelfTest.class,
+    ClientTcpSslMultiThreadedSelfTest.class,
+
+    // Test client authentication.
+    ClientTcpSslAuthenticationSelfTest.class,
+
+    ClientTcpConnectivitySelfTest.class,
+    ClientReconnectionSelfTest.class,
+
+    // Rest task command handler test.
+    TaskCommandHandlerSelfTest.class,
+    ChangeStateCommandHandlerTest.class,
+    TaskEventSubjectIdSelfTest.class,
+
+    // Default cache only test.
+    ClientDefaultCacheSelfTest.class,
+
+    ClientFutureAdapterSelfTest.class,
+    ClientPropertiesConfigurationSelfTest.class,
+    ClientConsistentHashSelfTest.class,
+    ClientJavaHasherSelfTest.class,
+
+    ClientByteUtilsTest.class,
+
+    // Router tests.
+    TcpRouterSelfTest.class,
+    TcpSslRouterSelfTest.class,
+    TcpRouterMultiNodeSelfTest.class,
+
+    ClientFailedInitSelfTest.class,
+
+    ClientTcpTaskExecutionAfterTopologyRestartSelfTest.class,
+
+    // SSL params.
+    ClientSslParametersTest.class,
+})
 public class IgniteClientTestSuite {
-    /**
-     * @return Suite that contains all tests for REST.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("Ignite Clients Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(RouterFactorySelfTest.class));
-
-        // Parser standalone test.
-        suite.addTest(new JUnit4TestAdapter(TcpRestParserSelfTest.class));
-
-        // Test memcache protocol with custom test client.
-        suite.addTest(new JUnit4TestAdapter(RestMemcacheProtocolSelfTest.class));
-
-        // Test custom binary protocol with test client.
-        suite.addTest(new JUnit4TestAdapter(RestBinaryProtocolSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpRestUnmarshalVulnerabilityTest.class));
-
-        // Test jetty rest processor
-        suite.addTest(new JUnit4TestAdapter(JettyRestProcessorSignedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JettyRestProcessorUnsignedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JettyRestProcessorAuthenticationWithCredsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JettyRestProcessorAuthenticationWithTokenSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(JettyRestProcessorGetAllAsArrayTest.class));
-        suite.addTest(new JUnit4TestAdapter(JettyRestProcessorBaselineSelfTest.class));
-
-        // Test TCP rest processor with original memcache client.
-        suite.addTest(new JUnit4TestAdapter(ClientMemcachedProtocolSelfTest.class));
-
-        // Test TCP rest processor with original REDIS client.
-        suite.addTest(new JUnit4TestAdapter(RedisProtocolStringSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(RedisProtocolGetAllAsArrayTest.class));
-        suite.addTest(new JUnit4TestAdapter(RedisProtocolConnectSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(RedisProtocolServerSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(RedisProtocolStringAtomicDatastructuresSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(RestProcessorStartSelfTest.class));
-
-        // Test cache flag conversion.
-        suite.addTest(new JUnit4TestAdapter(ClientCacheFlagsCodecTest.class));
-
-        // Test multi-start.
-        suite.addTest(new JUnit4TestAdapter(RestProcessorMultiStartSelfTest.class));
-
-        // Test clients.
-        suite.addTest(new JUnit4TestAdapter(ClientDataImplSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientComputeImplSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpDirectSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpSslSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpSslDirectSelfTest.class));
-
-        // Test client with many nodes.
-        suite.addTest(new JUnit4TestAdapter(ClientTcpMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpDirectMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpSslMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpSslDirectMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpUnreachableMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientPreferDirectSelfTest.class));
-
-        // Test client with many nodes and in multithreaded scenarios
-        suite.addTest(new JUnit4TestAdapter(ClientTcpMultiThreadedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientTcpSslMultiThreadedSelfTest.class));
-
-        // Test client authentication.
-        suite.addTest(new JUnit4TestAdapter(ClientTcpSslAuthenticationSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(ClientTcpConnectivitySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientReconnectionSelfTest.class));
-
-        // Rest task command handler test.
-        suite.addTest(new JUnit4TestAdapter(TaskCommandHandlerSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ChangeStateCommandHandlerTest.class));
-        suite.addTest(new JUnit4TestAdapter(TaskEventSubjectIdSelfTest.class));
-
-        // Default cache only test.
-        suite.addTest(new JUnit4TestAdapter(ClientDefaultCacheSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(ClientFutureAdapterSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientPropertiesConfigurationSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientConsistentHashSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientJavaHasherSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(ClientByteUtilsTest.class));
-
-        // Router tests.
-        suite.addTest(new JUnit4TestAdapter(TcpRouterSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpSslRouterSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(TcpRouterMultiNodeSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(ClientFailedInitSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(ClientTcpTaskExecutionAfterTopologyRestartSelfTest.class));
-
-        // SSL params.
-        suite.addTest(new JUnit4TestAdapter(ClientSslParametersTest.class));
-
-        return suite;
-    }
 }
index 89744a2..b12318f 100644 (file)
@@ -24,7 +24,7 @@ import java.util.Collection;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest;
 import org.apache.ignite.testsuites.IgniteCloudTestSuite;
-import org.apache.ignite.testsuites.IgniteIgnore;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -44,17 +44,18 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends
         // No-op.
     }
 
+    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         // No-op.
     }
 
-    /* {@inheritDoc} */
+    /** {@inheritDoc} */
     @Override protected TcpDiscoveryCloudIpFinder ipFinder() throws Exception {
         // No-op.
         return null;
     }
 
-    /* {@inheritDoc} */
+    /** {@inheritDoc} */
     @Test
     @Override public void testIpFinder() throws Exception {
         // No-op
@@ -65,7 +66,7 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends
      *
      * @throws Exception If any error occurs.
      */
-    @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-1585")
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-1585")
     @Test
     public void testGoogleComputeEngine() throws Exception {
         testCloudProvider("google-compute-engine");
@@ -77,9 +78,8 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends
      * @throws Exception If any error occurs.
      */
     @Test
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-9444")
     public void testRackspace() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-9444");
-
         testCloudProvider("rackspace-cloudservers-us");
     }
 
index 5be6d3b..f8780f4 100644 (file)
@@ -19,31 +19,17 @@ package org.apache.ignite.testsuites;
 
 import java.util.Collection;
 import java.util.LinkedList;
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.cloud.TcpDiscoveryCloudIpFinderSelfTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Ignite Cloud integration test.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({TcpDiscoveryCloudIpFinderSelfTest.class})
 public class IgniteCloudTestSuite {
     /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("Cloud Integration Test Suite");
-
-        // Cloud Nodes IP finder.
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryCloudIpFinderSelfTest.class));
-
-        return suite;
-    }
-
-    /**
      * <a href="http://jclouds.apache.org/guides/google/">Service Account email<a/> for GCE.
      * <a href="http://jclouds.apache.org/guides/aws/">Access Key ID</a> for Amazon.
      * <a href="http://jclouds.apache.org/guides/rackspace/">Username</a> for Rackspace.
index deb9dc2..2a15761 100644 (file)
@@ -27,6 +27,7 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.GridTestUtils;
 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;
@@ -108,9 +109,8 @@ public class AuthenticationProcessorNodeRestartTest extends GridCommonAbstractTe
      * @throws Exception If failed.
      */
     @Test
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-7472")
     public void testConcurrentAddUpdateRemoveNodeRestartCoordinator() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-7472");
-
         final IgniteInternalFuture restartFut = restartCoordinator();
 
         AuthorizationContext.context(actxDflt);
index 50f82b4..d2972e1 100644 (file)
@@ -30,6 +30,8 @@ import org.apache.ignite.internal.IgniteClientReconnectAbstractTest;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.GridTestUtils.SF;
+import org.junit.Assume;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -141,8 +143,7 @@ public class WalModeChangeAdvancedSelfTest extends WalModeChangeCommonAbstractSe
      */
     @Test
     public void testJoin() throws Exception {
-        if (MvccFeatureChecker.forcedMvcc())
-            fail("https://issues.apache.org/jira/browse/IGNITE-10421");
+        Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-10421", MvccFeatureChecker.forcedMvcc());
 
         checkJoin(false);
     }
@@ -232,9 +233,8 @@ public class WalModeChangeAdvancedSelfTest extends WalModeChangeCommonAbstractSe
      * @throws Exception If failed.
      */
     @Test
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-7472")
     public void testServerRestartCoordinator() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-7472");
-
         checkNodeRestart(true);
     }
 
index 48ec9fc..19a23cc 100644 (file)
@@ -30,6 +30,7 @@ import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -108,8 +109,7 @@ public class IgniteCachePrimarySyncTest extends GridCommonAbstractTest {
      */
     @Test
     public void testPutGet() throws Exception {
-        if (MvccFeatureChecker.forcedMvcc())
-            fail("https://issues.apache.org/jira/browse/IGNITE-10520");
+        Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-10520", MvccFeatureChecker.forcedMvcc());
 
         Ignite ignite = ignite(SRVS);
 
index 61f6486..aa5de61 100644 (file)
@@ -62,6 +62,7 @@ import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.NotNull;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -133,6 +134,8 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
      */
     @Test
     public void testSingleKeyCommitFromPrimary() throws Exception {
+        Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-10518", MvccFeatureChecker.forcedMvcc());
+
         singleKeyCommitFromPrimary(cacheConfiguration(DEFAULT_CACHE_NAME, PRIMARY_SYNC, 1, true, false));
 
         singleKeyCommitFromPrimary(cacheConfiguration(DEFAULT_CACHE_NAME, PRIMARY_SYNC, 2, false, false));
@@ -397,6 +400,8 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
      */
     @Test
     public void testSingleKeyCommit() throws Exception {
+        Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-10518", MvccFeatureChecker.forcedMvcc());
+
         singleKeyCommit(cacheConfiguration(DEFAULT_CACHE_NAME, PRIMARY_SYNC, 1, true, false));
 
         singleKeyCommit(cacheConfiguration(DEFAULT_CACHE_NAME, PRIMARY_SYNC, 2, false, false));
index 4c88fad..4275756 100644 (file)
@@ -33,11 +33,11 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
 import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.apache.ignite.testsuites.IgniteIgnore;
 import org.apache.ignite.transactions.Transaction;
 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;
@@ -119,7 +119,7 @@ public class TxDataConsistencyOnCommitFailureTest extends GridCommonAbstractTest
     }
 
     /** */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-9806", forceFailure = false)
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-9806")
     @Test
     public void testCommitErrorOnColocatedNode2PC() throws Exception {
         nodesCnt = 3;
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
deleted file mode 100644 (file)
index 861c139..0000000
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testframework;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.testframework.junits.GridAbstractTest;
-import org.apache.ignite.testsuites.IgniteIgnore;
-import org.jetbrains.annotations.Nullable;
-import org.junit.internal.MethodSorter;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Base class for run junit tests.
- * Test methods marked with @Ignored annotation won't be executed.
- */
-public class IgniteTestSuite extends TestSuite {
-    /** Ignore default flag thread local. */
-    private static final ThreadLocal<Boolean> IGNORE_DFLT = new ThreadLocal<Boolean>() {
-        @Override protected Boolean initialValue() {
-            return false;
-        }
-    };
-
-    /** Whether to execute only ignored tests. */
-    private boolean ignoredOnly;
-
-    /**
-     * Constructor.
-     *
-     * @param name Name.
-     */
-    public IgniteTestSuite(String name) {
-        this(null, name);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param theClass TestCase class
-     */
-    public IgniteTestSuite(Class<? extends TestCase> theClass) {
-        this(theClass, ignoreDefault());
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param theClass TestCase class
-     * @param ignoredOnly Whether to execute only ignored tests.
-     */
-    public IgniteTestSuite(Class<? extends TestCase> theClass, boolean ignoredOnly) {
-        this(theClass, null, ignoredOnly);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param theClass TestCase class
-     * @param name Test suite name.
-     */
-    public IgniteTestSuite(Class<? extends TestCase> theClass, String name) {
-        this(theClass, name, ignoreDefault());
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param theClass TestCase class
-     * @param name Test suite name.
-     * @param ignoredOnly Whether to execute only ignored tests.
-     */
-    public IgniteTestSuite(@Nullable Class<? extends TestCase> theClass, @Nullable String name, boolean ignoredOnly) {
-        this.ignoredOnly = ignoredOnly;
-
-        if (theClass != null)
-            addTestsFromTestCase(theClass);
-
-        if (name != null)
-            setName(name);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void addTest(Test test) {
-        // Ignore empty test suites.
-        if (test instanceof IgniteTestSuite) {
-            IgniteTestSuite suite = (IgniteTestSuite)test;
-
-            if (suite.testCount() == 0)
-                return;
-        }
-
-        super.addTest(test);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void addTestSuite(Class<? extends TestCase> testClass) {
-        addTest(new IgniteTestSuite(testClass, ignoredOnly));
-    }
-
-    /**
-     *
-     * @param theClass TestCase class
-     */
-    private void addTestsFromTestCase(Class<?> theClass) {
-        setName(theClass.getName());
-
-        try {
-            getTestConstructor(theClass);
-        }
-        catch (NoSuchMethodException ignored) {
-            addTest(warning("Class " + theClass.getName() +
-                " has no public constructor TestCase(String name) or TestCase()"));
-
-            return;
-        }
-
-        if(!Modifier.isPublic(theClass.getModifiers()))
-            addTest(warning("Class " + theClass.getName() + " is not public"));
-        else {
-            IgnoreDescriptor clsIgnore = IgnoreDescriptor.forClass(theClass);
-
-            Class superCls = theClass;
-
-            int testAdded = 0;
-            int testSkipped = 0;
-
-            LinkedList<Test> addedTests = new LinkedList<>();
-
-            for(List<String> names = new ArrayList<>(); Test.class.isAssignableFrom(superCls);
-                superCls = superCls.getSuperclass()) {
-
-                Method[] methods = MethodSorter.getDeclaredMethods(superCls);
-
-                for (Method each : methods) {
-                    AddResult res = addTestMethod(each, names, theClass, clsIgnore);
-
-                    if (res.added()) {
-                        testAdded++;
-
-                        addedTests.add(res.test());
-                    }
-                    else
-                        testSkipped++;
-                }
-            }
-
-            if(testAdded == 0 && testSkipped == 0)
-                addTest(warning("No tests found in " + theClass.getName()));
-
-            // Populate tests count.
-            for (Test test : addedTests) {
-                if (test instanceof GridAbstractTest) {
-                    GridAbstractTest test0 = (GridAbstractTest)test;
-
-                    test0.forceTestCount(addedTests.size());
-                }
-            }
-        }
-    }
-
-    /**
-     * Add test method.
-     *
-     * @param m Test method.
-     * @param names Test name list.
-     * @param theClass Test class.
-     * @param clsIgnore Class ignore descriptor (if any).
-     * @return Result.
-     */
-    private AddResult addTestMethod(Method m, List<String> names, Class<?> theClass,
-        @Nullable IgnoreDescriptor clsIgnore) {
-        String name = m.getName();
-
-        if (names.contains(name))
-            return new AddResult(false, null);
-
-        if (!isPublicTestMethod(m)) {
-            if (isTestMethod(m))
-                addTest(warning("Test method isn't public: " + m.getName() + "(" + theClass.getCanonicalName() + ")"));
-
-            return new AddResult(false, null);
-        }
-
-        names.add(name);
-
-        IgnoreDescriptor ignore = IgnoreDescriptor.forMethod(theClass, m);
-
-        if (ignore == null)
-            ignore = clsIgnore;
-
-        if (ignoredOnly) {
-            if (ignore != null) {
-                Test test = createTest(theClass, name);
-
-                if (ignore.forceFailure()) {
-                    if (test instanceof GridAbstractTest)
-                        ((GridAbstractTest)test).forceFailure(ignore.reason());
-                    else
-                        test = new ForcedFailure(name, ignore.reason());
-                }
-
-                addTest(test);
-
-                return new AddResult(true, test);
-            }
-        }
-        else {
-            if (ignore == null) {
-                Test test = createTest(theClass, name);
-
-                addTest(test);
-
-                return new AddResult(true, test);
-            }
-        }
-
-        return new AddResult(false, null);
-    }
-
-    /**
-     * Check whether this is a test method.
-     *
-     * @param m Method.
-     * @return {@code True} if this is a test method.
-     */
-    private static boolean isTestMethod(Method m) {
-        return m.getParameterTypes().length == 0 &&
-            m.getName().startsWith("test") &&
-            m.getReturnType().equals(Void.TYPE);
-    }
-
-    /**
-     * Check whether this is a public test method.
-     *
-     * @param m Method.
-     * @return {@code True} if this is a public test method.
-     */
-    private static boolean isPublicTestMethod(Method m) {
-        return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
-    }
-
-    /**
-     * @param val Default value of ignore flag.
-     */
-    public static void ignoreDefault(boolean val) {
-        IGNORE_DFLT.set(val);
-    }
-
-    /**
-     * @return Default value of ignore flag.
-     */
-    private static boolean ignoreDefault() {
-        Boolean res = IGNORE_DFLT.get();
-
-        return res != null && res;
-    }
-
-    /**
-     * Ignore descriptor.
-     */
-    private static class IgnoreDescriptor {
-        /** Reason. */
-        private final String reason;
-
-        /** Force failure. */
-        private final boolean forceFailure;
-
-        /**
-         * Get descriptor for class (if any).
-         *
-         * @param cls Class.
-         * @return Descriptor or {@code null}.
-         */
-        @Nullable public static IgnoreDescriptor forClass(Class cls) {
-            Class cls0 = cls;
-
-            while (Test.class.isAssignableFrom(cls0)) {
-                if (cls0.isAnnotationPresent(IgniteIgnore.class)) {
-                    IgniteIgnore ignore = (IgniteIgnore)cls0.getAnnotation(IgniteIgnore.class);
-
-                    String reason = ignore.value();
-
-                    if (F.isEmpty(reason))
-                        throw new IllegalArgumentException("Reason is not set for ignored test [class=" +
-                            cls0.getName() + ']');
-
-                    return new IgnoreDescriptor(reason, ignore.forceFailure());
-                }
-
-                cls0 = cls0.getSuperclass();
-            }
-
-            return null;
-        }
-
-        /**
-         * Get descriptor for method (if any).
-         *
-         * @param cls Class.
-         * @param mthd Method.
-         * @return Descriptor or {@code null}.
-         */
-        @Nullable public static IgnoreDescriptor forMethod(Class cls, Method mthd) {
-            if (mthd.isAnnotationPresent(IgniteIgnore.class)) {
-                IgniteIgnore ignore = mthd.getAnnotation(IgniteIgnore.class);
-
-                String reason = ignore.value();
-
-                if (F.isEmpty(reason))
-                    throw new IllegalArgumentException("Reason is not set for ignored test [class=" +
-                        cls.getName() + ", method=" + mthd.getName() + ']');
-
-                return new IgnoreDescriptor(reason, ignore.forceFailure());
-            }
-            else
-                return null;
-        }
-
-        /**
-         * Constructor.
-         *
-         * @param reason Reason.
-         * @param forceFailure Force failure.
-         */
-        private IgnoreDescriptor(String reason, boolean forceFailure) {
-            this.reason = reason;
-            this.forceFailure = forceFailure;
-        }
-
-        /**
-         * @return Reason.
-         */
-        public String reason() {
-            return reason;
-        }
-
-        /**
-         * @return Force failure.
-         */
-        public boolean forceFailure() {
-            return forceFailure;
-        }
-    }
-
-    /**
-     * Test add result.
-     */
-    private static class AddResult {
-        /** Result. */
-        private final boolean added;
-
-        /** Test */
-        private final Test test;
-
-        /**
-         * Constructor.
-         *
-         * @param added Result.
-         * @param test Test.
-         */
-        public AddResult(boolean added, Test test) {
-            this.added = added;
-            this.test = test;
-        }
-
-        /**
-         * @return Result.
-         */
-        public boolean added() {
-            return added;
-        }
-
-        /**
-         * @return Test.
-         */
-        public Test test() {
-            return test;
-        }
-    }
-
-    /**
-     * Test case simulating failure.
-     */
-    private static class ForcedFailure extends TestCase {
-        /** Message. */
-        private final String msg;
-
-        /**
-         * Constructor.
-         *
-         * @param name Name.
-         * @param msg  Message.
-         */
-        private ForcedFailure(String name, String msg) {
-            super(name);
-
-            this.msg = msg;
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void runTest() {
-            fail("Forced failure: " + msg + " (extend " + GridAbstractTest.class.getSimpleName() +
-                " for better output).");
-        }
-    }
-}
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnore.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnore.java
deleted file mode 100644 (file)
index 05af2a2..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation which indicates that the test is ignored.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface IgniteIgnore {
-    /**
-     * Reason for ignore (usually link to JIRA ticket).
-     */
-    String value();
-
-    /**
-     * Whether test should be failed immediately. Useful when test hangs or consumes a lot of time.
-     */
-    boolean forceFailure() default false;
-}
index aa2e219..0a6181e 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.TestSuite;
-import org.apache.ignite.testframework.IgniteTestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Special test suite with ignored tests for Binary mode.
  */
-public class IgniteIgnoredBinarySimpleMapperTestSuite extends TestSuite {
-    /**
-     * @return IgniteCache test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        IgniteTestSuite.ignoreDefault(true);
-
-        IgniteTestSuite suite = new IgniteTestSuite(null, "Ignite Ignored Binary Simple Mapper Test Suite");
-
-        /* --- QUERY --- */
-        suite.addTest(IgniteBinarySimpleNameMapperCacheQueryTestSuite.suite());
-
-        return suite;
-    }
+@RunWith(Suite.class)
+@Suite.SuiteClasses({IgniteBinarySimpleNameMapperCacheQueryTestSuite.class})
+public class IgniteIgnoredBinarySimpleMapperTestSuite {
 }
index 5116bd7..fc90858 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.TestSuite;
-import org.apache.ignite.testframework.IgniteTestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Special test suite with ignored tests for Binary mode.
  */
-public class IgniteIgnoredBinaryTestSuite extends TestSuite {
-    /**
-     * @return IgniteCache test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        IgniteTestSuite.ignoreDefault(true);
-
-        IgniteTestSuite suite = new IgniteTestSuite(null, "Ignite Ignored Binary Test Suite");
-
-        /* --- QUERY --- */
-        suite.addTest(IgniteBinaryCacheQueryTestSuite.suite());
-        suite.addTest(IgniteBinaryCacheQueryTestSuite2.suite());
-
-        return suite;
-    }
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteBinaryCacheQueryTestSuite.class,
+    IgniteBinaryCacheQueryTestSuite2.class
+})
+public class IgniteIgnoredBinaryTestSuite {
 }
index 414d166..1fb2009 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.websession.IgniteWebSessionSelfTestSuite;
-import org.apache.ignite.testframework.IgniteTestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Special test suite with ignored tests.
  */
-public class IgniteIgnoredTestSuite extends TestSuite {
-    /**
-     * @return IgniteCache test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        IgniteTestSuite.ignoreDefault(true);
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteS3TestSuite.class,
 
-        IgniteTestSuite suite = new IgniteTestSuite(null, "Ignite Ignored Test Suite");
+    /* --- CLIENTS --- */
+    org.apache.ignite.internal.client.suite.IgniteClientTestSuite.class,
 
-        /* --- AWS --- */
-        suite.addTest(IgniteS3TestSuite.suite());
+    /* --- CLOUDS --- */
+    IgniteCloudTestSuite.class,
 
-        /* --- CLIENTS --- */
-        suite.addTest(org.apache.ignite.internal.client.suite.IgniteClientTestSuite.suite());
+    /* --- JTA --- */
+    IgniteJtaTestSuite.class,
 
-        /* --- CLOUDS --- */
-        suite.addTest(IgniteCloudTestSuite.suite());
+    /* --- QUERIES --- */
+    //IgniteCacheQuerySelfTestSuite.class,
+    //IgniteCacheQuerySelfTestSuite2.class,
 
-        /* --- JTA --- */
-        suite.addTest(IgniteJtaTestSuite.suite());
+    /* --- SPRING --- */
+    IgniteSpringTestSuite.class,
 
-        /* --- QUERIES --- */
-        suite.addTest(IgniteCacheQuerySelfTestSuite.suite());
-        suite.addTest(IgniteCacheQuerySelfTestSuite2.suite());
-
-        /* --- SPRING --- */
-        suite.addTest(IgniteSpringTestSuite.suite());
-
-        /* --- WEB SESSIONS --- */
-        suite.addTest(IgniteWebSessionSelfTestSuite.suite());
-
-        return suite;
-    }
+    /* --- WEB SESSIONS --- */
+    IgniteWebSessionSelfTestSuite.class,
+})
+public class IgniteIgnoredTestSuite {
 }
index 5d7a338..0cfb016 100644 (file)
@@ -53,7 +53,6 @@ import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.SB;
 import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testsuites.IgniteIgnore;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -1797,7 +1796,7 @@ public class IgniteSqlSplitterSelfTest extends AbstractIndexingCommonTest {
     /**
      *
      */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-1886", forceFailure = true)
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-1886")
     @Test
     public void testFunctionNpe() {
         IgniteCache<Integer, User> userCache = ignite(0).createCache(
index 157dc3b..6ed5111 100644 (file)
@@ -38,7 +38,7 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField;
 import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testsuites.IgniteIgnore;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -120,7 +120,6 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
     }
 
     /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
     @Override protected void createCaches() {
         cacheOrg = jcache(ignite, cacheConfiguration(ORG, CacheMode.PARTITIONED, Integer.class, Organization.class), ORG, Integer.class, Organization.class);
         cachePers = ignite.cache(PERS);
@@ -130,7 +129,6 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
     }
 
     /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
     @Override protected void initCacheAndDbData() throws SQLException {
         int idGen = 0;
 
@@ -258,9 +256,9 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
     }
 
     /**
-     * @throws Exception
+     * @throws Exception If failed.
      */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-705", forceFailure = true)
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-705")
     @Test
     public void testAllExamples() throws Exception {
 //        compareQueryRes0("select ? limit ? offset ?");
index 0f20fdf..386f095 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.AffinityKeyNameAndValueFieldNameConflictTest;
 import org.apache.ignite.internal.processors.cache.BigEntryQueryTest;
 import org.apache.ignite.internal.processors.cache.BinaryMetadataConcurrentUpdateWithIndexesTest;
@@ -234,312 +232,302 @@ import org.apache.ignite.internal.sql.SqlParserUserSelfTest;
 import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest;
 import org.apache.ignite.sqltests.PartitionedSqlTest;
 import org.apache.ignite.sqltests.ReplicatedSqlTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 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({
+    AffinityKeyNameAndValueFieldNameConflictTest.class,
+    DmlInsideTransactionTest.class,
+    ComplexPrimaryKeyUnwrapSelfTest.class,
+    SqlNestedQuerySelfTest.class,
+    ExplainSelfTest.class,
+    RunningQueriesTest.class,
+
+    PartitionedSqlTest.class,
+    ReplicatedSqlTest.class,
+
+    SqlParserCreateIndexSelfTest.class,
+    SqlParserDropIndexSelfTest.class,
+    SqlParserTransactionalKeywordsSelfTest.class,
+    SqlParserBulkLoadSelfTest.class,
+    SqlParserSetStreamingSelfTest.class,
+
+    SqlConnectorConfigurationValidationSelfTest.class,
+    ClientConnectorConfigurationValidationSelfTest.class,
+
+    SqlSchemaSelfTest.class,
+    SqlIllegalSchemaSelfTest.class,
+    MultipleStatementsSqlQuerySelfTest.class,
+
+    BasicIndexTest.class,
+    BasicIndexMultinodeTest.class,
+
+    // Misc tests.
+    QueryEntityValidationSelfTest.class,
+    DuplicateKeyValueClassesSelfTest.class,
+    GridCacheLazyQueryPartitionsReleaseTest.class,
+
+    // Dynamic index create/drop tests.
+    SchemaExchangeSelfTest.class,
+
+    DynamicIndexServerCoordinatorBasicSelfTest.class,
+    DynamicIndexServerBasicSelfTest.class,
+    DynamicIndexServerNodeFilterCoordinatorBasicSelfTest.class,
+    DynamicIndexServerNodeFIlterBasicSelfTest.class,
+    DynamicIndexClientBasicSelfTest.class,
+
+    // H2 tests.
+
+    GridH2IndexingInMemSelfTest.class,
+    GridH2IndexingOffheapSelfTest.class,
+
+    // Parsing
+    GridQueryParsingTest.class,
+    IgniteCacheSqlQueryErrorSelfTest.class,
+
+    // Config.
+    IgniteCacheDuplicateEntityConfigurationSelfTest.class,
+    IncorrectQueryEntityTest.class,
+    IgniteDynamicSqlRestoreTest.class,
+
+    // Queries tests.
+    LazyQuerySelfTest.class,
+    IgniteSqlSplitterSelfTest.class,
+    SqlPushDownFunctionTest.class,
+    IgniteSqlSegmentedIndexSelfTest.class,
+    IgniteCachelessQueriesSelfTest.class,
+    IgniteSqlSegmentedIndexMultiNodeSelfTest.class,
+    IgniteSqlSchemaIndexingTest.class,
+    GridCacheQueryIndexDisabledSelfTest.class,
+    IgniteCacheQueryLoadSelfTest.class,
+    IgniteCacheLocalQuerySelfTest.class,
+    IgniteCacheLocalAtomicQuerySelfTest.class,
+    IgniteCacheReplicatedQuerySelfTest.class,
+    IgniteCacheReplicatedQueryP2PDisabledSelfTest.class,
+    IgniteCacheReplicatedQueryEvtsDisabledSelfTest.class,
+    IgniteCachePartitionedQuerySelfTest.class,
+    IgniteCachePartitionedSnapshotEnabledQuerySelfTest.class,
+    IgniteCacheAtomicQuerySelfTest.class,
+    IgniteCacheAtomicNearEnabledQuerySelfTest.class,
+    IgniteCachePartitionedQueryP2PDisabledSelfTest.class,
+    IgniteCachePartitionedQueryEvtsDisabledSelfTest.class,
+
+    IgniteCacheUnionDuplicatesTest.class,
+    IgniteCacheJoinPartitionedAndReplicatedCollocationTest.class,
+    IgniteClientReconnectCacheQueriesFailoverTest.class,
+    IgniteErrorOnRebalanceTest.class,
+    CacheQueryBuildValueTest.class,
+    CacheOffheapBatchIndexingMultiTypeTest.class,
+
+    IgniteCacheQueryIndexSelfTest.class,
+    IgniteCacheCollocatedQuerySelfTest.class,
+    IgniteCacheLargeResultSelfTest.class,
+    GridCacheQueryInternalKeysSelfTest.class,
+    H2ResultSetIteratorNullifyOnEndSelfTest.class,
+    IgniteSqlBigIntegerKeyTest.class,
+    IgniteCacheOffheapEvictQueryTest.class,
+    IgniteCacheOffheapIndexScanTest.class,
+
+    GridCacheCrossCacheQuerySelfTest.class,
+    GridCacheQuerySerializationSelfTest.class,
+    IgniteBinaryObjectFieldsQuerySelfTest.class,
+    IgniteStableBaselineBinObjFieldsQuerySelfTest.class,
+    IgniteBinaryWrappedObjectFieldsQuerySelfTest.class,
+    IgniteCacheQueryH2IndexingLeakTest.class,
+    IgniteCacheQueryNoRebalanceSelfTest.class,
+    GridCacheQueryTransformerSelfTest.class,
+    CacheScanQueryFailoverTest.class,
+    IgniteCachePrimitiveFieldsQuerySelfTest.class,
+
+    IgniteCacheJoinQueryWithAffinityKeyTest.class,
+    IgniteCacheJoinPartitionedAndReplicatedTest.class,
+    IgniteCrossCachesJoinsQueryTest.class,
+
+    IgniteCacheMultipleIndexedTypesTest.class,
+
+    // DML.
+    IgniteCacheMergeSqlQuerySelfTest.class,
+    IgniteCacheInsertSqlQuerySelfTest.class,
+    IgniteCacheUpdateSqlQuerySelfTest.class,
+    IgniteCacheDeleteSqlQuerySelfTest.class,
+    IgniteSqlSkipReducerOnUpdateDmlSelfTest.class,
+    IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.class,
+
+    IgniteBinaryObjectQueryArgumentsTest.class,
+    IgniteBinaryObjectLocalQueryArgumentsTest.class,
+
+    IndexingSpiQuerySelfTest.class,
+    IndexingSpiQueryTxSelfTest.class,
+
+    IgniteCacheMultipleIndexedTypesTest.class,
+    IgniteSqlQueryMinMaxTest.class,
+
+    GridCircularQueueTest.class,
+    IndexingSpiQueryWithH2IndexingSelfTest.class,
+
+    // DDL.
+    H2DynamicIndexTransactionalReplicatedSelfTest.class,
+    H2DynamicIndexTransactionalPartitionedSelfTest.class,
+    H2DynamicIndexTransactionalPartitionedNearSelfTest.class,
+    H2DynamicIndexAtomicReplicatedSelfTest.class,
+    H2DynamicIndexAtomicPartitionedSelfTest.class,
+    H2DynamicIndexAtomicPartitionedNearSelfTest.class,
+    H2DynamicTableSelfTest.class,
+    H2DynamicColumnsClientBasicSelfTest.class,
+    H2DynamicColumnsServerBasicSelfTest.class,
+    H2DynamicColumnsServerCoordinatorBasicSelfTest.class,
+
+    // DML+DDL.
+    H2DynamicIndexingComplexClientAtomicPartitionedTest.class,
+    H2DynamicIndexingComplexClientAtomicPartitionedNoBackupsTest.class,
+    H2DynamicIndexingComplexClientAtomicReplicatedTest.class,
+    H2DynamicIndexingComplexClientTransactionalPartitionedTest.class,
+    H2DynamicIndexingComplexClientTransactionalPartitionedNoBackupsTest.class,
+    H2DynamicIndexingComplexClientTransactionalReplicatedTest.class,
+    H2DynamicIndexingComplexServerAtomicPartitionedTest.class,
+    H2DynamicIndexingComplexServerAtomicPartitionedNoBackupsTest.class,
+    H2DynamicIndexingComplexServerAtomicReplicatedTest.class,
+    H2DynamicIndexingComplexServerTransactionalPartitionedTest.class,
+    H2DynamicIndexingComplexServerTransactionalPartitionedNoBackupsTest.class,
+    H2DynamicIndexingComplexServerTransactionalReplicatedTest.class,
+
+    DdlTransactionSelfTest.class,
+
+    // Fields queries.
+    SqlFieldsQuerySelfTest.class,
+    IgniteCacheLocalFieldsQuerySelfTest.class,
+    IgniteCacheReplicatedFieldsQuerySelfTest.class,
+    IgniteCacheReplicatedFieldsQueryROSelfTest.class,
+    IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.class,
+    IgniteCacheReplicatedFieldsQueryJoinNoPrimaryPartitionsSelfTest.class,
+    IgniteCachePartitionedFieldsQuerySelfTest.class,
+    IgniteCacheAtomicFieldsQuerySelfTest.class,
+    IgniteCacheAtomicNearEnabledFieldsQuerySelfTest.class,
+    IgniteCachePartitionedFieldsQueryP2PEnabledSelfTest.class,
+    IgniteCacheFieldsQueryNoDataSelfTest.class,
+    GridCacheQueryIndexingDisabledSelfTest.class,
+    GridOrderedMessageCancelSelfTest.class,
+    CacheQueryEvictDataLostTest.class,
+
+    // Full text queries.
+    GridCacheFullTextQuerySelfTest.class,
+    IgniteCacheFullTextQueryNodeJoiningSelfTest.class,
+
+    // Ignite cache and H2 comparison.
+    BaseH2CompareQueryTest.class,
+    H2CompareBigQueryTest.class,
+    H2CompareBigQueryDistributedJoinsTest.class,
+
+    // Cache query metrics.
+    CacheLocalQueryMetricsSelfTest.class,
+    CachePartitionedQueryMetricsDistributedSelfTest.class,
+    CachePartitionedQueryMetricsLocalSelfTest.class,
+    CacheReplicatedQueryMetricsDistributedSelfTest.class,
+    CacheReplicatedQueryMetricsLocalSelfTest.class,
+
+    // Cache query metrics.
+    CacheLocalQueryDetailMetricsSelfTest.class,
+    CachePartitionedQueryDetailMetricsDistributedSelfTest.class,
+    CachePartitionedQueryDetailMetricsLocalSelfTest.class,
+    CacheReplicatedQueryDetailMetricsDistributedSelfTest.class,
+    CacheReplicatedQueryDetailMetricsLocalSelfTest.class,
+
+    // Unmarshalling query test.
+    IgniteCacheP2pUnmarshallingQueryErrorTest.class,
+    IgniteCacheNoClassQuerySelfTest.class,
+
+    // Cancellation.
+    IgniteCacheDistributedQueryCancelSelfTest.class,
+    IgniteCacheLocalQueryCancelOrTimeoutSelfTest.class,
+
+    // Distributed joins.
+    H2CompareBigQueryDistributedJoinsTest.class,
+    IgniteCacheDistributedJoinCollocatedAndNotTest.class,
+    IgniteCacheDistributedJoinCustomAffinityMapper.class,
+    IgniteCacheDistributedJoinNoIndexTest.class,
+    IgniteCacheDistributedJoinPartitionedAndReplicatedTest.class,
+    IgniteCacheDistributedJoinQueryConditionsTest.class,
+    IgniteCacheDistributedJoinTest.class,
+    IgniteSqlDistributedJoinSelfTest.class,
+    IgniteSqlQueryParallelismTest.class,
+
+    // Other.
+    CacheIteratorScanQueryTest.class,
+    CacheQueryNewClientSelfTest.class,
+    CacheOffheapBatchIndexingSingleTypeTest.class,
+    CacheSqlQueryValueCopySelfTest.class,
+    IgniteCacheQueryCacheDestroySelfTest.class,
+    IgniteQueryDedicatedPoolTest.class,
+    IgniteSqlEntryCacheModeAgnosticTest.class,
+    QueryEntityCaseMismatchTest.class,
+    IgniteCacheDistributedPartitionQuerySelfTest.class,
+    IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.class,
+    IgniteCacheDistributedPartitionQueryConfigurationSelfTest.class,
+    IgniteSqlKeyValueFieldsTest.class,
+    IgniteSqlRoutingTest.class,
+    IgniteSqlNotNullConstraintTest.class,
+    LongIndexNameTest.class,
+    GridCacheQuerySqlFieldInlineSizeSelfTest.class,
+    IgniteSqlParameterizedQueryTest.class,
+    H2ConnectionLeaksSelfTest.class,
+    IgniteCheckClusterStateBeforeExecuteQueryTest.class,
+    OptimizedMarshallerIndexNameTest.class,
+    SqlSystemViewsSelfTest.class,
+
+    GridIndexRebuildSelfTest.class,
+
+    SqlTransactionCommandsWithMvccDisabledSelfTest.class,
+
+    IgniteSqlDefaultValueTest.class,
+    IgniteDecimalSelfTest.class,
+    IgniteSQLColumnConstraintsTest.class,
+    IgniteTransactionSQLColumnConstraintTest.class,
+
+    IgniteCachePartitionedAtomicColumnConstraintsTest.class,
+    IgniteCachePartitionedTransactionalColumnConstraintsTest.class,
+    IgniteCachePartitionedTransactionalSnapshotColumnConstraintTest.class,
+    IgniteCacheReplicatedAtomicColumnConstraintsTest.class,
+    IgniteCacheReplicatedTransactionalColumnConstraintsTest.class,
+    IgniteCacheReplicatedTransactionalSnapshotColumnConstraintTest.class,
+
+    // H2 Rows on-heap cache
+    H2RowCacheSelfTest.class,
+    H2RowCachePageEvictionTest.class,
+
+    // User operation SQL
+    SqlParserUserSelfTest.class,
+    SqlUserCommandSelfTest.class,
+    EncryptedSqlTableTest.class,
+
+    ThreadLocalObjectPoolSelfTest.class,
+    H2StatementCacheSelfTest.class,
+    PreparedStatementExSelfTest.class,
+
+    // Partition loss.
+    IndexingCachePartitionLossPolicySelfTest.class,
+
+    // GROUP_CONCAT
+    IgniteSqlGroupConcatCollocatedTest.class,
+    IgniteSqlGroupConcatNotCollocatedTest.class,
+
+    // Binary
+    BinarySerializationQuerySelfTest.class,
+    BinarySerializationQueryWithReflectiveSerializerSelfTest.class,
+    IgniteCacheBinaryObjectsScanSelfTest.class,
+    IgniteCacheBinaryObjectsScanWithEventsSelfTest.class,
+    BigEntryQueryTest.class,
+    BinaryMetadataConcurrentUpdateWithIndexesTest.class,
+
+    // Partition pruning.
+    InOperationExtractPartitionSelfTest.class,
+    AndOperationExtractPartitionSelfTest.class,
+
+    GridCacheDynamicLoadOnClientTest.class,
+    GridCacheDynamicLoadOnClientPersistentTest.class,
+})
 public class IgniteBinaryCacheQueryTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        IgniteTestSuite suite = new IgniteTestSuite("Ignite Cache Queries Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(AffinityKeyNameAndValueFieldNameConflictTest.class));
-        suite.addTest(new JUnit4TestAdapter(DmlInsideTransactionTest.class));
-        suite.addTest(new JUnit4TestAdapter(ComplexPrimaryKeyUnwrapSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlNestedQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ExplainSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(RunningQueriesTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(ComplexPrimaryKeyUnwrapSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(PartitionedSqlTest.class));
-        suite.addTest(new JUnit4TestAdapter(ReplicatedSqlTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(SqlParserCreateIndexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlParserDropIndexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlParserTransactionalKeywordsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlParserBulkLoadSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlParserSetStreamingSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(SqlConnectorConfigurationValidationSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClientConnectorConfigurationValidationSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(SqlSchemaSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlIllegalSchemaSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(MultipleStatementsSqlQuerySelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(BasicIndexTest.class));
-        suite.addTest(new JUnit4TestAdapter(BasicIndexMultinodeTest.class));
-
-        // Misc tests.
-        suite.addTest(new JUnit4TestAdapter(QueryEntityValidationSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DuplicateKeyValueClassesSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheLazyQueryPartitionsReleaseTest.class));
-
-        // Dynamic index create/drop tests.
-        suite.addTest(new JUnit4TestAdapter(SchemaExchangeSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexServerCoordinatorBasicSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexServerBasicSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexServerNodeFilterCoordinatorBasicSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexServerNodeFIlterBasicSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexClientBasicSelfTest.class));
-
-        // H2 tests.
-
-        suite.addTest(new JUnit4TestAdapter(GridH2IndexingInMemSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridH2IndexingOffheapSelfTest.class));
-
-        // Parsing
-        suite.addTest(new JUnit4TestAdapter(GridQueryParsingTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheSqlQueryErrorSelfTest.class));
-
-        // Config.
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDuplicateEntityConfigurationSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IncorrectQueryEntityTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteDynamicSqlRestoreTest.class));
-
-        // Queries tests.
-        suite.addTest(new JUnit4TestAdapter(LazyQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlSplitterSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlPushDownFunctionTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlSegmentedIndexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachelessQueriesSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlSegmentedIndexMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlSchemaIndexingTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQueryIndexDisabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryLoadSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheLocalQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheLocalAtomicQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedQueryP2PDisabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedQueryEvtsDisabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedSnapshotEnabledQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheAtomicQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheAtomicNearEnabledQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedQueryP2PDisabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedQueryEvtsDisabledSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheUnionDuplicatesTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheJoinPartitionedAndReplicatedCollocationTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectCacheQueriesFailoverTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteErrorOnRebalanceTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheQueryBuildValueTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheOffheapBatchIndexingMultiTypeTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryIndexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheCollocatedQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheLargeResultSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQueryInternalKeysSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2ResultSetIteratorNullifyOnEndSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlBigIntegerKeyTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheOffheapEvictQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheOffheapIndexScanTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheCrossCacheQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQuerySerializationSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteBinaryObjectFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineBinObjFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteBinaryWrappedObjectFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryH2IndexingLeakTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNoRebalanceSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQueryTransformerSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheScanQueryFailoverTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePrimitiveFieldsQuerySelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheJoinQueryWithAffinityKeyTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheJoinPartitionedAndReplicatedTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCrossCachesJoinsQueryTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheMultipleIndexedTypesTest.class));
-
-        // DML.
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheMergeSqlQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheInsertSqlQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheUpdateSqlQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDeleteSqlQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlSkipReducerOnUpdateDmlSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteBinaryObjectQueryArgumentsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteBinaryObjectLocalQueryArgumentsTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IndexingSpiQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IndexingSpiQueryTxSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheMultipleIndexedTypesTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlQueryMinMaxTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCircularQueueTest.class));
-        suite.addTest(new JUnit4TestAdapter(IndexingSpiQueryWithH2IndexingSelfTest.class));
-
-        // DDL.
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexTransactionalReplicatedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexTransactionalPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexTransactionalPartitionedNearSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexAtomicReplicatedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexAtomicPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexAtomicPartitionedNearSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicTableSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicColumnsClientBasicSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicColumnsServerBasicSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicColumnsServerCoordinatorBasicSelfTest.class));
-
-        // DML+DDL.
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexClientAtomicPartitionedTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexClientAtomicPartitionedNoBackupsTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexClientAtomicReplicatedTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexClientTransactionalPartitionedTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexClientTransactionalPartitionedNoBackupsTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexClientTransactionalReplicatedTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexServerAtomicPartitionedTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexServerAtomicPartitionedNoBackupsTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexServerAtomicReplicatedTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexServerTransactionalPartitionedTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexServerTransactionalPartitionedNoBackupsTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2DynamicIndexingComplexServerTransactionalReplicatedTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(DdlTransactionSelfTest.class));
-
-        // Fields queries.
-        suite.addTest(new JUnit4TestAdapter(SqlFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheLocalFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedFieldsQueryROSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedFieldsQueryJoinNoPrimaryPartitionsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheAtomicFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheAtomicNearEnabledFieldsQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedFieldsQueryP2PEnabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheFieldsQueryNoDataSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQueryIndexingDisabledSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridOrderedMessageCancelSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheQueryEvictDataLostTest.class));
-
-        // Full text queries.
-        suite.addTest(new JUnit4TestAdapter(GridCacheFullTextQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheFullTextQueryNodeJoiningSelfTest.class));
-
-        // Ignite cache and H2 comparison.
-        suite.addTest(new JUnit4TestAdapter(BaseH2CompareQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2CompareBigQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2CompareBigQueryDistributedJoinsTest.class));
-
-        // Cache query metrics.
-        suite.addTest(new JUnit4TestAdapter(CacheLocalQueryMetricsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePartitionedQueryMetricsDistributedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePartitionedQueryMetricsLocalSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheReplicatedQueryMetricsDistributedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheReplicatedQueryMetricsLocalSelfTest.class));
-
-        // Cache query metrics.
-        suite.addTest(new JUnit4TestAdapter(CacheLocalQueryDetailMetricsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePartitionedQueryDetailMetricsDistributedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePartitionedQueryDetailMetricsLocalSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheReplicatedQueryDetailMetricsDistributedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheReplicatedQueryDetailMetricsLocalSelfTest.class));
-
-        // Unmarshalling query test.
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheP2pUnmarshallingQueryErrorTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheNoClassQuerySelfTest.class));
-
-        // Cancellation.
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedQueryCancelSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheLocalQueryCancelOrTimeoutSelfTest.class));
-
-        // Distributed joins.
-        suite.addTest(new JUnit4TestAdapter(H2CompareBigQueryDistributedJoinsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedJoinCollocatedAndNotTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedJoinCustomAffinityMapper.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedJoinNoIndexTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedJoinPartitionedAndReplicatedTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedJoinQueryConditionsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedJoinTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlDistributedJoinSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlQueryParallelismTest.class));
-
-        // Other.
-        suite.addTest(new JUnit4TestAdapter(CacheIteratorScanQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheQueryNewClientSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheOffheapBatchIndexingSingleTypeTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheSqlQueryValueCopySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryCacheDestroySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteQueryDedicatedPoolTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlEntryCacheModeAgnosticTest.class));
-        suite.addTest(new JUnit4TestAdapter(QueryEntityCaseMismatchTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedPartitionQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedPartitionQueryConfigurationSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlKeyValueFieldsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlRoutingTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlNotNullConstraintTest.class));
-        suite.addTest(new JUnit4TestAdapter(LongIndexNameTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheQuerySqlFieldInlineSizeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlParameterizedQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2ConnectionLeaksSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCheckClusterStateBeforeExecuteQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(OptimizedMarshallerIndexNameTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlSystemViewsSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridIndexRebuildSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(SqlTransactionCommandsWithMvccDisabledSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlDefaultValueTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteDecimalSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSQLColumnConstraintsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteTransactionSQLColumnConstraintTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedAtomicColumnConstraintsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedTransactionalColumnConstraintsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedTransactionalSnapshotColumnConstraintTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedAtomicColumnConstraintsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedTransactionalColumnConstraintsTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheReplicatedTransactionalSnapshotColumnConstraintTest.class));
-
-        // H2 Rows on-heap cache
-        suite.addTest(new JUnit4TestAdapter(H2RowCacheSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2RowCachePageEvictionTest.class));
-
-        // User operation SQL
-        suite.addTest(new JUnit4TestAdapter(SqlParserUserSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SqlUserCommandSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(EncryptedSqlTableTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(ThreadLocalObjectPoolSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(H2StatementCacheSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(PreparedStatementExSelfTest.class));
-
-        // Partition loss.
-        suite.addTest(new JUnit4TestAdapter(IndexingCachePartitionLossPolicySelfTest.class));
-
-        // GROUP_CONCAT
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlGroupConcatCollocatedTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlGroupConcatNotCollocatedTest.class));
-
-        // Binary
-        suite.addTest(new JUnit4TestAdapter(BinarySerializationQuerySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(BinarySerializationQueryWithReflectiveSerializerSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheBinaryObjectsScanSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheBinaryObjectsScanWithEventsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(BigEntryQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(BinaryMetadataConcurrentUpdateWithIndexesTest.class));
-
-        // Partition pruning.
-        suite.addTest(new JUnit4TestAdapter(InOperationExtractPartitionSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(AndOperationExtractPartitionSelfTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridCacheDynamicLoadOnClientTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCacheDynamicLoadOnClientPersistentTest.class));
-
-        return suite;
-    }
 }
index 8273e9e..72d2bb0 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.CacheScanPartitionQueryFallbackSelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRandomTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheObjectKeyIndexingSelfTest;
@@ -61,82 +59,74 @@ import org.apache.ignite.internal.processors.query.h2.twostep.DisappearedCacheWa
 import org.apache.ignite.internal.processors.query.h2.twostep.NonCollocatedRetryMessageSelfTest;
 import org.apache.ignite.internal.processors.query.h2.twostep.RetryCauseMessageSelfTest;
 import org.apache.ignite.internal.processors.query.h2.twostep.TableViewSubquerySelfTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 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 IgniteBinaryCacheQueryTestSuite2 {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("Ignite Cache Queries Test Suite 2");
-
-        // Dynamic index create/drop tests.
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexPartitionedAtomicConcurrentSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexPartitionedTransactionalConcurrentSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexReplicatedAtomicConcurrentSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicIndexReplicatedTransactionalConcurrentSelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    // Dynamic index create/drop tests.
+    DynamicIndexPartitionedAtomicConcurrentSelfTest.class,
+    DynamicIndexPartitionedTransactionalConcurrentSelfTest.class,
+    DynamicIndexReplicatedAtomicConcurrentSelfTest.class,
+    DynamicIndexReplicatedTransactionalConcurrentSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(DynamicColumnsConcurrentAtomicPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicColumnsConcurrentTransactionalPartitionedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicColumnsConcurrentAtomicReplicatedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DynamicColumnsConcurrentTransactionalReplicatedSelfTest.class));
+    DynamicColumnsConcurrentAtomicPartitionedSelfTest.class,
+    DynamicColumnsConcurrentTransactionalPartitionedSelfTest.class,
+    DynamicColumnsConcurrentAtomicReplicatedSelfTest.class,
+    DynamicColumnsConcurrentTransactionalReplicatedSelfTest.class,
 
-        // Distributed joins.
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeRestartDistributedJoinSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryStopOnCancelOrTimeoutDistributedJoinSelfTest.class));
+    // Distributed joins.
+    IgniteCacheQueryNodeRestartDistributedJoinSelfTest.class,
+    IgniteCacheQueryStopOnCancelOrTimeoutDistributedJoinSelfTest.class,
 
-        // Other tests.
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryMultiThreadedSelfTest.class));
+    // Other tests.
+    IgniteCacheQueryMultiThreadedSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryEvictsMultiThreadedSelfTest.class));
+    IgniteCacheQueryEvictsMultiThreadedSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(ScanQueryOffheapExpiryPolicySelfTest.class));
+    ScanQueryOffheapExpiryPolicySelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheCrossCacheJoinRandomTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeFailTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeRestartSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSqlQueryWithBaselineTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteChangingBaselineCacheQueryNodeRestartSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineCacheQueryNodeRestartsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeRestartSelfTest2.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeRestartTxSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheSqlQueryMultiThreadedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedQueryMultiThreadedSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheScanPartitionQueryFallbackSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheObjectKeyIndexingSelfTest.class));
+    IgniteCacheCrossCacheJoinRandomTest.class,
+    IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class,
+    IgniteCacheQueryNodeFailTest.class,
+    IgniteCacheQueryNodeRestartSelfTest.class,
+    IgniteSqlQueryWithBaselineTest.class,
+    IgniteChangingBaselineCacheQueryNodeRestartSelfTest.class,
+    IgniteStableBaselineCacheQueryNodeRestartsSelfTest.class,
+    IgniteCacheQueryNodeRestartSelfTest2.class,
+    IgniteCacheQueryNodeRestartTxSelfTest.class,
+    IgniteCacheSqlQueryMultiThreadedSelfTest.class,
+    IgniteCachePartitionedQueryMultiThreadedSelfTest.class,
+    CacheScanPartitionQueryFallbackSelfTest.class,
+    IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.class,
+    IgniteCacheObjectKeyIndexingSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsCompareQueryTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsSqlSegmentedIndexSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsSqlSegmentedIndexMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsSqlDistributedJoinSelfTest.class));
+    IgniteCacheGroupsCompareQueryTest.class,
+    IgniteCacheGroupsSqlSegmentedIndexSelfTest.class,
+    IgniteCacheGroupsSqlSegmentedIndexMultiNodeSelfTest.class,
+    IgniteCacheGroupsSqlDistributedJoinSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(QueryJoinWithDifferentNodeFiltersTest.class));
+    QueryJoinWithDifferentNodeFiltersTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(CacheQueryMemoryLeakTest.class));
+    CacheQueryMemoryLeakTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(CreateTableWithDateKeySelfTest.class));
+    CreateTableWithDateKeySelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(CacheQueryEntityWithDateTimeApiFieldsTest.class));
+    CacheQueryEntityWithDateTimeApiFieldsTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(NonCollocatedRetryMessageSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(RetryCauseMessageSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DisappearedCacheCauseRetryMessageSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(DisappearedCacheWasNotFoundMessageSelfTest.class));
+    NonCollocatedRetryMessageSelfTest.class,
+    RetryCauseMessageSelfTest.class,
+    DisappearedCacheCauseRetryMessageSelfTest.class,
+    DisappearedCacheWasNotFoundMessageSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(TableViewSubquerySelfTest.class));
+    TableViewSubquerySelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteCacheQueriesLoadTest1.class));
+    IgniteCacheQueriesLoadTest1.class,
 
-        suite.addTest(new JUnit4TestAdapter(SqlLocalQueryConnectionAndStatementTest.class));
-
-        return suite;
-    }
+    SqlLocalQueryConnectionAndStatementTest.class,
+})
+public class IgniteBinaryCacheQueryTestSuite2 {
 }
index b136319..74ee013 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.TestSuite;
 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 query suite with binary marshaller.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({IgniteBinaryCacheQueryTestSuite.class})
 public class IgniteBinarySimpleNameMapperCacheQueryTestSuite {
-    /**
-     * @return Suite.
-     */
-    public static TestSuite suite() {
+    /** */
+    @BeforeClass
+    public static void init() {
         GridTestProperties.setProperty(GridTestProperties.BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER, "true");
-
-        return IgniteBinaryCacheQueryTestSuite.suite();
     }
 }
index b737efb..4c95e57 100644 (file)
@@ -26,7 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testsuites.IgniteIgnore;
+import org.junit.Ignore;
 
 /**
  * Lookup class name based JTA integration test using PARTITIONED cache.
@@ -40,7 +40,7 @@ public class GridPartitionedCacheJtaLookupClassNameSelfTest extends AbstractCach
     /**
      *
      */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-10723", forceFailure = true)
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-10723")
     public void testIncompatibleTmLookup() {
         final IgniteEx ignite = grid(0);
 
index 43b9b91..5e8a4d3 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes.TcpDiscoveryKubernetesIpFinderSelfTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Ignite Kubernetes integration test.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({TcpDiscoveryKubernetesIpFinderSelfTest.class})
 public class IgniteKubernetesTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("Kubernetes Integration Test Suite");
-
-        // Cloud Nodes IP finder.
-        suite.addTest(new JUnit4TestAdapter(TcpDiscoveryKubernetesIpFinderSelfTest.class));
-
-        return suite;
-    }
 }
index c0c6aed..1bdc9f9 100644 (file)
@@ -38,7 +38,7 @@ import org.apache.ignite.testframework.GridTestExternalClassLoader;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.config.GridTestProperties;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.apache.ignite.testsuites.IgniteIgnore;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -282,7 +282,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-604", forceFailure = true)
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-604")
     @Test
     public void testCacheRedeployVersionChangeContinuousMode() throws Exception {
         depMode = DeploymentMode.CONTINUOUS;
index 4b0ac6b..0a9f82d 100644 (file)
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.resource.GridLoggerInjectionSelfTest;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessorSelfTest;
 import org.apache.ignite.internal.processors.resource.GridServiceInjectionSelfTest;
 import org.apache.ignite.internal.processors.resource.GridSpringResourceInjectionSelfTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Ignite resource injection test Suite.
  */
-@SuppressWarnings({"ProhibitedExceptionDeclared"})
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridResourceProcessorSelfTest.class,
+    GridLoggerInjectionSelfTest.class,
+    GridServiceInjectionSelfTest.class,
+    GridSpringResourceInjectionSelfTest.class,
+})
 public class IgniteResourceSelfTestSuite {
-    /**
-     * @return Resource injection test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("Ignite Resource Injection Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridResourceProcessorSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridLoggerInjectionSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceInjectionSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridSpringResourceInjectionSelfTest.class));
-
-        return suite;
-    }
 }
index 5c14b98..080b88a 100644 (file)
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.cache.spring.GridSpringCacheManagerMultiJvmSelfTest;
 import org.apache.ignite.cache.spring.GridSpringCacheManagerSelfTest;
 import org.apache.ignite.cache.spring.GridSpringCacheManagerSpringBeanSelfTest;
@@ -42,70 +40,62 @@ import org.apache.ignite.spring.IgniteExcludeInConfigurationTest;
 import org.apache.ignite.spring.IgniteStartFromStreamConfigurationTest;
 import org.apache.ignite.spring.injection.GridServiceInjectionSpringResourceTest;
 import org.apache.ignite.startup.cmdline.GridCommandLineLoaderTest;
-import org.apache.ignite.testframework.IgniteTestSuite;
 import org.apache.ignite.transactions.spring.GridSpringTransactionManagerSelfTest;
 import org.apache.ignite.transactions.spring.GridSpringTransactionManagerSpringBeanSelfTest;
 import org.apache.ignite.transactions.spring.SpringTransactionManagerContextInjectionTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Spring tests.
  */
-@RunWith(AllTests.class)
-public class IgniteSpringTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("Spring Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridSpringBeanSerializationSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSpringBeanTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridFactorySelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridSpringBeanSerializationSelfTest.class,
+    IgniteSpringBeanTest.class,
+    GridFactorySelfTest.class,
 
-        suite.addTest(IgniteResourceSelfTestSuite.suite());
+    IgniteResourceSelfTestSuite.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteExcludeInConfigurationTest.class));
+    IgniteExcludeInConfigurationTest.class,
 
-        // Tests moved to this suite since they require Spring functionality.
-        suite.addTest(new JUnit4TestAdapter(GridP2PUserVersionChangeSelfTest.class));
+    // Tests moved to this suite since they require Spring functionality.
+    GridP2PUserVersionChangeSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridSpringCacheManagerSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridSpringCacheManagerSpringBeanSelfTest.class));
+    GridSpringCacheManagerSelfTest.class,
+    GridSpringCacheManagerSpringBeanSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteDynamicCacheConfigTest.class));
+    IgniteDynamicCacheConfigTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(IgniteStartFromStreamConfigurationTest.class));
+    IgniteStartFromStreamConfigurationTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(CacheSpringStoreSessionListenerSelfTest.class));
+    CacheSpringStoreSessionListenerSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(CacheJdbcBlobStoreFactorySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheJdbcPojoStoreFactorySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePojoStoreXmlSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(CachePojoStoreXmlWithSqlEscapeSelfTest.class));
+    CacheJdbcBlobStoreFactorySelfTest.class,
+    CacheJdbcPojoStoreFactorySelfTest.class,
+    CachePojoStoreXmlSelfTest.class,
+    CachePojoStoreXmlWithSqlEscapeSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridSpringTransactionManagerSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridSpringTransactionManagerSpringBeanSelfTest.class));
+    GridSpringTransactionManagerSelfTest.class,
+    GridSpringTransactionManagerSpringBeanSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridServiceInjectionSpringResourceTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteSpringBeanSpringResourceInjectionTest.class));
+    GridServiceInjectionSpringResourceTest.class,
+    IgniteSpringBeanSpringResourceInjectionTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridTransformSpringInjectionSelfTest.class));
+    GridTransformSpringInjectionSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(SpringCacheManagerContextInjectionTest.class));
-        suite.addTest(new JUnit4TestAdapter(SpringTransactionManagerContextInjectionTest.class));
+    SpringCacheManagerContextInjectionTest.class,
+    SpringTransactionManagerContextInjectionTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(SpringCacheTest.class));
+    SpringCacheTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(SpringEncryptedCacheRestartTest.class));
-        suite.addTest(new JUnit4TestAdapter(SpringEncryptedCacheRestartClientTest.class));
+    SpringEncryptedCacheRestartTest.class,
+    SpringEncryptedCacheRestartClientTest.class,
 
-        //suite.addTest(new JUnit4TestAdapter(GridSpringCacheManagerMultiJvmSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridSpringCacheManagerMultiJvmSelfTest.class));
+    //GridSpringCacheManagerMultiJvmSelfTest.class,
+    GridSpringCacheManagerMultiJvmSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridCommandLineLoaderTest.class));
-
-        return suite;
-    }
+    GridCommandLineLoaderTest.class,
+})
+public class IgniteSpringTestSuite {
 }
index 86ad9f5..36836fe 100644 (file)
 
 package org.apache.ignite.internal.websession;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.IgniteTestSuite;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP;
 
 /**
  * Test suite for web sessions caching functionality.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    WebSessionSelfTest.class,
+    WebSessionTransactionalSelfTest.class,
+    WebSessionReplicatedSelfTest.class,
+
+    // Old implementation tests.
+    WebSessionV1SelfTest.class,
+    WebSessionTransactionalV1SelfTest.class,
+    WebSessionReplicatedV1SelfTest.class,
+})
 public class IgniteWebSessionSelfTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new IgniteTestSuite("Ignite Web Sessions Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(WebSessionSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(WebSessionTransactionalSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(WebSessionReplicatedSelfTest.class));
-
-        // Old implementation tests.
-        suite.addTest(new JUnit4TestAdapter(WebSessionV1SelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(WebSessionTransactionalV1SelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(WebSessionReplicatedV1SelfTest.class));
-
+    /** */
+    @BeforeClass
+    public static void init() {
         System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
             GridTestUtils.getNextMulticastGroup(IgniteWebSessionSelfTestSuite.class));
-
-        return suite;
     }
 }
index 4cc1a63..2a37ff4 100644 (file)
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.websession;
 
-import org.apache.ignite.testsuites.IgniteIgnore;
+import org.junit.Ignore;
 
 /**
  * Tests web sessions with TRANSACTIONAL cache.
@@ -29,19 +29,19 @@ public class WebSessionTransactionalSelfTest extends WebSessionSelfTest {
     }
 
     /** {@inheritDoc} */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true)
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-810")
     @Override public void testRestarts() throws Exception {
         // No-op.
     }
 
     /** {@inheritDoc} */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true)
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-810")
     @Override public void testInvalidatedSession() throws Exception {
         // No-op.
     }
 
     /** {@inheritDoc} */
-    @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true)
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-810")
     @Override public void testClientReconnectRequest() throws Exception {
         // No-op.
     }