http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java index a062b51..5fec502 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java @@ -23,11 +23,15 @@ 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.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid S3 checkpoint SPI start stop self test. */ @GridSpiTest(spi = S3CheckpointSpi.class, group = "Checkpoint SPI") +@RunWith(JUnit4.class) public class S3CheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<S3CheckpointSpi> { /** {@inheritDoc} */ @Override protected void spiConfigure(S3CheckpointSpi spi) throws Exception { @@ -43,7 +47,8 @@ public class S3CheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTe /** {@inheritDoc} */ @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420";) + @Test @Override public void testStartStop() throws Exception { super.testStartStop(); } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java index 54a7910..99a0cc5 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java @@ -24,15 +24,20 @@ 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.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid session checkpoint self test using {@link S3CheckpointSpi}. */ +@RunWith(JUnit4.class) public class S3SessionCheckpointSelfTest extends GridSessionCheckpointAbstractSelfTest { /** * @throws Exception If failed. */ @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420";) + @Test public void testS3Checkpoint() throws Exception { IgniteConfiguration cfg = getConfiguration(); @@ -51,4 +56,4 @@ public class S3SessionCheckpointSelfTest extends GridSessionCheckpointAbstractSe checkCheckpoints(cfg); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinderSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinderSelfTest.java index 1217d8b..85568f0 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinderSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinderSelfTest.java @@ -19,10 +19,14 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.elb; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * TcpDiscoveryElbIpFinderSelfTest test. */ +@RunWith(JUnit4.class) public class TcpDiscoveryElbIpFinderSelfTest extends TcpDiscoveryIpFinderAbstractSelfTest<TcpDiscoveryElbIpFinder> { /** * Constructor. @@ -44,6 +48,7 @@ public class TcpDiscoveryElbIpFinderSelfTest extends TcpDiscoveryIpFinderAbstrac } /** {@inheritDoc} */ + @Test @Override public void testIpFinder() throws Exception { TcpDiscoveryElbIpFinder ipFinder = new TcpDiscoveryElbIpFinder(); @@ -78,4 +83,4 @@ public class TcpDiscoveryElbIpFinderSelfTest extends TcpDiscoveryIpFinderAbstrac assertTrue(e.getMessage().startsWith("One or more configuration parameters are invalid")); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAbstractSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAbstractSelfTest.java index 768e44d..37a0acc 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAbstractSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAbstractSelfTest.java @@ -27,10 +27,14 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstract import org.apache.ignite.testsuites.IgniteIgnore; import org.apache.ignite.testsuites.IgniteS3TestSuite; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Abstract TcpDiscoveryS3IpFinder to test with different ways of setting AWS credentials. */ +@RunWith(JUnit4.class) abstract class TcpDiscoveryS3IpFinderAbstractSelfTest extends TcpDiscoveryIpFinderAbstractSelfTest<TcpDiscoveryS3IpFinder> { /** Bucket endpoint */ @@ -83,6 +87,7 @@ abstract class TcpDiscoveryS3IpFinderAbstractSelfTest /** {@inheritDoc} */ @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-2420";) + @Test @Override public void testIpFinder() throws Exception { super.testIpFinder(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java index 9ff5571..06524d2 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java @@ -20,10 +20,14 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import org.apache.ignite.testsuites.IgniteS3TestSuite; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * TcpDiscoveryS3IpFinder test using AWS credentials provider. */ +@RunWith(JUnit4.class) public class TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest extends TcpDiscoveryS3IpFinderAbstractSelfTest { /** * Constructor. @@ -41,7 +45,8 @@ public class TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest extends TcpDis } /** {@inheritDoc} */ + @Test @Override public void testIpFinder() throws Exception { super.testIpFinder(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsSelfTest.java index 5bea251..db28710 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsSelfTest.java @@ -19,10 +19,14 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; import com.amazonaws.auth.BasicAWSCredentials; import org.apache.ignite.testsuites.IgniteS3TestSuite; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * TcpDiscoveryS3IpFinder test using AWS credentials. */ +@RunWith(JUnit4.class) public class TcpDiscoveryS3IpFinderAwsCredentialsSelfTest extends TcpDiscoveryS3IpFinderAbstractSelfTest { /** * Constructor. @@ -40,7 +44,8 @@ public class TcpDiscoveryS3IpFinderAwsCredentialsSelfTest extends TcpDiscoveryS3 } /** {@inheritDoc} */ + @Test @Override public void testIpFinder() throws Exception { super.testIpFinder(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderBucketEndpointSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderBucketEndpointSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderBucketEndpointSelfTest.java index 07d4839..11481d8 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderBucketEndpointSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderBucketEndpointSelfTest.java @@ -19,12 +19,16 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; import com.amazonaws.auth.BasicAWSCredentials; import org.apache.ignite.testsuites.IgniteS3TestSuite; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * TcpDiscoveryS3IpFinder tests bucket endpoint for IP finder. * For information about possible endpoint names visit * <a href="http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region";>docs.aws.amazon.com</a>. */ +@RunWith(JUnit4.class) public class TcpDiscoveryS3IpFinderBucketEndpointSelfTest extends TcpDiscoveryS3IpFinderAbstractSelfTest { /** * Constructor. @@ -49,6 +53,7 @@ public class TcpDiscoveryS3IpFinderBucketEndpointSelfTest extends TcpDiscoveryS3 } /** {@inheritDoc} */ + @Test @Override public void testIpFinder() throws Exception { super.testIpFinder(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderKeyPrefixSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderKeyPrefixSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderKeyPrefixSelfTest.java index 6e4960b..bb01f0b 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderKeyPrefixSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderKeyPrefixSelfTest.java @@ -19,12 +19,16 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; import com.amazonaws.auth.BasicAWSCredentials; import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.client.DummyS3Client; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import org.mockito.Mockito; /** * TcpDiscoveryS3IpFinder tests key prefix for IP finder. For information about key prefix visit: * <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/ListingKeysHierarchy.html"/>. */ +@RunWith(JUnit4.class) public class TcpDiscoveryS3IpFinderKeyPrefixSelfTest extends TcpDiscoveryS3IpFinderAbstractSelfTest { /** * Constructor. @@ -58,6 +62,7 @@ public class TcpDiscoveryS3IpFinderKeyPrefixSelfTest extends TcpDiscoveryS3IpFin } /** {@inheritDoc} */ + @Test @Override public void testIpFinder() throws Exception { injectLogger(finder); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest.java index 838a3c6..b909fac 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest.java @@ -19,12 +19,16 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; import com.amazonaws.auth.BasicAWSCredentials; import org.apache.ignite.testsuites.IgniteS3TestSuite; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * TcpDiscoveryS3IpFinder tests server-side encryption algorithm for Amazon S3-managed encryption keys. * For information about possible S3-managed encryption keys visit * <a href="http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html";>docs.aws.amazon.com</a>. */ +@RunWith(JUnit4.class) public class TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest extends TcpDiscoveryS3IpFinderAbstractSelfTest { /** * Constructor. @@ -42,7 +46,8 @@ public class TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest extends TcpDiscoveryS3Ip } /** {@inheritDoc} */ + @Test @Override public void testIpFinder() throws Exception { super.testIpFinder(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyObjectListingTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyObjectListingTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyObjectListingTest.java index 2598af0..9016b52 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyObjectListingTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyObjectListingTest.java @@ -23,14 +23,19 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Class to test {@link DummyObjectListing}. */ +@RunWith(JUnit4.class) public class DummyObjectListingTest extends GridCommonAbstractTest { /** * Test cases for various object listing functions for S3 bucket. */ + @Test public void testDummyObjectListing() { Set<String> fakeKeyPrefixSet = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyS3ClientTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyS3ClientTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyS3ClientTest.java index bd1b12f..88c205c 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyS3ClientTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/client/DummyS3ClientTest.java @@ -26,10 +26,14 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Class to test {@link DummyS3Client}. */ +@RunWith(JUnit4.class) public class DummyS3ClientTest extends GridCommonAbstractTest { /** Instance of {@link DummyS3Client} to be used for tests. */ private DummyS3Client s3; @@ -54,6 +58,7 @@ public class DummyS3ClientTest extends GridCommonAbstractTest { /** * Test cases to check the 'doesBucketExist' method. */ + @Test public void testDoesBucketExist() { assertTrue("The bucket 'testBucket' should exist", s3.doesBucketExist("testBucket")); assertFalse("The bucket 'nonExistentBucket' should not exist", s3.doesBucketExist("nonExistentBucket")); @@ -62,6 +67,7 @@ public class DummyS3ClientTest extends GridCommonAbstractTest { /** * Test cases for various object listing functions for S3 bucket. */ + @Test public void testListObjects() { ObjectListing listing = s3.listObjects("testBucket"); @@ -98,6 +104,7 @@ public class DummyS3ClientTest extends GridCommonAbstractTest { /** * Test cases for various object listing functions for S3 bucket and key prefix. */ + @Test public void testListObjectsWithAPrefix() { ObjectListing listing = s3.listObjects("testBucket", "/test"); @@ -149,6 +156,7 @@ public class DummyS3ClientTest extends GridCommonAbstractTest { /** * Test case to check if a bucket is created properly. */ + @Test public void testCreateBucket() { s3.createBucket("testBucket1"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteElbTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteElbTestSuite.java b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteElbTestSuite.java index 28f7e0e..65aa46e 100644 --- a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteElbTestSuite.java +++ b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteElbTestSuite.java @@ -17,6 +17,7 @@ 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; @@ -27,12 +28,11 @@ import org.apache.ignite.testframework.IgniteTestSuite; public class IgniteElbTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new IgniteTestSuite("ELB Integration Test Suite"); - suite.addTestSuite(TcpDiscoveryElbIpFinderSelfTest.class); + suite.addTest(new JUnit4TestAdapter(TcpDiscoveryElbIpFinderSelfTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java index a5b5eaa..f1c3128 100644 --- a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java +++ b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java @@ -17,6 +17,7 @@ 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; @@ -40,28 +41,27 @@ import org.apache.ignite.testframework.IgniteTestSuite; public class IgniteS3TestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new IgniteTestSuite("S3 Integration Test Suite"); // Checkpoint SPI. - suite.addTestSuite(S3CheckpointSpiConfigSelfTest.class); - suite.addTestSuite(S3CheckpointSpiSelfTest.class); - suite.addTestSuite(S3CheckpointSpiStartStopSelfTest.class); - suite.addTestSuite(S3CheckpointManagerSelfTest.class); - suite.addTestSuite(S3SessionCheckpointSelfTest.class); - suite.addTestSuite(S3CheckpointSpiStartStopBucketEndpointSelfTest.class); - suite.addTestSuite(S3CheckpointSpiStartStopSSEAlgorithmSelfTest.class); + 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)); // S3 IP finder. - suite.addTestSuite(DummyS3ClientTest.class); - suite.addTestSuite(DummyObjectListingTest.class); - suite.addTestSuite(TcpDiscoveryS3IpFinderAwsCredentialsSelfTest.class); - suite.addTestSuite(TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.class); - suite.addTestSuite(TcpDiscoveryS3IpFinderBucketEndpointSelfTest.class); - suite.addTestSuite(TcpDiscoveryS3IpFinderSSEAlgorithmSelfTest.class); - suite.addTestSuite(TcpDiscoveryS3IpFinderKeyPrefixSelfTest.class); + 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)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java ---------------------------------------------------------------------- diff --git a/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java b/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java index 88b7eb8..b384d1a 100644 --- a/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java +++ b/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java @@ -56,12 +56,16 @@ import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.stream.StreamMultipleTupleExtractor; import org.apache.ignite.stream.StreamSingleTupleExtractor; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT; /** * Test class for {@link CamelStreamer}. */ +@RunWith(JUnit4.class) public class IgniteCamelStreamerTest extends GridCommonAbstractTest { /** text/plain media type. */ private static final MediaType TEXT_PLAIN = MediaType.parse("text/plain;charset=utf-8"); @@ -127,6 +131,7 @@ public class IgniteCamelStreamerTest extends GridCommonAbstractTest { /** * @throws Exception */ + @Test public void testSendOneEntryPerMessage() throws Exception { streamer.setSingleTupleExtractor(singleTupleExtractor()); @@ -147,6 +152,7 @@ public class IgniteCamelStreamerTest extends GridCommonAbstractTest { /** * @throws Exception */ + @Test public void testMultipleEntriesInOneMessage() throws Exception { streamer.setMultipleTupleExtractor(multipleTupleExtractor()); @@ -167,6 +173,7 @@ public class IgniteCamelStreamerTest extends GridCommonAbstractTest { /** * @throws Exception */ + @Test public void testResponseProcessorIsCalled() throws Exception { streamer.setSingleTupleExtractor(singleTupleExtractor()); streamer.setResponseProcessor(new Processor() { @@ -195,6 +202,7 @@ public class IgniteCamelStreamerTest extends GridCommonAbstractTest { /** * @throws Exception */ + @Test public void testUserSpecifiedCamelContext() throws Exception { final AtomicInteger cnt = new AtomicInteger(); @@ -228,6 +236,7 @@ public class IgniteCamelStreamerTest extends GridCommonAbstractTest { /** * @throws Exception */ + @Test public void testUserSpecifiedCamelContextWithPropertyPlaceholders() throws Exception { // Create a CamelContext with a custom property placeholder. CamelContext context = new DefaultCamelContext(); @@ -266,6 +275,7 @@ public class IgniteCamelStreamerTest extends GridCommonAbstractTest { /** * @throws Exception */ + @Test public void testInvalidEndpointUri() throws Exception { streamer.setSingleTupleExtractor(singleTupleExtractor()); streamer.setEndpointUri("abc"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTestSuite.java b/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTestSuite.java index c45272e..9aa1836 100644 --- a/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTestSuite.java +++ b/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTestSuite.java @@ -18,6 +18,7 @@ package org.apache.ignite.stream.camel; import java.util.Set; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; /** @@ -26,21 +27,19 @@ import junit.framework.TestSuite; public class IgniteCamelStreamerTestSuite extends TestSuite { /** * @return {@link IgniteCamelStreamerTest} test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { return suite(null); } /** - * @param ignoredTests + * @param ignoredTests List of ignored tests. * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite(Set<Class> ignoredTests) throws Exception { + public static TestSuite suite(Set<Class> ignoredTests) { TestSuite suite = new TestSuite("IgniteCamelStreamer Test Suite"); - suite.addTestSuite(IgniteCamelStreamerTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCamelStreamerTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java index f09f503..7f4d5ef 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java @@ -21,16 +21,21 @@ import junit.framework.TestCase; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.cache.store.cassandra.persistence.KeyPersistenceSettings; import org.apache.ignite.cache.store.cassandra.persistence.KeyValuePersistenceSettings; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Simple test for DDL generator. */ +@RunWith(JUnit4.class) public class CassandraConfigTest extends TestCase { /** * Check if same DDL generated for similar keys and same KeyPersistenceConfiguration. * * @throws Exception */ + @Test public void testDDLGeneration() throws Exception { KeyPersistenceSettings keyPersistenceSettingsA = getKeyPersistenceSettings(KeyA.class); KeyPersistenceSettings keyPersistenceSettingsB = getKeyPersistenceSettings(KeyB.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java index ebd7ab5..de951cf 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java @@ -44,6 +44,9 @@ import org.apache.ignite.lang.IgniteRunnable; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.events.EventType.EVTS_TASK_EXECUTION; @@ -56,6 +59,7 @@ import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT; /** * Tests for security subject ID in task events. */ +@RunWith(JUnit4.class) public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest { /** */ private static final Collection<TaskEvent> evts = new ArrayList<>(); @@ -116,6 +120,7 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSimpleTask() throws Exception { latch = new CountDownLatch(3); @@ -160,6 +165,7 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFailedTask() throws Exception { latch = new CountDownLatch(2); @@ -206,6 +212,7 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTimedOutTask() throws Exception { latch = new CountDownLatch(2); @@ -261,6 +268,7 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClosure() throws Exception { latch = new CountDownLatch(3); @@ -312,6 +320,7 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testClient() throws Exception { latch = new CountDownLatch(3); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java index 6b14185..2ba00c3 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java @@ -48,6 +48,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -58,6 +61,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -245,6 +249,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst /** * @throws Exception If failed. */ + @Test public void testMultithreadedTaskRun() throws Exception { final AtomicLong cnt = new AtomicLong(); @@ -396,4 +401,4 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst return locNodeId; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java index c62cf8a..7e4e4f0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java @@ -41,12 +41,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; /** * Tests that client is able to connect to a grid with only default cache enabled. */ +@RunWith(JUnit4.class) public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { /** Path to jetty config configured with SSL. */ private static final String REST_JETTY_CFG = "modules/clients/src/test/resources/jetty/rest-jetty.xml"; @@ -183,6 +187,7 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { /** * Json format string in cache should not transform to Json object on get request. */ + @Test public void testSkipString2JsonTransformation() throws Exception { String val = "{\"v\":\"my Value\",\"t\":1422559650154}"; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java index f1085b3..453243c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java @@ -25,10 +25,14 @@ import org.apache.ignite.internal.client.impl.connection.GridClientConnectionRes 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.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class ClientReconnectionSelfTest extends GridCommonAbstractTest { /** */ public static final String HOST = "127.0.0.1"; @@ -83,6 +87,7 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNoFailedReconnection() throws Exception { for (int i = 0; i < ClientTestRestServer.SERVERS_CNT; i++) runServer(i, false); @@ -140,6 +145,7 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCorrectInit() throws Exception { for (int i = 0; i < ClientTestRestServer.SERVERS_CNT; i++) runServer(i, i == 0); @@ -157,6 +163,7 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFailedInit() throws Exception { for (int i = 0; i < ClientTestRestServer.SERVERS_CNT; i++) runServer(i, true); @@ -184,9 +191,10 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-590";, forceFailure = true) + @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. - + for (int i = 0; i < srvsCnt; i++) runServer(i, false); @@ -235,4 +243,4 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest { return srv; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java index 9225262..c43c3c0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java @@ -32,10 +32,14 @@ import org.apache.ignite.internal.util.typedef.X; 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.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests */ +@RunWith(JUnit4.class) public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest { /** REST TCP port. */ private static final int REST_TCP_PORT = 12121; @@ -112,6 +116,7 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testServerAuthenticated() throws Exception { checkServerAuthenticatedByClient(false); } @@ -119,6 +124,7 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testServerNotAuthenticatedByClient() throws Exception { try { checkServerAuthenticatedByClient(true); @@ -131,6 +137,7 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClientAuthenticated() throws Exception { checkClientAuthenticatedByServer(false); } @@ -138,6 +145,7 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClientNotAuthenticated() throws Exception { try { checkServerAuthenticatedByClient(true); @@ -264,4 +272,4 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest { srvCheckCallCnt.set(0); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java index 4b63fff..ca73475 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java @@ -21,10 +21,14 @@ import java.util.Collections; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Ensures */ +@RunWith(JUnit4.class) public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridCommonAbstractTest { /** Port. */ private static final int PORT = 11211; @@ -54,6 +58,7 @@ public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridComm /** * @throws Exception If failed. */ + @Test public void testTaskAfterRestart() throws Exception { startGrids(1); @@ -72,4 +77,4 @@ public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridComm cli.compute().execute(ClientTcpTask.class.getName(), Collections.singletonList("arg")); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java index a9bda0a..c792edb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java @@ -25,14 +25,19 @@ import junit.framework.TestCase; import org.apache.ignite.internal.client.GridClientCacheFlag; import org.apache.ignite.internal.util.typedef.F; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests conversions between GridClientCacheFlag. */ +@RunWith(JUnit4.class) public class ClientCacheFlagsCodecTest extends TestCase { /** * Tests that each client flag will be correctly converted to server flag. */ + @Test public void testEncodingDecodingFullness() { for (GridClientCacheFlag f : GridClientCacheFlag.values()) { int bits = GridClientCacheFlag.encodeCacheFlags(EnumSet.of(f)); @@ -48,6 +53,7 @@ public class ClientCacheFlagsCodecTest extends TestCase { /** * Tests that groups of client flags can be correctly converted to corresponding server flag groups. */ + @Test public void testGroupEncodingDecoding() { // All. doTestGroup(GridClientCacheFlag.values()); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java index 7777f33..7fd5057 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java @@ -24,6 +24,9 @@ import org.apache.ignite.internal.client.GridClientCompute; import org.apache.ignite.internal.client.GridClientNode; import org.apache.ignite.internal.client.GridClientPredicate; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.testframework.GridTestUtils.assertThrows; @@ -31,6 +34,7 @@ import static org.apache.ignite.testframework.GridTestUtils.assertThrows; * Simple unit test for GridClientComputeImpl which checks method parameters. * It tests only those methods that can produce assertion underneath upon incorrect arguments. */ +@RunWith(JUnit4.class) public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** Mocked client compute. */ private GridClientCompute compute = allocateInstance0(GridClientComputeImpl.class); @@ -38,6 +42,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testProjection_byGridClientNode() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -49,6 +54,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecute() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -60,6 +66,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecuteAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -71,6 +78,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAffinityExecute() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -82,6 +90,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAffinityExecuteAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -93,6 +102,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNode() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -104,6 +114,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNodesByIds() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -115,6 +126,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNodesByFilter() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -126,6 +138,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRefreshNodeById() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -137,6 +150,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRefreshNodeByIdAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -148,6 +162,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRefreshNodeByIp() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -159,6 +174,7 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRefreshNodeByIpAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -166,4 +182,4 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { } }, NullPointerException.class, "Ouch! Argument cannot be null: ip"); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java index 1638f31..61379d1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java @@ -20,12 +20,16 @@ package org.apache.ignite.internal.client.impl; import java.util.concurrent.Callable; import org.apache.ignite.internal.client.GridClientData; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.testframework.GridTestUtils.assertThrows; /** * Simple unit test for GridClientDataImpl which checks method parameters. */ +@RunWith(JUnit4.class) public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** Mocked client data. */ private GridClientData data = allocateInstance0(GridClientDataImpl.class); @@ -33,6 +37,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPut() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -54,6 +59,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -75,6 +81,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAll() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -88,6 +95,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -101,6 +109,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGet() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -112,6 +121,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -123,6 +133,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetAll() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -134,6 +145,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetAllAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -145,6 +157,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRemove() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -158,6 +171,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRemoveAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -169,6 +183,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRemoveAll() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -182,6 +197,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRemoveAllAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -195,6 +211,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testReplace() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -216,6 +233,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testReplaceAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -233,6 +251,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCas() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -246,6 +265,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCasAsync() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -257,6 +277,7 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAffinity() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -264,4 +285,4 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { } }, NullPointerException.class, "Ouch! Argument cannot be null: key"); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java index 67df048..0d017cff 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java @@ -24,14 +24,19 @@ import org.apache.ignite.internal.client.GridClientException; import org.apache.ignite.internal.client.GridClientFuture; import org.apache.ignite.internal.client.GridClientFutureTimeoutException; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid client future implementation self test. */ +@RunWith(JUnit4.class) public class ClientFutureAdapterSelfTest extends GridCommonAbstractTest { /** * Test finished futures. */ + @Test public void testFinished() { GridClientFutureAdapter<Integer> fut = new GridClientFutureAdapter<>(); @@ -50,6 +55,7 @@ public class ClientFutureAdapterSelfTest extends GridCommonAbstractTest { * * @throws org.apache.ignite.internal.client.GridClientException On any exception. */ + @Test public void testChains() throws GridClientException { // Synchronous notifications. testChains(1, 100); @@ -114,4 +120,4 @@ public class ClientFutureAdapterSelfTest extends GridCommonAbstractTest { info("Time consumption for " + chainSize + " chained futures: " + (System.currentTimeMillis() - start)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java index 55aadfd..964b14e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java @@ -39,6 +39,9 @@ import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import org.springframework.context.support.FileSystemXmlApplicationContext; import static org.apache.ignite.internal.client.GridClientConfiguration.DFLT_MAX_CONN_IDLE_TIME; @@ -47,6 +50,7 @@ import static org.apache.ignite.internal.client.GridClientConfiguration.DFLT_TOP /** * Properties-based configuration self test. */ +@RunWith(JUnit4.class) public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTest { /** * Grid client spring configuration. @@ -73,6 +77,7 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes * * @throws Exception In case of exception. */ + @Test public void testCreation() throws Exception { // Validate default configuration. GridClientConfiguration cfg = new GridClientConfiguration(); @@ -131,6 +136,7 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes * * @throws Exception In case of any exception. */ + @Test public void testSpringConfig() throws Exception { GridClientConfiguration cfg = new FileSystemXmlApplicationContext( GRID_CLIENT_SPRING_CONFIG.toString()).getBean(GridClientConfiguration.class); @@ -242,4 +248,4 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes assertEquals(null, cfg.getSslContextFactory(), null); assertEquals(DFLT_TOP_REFRESH_FREQ, cfg.getTopologyRefreshFrequency()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java index 8207ccf..327c56f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java @@ -38,10 +38,14 @@ import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests the REST client-server connectivity with various configurations. */ +@RunWith(JUnit4.class) public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstractTest { /** */ private static final String WILDCARD_IP = "0.0.0.0"; @@ -122,6 +126,7 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr * * @throws Exception If failed. */ + @Test public void testOneNodeDefaultHostAndPort() throws Exception { startRestNode("grid1", null, null); @@ -136,6 +141,7 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr * Simple test of address list filtering. * @throws Exception If failed. */ + @Test public void testResolveReachableOneAddress() throws Exception { InetAddress addr = InetAddress.getByAddress(new byte[] {127, 0, 0, 1} ); @@ -151,6 +157,7 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr * * @throws Exception If error occurs. */ + @Test public void testOneNodeLoopbackHost() throws Exception { startRestNode("grid1", LOOPBACK_IP, defaultRestPort()); @@ -164,6 +171,7 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr * * @throws Exception If error occurs. */ + @Test public void testOneNodeZeroIpv4Address() throws Exception { startRestNode("grid1", WILDCARD_IP, defaultRestPort()); @@ -208,6 +216,7 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr * * @throws Exception If error occurs. */ + @Test public void testTwoNodesDefaultHostAndPort() throws Exception { startRestNode("grid1", null, null); startRestNode("grid2", null, null); @@ -256,6 +265,7 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr * * @throws Exception If error occurs. */ + @Test public void testRefreshTopologyOnNodeLeft() throws Exception { startRestNode("grid1", null, null); startRestNode("grid2", null, null); @@ -323,4 +333,4 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr return s.matches("\\d+\\.\\d+\\.\\d+\\.\\d+"); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index 7ccb9c3..077381a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -75,6 +75,9 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -87,6 +90,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests basic client behavior with multiple nodes. */ +@RunWith(JUnit4.class) public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -254,6 +258,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ + @Test public void testEmptyProjections() throws Exception { final GridClientCompute dflt = client.compute(); @@ -289,6 +294,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ + @Test public void testProjectionRun() throws Exception { GridClientCompute dflt = client.compute(); @@ -318,6 +324,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ + @Test public void testTopologyListener() throws Exception { final Collection<UUID> added = new ArrayList<>(1); final Collection<UUID> rmvd = new ArrayList<>(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index 041e9fc..eee73f7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -72,6 +72,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -83,6 +86,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * Tests for Java client. */ @SuppressWarnings("deprecation") +@RunWith(JUnit4.class) public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -346,6 +350,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testConnectable() throws Exception { GridClient client = client(); @@ -359,6 +364,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testNoAsyncExceptions() throws Exception { GridClient client = client(); @@ -404,6 +410,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGracefulShutdown() throws Exception { GridClientCompute compute = client.compute(); @@ -422,6 +429,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testForceShutdown() throws Exception { GridClientCompute compute = client.compute(); @@ -445,6 +453,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testShutdown() throws Exception { GridClient c = client(); @@ -486,6 +495,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecute() throws Exception { String taskName = getTaskName(); Object taskArg = getTaskArgument(); @@ -499,6 +509,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTopology() throws Exception { GridClientCompute compute = client.compute(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java index b012d3b..e99d93d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java @@ -40,6 +40,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.HOST; import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.REST_TCP_PORT_BASE; @@ -48,6 +51,7 @@ import static org.apache.ignite.internal.client.integration.ClientAbstractMultiN /** * */ +@RunWith(JUnit4.class) public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { /** VM ip finder for TCP discovery. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -86,6 +90,7 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRandomBalancer() throws Exception { GridClientRandomBalancer b = new GridClientRandomBalancer(); @@ -97,6 +102,7 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRoundRobinBalancer() throws Exception { GridClientRoundRobinBalancer b = new GridClientRoundRobinBalancer(); @@ -195,4 +201,4 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { return ignite.cluster().localNode().id().toString(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java index 971dcb1..86fc9a6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java @@ -42,6 +42,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; import static org.apache.ignite.internal.client.GridClientProtocol.TCP; @@ -53,6 +56,7 @@ import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTe /** * */ +@RunWith(JUnit4.class) public class ClientFailedInitSelfTest extends GridCommonAbstractTest { /** */ private static final int RECONN_CNT = 3; @@ -103,6 +107,7 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { /** * */ + @Test public void testEmptyAddresses() { try { GridClientFactory.start(new GridClientConfiguration()); @@ -117,6 +122,7 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { /** * */ + @Test public void testRoutersAndServersAddressesProvided() { try { GridClientConfiguration c = new GridClientConfiguration(); @@ -136,6 +142,7 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTcpClient() throws Exception { doTestClient(TCP); } @@ -143,6 +150,7 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTcpRouter() throws Exception { doTestRouter(TCP); } @@ -288,4 +296,4 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { return results.get(0).getData(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java index 5df424c..09ff380 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java @@ -27,12 +27,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; /** * Test routers factory. */ +@RunWith(JUnit4.class) public class RouterFactorySelfTest extends GridCommonAbstractTest { /** Shared IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -59,6 +63,7 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest { * * @throws Exception In case of any exception. */ + @Test public void testRouterFactory() throws Exception { try { System.setProperty(IGNITE_JETTY_PORT, String.valueOf(GRID_HTTP_PORT)); @@ -109,4 +114,4 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest { stopAllGrids(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java index 628006e..c3ae3d2 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java @@ -29,10 +29,14 @@ import org.apache.ignite.internal.client.integration.ClientAbstractSelfTest; import org.apache.ignite.internal.client.router.impl.GridTcpRouterImpl; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.logger.log4j.Log4JLogger; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Abstract base class for http routing tests. */ +@RunWith(JUnit4.class) public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest { /** Port number to use by router. */ private static final int ROUTER_PORT = BINARY_PORT + 1; @@ -117,6 +121,7 @@ public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest { /** * @throws Exception If failed. */ + @Test @Override public void testConnectable() throws Exception { GridClient client = client(); @@ -124,4 +129,4 @@ public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest { assertFalse(F.first(nodes).connectable()); } -} \ No newline at end of file +}
