Repository: ignite Updated Branches: refs/heads/master 986f645ea -> b3a964542
IGNITE-10174 Migrate examples tests from JUnit 3 to JUnit 4 - Fixes #5369. Signed-off-by: Pavel Kovalenko <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3a96454 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3a96454 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3a96454 Branch: refs/heads/master Commit: b3a96454221d2e98acf0ebb9660f921b135ac338 Parents: 986f645 Author: Oleg Ignatenko <[email protected]> Authored: Thu Nov 22 18:43:58 2018 +0300 Committer: Pavel Kovalenko <[email protected]> Committed: Thu Nov 22 18:43:58 2018 +0300 ---------------------------------------------------------------------- .../ignite/examples/BasicExamplesSelfTest.java | 6 ++ .../examples/CacheClientBinaryExampleTest.java | 3 + .../CacheContinuousQueryExamplesSelfTest.java | 4 ++ .../ignite/examples/CacheExamplesSelfTest.java | 4 ++ .../ComputeClientBinaryExampleTest.java | 2 + .../examples/EncryptedCacheExampleSelfTest.java | 3 + .../ignite/examples/EventsExamplesSelfTest.java | 2 + .../examples/MessagingExamplesSelfTest.java | 3 + .../examples/SpringDataExampleSelfTest.java | 2 + .../ignite/examples/SqlExamplesSelfTest.java | 4 ++ .../IgniteExamplesJ8SelfTestSuite.java | 53 ++++++++-------- .../testsuites/IgniteExamplesSelfTestSuite.java | 59 +++++++++--------- .../testframework/junits/GridAbstractTest.java | 64 ++++++++++++++------ .../junits/common/GridAbstractExamplesTest.java | 5 +- .../junits/common/GridCommonAbstractTest.java | 4 +- .../junits/spi/GridSpiAbstractTest.java | 6 +- .../util/mbeans/GridMBeanDisableSelfTest.java | 4 +- 17 files changed, 146 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java index 41ae90a..fa1e630 100644 --- a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.examples.computegrid.ComputeClosureExample; import org.apache.ignite.examples.computegrid.ComputeRunnableExample; import org.apache.ignite.examples.datastructures.IgniteExecutorServiceExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** * Closure examples self test. @@ -31,6 +32,7 @@ public class BasicExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testBroadcastExample() throws Exception { ComputeBroadcastExample.main(EMPTY_ARGS); } @@ -38,6 +40,7 @@ public class BasicExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testCallableExample() throws Exception { ComputeCallableExample.main(EMPTY_ARGS); } @@ -45,6 +48,7 @@ public class BasicExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testClosureExample() throws Exception { ComputeClosureExample.main(EMPTY_ARGS); } @@ -52,6 +56,7 @@ public class BasicExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testExecutorExample() throws Exception { IgniteExecutorServiceExample.main(EMPTY_ARGS); } @@ -67,6 +72,7 @@ public class BasicExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testRunnableExample() throws Exception { ComputeRunnableExample.main(EMPTY_ARGS); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java index 01be0bc..db25c60 100644 --- a/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.examples; import org.apache.ignite.examples.binary.datagrid.CacheClientBinaryPutGetExample; import org.apache.ignite.examples.binary.datagrid.CacheClientBinaryQueryExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** * @@ -33,6 +34,7 @@ public class CacheClientBinaryExampleTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testBinaryPutGetExample() throws Exception { CacheClientBinaryPutGetExample.main(new String[] {}); } @@ -40,6 +42,7 @@ public class CacheClientBinaryExampleTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testBinaryQueryExample() throws Exception { CacheClientBinaryQueryExample.main(new String[] {}); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/CacheContinuousQueryExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheContinuousQueryExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheContinuousQueryExamplesSelfTest.java index 1a1ae4e..d3aa704 100644 --- a/examples/src/test/java/org/apache/ignite/examples/CacheContinuousQueryExamplesSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/CacheContinuousQueryExamplesSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.examples.datagrid.CacheContinuousAsyncQueryExample; import org.apache.ignite.examples.datagrid.CacheContinuousQueryExample; import org.apache.ignite.examples.datagrid.CacheContinuousQueryWithTransformerExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** */ @@ -28,6 +29,7 @@ public class CacheContinuousQueryExamplesSelfTest extends GridAbstractExamplesTe /** * @throws Exception If failed. */ + @Test public void testCacheContinuousAsyncQueryExample() throws Exception { CacheContinuousAsyncQueryExample.main(new String[] {}); } @@ -35,6 +37,7 @@ public class CacheContinuousQueryExamplesSelfTest extends GridAbstractExamplesTe /** * @throws Exception If failed. */ + @Test public void testCacheContinuousQueryExample() throws Exception { CacheContinuousQueryExample.main(new String[] {}); } @@ -42,6 +45,7 @@ public class CacheContinuousQueryExamplesSelfTest extends GridAbstractExamplesTe /** * @throws Exception If failed. */ + @Test public void testCacheContinuousQueryWithTransformerExample() throws Exception { CacheContinuousQueryWithTransformerExample.main(new String[] {}); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java index 0085573..258adbc 100644 --- a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.examples.datagrid.CacheAffinityExample; import org.apache.ignite.examples.datagrid.CacheEntryProcessorExample; import org.apache.ignite.examples.datagrid.CacheApiExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; //import org.apache.ignite.examples.datagrid.starschema.*; //import org.apache.ignite.examples.datagrid.store.dummy.*; @@ -33,6 +34,7 @@ public class CacheExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testCacheAffinityExample() throws Exception { CacheAffinityExample.main(EMPTY_ARGS); } @@ -40,6 +42,7 @@ public class CacheExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testCacheEntryProcessorExample() throws Exception { CacheEntryProcessorExample.main(EMPTY_ARGS); } @@ -112,6 +115,7 @@ public class CacheExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testCacheApiExample() throws Exception { CacheApiExample.main(EMPTY_ARGS); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java b/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java index 5dcad62..30480f0 100644 --- a/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.examples; import org.apache.ignite.examples.binary.computegrid.ComputeClientBinaryTaskExecutionExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** * @@ -31,6 +32,7 @@ public class ComputeClientBinaryExampleTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testBinaryTaskExecutionExample() throws Exception { ComputeClientBinaryTaskExecutionExample.main(new String[] {}); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/EncryptedCacheExampleSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/EncryptedCacheExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/EncryptedCacheExampleSelfTest.java index 234a3ac..66cd4cf 100644 --- a/examples/src/test/java/org/apache/ignite/examples/EncryptedCacheExampleSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/EncryptedCacheExampleSelfTest.java @@ -19,10 +19,12 @@ package org.apache.ignite.examples; import org.apache.ignite.examples.encryption.EncryptedCacheExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** */ public class EncryptedCacheExampleSelfTest extends GridAbstractExamplesTest { + /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { cleanPersistenceDir(); } @@ -30,6 +32,7 @@ public class EncryptedCacheExampleSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testBinaryPutGetExample() throws Exception { EncryptedCacheExample.main(new String[] {}); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java index 8e675a3..635b247 100644 --- a/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.examples; import org.apache.ignite.examples.events.EventsExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** * Events examples self test. @@ -27,6 +28,7 @@ public class EventsExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testEventsExample() throws Exception { EventsExample.main(EMPTY_ARGS); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java index 3c94d3b..0686dff 100644 --- a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.examples; import org.apache.ignite.examples.messaging.MessagingExample; import org.apache.ignite.examples.messaging.MessagingPingPongExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** * Messaging examples self test. @@ -33,6 +34,7 @@ public class MessagingExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testMessagingExample() throws Exception { MessagingExample.main(EMPTY_ARGS); } @@ -40,6 +42,7 @@ public class MessagingExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testMessagingPingPongExample() throws Exception { MessagingPingPongExample.main(EMPTY_ARGS); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/SpringDataExampleSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/SpringDataExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/SpringDataExampleSelfTest.java index 516ad45..bba21b3 100644 --- a/examples/src/test/java/org/apache/ignite/examples/SpringDataExampleSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/SpringDataExampleSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.examples; import org.apache.ignite.examples.springdata.SpringDataExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** * Spring Data example test. @@ -26,6 +27,7 @@ public class SpringDataExampleSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testSpringDataExample() throws Exception { SpringDataExample.main(EMPTY_ARGS); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/examples/SqlExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/SqlExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/SqlExamplesSelfTest.java index 0bf01d8..c105335 100644 --- a/examples/src/test/java/org/apache/ignite/examples/SqlExamplesSelfTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/SqlExamplesSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.examples.sql.SqlDdlExample; import org.apache.ignite.examples.sql.SqlDmlExample; import org.apache.ignite.examples.sql.SqlQueriesExample; import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; +import org.junit.Test; /** * SQL examples self test. @@ -29,6 +30,7 @@ public class SqlExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testSqlJavaExample() throws Exception { SqlQueriesExample.main(EMPTY_ARGS); } @@ -36,6 +38,7 @@ public class SqlExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testSqlDmlExample() throws Exception { SqlDmlExample.main(EMPTY_ARGS); } @@ -43,6 +46,7 @@ public class SqlExamplesSelfTest extends GridAbstractExamplesTest { /** * @throws Exception If failed. */ + @Test public void testSqlDdlExample() throws Exception { SqlDdlExample.main(EMPTY_ARGS); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesJ8SelfTestSuite.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesJ8SelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesJ8SelfTestSuite.java index f73d977..f281ec5 100644 --- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesJ8SelfTestSuite.java +++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesJ8SelfTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.examples.BasicExamplesMultiNodeSelfTest; import org.apache.ignite.examples.BasicExamplesSelfTest; @@ -45,35 +46,35 @@ public class IgniteExamplesJ8SelfTestSuite extends TestSuite { TestSuite suite = new TestSuite("Ignite Examples Test Suite"); - suite.addTest(new TestSuite(CacheExamplesSelfTest.class)); - suite.addTest(new TestSuite(BasicExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(BasicExamplesSelfTest.class)); -// suite.addTest(new TestSuite(ContinuationExamplesSelfTest.class)); -// suite.addTest(new TestSuite(ContinuousMapperExamplesSelfTest.class)); -// suite.addTest(new TestSuite(DeploymentExamplesSelfTest.class)); - suite.addTest(new TestSuite(EventsExamplesSelfTest.class)); -// suite.addTest(new TestSuite(LifecycleExamplesSelfTest.class)); - suite.addTest(new TestSuite(MessagingExamplesSelfTest.class)); -// suite.addTest(new TestSuite(MemcacheRestExamplesSelfTest.class)); -// suite.addTest(new TestSuite(MonteCarloExamplesSelfTest.class)); -// suite.addTest(new TestSuite(TaskExamplesSelfTest.class)); -// suite.addTest(new TestSuite(SpringBeanExamplesSelfTest.class)); -// suite.addTest(new TestSuite(IgfsExamplesSelfTest.class)); -// suite.addTest(new TestSuite(CheckpointExamplesSelfTest.class)); -// suite.addTest(new TestSuite(HibernateL2CacheExampleSelfTest.class)); -// suite.addTest(new TestSuite(ClusterGroupExampleSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(ContinuationExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(ContinuousMapperExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(DeploymentExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(EventsExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(LifecycleExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(MessagingExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(MemcacheRestExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(MonteCarloExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(TaskExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(SpringBeanExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(IgfsExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(CheckpointExamplesSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(HibernateL2CacheExampleSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(ClusterGroupExampleSelfTest.class)); // Multi-node. - suite.addTest(new TestSuite(CacheExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(BasicExamplesMultiNodeSelfTest.class)); -// suite.addTest(new TestSuite(ContinuationExamplesMultiNodeSelfTest.class)); -// suite.addTest(new TestSuite(ContinuousMapperExamplesMultiNodeSelfTest.class)); -// suite.addTest(new TestSuite(DeploymentExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(EventsExamplesMultiNodeSelfTest.class)); -// suite.addTest(new TestSuite(TaskExamplesMultiNodeSelfTest.class)); -// suite.addTest(new TestSuite(MemcacheRestExamplesMultiNodeSelfTest.class)); -// suite.addTest(new TestSuite(MonteCarloExamplesMultiNodeSelfTest.class)); -// suite.addTest(new TestSuite(HibernateL2CacheExampleMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(BasicExamplesMultiNodeSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(ContinuationExamplesMultiNodeSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(ContinuousMapperExamplesMultiNodeSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(DeploymentExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(EventsExamplesMultiNodeSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(TaskExamplesMultiNodeSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(MemcacheRestExamplesMultiNodeSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(MonteCarloExamplesMultiNodeSelfTest.class)); +// suite.addTest(new JUnit4TestAdapter(HibernateL2CacheExampleMultiNodeSelfTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java index 9553103..1c93a4b 100644 --- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java +++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.examples.BasicExamplesMultiNodeSelfTest; import org.apache.ignite.examples.BasicExamplesSelfTest; @@ -65,39 +66,39 @@ public class IgniteExamplesSelfTestSuite extends TestSuite { TestSuite suite = new TestSuite("Ignite Examples Test Suite"); - suite.addTest(new TestSuite(CacheExamplesSelfTest.class)); - suite.addTest(new TestSuite(SqlExamplesSelfTest.class)); - suite.addTest(new TestSuite(BasicExamplesSelfTest.class)); - suite.addTest(new TestSuite(ContinuationExamplesSelfTest.class)); - suite.addTest(new TestSuite(ContinuousMapperExamplesSelfTest.class)); - suite.addTest(new TestSuite(DeploymentExamplesSelfTest.class)); - suite.addTest(new TestSuite(EventsExamplesSelfTest.class)); - suite.addTest(new TestSuite(LifecycleExamplesSelfTest.class)); - suite.addTest(new TestSuite(MessagingExamplesSelfTest.class)); - suite.addTest(new TestSuite(MemcacheRestExamplesSelfTest.class)); - suite.addTest(new TestSuite(MonteCarloExamplesSelfTest.class)); - suite.addTest(new TestSuite(TaskExamplesSelfTest.class)); - suite.addTest(new TestSuite(SpringBeanExamplesSelfTest.class)); - suite.addTest(new TestSuite(SpringDataExampleSelfTest.class)); - suite.addTest(new TestSuite(IgfsExamplesSelfTest.class)); - suite.addTest(new TestSuite(CheckpointExamplesSelfTest.class)); - suite.addTest(new TestSuite(ClusterGroupExampleSelfTest.class)); - suite.addTest(new TestSuite(CacheContinuousQueryExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(SqlExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(BasicExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ContinuationExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ContinuousMapperExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DeploymentExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(EventsExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(LifecycleExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(MessagingExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(MemcacheRestExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(MonteCarloExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(TaskExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(SpringBeanExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(SpringDataExampleSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgfsExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CheckpointExamplesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClusterGroupExampleSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryExamplesSelfTest.class)); // Multi-node. - suite.addTest(new TestSuite(CacheExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(BasicExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(ContinuationExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(ContinuousMapperExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(DeploymentExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(EventsExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(TaskExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(MemcacheRestExamplesMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(MonteCarloExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(BasicExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ContinuationExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ContinuousMapperExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DeploymentExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(EventsExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(TaskExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(MemcacheRestExamplesMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(MonteCarloExamplesMultiNodeSelfTest.class)); // Binary. - suite.addTest(new TestSuite(CacheClientBinaryExampleTest.class)); - suite.addTest(new TestSuite(ComputeClientBinaryExampleTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheClientBinaryExampleTest.class)); + suite.addTest(new JUnit4TestAdapter(ComputeClientBinaryExampleTest.class)); // ML Grid. suite.addTest(IgniteExamplesMLTestSuite.suite()); http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 1f42694..b2d12fd 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -121,6 +121,12 @@ import org.apache.log4j.Priority; import org.apache.log4j.RollingFileAppender; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.rules.TestName; +import org.junit.rules.TestRule; +import org.junit.runners.model.Statement; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; @@ -166,6 +172,16 @@ public abstract class GridAbstractTest extends TestCase { /** */ protected static final String DEFAULT_CACHE_NAME = "default"; + /** Supports obtaining test name for JUnit4 cases. */ + @Rule public transient TestName nameRule = new TestName(); + + /** Manages test execution and reporting. */ + @Rule public transient TestRule runRule = (base, description) -> new Statement() { + @Override public void evaluate() throws Throwable { + runTest(base); + } + }; + /** */ private transient boolean startGrid; @@ -246,6 +262,13 @@ public abstract class GridAbstractTest extends TestCase { this.startGrid = startGrid; } + /** {@inheritDoc} */ + @Override public String getName() { + String junit3Name = super.getName(); + + return junit3Name != null ? junit3Name : nameRule.getMethodName(); + } + /** * @param cls Class to create. * @return Instance of class. @@ -564,7 +587,8 @@ public abstract class GridAbstractTest extends TestCase { } /** {@inheritDoc} */ - @Override protected void setUp() throws Exception { + @Before + @Override public void setUp() throws Exception { stopGridErr = false; clsLdr = Thread.currentThread().getContextClassLoader(); @@ -1746,7 +1770,8 @@ public abstract class GridAbstractTest extends TestCase { } /** {@inheritDoc} */ - @Override protected void tearDown() throws Exception { + @After + @Override public void tearDown() throws Exception { long dur = System.currentTimeMillis() - ts; info(">>> Stopping test: " + testDescription() + " in " + dur + " ms <<<"); @@ -2074,12 +2099,24 @@ public abstract class GridAbstractTest extends TestCase { /** {@inheritDoc} */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @Override protected void runTest() throws Throwable { + runTest(new Statement() { + @Override public void evaluate() throws Throwable { + GridAbstractTest.super.runTest(); + } + }); + } + + /** */ + private void runTest(Statement testRoutine) throws Throwable { final AtomicReference<Throwable> ex = new AtomicReference<>(); Thread runner = new IgniteThread(getTestIgniteInstanceName(), "test-runner", new Runnable() { @Override public void run() { try { - runTestInternal(); + if (forceFailure) + fail("Forced failure: " + forceFailureMsg); + + testRoutine.evaluate(); } catch (Throwable e) { IgniteClosure<Throwable, Throwable> hnd = errorHandler(); @@ -2156,17 +2193,6 @@ public abstract class GridAbstractTest extends TestCase { } /** - * @throws Throwable If failed. - */ - @SuppressWarnings({"ProhibitedExceptionDeclared"}) - private void runTestInternal() throws Throwable { - if (forceFailure) - fail("Forced failure: " + forceFailureMsg); - else - super.runTest(); - } - - /** * @return Test case timeout. */ protected long getTestTimeout() { @@ -2188,7 +2214,7 @@ public abstract class GridAbstractTest extends TestCase { /** * @param store Store. */ - protected <T> Factory<T> singletonFactory(T store) { + protected static <T> Factory<T> singletonFactory(T store) { return notSerializableProxy(new FactoryBuilder.SingletonFactory<>(store), Factory.class); } @@ -2196,7 +2222,7 @@ public abstract class GridAbstractTest extends TestCase { * @param obj Object that should be wrap proxy * @return Created proxy. */ - protected <T> T notSerializableProxy(final T obj) { + protected static <T> T notSerializableProxy(final T obj) { Class<T> cls = (Class<T>)obj.getClass(); Class<T>[] interfaces = (Class<T>[])cls.getInterfaces(); @@ -2214,7 +2240,7 @@ public abstract class GridAbstractTest extends TestCase { * @param itfClses Interfaces that should be implemented by proxy (vararg parameter) * @return Created proxy. */ - protected <T> T notSerializableProxy(final T obj, Class<? super T> itfCls, Class<? super T>... itfClses) { + protected static <T> T notSerializableProxy(final T obj, Class<? super T> itfCls, Class<? super T>... itfClses) { Class<?>[] itfs = Arrays.copyOf(itfClses, itfClses.length + 3); itfs[itfClses.length] = itfCls; @@ -2237,7 +2263,7 @@ public abstract class GridAbstractTest extends TestCase { * @param obj Object that must not be changed after serialization/deserialization. * @return An object to return from writeReplace() */ - private Object supressSerialization(Object obj) { + private static Object supressSerialization(Object obj) { SerializableProxy res = new SerializableProxy(UUID.randomUUID()); serializedObj.put(res.uuid, obj); @@ -2353,7 +2379,7 @@ public abstract class GridAbstractTest extends TestCase { * @param cacheName Cache name. * @return Cache group ID for given cache name. */ - protected final int groupIdForCache(Ignite node, String cacheName) { + protected static final int groupIdForCache(Ignite node, String cacheName) { for (CacheGroupContext grp : ((IgniteKernal)node).context().cache().cacheGroups()) { if (grp.hasCache(cacheName)) return grp.groupId(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java index 1e6c84e..70fd330 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java @@ -20,10 +20,13 @@ package org.apache.ignite.testframework.junits.common; import java.io.FileReader; import java.util.Properties; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Base class for examples test. */ +@RunWith(JUnit4.class) public abstract class GridAbstractExamplesTest extends GridCommonAbstractTest { /** */ protected static final String[] EMPTY_ARGS = new String[0]; @@ -75,4 +78,4 @@ public abstract class GridAbstractExamplesTest extends GridCommonAbstractTest { protected String defaultConfig() { return DFLT_CFG; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 27a25ac..c931a0d 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -481,7 +481,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { } /** {@inheritDoc} */ - @Override protected void setUp() throws Exception { + @Override public void setUp() throws Exception { // Disable SSL hostname verifier. HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() { @Override public boolean verify(String s, SSLSession sslSes) { @@ -495,7 +495,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { } /** {@inheritDoc} */ - @Override protected void tearDown() throws Exception { + @Override public void tearDown() throws Exception { getTestCounters().incrementStopped(); super.tearDown(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java index 82bf417..05ebddf 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java @@ -126,7 +126,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr /** * @throws Exception If failed. */ - @Override protected final void setUp() throws Exception { + @Override public final void setUp() throws Exception { // Need to change classloader here, although it also handled in the parent class // the current test initialisation procedure doesn't allow us to setUp the parent first. cl = Thread.currentThread().getContextClassLoader(); @@ -490,7 +490,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr /** * @throws Exception If failed. */ - @Override protected final void tearDown() throws Exception { + @Override public final void tearDown() throws Exception { getTestCounters().incrementStopped(); boolean wasLast = isLastTest(); @@ -730,4 +730,4 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr return null; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/b3a96454/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java index b98cd46..356c05a 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java @@ -33,14 +33,14 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; */ public class GridMBeanDisableSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ - @Override protected void setUp() throws Exception { + @Override public void setUp() throws Exception { IgniteUtils.IGNITE_MBEANS_DISABLED = true; super.setUp(); } /** {@inheritDoc} */ - @Override protected void tearDown() throws Exception { + @Override public void tearDown() throws Exception { IgniteUtils.IGNITE_MBEANS_DISABLED = false; super.tearDown();
