http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java8/org/apache/ignite/testsuites/CacheQueryJsr310Java8DateTimeApiSupportTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java8/org/apache/ignite/testsuites/CacheQueryJsr310Java8DateTimeApiSupportTestSuite.java b/modules/indexing/src/test/java8/org/apache/ignite/testsuites/CacheQueryJsr310Java8DateTimeApiSupportTestSuite.java index aa7aed8..77f2ed6 100644 --- a/modules/indexing/src/test/java8/org/apache/ignite/testsuites/CacheQueryJsr310Java8DateTimeApiSupportTestSuite.java +++ b/modules/indexing/src/test/java8/org/apache/ignite/testsuites/CacheQueryJsr310Java8DateTimeApiSupportTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.query.h2.CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest; @@ -31,7 +32,7 @@ public class CacheQueryJsr310Java8DateTimeApiSupportTestSuite extends TestSuite public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("JSR-310 Java 8 Date and Time API Cache Queries Test Suite"); - suite.addTestSuite(CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest.class); + suite.addTest(new JUnit4TestAdapter(CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest.class)); return suite; }
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java ---------------------------------------------------------------------- diff --git a/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java b/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java index f7b60ec..e6c8c1e 100644 --- a/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java +++ b/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java @@ -21,17 +21,22 @@ import junit.framework.TestCase; import org.apache.commons.logging.LogFactory; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Jcl logger test. */ @GridCommonTest(group = "Logger") +@RunWith(JUnit4.class) public class JclLoggerTest extends TestCase { /** */ @SuppressWarnings({"FieldCanBeLocal"}) private IgniteLogger log; /** */ + @Test public void testLogInitialize() { log = new JclLogger(LogFactory.getLog(JclLoggerTest.class.getName())); @@ -45,4 +50,4 @@ public class JclLoggerTest extends TestCase { assert log.getLogger(JclLoggerTest.class.getName()) instanceof JclLogger; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java b/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java index 8c65cd9..c27f59a 100644 --- a/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java +++ b/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.logger.jcl.JclLoggerTest; @@ -26,13 +27,12 @@ import org.apache.ignite.logger.jcl.JclLoggerTest; public class IgniteJclTestSuite 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 TestSuite("Commons Logging Test Suite"); - suite.addTest(new TestSuite(JclLoggerTest.class)); + suite.addTest(new JUnit4TestAdapter(JclLoggerTest.class)); return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java ---------------------------------------------------------------------- diff --git a/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java b/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java index caf8f9e..4b2e819 100644 --- a/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java +++ b/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java @@ -57,8 +57,9 @@ import org.apache.ignite.events.CacheEvent; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.junit.After; -import org.junit.Before; +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; @@ -67,6 +68,7 @@ import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT; * * @author Raul Kripalani */ +@RunWith(JUnit4.class) public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** */ private static final int CACHE_ENTRY_COUNT = 100; @@ -99,9 +101,8 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - @Before @SuppressWarnings("unchecked") - public void beforeTest() throws Exception { + @Override public void beforeTest() throws Exception { grid().<Integer, String>getOrCreateCache(defaultCacheConfiguration()); broker = new BrokerService(); @@ -127,8 +128,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception Iff ailed. */ - @After - public void afterTest() throws Exception { + @Override public void afterTest() throws Exception { grid().cache(DEFAULT_CACHE_NAME).clear(); broker.stop(); @@ -138,6 +138,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueueFromName() throws Exception { Destination dest = new ActiveMQQueue(QUEUE_NAME); @@ -167,6 +168,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTopicFromName() throws JMSException, InterruptedException { Destination dest = new ActiveMQTopic(TOPIC_NAME); @@ -199,6 +201,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueueFromExplicitDestination() throws Exception { Destination dest = new ActiveMQQueue(QUEUE_NAME); @@ -228,6 +231,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTopicFromExplicitDestination() throws JMSException, InterruptedException { Destination dest = new ActiveMQTopic(TOPIC_NAME); @@ -259,6 +263,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testInsertMultipleCacheEntriesFromOneMessage() throws Exception { Destination dest = new ActiveMQQueue(QUEUE_NAME); @@ -287,6 +292,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDurableSubscriberStartStopStart() throws Exception { Destination dest = new ActiveMQTopic(TOPIC_NAME); @@ -327,6 +333,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueueMessagesConsumedInBatchesCompletionSizeBased() throws Exception { Destination dest = new ActiveMQQueue(QUEUE_NAME); @@ -366,6 +373,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueueMessagesConsumedInBatchesCompletionTimeBased() throws Exception { Destination dest = new ActiveMQQueue(QUEUE_NAME); @@ -416,6 +424,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGenerateNoEntries() throws Exception { Destination dest = new ActiveMQQueue(QUEUE_NAME); @@ -444,6 +453,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTransactedSessionNoBatching() throws Exception { Destination dest = new ActiveMQQueue(QUEUE_NAME); @@ -473,6 +483,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueueMultipleThreads() throws Exception { Destination dest = new ActiveMQQueue(QUEUE_NAME); @@ -512,6 +523,7 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { * * @throws Exception If fails. */ + @Test public void testExceptionListener() throws Exception { // restart broker with auth plugin if (broker.isStarted()) @@ -696,4 +708,4 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest { } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java index 494c5b7..0dae5f8 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java @@ -32,10 +32,14 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.cache.jta.jndi.CacheJndiTmFactory; 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; /** * */ +@RunWith(JUnit4.class) public class CacheJndiTmFactorySelfTest extends GridCommonAbstractTest { /** */ private static final String TM_JNDI_NAME = "java:/comp/env/tm/testtm1"; @@ -87,6 +91,7 @@ public class CacheJndiTmFactorySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFactory() throws Exception { CacheJndiTmFactory f = new CacheJndiTmFactory("wrongJndiName", NOT_TM_JNDI_NAME, TM_JNDI_NAME2, TM_JNDI_NAME); @@ -100,6 +105,7 @@ public class CacheJndiTmFactorySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFactoryException() throws Exception { final CacheJndiTmFactory f = new CacheJndiTmFactory("wrongJndiName", NOT_TM_JNDI_NAME, "wrongJndiName2"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java index c7b7fed..dc65ae5 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java @@ -26,12 +26,16 @@ import org.apache.ignite.configuration.IgniteConfiguration; 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 org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * Configuration validation test. */ +@RunWith(JUnit4.class) public class GridCacheJtaConfigurationValidationSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { @@ -53,6 +57,7 @@ public class GridCacheJtaConfigurationValidationSelfTest extends GridCommonAbstr * * @throws Exception If failed. */ + @Test public void testAtomicWithTmLookup() throws Exception { GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java index bb12d5e..c63df3c 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java @@ -25,12 +25,16 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; 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; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * Configuration validation test. */ +@RunWith(JUnit4.class) public class GridCacheJtaFactoryConfigValidationSelfTest extends GridCommonAbstractTest { /** */ private Factory factory; @@ -53,6 +57,7 @@ public class GridCacheJtaFactoryConfigValidationSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNullFactory() throws Exception { factory = new NullTxFactory(); @@ -70,6 +75,7 @@ public class GridCacheJtaFactoryConfigValidationSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testWrongTypeFactory() throws Exception { factory = new IntegerTxFactory(); @@ -87,6 +93,7 @@ public class GridCacheJtaFactoryConfigValidationSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testExceptionFactory() throws Exception { factory = new ExceptionTxFactory(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java index c10d115..bd36a25 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java @@ -31,12 +31,16 @@ import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.junits.common.GridAbstractLifecycleAwareSelfTest; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** * Test for {@link LifecycleAware} support for {@link CacheTmLookup}. */ +@RunWith(JUnit4.class) public class GridJtaLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTest { /** */ private static final String CACHE_NAME = "cache"; @@ -140,11 +144,13 @@ public class GridJtaLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSel } /** {@inheritDoc} */ + @Test @Override public void testLifecycleAware() throws Exception { // No-op, see anothre tests. } /** {@inheritDoc} */ + @Test public void testCacheLookupLifecycleAware() throws Exception { tmConfigurationType = TmConfigurationType.CACHE_LOOKUP; @@ -152,6 +158,7 @@ public class GridJtaLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSel } /** {@inheritDoc} */ + @Test public void testGlobalLookupLifecycleAware() throws Exception { tmConfigurationType = TmConfigurationType.GLOBAL_LOOKUP; @@ -159,6 +166,7 @@ public class GridJtaLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSel } /** {@inheritDoc} */ + @Test public void testFactoryLifecycleAware() throws Exception { tmConfigurationType = TmConfigurationType.FACTORY; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java index a7bb785..dff2aac 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java @@ -26,6 +26,9 @@ import org.apache.ignite.configuration.TransactionConfiguration; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import org.objectweb.jotm.Current; import org.objectweb.jotm.Jotm; @@ -35,6 +38,7 @@ import static org.apache.ignite.transactions.TransactionState.ACTIVE; /** * JTA Tx Manager test. */ +@RunWith(JUnit4.class) public class GridJtaTransactionManagerSelfTest extends GridCommonAbstractTest { /** Java Open Transaction Manager facade. */ private static Jotm jotm; @@ -70,6 +74,7 @@ public class GridJtaTransactionManagerSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testJtaTxContextSwitch() throws Exception { for (TransactionIsolation isolation : TransactionIsolation.values()) { TransactionConfiguration cfg = grid().context().config().getTransactionConfiguration(); @@ -144,6 +149,7 @@ public class GridJtaTransactionManagerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testJtaTxContextSwitchWithExistingTx() throws Exception { for (TransactionIsolation isolation : TransactionIsolation.values()) { TransactionConfiguration cfg = grid().context().config().getTransactionConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java b/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java index 3cc7935..f28de3c 100644 --- a/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java +++ b/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.CacheJndiTmFactorySelfTest; import org.apache.ignite.internal.processors.cache.GridCacheJtaConfigurationValidationSelfTest; @@ -37,28 +38,27 @@ import org.apache.ignite.testframework.IgniteTestSuite; public class IgniteJtaTestSuite 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("JTA Integration Test Suite"); suite.addTestSuite(GridPartitionedCacheJtaFactorySelfTest.class); - suite.addTestSuite(GridReplicatedCacheJtaFactorySelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridReplicatedCacheJtaFactorySelfTest.class)); suite.addTestSuite(GridPartitionedCacheJtaLookupClassNameSelfTest.class); suite.addTestSuite(GridReplicatedCacheJtaLookupClassNameSelfTest.class); suite.addTestSuite(GridPartitionedCacheJtaFactoryUseSyncSelfTest.class); - suite.addTestSuite(GridReplicatedCacheJtaFactoryUseSyncSelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridReplicatedCacheJtaFactoryUseSyncSelfTest.class)); - suite.addTestSuite(GridJtaLifecycleAwareSelfTest.class); - suite.addTestSuite(GridCacheJtaConfigurationValidationSelfTest.class); - suite.addTestSuite(GridCacheJtaFactoryConfigValidationSelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridJtaLifecycleAwareSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheJtaConfigurationValidationSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheJtaFactoryConfigValidationSelfTest.class)); - suite.addTestSuite(GridJtaTransactionManagerSelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridJtaTransactionManagerSelfTest.class)); // Factory - suite.addTestSuite(CacheJndiTmFactorySelfTest.class); + suite.addTest(new JUnit4TestAdapter(CacheJndiTmFactorySelfTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java index c8d413a..9fb7468 100644 --- a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java +++ b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/IgniteKafkaStreamerSelfTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.stream.kafka; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.stream.kafka.connect.IgniteSinkConnectorTest; import org.apache.ignite.stream.kafka.connect.IgniteSourceConnectorTest; @@ -27,17 +28,16 @@ import org.apache.ignite.stream.kafka.connect.IgniteSourceConnectorTest; public class IgniteKafkaStreamerSelfTestSuite 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 TestSuite("Apache Kafka streamer Test Suite"); // Kafka streamer. - suite.addTest(new TestSuite(KafkaIgniteStreamerSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(KafkaIgniteStreamerSelfTest.class)); // Kafka streamers via Connect API. - suite.addTest(new TestSuite(IgniteSinkConnectorTest.class)); - suite.addTest(new TestSuite(IgniteSourceConnectorTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteSinkConnectorTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteSourceConnectorTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/KafkaIgniteStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/KafkaIgniteStreamerSelfTest.java b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/KafkaIgniteStreamerSelfTest.java index 081add8..24fd8a3 100644 --- a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/KafkaIgniteStreamerSelfTest.java +++ b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/KafkaIgniteStreamerSelfTest.java @@ -42,12 +42,16 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.serialization.StringDeserializer; +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; /** * Tests {@link KafkaStreamer}. */ +@RunWith(JUnit4.class) public class KafkaIgniteStreamerSelfTest extends GridCommonAbstractTest { /** Embedded Kafka. */ private TestKafkaBroker embeddedBroker; @@ -96,6 +100,7 @@ public class KafkaIgniteStreamerSelfTest extends GridCommonAbstractTest { * @throws TimeoutException If timed out. * @throws InterruptedException If interrupted. */ + @Test public void testKafkaStreamer() throws TimeoutException, InterruptedException { embeddedBroker.createTopic(TOPIC_NAME, PARTITIONS, REPLICATION_FACTOR); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java ---------------------------------------------------------------------- diff --git a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java index 2844542..24a605e 100644 --- a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java +++ b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java @@ -51,6 +51,9 @@ import org.apache.kafka.connect.storage.OffsetBackingStore; import org.apache.kafka.connect.util.Callback; import org.apache.kafka.connect.util.ConnectUtils; import org.apache.kafka.connect.util.FutureCallback; +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; import static org.easymock.EasyMock.mock; @@ -58,6 +61,7 @@ import static org.easymock.EasyMock.mock; /** * Tests for {@link IgniteSinkConnector}. */ +@RunWith(JUnit4.class) public class IgniteSinkConnectorTest extends GridCommonAbstractTest { /** Number of input messages. */ private static final int EVENT_CNT = 10000; @@ -138,6 +142,7 @@ public class IgniteSinkConnectorTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testSinkPutsWithoutTransformation() throws Exception { Map<String, String> sinkProps = makeSinkProps(Utils.join(TOPICS, ",")); @@ -149,6 +154,7 @@ public class IgniteSinkConnectorTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testSinkPutsWithTransformation() throws Exception { testSinkPuts(makeSinkProps(Utils.join(TOPICS, ",")), true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java ---------------------------------------------------------------------- diff --git a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java index 2a882f0..e98bf3e 100644 --- a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java +++ b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java @@ -55,12 +55,16 @@ import org.apache.kafka.connect.storage.MemoryOffsetBackingStore; import org.apache.kafka.connect.util.Callback; import org.apache.kafka.connect.util.ConnectUtils; import org.apache.kafka.connect.util.FutureCallback; +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; /** * Tests for {@link IgniteSourceConnector}. */ +@RunWith(JUnit4.class) public class IgniteSourceConnectorTest extends GridCommonAbstractTest { /** Number of input messages. */ private static final int EVENT_CNT = 100; @@ -135,6 +139,7 @@ public class IgniteSourceConnectorTest extends GridCommonAbstractTest { * * @throws Exception Thrown in case of the failure. */ + @Test public void testEventsInjectedIntoKafkaWithoutFilter() throws Exception { Map<String, String> srcProps = makeSourceProps(Utils.join(TOPICS, ",")); @@ -148,6 +153,7 @@ public class IgniteSourceConnectorTest extends GridCommonAbstractTest { * * @throws Exception Thrown in case of the failure. */ + @Test public void testEventsInjectedIntoKafka() throws Exception { doTest(makeSourceProps(Utils.join(TOPICS, ",")), true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java b/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java index fd3e2a3..c12e18a 100644 --- a/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java +++ b/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java @@ -19,10 +19,14 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes; 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; /** * TcpDiscoveryKubernetesIpFinder test. */ +@RunWith(JUnit4.class) public class TcpDiscoveryKubernetesIpFinderSelfTest extends TcpDiscoveryIpFinderAbstractSelfTest<TcpDiscoveryKubernetesIpFinder> { /** @@ -45,6 +49,7 @@ public class TcpDiscoveryKubernetesIpFinderSelfTest extends } /* {@inheritDoc} */ + @Test @Override public void testIpFinder() throws Exception { TcpDiscoveryKubernetesIpFinder ipFinder = new TcpDiscoveryKubernetesIpFinder(); @@ -90,4 +95,4 @@ public class TcpDiscoveryKubernetesIpFinderSelfTest extends 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/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java b/modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java index 540657e..8c856af 100644 --- a/modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java +++ b/modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java @@ -18,6 +18,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes.TcpDiscoveryKubernetesIpFinderSelfTest; import org.apache.ignite.testframework.IgniteTestSuite; @@ -28,14 +29,13 @@ import org.apache.ignite.testframework.IgniteTestSuite; public class IgniteKubernetesTestSuite 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("Kubernetes Integration Test Suite"); // Cloud Nodes IP finder. - suite.addTestSuite(TcpDiscoveryKubernetesIpFinderSelfTest.class); + suite.addTest(new JUnit4TestAdapter(TcpDiscoveryKubernetesIpFinderSelfTest.class)); return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java index debbb37..bb0f086 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java @@ -24,10 +24,14 @@ import java.util.Date; import junit.framework.TestCase; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.log4j.helpers.FileWatchdog; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checking that Log4j configuration is updated when its source file is changed. */ +@RunWith(JUnit4.class) public class GridLog4jConfigUpdateTest extends TestCase { /** Path to log4j configuration with INFO enabled. */ private static final String LOG_CONFIG_INFO = "modules/log4j/src/test/config/log4j-info.xml"; @@ -51,6 +55,7 @@ public class GridLog4jConfigUpdateTest extends TestCase { * Check that changing log4j config file causes the logger configuration to be updated. * String-accepting constructor is used. */ + @Test public void testConfigChangeStringConstructor() throws Exception { checkConfigUpdate(new Log4JLoggerSupplier() { @Override public Log4JLogger get(File cfgFile) throws Exception { @@ -63,6 +68,7 @@ public class GridLog4jConfigUpdateTest extends TestCase { * Check that changing log4j config file causes the logger configuration to be updated. * String-accepting constructor is used. */ + @Test public void testConfigChangeStringConstructorDefaultDelay() throws Exception { checkConfigUpdate(new Log4JLoggerSupplier() { @Override public Log4JLogger get(File cfgFile) throws Exception { @@ -75,6 +81,7 @@ public class GridLog4jConfigUpdateTest extends TestCase { * Check that changing log4j config file causes the logger configuration to be updated. * File-accepting constructor is used. */ + @Test public void testConfigChangeFileConstructor() throws Exception { checkConfigUpdate(new Log4JLoggerSupplier() { @Override public Log4JLogger get(File cfgFile) throws Exception { @@ -87,6 +94,7 @@ public class GridLog4jConfigUpdateTest extends TestCase { * Check that changing log4j config file causes the logger configuration to be updated. * File-accepting constructor is used. */ + @Test public void testConfigChangeUrlConstructor() throws Exception { checkConfigUpdate(new Log4JLoggerSupplier() { @Override public Log4JLogger get(File cfgFile) throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java index ac5b498..a1e6a96 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.logger.log4j; import java.io.File; import java.util.Collections; import java.util.Enumeration; -import junit.framework.TestCase; import org.apache.ignite.Ignite; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.G; @@ -32,17 +31,21 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; import org.apache.log4j.varia.LevelRangeFilter; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Tests that several grids log to files with correct names. */ @GridCommonTest(group = "Logger") -public class GridLog4jCorrectFileNameTest extends TestCase { +public class GridLog4jCorrectFileNameTest { /** Appender */ private Log4jRollingFileAppender appender; - /** {@inheritDoc} */ - @Override protected void setUp() throws Exception { + /** TODO IGNITE-10177 add annotation @Before here. */ + private void setUp() { Logger root = Logger.getRootLogger(); for (Enumeration appenders = root.getAllAppenders(); appenders.hasMoreElements(); ) { @@ -55,8 +58,8 @@ public class GridLog4jCorrectFileNameTest extends TestCase { root.addAppender(appender); } - /** {@inheritDoc} */ - @Override public void tearDown() { + /** TODO IGNITE-10177 add annotation @After here. */ + private void tearDown() { if (appender != null) { Logger.getRootLogger().removeAppender(Log4jRollingFileAppender.class.getSimpleName()); @@ -69,9 +72,12 @@ public class GridLog4jCorrectFileNameTest extends TestCase { * * @throws Exception If error occurs. */ + @Test public void testLogFilesTwoNodes() throws Exception { + setUp(); checkOneNode(0); checkOneNode(1); + tearDown(); } /** @@ -102,9 +108,8 @@ public class GridLog4jCorrectFileNameTest extends TestCase { * * @param igniteInstanceName Ignite instance name. * @return Grid configuration. - * @throws Exception If error occurred. */ - private static IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + private static IgniteConfiguration getConfiguration(String igniteInstanceName) { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setIgniteInstanceName(igniteInstanceName); @@ -128,9 +133,8 @@ public class GridLog4jCorrectFileNameTest extends TestCase { * Creates new GridLog4jRollingFileAppender. * * @return GridLog4jRollingFileAppender. - * @throws Exception If error occurred. */ - private static Log4jRollingFileAppender createAppender() throws Exception { + private static Log4jRollingFileAppender createAppender() { Log4jRollingFileAppender appender = new Log4jRollingFileAppender(); appender.setLayout(new PatternLayout("[%d{ISO8601}][%-5p][%t][%c{1}] %m%n")); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java index 1fb9c34..9f3c10f 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java @@ -21,11 +21,15 @@ import junit.framework.TestCase; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.junits.common.GridCommonTest; import org.apache.log4j.BasicConfigurator; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Log4j initialized test. */ @GridCommonTest(group = "Logger") +@RunWith(JUnit4.class) public class GridLog4jInitializedTest extends TestCase { /** @@ -36,6 +40,7 @@ public class GridLog4jInitializedTest extends TestCase { } /** */ + @Test public void testLogInitialize() { IgniteLogger log = new Log4JLogger(); @@ -57,4 +62,4 @@ public class GridLog4jInitializedTest extends TestCase { assert log.getLogger(GridLog4jInitializedTest.class.getName()) instanceof Log4JLogger; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java index d1b09d7..78b77d2 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java @@ -18,24 +18,26 @@ package org.apache.ignite.logger.log4j; import java.io.File; -import junit.framework.TestCase; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; /** * Grid Log4j SPI test. */ @GridCommonTest(group = "Logger") -public class GridLog4jLoggingFileTest extends TestCase { +public class GridLog4jLoggingFileTest { /** */ private IgniteLogger log; /** Logger config */ private File xml; - /** {@inheritDoc} */ - @Override protected void setUp() throws Exception { + /** TODO IGNITE-10177 add annotation @Before here. */ + private void setUp() throws Exception { xml = GridTestUtils.resolveIgnitePath("modules/core/src/test/config/log4j-test.xml"); assert xml != null; @@ -47,7 +49,10 @@ public class GridLog4jLoggingFileTest extends TestCase { /** * Tests log4j logging SPI. */ - public void testLog() { + @Test + public void testLog() throws Exception { + setUp(); + System.out.println(log.toString()); assertTrue(log.toString().contains("Log4JLogger")); @@ -62,4 +67,4 @@ public class GridLog4jLoggingFileTest extends TestCase { log.error("This is 'error' message."); log.error("This is 'error' message.", new Exception("It's a test error exception")); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingPathTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingPathTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingPathTest.java index 867efba..1d752e4 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingPathTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingPathTest.java @@ -17,30 +17,35 @@ package org.apache.ignite.logger.log4j; -import junit.framework.TestCase; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; /** * Grid Log4j SPI test. */ @GridCommonTest(group = "Logger") -public class GridLog4jLoggingPathTest extends TestCase { +public class GridLog4jLoggingPathTest { /** */ private IgniteLogger log; /** Logger config */ private String path = "modules/core/src/test/config/log4j-test.xml"; - /** {@inheritDoc} */ - @Override protected void setUp() throws Exception { + /** TODO IGNITE-10177 add annotation @Before here. */ + private void setUp() throws Exception { log = new Log4JLogger(path).getLogger(getClass()); } /** * Tests log4j logging SPI. */ - public void testLog() { + @Test + public void testLog() throws Exception { + setUp(); + System.out.println(log.toString()); assertTrue(log.toString().contains("Log4JLogger")); @@ -57,4 +62,4 @@ public class GridLog4jLoggingPathTest extends TestCase { log.error("This is 'error' message."); log.error("This is 'error' message.", new Exception("It's a test error exception")); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java index 1e2e8df..4774448 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java @@ -19,24 +19,26 @@ package org.apache.ignite.logger.log4j; import java.io.File; import java.net.URL; -import junit.framework.TestCase; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; /** * Grid Log4j SPI test. */ @GridCommonTest(group = "Logger") -public class GridLog4jLoggingUrlTest extends TestCase { +public class GridLog4jLoggingUrlTest { /** */ private IgniteLogger log; /** Logger config */ private URL url; - /** {@inheritDoc} */ - @Override protected void setUp() throws Exception { + /** TODO IGNITE-10177 add annotation @Before here. */ + private void setUp() throws Exception { File xml = GridTestUtils.resolveIgnitePath("modules/core/src/test/config/log4j-test.xml"); assert xml != null; @@ -49,7 +51,10 @@ public class GridLog4jLoggingUrlTest extends TestCase { /** * Tests log4j logging SPI. */ - public void testLog() { + @Test + public void testLog() throws Exception { + setUp(); + System.out.println(log.toString()); assertTrue(log.toString().contains("Log4JLogger")); @@ -64,4 +69,4 @@ public class GridLog4jLoggingUrlTest extends TestCase { log.error("This is 'error' message."); log.error("This is 'error' message.", new Exception("It's a test error exception")); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java index d32e890..12d6fc8 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java @@ -20,13 +20,18 @@ package org.apache.ignite.logger.log4j; import junit.framework.TestCase; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Log4j not initialized test. */ @GridCommonTest(group = "Logger") +@RunWith(JUnit4.class) public class GridLog4jNotInitializedTest extends TestCase { /** */ + @Test public void testLogInitialize() { IgniteLogger log = new Log4JLogger().getLogger(GridLog4jNotInitializedTest.class); @@ -48,4 +53,4 @@ public class GridLog4jNotInitializedTest extends TestCase { log.warning("This is 'warning' message."); log.error("This is 'error' message."); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java index ad8f7d9..9a4380b 100644 --- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java @@ -23,10 +23,14 @@ import java.nio.file.StandardCopyOption; import java.util.Date; import junit.framework.TestCase; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checking that Log4j2 configuration is updated when its source file is changed. */ +@RunWith(JUnit4.class) public class Log4j2ConfigUpdateTest extends TestCase { /** Path to log4j2 configuration with INFO enabled. */ private static final String LOG_CONFIG_INFO = "modules/log4j2/src/test/config/log4j2-info.xml"; @@ -56,6 +60,7 @@ public class Log4j2ConfigUpdateTest extends TestCase { * Check that changing log4j2 config file causes the logger configuration to be updated. * String-accepting constructor is used. */ + @Test public void testConfigChangeStringConstructor() throws Exception { checkConfigUpdate(new Log4J2LoggerSupplier() { @Override public Log4J2Logger get(File cfgFile) throws Exception { @@ -68,6 +73,7 @@ public class Log4j2ConfigUpdateTest extends TestCase { * Check that changing log4j config file causes the logger configuration to be updated. * File-accepting constructor is used. */ + @Test public void testConfigChangeFileConstructor() throws Exception { checkConfigUpdate(new Log4J2LoggerSupplier() { @Override public Log4J2Logger get(File cfgFile) throws Exception { @@ -80,6 +86,7 @@ public class Log4j2ConfigUpdateTest extends TestCase { * Check that changing log4j config file causes the logger configuration to be updated. * File-accepting constructor is used. */ + @Test public void testConfigChangeUrlConstructor() throws Exception { checkConfigUpdate(new Log4J2LoggerSupplier() { @Override public Log4J2Logger get(File cfgFile) throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerMarkerTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerMarkerTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerMarkerTest.java index 672f5d9..22f8c5e 100644 --- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerMarkerTest.java +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerMarkerTest.java @@ -18,13 +18,22 @@ package org.apache.ignite.logger.log4j2; import java.io.File; -import junit.framework.TestCase; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Testing that markers are supported by log4j2 implementation. */ -public class Log4j2LoggerMarkerTest extends TestCase { +@RunWith(JUnit4.class) +public class Log4j2LoggerMarkerTest { /** Path to log4j configuration. */ private static final String LOG_CONFIG = "modules/log4j2/src/test/config/log4j2-markers.xml"; @@ -35,22 +44,21 @@ public class Log4j2LoggerMarkerTest extends TestCase { private static final String LOG_FILTERED = "work/log/filtered.log"; /** */ - @Override protected void setUp() throws Exception { - super.setUp(); - + @Before + public void setUp() { Log4J2Logger.cleanup(); deleteLogs(); } /** */ - @Override protected void tearDown() throws Exception { - super.tearDown(); - + @After + public void tearDown() { deleteLogs(); } /** */ + @Test public void testMarkerFiltering() throws Exception { // create log Log4J2Logger log = new Log4J2Logger(LOG_CONFIG); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java index 5f3207e..4ad4c65 100644 --- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java @@ -21,7 +21,6 @@ import java.io.File; import java.net.URL; import java.util.Collections; import java.util.UUID; -import junit.framework.TestCase; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteLogger; import org.apache.ignite.configuration.IgniteConfiguration; @@ -31,27 +30,36 @@ import org.apache.ignite.logger.LoggerNodeIdAware; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Grid Log4j2 SPI test. */ -public class Log4j2LoggerSelfTest extends TestCase { +@RunWith(JUnit4.class) +public class Log4j2LoggerSelfTest { /** */ private static final String LOG_PATH_TEST = "modules/core/src/test/config/log4j2-test.xml"; /** */ private static final String LOG_PATH_MAIN = "config/ignite-log4j2.xml"; - /** - * @throws Exception If failed. - */ - @Override protected void setUp() throws Exception { + /** */ + @Before + public void setUp() { Log4J2Logger.cleanup(); } /** * @throws Exception If failed. */ + @Test public void testFileConstructor() throws Exception { File xml = GridTestUtils.resolveIgnitePath(LOG_PATH_TEST); @@ -73,6 +81,7 @@ public class Log4j2LoggerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testUrlConstructor() throws Exception { File xml = GridTestUtils.resolveIgnitePath(LOG_PATH_TEST); @@ -95,6 +104,7 @@ public class Log4j2LoggerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testPathConstructor() throws Exception { IgniteLogger log = new Log4J2Logger(LOG_PATH_TEST).getLogger(getClass()); @@ -126,6 +136,7 @@ public class Log4j2LoggerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testSystemNodeId() throws Exception { UUID id = UUID.randomUUID(); @@ -139,6 +150,7 @@ public class Log4j2LoggerSelfTest extends TestCase { * * @throws Exception If error occurs. */ + @Test public void testLogFilesTwoNodes() throws Exception { checkOneNode(0); checkOneNode(1); @@ -196,4 +208,4 @@ public class Log4j2LoggerSelfTest extends TestCase { .setConnectorConfiguration(null) .setDiscoverySpi(disco); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java index c28108c..26a90bc 100644 --- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java @@ -29,10 +29,15 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.logging.log4j.Level; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid Log4j2 SPI test. */ +@RunWith(JUnit4.class) public class Log4j2LoggerVerboseModeSelfTest extends TestCase { /** */ private static final String LOG_PATH_VERBOSE_TEST = "modules/core/src/test/config/log4j2-verbose-test.xml"; @@ -40,7 +45,8 @@ public class Log4j2LoggerVerboseModeSelfTest extends TestCase { /** * @throws Exception If failed. */ - @Override protected void setUp() throws Exception { + @Before + @Override public void setUp() throws Exception { Log4J2Logger.cleanup(); } @@ -50,6 +56,7 @@ public class Log4j2LoggerVerboseModeSelfTest extends TestCase { * * @throws Exception If failed. */ + @Test public void testVerboseMode() throws Exception { final PrintStream backupSysOut = System.out; final PrintStream backupSysErr = System.err; @@ -137,4 +144,4 @@ public class Log4j2LoggerVerboseModeSelfTest extends TestCase { .setConnectorConfiguration(null) .setDiscoverySpi(disco); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java b/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java index 0b8cefa..3dd4c44 100644 --- a/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java +++ b/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.logger.log4j2.Log4j2ConfigUpdateTest; import org.apache.ignite.logger.log4j2.Log4j2LoggerMarkerTest; @@ -29,16 +30,15 @@ import org.apache.ignite.logger.log4j2.Log4j2LoggerVerboseModeSelfTest; public class IgniteLog4j2TestSuite 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 TestSuite("Log4j2 Logging Test Suite"); - suite.addTestSuite(Log4j2LoggerSelfTest.class); - suite.addTestSuite(Log4j2LoggerVerboseModeSelfTest.class); - suite.addTestSuite(Log4j2LoggerMarkerTest.class); - suite.addTestSuite(Log4j2ConfigUpdateTest.class); + suite.addTest(new JUnit4TestAdapter(Log4j2LoggerSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(Log4j2LoggerVerboseModeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(Log4j2LoggerMarkerTest.class)); + suite.addTest(new JUnit4TestAdapter(Log4j2ConfigUpdateTest.class)); return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java b/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java index af9a37d..db2e850 100644 --- a/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java +++ b/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.mesos.IgniteSchedulerSelfTest; @@ -26,13 +27,12 @@ import org.apache.ignite.mesos.IgniteSchedulerSelfTest; public class IgniteMesosTestSuite 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 TestSuite("Apache Mesos Integration Test Suite"); - suite.addTest(new TestSuite(IgniteSchedulerSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteSchedulerSelfTest.class)); return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java index b4cd832..5acac7b 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java @@ -17,6 +17,8 @@ package org.apache.ignite.ml; +import junit.framework.JUnit4TestAdapter; +import junit.framework.TestSuite; import org.apache.ignite.ml.clustering.ClusteringTestSuite; import org.apache.ignite.ml.common.CommonTestSuite; import org.apache.ignite.ml.composition.CompositionTestSuite; @@ -36,33 +38,40 @@ import org.apache.ignite.ml.structures.StructuresTestSuite; import org.apache.ignite.ml.svm.SVMTestSuite; import org.apache.ignite.ml.tree.DecisionTreeTestSuite; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.runners.AllTests; /** * Test suite for all module tests. IMPL NOTE tests in {@code org.apache.ignite.ml.tree.performance} are not * included here because these are intended only for manual execution. */ -@RunWith(Suite.class) [email protected]({ - MathImplMainTestSuite.class, - RegressionsTestSuite.class, - SVMTestSuite.class, - ClusteringTestSuite.class, - DecisionTreeTestSuite.class, - KNNTestSuite.class, - MLPTestSuite.class, - DatasetTestSuite.class, - PipelineTestSuite.class, - PreprocessingTestSuite.class, - GAGridTestSuite.class, - SelectionTestSuite.class, - CompositionTestSuite.class, - EnvironmentTestSuite.class, - StructuresTestSuite.class, - CommonTestSuite.class, - InferenceTestSuite.class, - MultiClassTestSuite.class -}) +@RunWith(AllTests.class) public class IgniteMLTestSuite { - // No-op. + /** */ + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + + /** JUnit 4 tests. */ + suite.addTest(new JUnit4TestAdapter(MathImplMainTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(RegressionsTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(SVMTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(ClusteringTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(KNNTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(PipelineTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(PreprocessingTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(GAGridTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(CompositionTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(EnvironmentTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(StructuresTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(CommonTestSuite.class)); + suite.addTest(new JUnit4TestAdapter(MultiClassTestSuite.class)); + + /** JUnit 3 tests. */ + suite.addTest(DecisionTreeTestSuite.suite()); + suite.addTest(MLPTestSuite.suite()); + suite.addTest(InferenceTestSuite.suite()); + suite.addTest(DatasetTestSuite.suite()); + suite.addTest(SelectionTestSuite.suite()); + + return suite; + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java index babddfb..14eb31c 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java @@ -17,6 +17,8 @@ package org.apache.ignite.ml.dataset; +import junit.framework.JUnit4TestAdapter; +import junit.framework.TestSuite; import org.apache.ignite.ml.dataset.feature.ObjectHistogramTest; import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetBuilderTest; import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetTest; @@ -28,24 +30,32 @@ import org.apache.ignite.ml.dataset.primitive.DatasetWrapperTest; import org.apache.ignite.ml.dataset.primitive.SimpleDatasetTest; import org.apache.ignite.ml.dataset.primitive.SimpleLabeledDatasetTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.runners.AllTests; /** * Test suite for all tests located in org.apache.ignite.ml.dataset.* package. */ -@RunWith(Suite.class) [email protected]({ - DatasetWrapperTest.class, - ComputeUtilsTest.class, - DatasetAffinityFunctionWrapperTest.class, - PartitionDataStorageTest.class, - CacheBasedDatasetBuilderTest.class, - CacheBasedDatasetTest.class, - LocalDatasetBuilderTest.class, - SimpleDatasetTest.class, - SimpleLabeledDatasetTest.class, - ObjectHistogramTest.class -}) +@RunWith(AllTests.class) public class DatasetTestSuite { - // No-op. + /** */ + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + + /** JUnit 4 tests. */ + suite.addTest(new JUnit4TestAdapter(DatasetWrapperTest.class)); + suite.addTest(new JUnit4TestAdapter(DatasetAffinityFunctionWrapperTest.class)); + suite.addTest(new JUnit4TestAdapter(PartitionDataStorageTest.class)); + suite.addTest(new JUnit4TestAdapter(LocalDatasetBuilderTest.class)); + suite.addTest(new JUnit4TestAdapter(SimpleDatasetTest.class)); + suite.addTest(new JUnit4TestAdapter(SimpleLabeledDatasetTest.class)); + suite.addTest(new JUnit4TestAdapter(DatasetWrapperTest.class)); + suite.addTest(new JUnit4TestAdapter(ObjectHistogramTest.class)); + + /** JUnit 3 tests. */ + suite.addTestSuite(ComputeUtilsTest.class); + suite.addTestSuite(CacheBasedDatasetBuilderTest.class); + suite.addTestSuite(CacheBasedDatasetTest.class); + + return suite; + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java index 202b6bc..66af506 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java @@ -59,7 +59,7 @@ public class ComputeUtilsTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { + @Override protected void beforeTest() { /* Grid instance. */ ignite = grid(NODE_COUNT); ignite.configuration().setPeerClassLoadingEnabled(true); @@ -264,7 +264,7 @@ public class ComputeUtilsTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void close() throws Exception { + @Override public void close() { // Do nothing, GC will clean up. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java index 7546b16..e81ceb7 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java @@ -17,24 +17,34 @@ package org.apache.ignite.ml.inference; +import junit.framework.JUnit4TestAdapter; +import junit.framework.TestSuite; import org.apache.ignite.ml.inference.builder.IgniteDistributedInfModelBuilderTest; import org.apache.ignite.ml.inference.builder.SingleInfModelBuilderTest; import org.apache.ignite.ml.inference.builder.ThreadedInfModelBuilderTest; import org.apache.ignite.ml.inference.storage.model.DefaultModelStorageTest; import org.apache.ignite.ml.inference.util.DirectorySerializerTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.runners.AllTests; /** * Test suite for all tests located in {@link org.apache.ignite.ml.inference} package. */ -@RunWith(Suite.class) [email protected]({ - IgniteDistributedInfModelBuilderTest.class, - SingleInfModelBuilderTest.class, - ThreadedInfModelBuilderTest.class, - DirectorySerializerTest.class, - DefaultModelStorageTest.class -}) +@RunWith(AllTests.class) public class InferenceTestSuite { + /** */ + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + + /** JUnit 4 tests. */ + suite.addTest(new JUnit4TestAdapter(SingleInfModelBuilderTest.class)); + suite.addTest(new JUnit4TestAdapter(ThreadedInfModelBuilderTest.class)); + suite.addTest(new JUnit4TestAdapter(DirectorySerializerTest.class)); + suite.addTest(new JUnit4TestAdapter(DefaultModelStorageTest.class)); + + /** JUnit 3 tests. */ + suite.addTestSuite(IgniteDistributedInfModelBuilderTest.class); + + return suite; + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedInfModelBuilderTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedInfModelBuilderTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedInfModelBuilderTest.java index 292319e..1cc8eb5 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedInfModelBuilderTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedInfModelBuilderTest.java @@ -17,7 +17,6 @@ package org.apache.ignite.ml.inference.builder; -import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import org.apache.ignite.Ignite; import org.apache.ignite.internal.util.IgniteUtils; @@ -56,7 +55,7 @@ public class IgniteDistributedInfModelBuilderTest extends GridCommonAbstractTest } /** */ - public void testBuild() throws ExecutionException, InterruptedException { + public void testBuild() { AsyncInfModelBuilder mdlBuilder = new IgniteDistributedInfModelBuilder(ignite, 1, 1); InfModel<Integer, Future<Integer>> infMdl = mdlBuilder.build( http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java index 3f98ba5..5cc0fd2 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java @@ -17,19 +17,28 @@ package org.apache.ignite.ml.nn; +import junit.framework.JUnit4TestAdapter; +import junit.framework.TestSuite; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.runners.AllTests; /** * Test suite for multilayer perceptrons. */ -@RunWith(Suite.class) [email protected]({ - MLPTest.class, - MLPTrainerTest.class, - MLPTrainerIntegrationTest.class, - LossFunctionsTest.class -}) +@RunWith(AllTests.class) public class MLPTestSuite { - // No-op. + /** */ + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + + /** JUnit 4 tests. */ + suite.addTest(new JUnit4TestAdapter(MLPTest.class)); + suite.addTest(new JUnit4TestAdapter(MLPTrainerTest.class)); + suite.addTest(new JUnit4TestAdapter(LossFunctionsTest.class)); + + /** JUnit 3 tests. */ + suite.addTestSuite(MLPTrainerIntegrationTest.class); + + return suite; + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java index 3521cb6..b0abf66 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java @@ -64,7 +64,7 @@ public class MLPTrainerIntegrationTest extends GridCommonAbstractTest { /** * {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { + @Override protected void beforeTest() { /* Grid instance. */ ignite = grid(NODE_COUNT); ignite.configuration().setPeerClassLoadingEnabled(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java index 5ee50a6..27c24f7 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java @@ -61,7 +61,7 @@ public class MLPTrainerMnistIntegrationTest extends GridCommonAbstractTest { /** * {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { + @Override protected void beforeTest() { /* Grid instance. */ ignite = grid(NODE_COUNT); ignite.configuration().setPeerClassLoadingEnabled(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java index 21c605b..510ccee 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java @@ -17,6 +17,8 @@ package org.apache.ignite.ml.selection; +import junit.framework.JUnit4TestAdapter; +import junit.framework.TestSuite; import org.apache.ignite.ml.selection.cv.CrossValidationTest; import org.apache.ignite.ml.selection.paramgrid.ParameterSetGeneratorTest; import org.apache.ignite.ml.selection.scoring.cursor.CacheBasedLabelPairCursorTest; @@ -29,25 +31,32 @@ import org.apache.ignite.ml.selection.scoring.metric.RecallTest; import org.apache.ignite.ml.selection.split.TrainTestDatasetSplitterTest; import org.apache.ignite.ml.selection.split.mapper.SHA256UniformMapperTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.runners.AllTests; /** * Test suite for all tests located in org.apache.ignite.ml.selection.* package. */ -@RunWith(Suite.class) [email protected]({ - CrossValidationTest.class, - EvaluatorTest.class, - ParameterSetGeneratorTest.class, - CacheBasedLabelPairCursorTest.class, - LocalLabelPairCursorTest.class, - AccuracyTest.class, - PrecisionTest.class, - RecallTest.class, - FmeasureTest.class, - SHA256UniformMapperTest.class, - TrainTestDatasetSplitterTest.class -}) +@RunWith(AllTests.class) public class SelectionTestSuite { - // No-op. + /** */ + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + + /** JUnit 4 tests. */ + suite.addTest(new JUnit4TestAdapter(CrossValidationTest.class)); + suite.addTest(new JUnit4TestAdapter(ParameterSetGeneratorTest.class)); + suite.addTest(new JUnit4TestAdapter(LocalLabelPairCursorTest.class)); + suite.addTest(new JUnit4TestAdapter(AccuracyTest.class)); + suite.addTest(new JUnit4TestAdapter(PrecisionTest.class)); + suite.addTest(new JUnit4TestAdapter(RecallTest.class)); + suite.addTest(new JUnit4TestAdapter(FmeasureTest.class)); + suite.addTest(new JUnit4TestAdapter(SHA256UniformMapperTest.class)); + suite.addTest(new JUnit4TestAdapter(TrainTestDatasetSplitterTest.class)); + + /** JUnit 3 tests. */ + suite.addTestSuite(EvaluatorTest.class); + suite.addTestSuite(CacheBasedLabelPairCursorTest.class); + + return suite; + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java index aadc8a7..30a522d 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java @@ -51,7 +51,7 @@ public class DecisionTreeClassificationTrainerIntegrationTest extends GridCommon /** * {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { + @Override protected void beforeTest() { /* Grid instance. */ ignite = grid(NODE_COUNT); ignite.configuration().setPeerClassLoadingEnabled(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeRegressionTrainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeRegressionTrainerIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeRegressionTrainerIntegrationTest.java index a190685..3f0dce3 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeRegressionTrainerIntegrationTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeRegressionTrainerIntegrationTest.java @@ -51,7 +51,7 @@ public class DecisionTreeRegressionTrainerIntegrationTest extends GridCommonAbst /** * {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { + @Override protected void beforeTest() { /* Grid instance. */ ignite = grid(NODE_COUNT); ignite.configuration().setPeerClassLoadingEnabled(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java index 2cbb486..c67c8fd 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java @@ -17,6 +17,8 @@ package org.apache.ignite.ml.tree; +import junit.framework.JUnit4TestAdapter; +import junit.framework.TestSuite; import org.apache.ignite.ml.tree.data.DecisionTreeDataTest; import org.apache.ignite.ml.tree.impurity.gini.GiniImpurityMeasureCalculatorTest; import org.apache.ignite.ml.tree.impurity.gini.GiniImpurityMeasureTest; @@ -25,24 +27,32 @@ import org.apache.ignite.ml.tree.impurity.mse.MSEImpurityMeasureTest; import org.apache.ignite.ml.tree.impurity.util.SimpleStepFunctionCompressorTest; import org.apache.ignite.ml.tree.impurity.util.StepFunctionTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.runners.AllTests; /** * Test suite for all tests located in {@link org.apache.ignite.ml.tree} package. */ -@RunWith(Suite.class) [email protected]({ - DecisionTreeClassificationTrainerTest.class, - DecisionTreeRegressionTrainerTest.class, - DecisionTreeClassificationTrainerIntegrationTest.class, - DecisionTreeRegressionTrainerIntegrationTest.class, - DecisionTreeDataTest.class, - GiniImpurityMeasureCalculatorTest.class, - GiniImpurityMeasureTest.class, - MSEImpurityMeasureCalculatorTest.class, - MSEImpurityMeasureTest.class, - StepFunctionTest.class, - SimpleStepFunctionCompressorTest.class -}) +@RunWith(AllTests.class) public class DecisionTreeTestSuite { + /** */ + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + + /** JUnit 4 tests. */ + suite.addTest(new JUnit4TestAdapter(DecisionTreeClassificationTrainerTest.class)); + suite.addTest(new JUnit4TestAdapter(DecisionTreeRegressionTrainerTest.class)); + suite.addTest(new JUnit4TestAdapter(DecisionTreeDataTest.class)); + suite.addTest(new JUnit4TestAdapter(GiniImpurityMeasureCalculatorTest.class)); + suite.addTest(new JUnit4TestAdapter(GiniImpurityMeasureTest.class)); + suite.addTest(new JUnit4TestAdapter(MSEImpurityMeasureCalculatorTest.class)); + suite.addTest(new JUnit4TestAdapter(MSEImpurityMeasureTest.class)); + suite.addTest(new JUnit4TestAdapter(StepFunctionTest.class)); + suite.addTest(new JUnit4TestAdapter(SimpleStepFunctionCompressorTest.class)); + + /** JUnit 3 tests. */ + suite.addTestSuite(DecisionTreeRegressionTrainerIntegrationTest.class); + suite.addTestSuite(DecisionTreeClassificationTrainerIntegrationTest.class); + + return suite; + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java index ca513ed..213c19f 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java @@ -57,7 +57,7 @@ public class DecisionTreeMNISTIntegrationTest extends GridCommonAbstractTest { /** * {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { + @Override protected void beforeTest() { /* Grid instance. */ ignite = grid(NODE_COUNT); ignite.configuration().setPeerClassLoadingEnabled(true);
