http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 e6c8c1e..0568e0c 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 @@ -17,20 +17,16 @@ package org.apache.ignite.logger.jcl; -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 { +public class JclLoggerTest { /** */ @SuppressWarnings({"FieldCanBeLocal"}) private IgniteLogger log;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 c27f59a..5736006 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 @@ -20,11 +20,14 @@ package org.apache.ignite.testsuites; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.logger.jcl.JclLoggerTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Commons logging test. */ -public class IgniteJclTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteJclTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java index 5111b44..1ea553d 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/AbstractCacheJtaSelfTest.java @@ -27,6 +27,9 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest; import org.apache.ignite.testframework.GridTestSafeThreadFactory; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import org.objectweb.jotm.Jotm; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; @@ -39,6 +42,7 @@ import static org.apache.ignite.transactions.TransactionState.ACTIVE; /** * Abstract class for cache tests. */ +@RunWith(JUnit4.class) public abstract class AbstractCacheJtaSelfTest extends GridCacheAbstractSelfTest { /** */ private static final int GRID_CNT = 1; @@ -97,6 +101,7 @@ public abstract class AbstractCacheJtaSelfTest extends GridCacheAbstractSelfTest * * @throws Exception If failed. */ + @Test public void testJta() throws Exception { UserTransaction jtaTx = jotm.getUserTransaction(); @@ -140,6 +145,7 @@ public abstract class AbstractCacheJtaSelfTest extends GridCacheAbstractSelfTest /** * @throws Exception If failed. */ + @Test public void testJtaTwoCaches() throws Exception { UserTransaction jtaTx = jotm.getUserTransaction(); @@ -189,6 +195,7 @@ public abstract class AbstractCacheJtaSelfTest extends GridCacheAbstractSelfTest /** * @throws Exception If failed. */ + @Test public void testAsyncOpAwait() throws Exception { final IgniteCache<String, Integer> cache = jcache(); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 f28de3c..82350b2 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 @@ -31,24 +31,27 @@ import org.apache.ignite.internal.processors.cache.jta.GridReplicatedCacheJtaFac import org.apache.ignite.internal.processors.cache.jta.GridReplicatedCacheJtaLookupClassNameSelfTest; import org.apache.ignite.internal.processors.cache.GridJtaLifecycleAwareSelfTest; import org.apache.ignite.testframework.IgniteTestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * JTA integration tests. */ -public class IgniteJtaTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteJtaTestSuite { /** * @return Test suite. */ public static TestSuite suite() { TestSuite suite = new IgniteTestSuite("JTA Integration Test Suite"); - suite.addTestSuite(GridPartitionedCacheJtaFactorySelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridPartitionedCacheJtaFactorySelfTest.class)); suite.addTest(new JUnit4TestAdapter(GridReplicatedCacheJtaFactorySelfTest.class)); - suite.addTestSuite(GridPartitionedCacheJtaLookupClassNameSelfTest.class); - suite.addTestSuite(GridReplicatedCacheJtaLookupClassNameSelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridPartitionedCacheJtaLookupClassNameSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridReplicatedCacheJtaLookupClassNameSelfTest.class)); - suite.addTestSuite(GridPartitionedCacheJtaFactoryUseSyncSelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridPartitionedCacheJtaFactoryUseSyncSelfTest.class)); suite.addTest(new JUnit4TestAdapter(GridReplicatedCacheJtaFactoryUseSyncSelfTest.class)); suite.addTest(new JUnit4TestAdapter(GridJtaLifecycleAwareSelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 9fb7468..f86f7a7 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 @@ -21,11 +21,14 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.stream.kafka.connect.IgniteSinkConnectorTest; import org.apache.ignite.stream.kafka.connect.IgniteSourceConnectorTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Apache Kafka streamers tests. */ -public class IgniteKafkaStreamerSelfTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteKafkaStreamerSelfTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 8c856af..43b9b91 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 @@ -22,11 +22,14 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes.TcpDiscoveryKubernetesIpFinderSelfTest; import org.apache.ignite.testframework.IgniteTestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Ignite Kubernetes integration test. */ -public class IgniteKubernetesTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteKubernetesTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 bb0f086..e2dc02b 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 @@ -21,18 +21,17 @@ import java.io.File; import java.nio.file.Files; import java.nio.file.StandardCopyOption; 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; + +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; /** * Checking that Log4j configuration is updated when its source file is changed. */ -@RunWith(JUnit4.class) -public class GridLog4jConfigUpdateTest extends TestCase { +public class GridLog4jConfigUpdateTest { /** Path to log4j configuration with INFO enabled. */ private static final String LOG_CONFIG_INFO = "modules/log4j/src/test/config/log4j-info.xml"; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 a1e6a96..f166c00 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 @@ -31,6 +31,8 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; import org.apache.log4j.varia.LevelRangeFilter; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertNotNull; @@ -44,8 +46,9 @@ public class GridLog4jCorrectFileNameTest { /** Appender */ private Log4jRollingFileAppender appender; - /** TODO IGNITE-10177 add annotation @Before here. */ - private void setUp() { + /** */ + @Before + public void setUp() { Logger root = Logger.getRootLogger(); for (Enumeration appenders = root.getAllAppenders(); appenders.hasMoreElements(); ) { @@ -58,8 +61,9 @@ public class GridLog4jCorrectFileNameTest { root.addAppender(appender); } - /** TODO IGNITE-10177 add annotation @After here. */ - private void tearDown() { + /** */ + @After + public void tearDown() { if (appender != null) { Logger.getRootLogger().removeAppender(Log4jRollingFileAppender.class.getSimpleName()); @@ -74,10 +78,8 @@ public class GridLog4jCorrectFileNameTest { */ @Test public void testLogFilesTwoNodes() throws Exception { - setUp(); checkOneNode(0); checkOneNode(1); - tearDown(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 9f3c10f..a8bb4fe 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 @@ -17,25 +17,22 @@ 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.apache.log4j.BasicConfigurator; +import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; + +import static junit.framework.Assert.assertTrue; /** * Log4j initialized test. */ @GridCommonTest(group = "Logger") -@RunWith(JUnit4.class) -public class GridLog4jInitializedTest extends TestCase { - - /** - * @throws Exception If failed. - */ - @Override protected void setUp() throws Exception { +public class GridLog4jInitializedTest { + /** */ + @Before + public void setUp() { BasicConfigurator.configure(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 78b77d2..a6d683e 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 @@ -21,6 +21,7 @@ import java.io.File; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -36,8 +37,9 @@ public class GridLog4jLoggingFileTest { /** Logger config */ private File xml; - /** TODO IGNITE-10177 add annotation @Before here. */ - private void setUp() throws Exception { + /** */ + @Before + public void setUp() throws Exception { xml = GridTestUtils.resolveIgnitePath("modules/core/src/test/config/log4j-test.xml"); assert xml != null; @@ -50,9 +52,7 @@ public class GridLog4jLoggingFileTest { * Tests log4j logging SPI. */ @Test - public void testLog() throws Exception { - setUp(); - + public void testLog() { System.out.println(log.toString()); assertTrue(log.toString().contains("Log4JLogger")); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 1d752e4..b4840a4 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 @@ -19,6 +19,7 @@ package org.apache.ignite.logger.log4j; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -34,8 +35,9 @@ public class GridLog4jLoggingPathTest { /** Logger config */ private String path = "modules/core/src/test/config/log4j-test.xml"; - /** TODO IGNITE-10177 add annotation @Before here. */ - private void setUp() throws Exception { + /** */ + @Before + public void setUp() throws Exception { log = new Log4JLogger(path).getLogger(getClass()); } @@ -43,9 +45,7 @@ public class GridLog4jLoggingPathTest { * Tests log4j logging SPI. */ @Test - public void testLog() throws Exception { - setUp(); - + public void testLog() { System.out.println(log.toString()); assertTrue(log.toString().contains("Log4JLogger")); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 4774448..e76625a 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 @@ -22,6 +22,7 @@ import java.net.URL; import org.apache.ignite.IgniteLogger; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -37,8 +38,9 @@ public class GridLog4jLoggingUrlTest { /** Logger config */ private URL url; - /** TODO IGNITE-10177 add annotation @Before here. */ - private void setUp() throws Exception { + /** */ + @Before + public void setUp() throws Exception { File xml = GridTestUtils.resolveIgnitePath("modules/core/src/test/config/log4j-test.xml"); assert xml != null; @@ -52,9 +54,7 @@ public class GridLog4jLoggingUrlTest { * Tests log4j logging SPI. */ @Test - public void testLog() throws Exception { - setUp(); - + public void testLog() { System.out.println(log.toString()); assertTrue(log.toString().contains("Log4JLogger")); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 12d6fc8..c230e7e 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 @@ -17,19 +17,17 @@ 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; + +import static junit.framework.Assert.assertTrue; /** * Log4j not initialized test. */ @GridCommonTest(group = "Logger") -@RunWith(JUnit4.class) -public class GridLog4jNotInitializedTest extends TestCase { +public class GridLog4jNotInitializedTest { /** */ @Test public void testLogInitialize() { http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 9a4380b..ae09b73 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 @@ -21,17 +21,16 @@ import java.io.File; import java.nio.file.Files; 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; + +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; /** * Checking that Log4j2 configuration is updated when its source file is changed. */ -@RunWith(JUnit4.class) -public class Log4j2ConfigUpdateTest extends TestCase { +public class Log4j2ConfigUpdateTest { /** Path to log4j2 configuration with INFO enabled. */ private static final String LOG_CONFIG_INFO = "modules/log4j2/src/test/config/log4j2-info.xml"; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 26a90bc..5c43908 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 @@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintStream; import java.util.Collections; -import junit.framework.TestCase; import org.apache.ignite.Ignite; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.G; @@ -31,24 +30,20 @@ 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; + +import static junit.framework.Assert.assertTrue; /** * Grid Log4j2 SPI test. */ -@RunWith(JUnit4.class) -public class Log4j2LoggerVerboseModeSelfTest extends TestCase { +public class Log4j2LoggerVerboseModeSelfTest { /** */ private static final String LOG_PATH_VERBOSE_TEST = "modules/core/src/test/config/log4j2-verbose-test.xml"; - /** - * @throws Exception If failed. - */ + /** */ @Before - @Override public void setUp() throws Exception { + public void setUp() { Log4J2Logger.cleanup(); - } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 3dd4c44..665ae31 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 @@ -23,11 +23,14 @@ import org.apache.ignite.logger.log4j2.Log4j2ConfigUpdateTest; import org.apache.ignite.logger.log4j2.Log4j2LoggerMarkerTest; import org.apache.ignite.logger.log4j2.Log4j2LoggerSelfTest; import org.apache.ignite.logger.log4j2.Log4j2LoggerVerboseModeSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Log4j2 logging tests. */ -public class IgniteLog4j2TestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteLog4j2TestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 db2e850..886bc9e 100644 --- a/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java +++ b/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java @@ -20,11 +20,14 @@ package org.apache.ignite; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.mesos.IgniteSchedulerSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Apache Mesos integration tests. */ -public class IgniteMesosTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteMesosTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java b/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java index 4e48569..64117f0 100644 --- a/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java +++ b/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java @@ -22,22 +22,27 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.regex.Pattern; -import junit.framework.TestCase; import org.apache.ignite.mesos.resource.ResourceProvider; import org.apache.mesos.Protos; import org.apache.mesos.SchedulerDriver; +import org.junit.Before; +import org.junit.Test; + +import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * Scheduler tests. */ -public class IgniteSchedulerSelfTest extends TestCase { +public class IgniteSchedulerSelfTest { /** */ private IgniteScheduler scheduler; - /** {@inheritDoc} */ - @Override public void setUp() throws Exception { - super.setUp(); - + /** */ + @Before + public void setUp() throws Exception { ClusterProperties clustProp = new ClusterProperties(); scheduler = new IgniteScheduler(clustProp, new ResourceProvider() { @@ -62,6 +67,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testHostRegister() throws Exception { Protos.Offer offer = createOffer("hostname", 4, 1024); @@ -81,6 +87,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testDeclineByCpu() throws Exception { Protos.Offer offer = createOffer("hostname", 4, 1024); @@ -115,6 +122,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testDeclineByMem() throws Exception { Protos.Offer offer = createOffer("hostname", 4, 1024); @@ -149,6 +157,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testDeclineByMemCpu() throws Exception { Protos.Offer offer = createOffer("hostname", 1, 1024); @@ -191,6 +200,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testDeclineByCpuMinRequirements() throws Exception { Protos.Offer offer = createOffer("hostname", 8, 10240); @@ -211,6 +221,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testDeclineByMemMinRequirements() throws Exception { Protos.Offer offer = createOffer("hostname", 8, 10240); @@ -231,6 +242,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testHosthameConstraint() throws Exception { Protos.Offer offer = createOffer("hostname", 8, 10240); @@ -258,6 +270,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testPerNode() throws Exception { Protos.Offer offer = createOffer("hostname", 8, 1024); @@ -304,6 +317,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testIgniteFramework() throws Exception { final String mesosUserValue = "userAAAAA"; final String mesosRoleValue = "role1"; @@ -330,6 +344,7 @@ public class IgniteSchedulerSelfTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testMesosRoleValidation() throws Exception { List<String> failedRoleValues = Arrays.asList("", ".", "..", "-testRole", "test/Role", "test\\Role", "test Role", null); @@ -511,4 +526,4 @@ public class IgniteSchedulerSelfTest extends TestCase { return null; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 5acac7b..d09207c 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 @@ -48,7 +48,7 @@ import org.junit.runners.AllTests; public class IgniteMLTestSuite { /** */ public static TestSuite suite() { - TestSuite suite = new TestSuite(); + TestSuite suite = new TestSuite(IgniteMLTestSuite.class.getSimpleName()); /** JUnit 4 tests. */ suite.addTest(new JUnit4TestAdapter(MathImplMainTestSuite.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 14eb31c..8ab41c5 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 @@ -39,9 +39,8 @@ import org.junit.runners.AllTests; public class DatasetTestSuite { /** */ public static TestSuite suite() { - TestSuite suite = new TestSuite(); + TestSuite suite = new TestSuite(DatasetTestSuite.class.getSimpleName()); - /** JUnit 4 tests. */ suite.addTest(new JUnit4TestAdapter(DatasetWrapperTest.class)); suite.addTest(new JUnit4TestAdapter(DatasetAffinityFunctionWrapperTest.class)); suite.addTest(new JUnit4TestAdapter(PartitionDataStorageTest.class)); @@ -50,11 +49,9 @@ public class DatasetTestSuite { 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); + suite.addTest(new JUnit4TestAdapter(ComputeUtilsTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheBasedDatasetBuilderTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheBasedDatasetTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java index 815bd86..4b1705f 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java @@ -29,10 +29,14 @@ import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.ml.TestUtils; import org.apache.ignite.ml.dataset.UpstreamEntry; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link CacheBasedDatasetBuilder}. */ +@RunWith(JUnit4.class) public class CacheBasedDatasetBuilderTest extends GridCommonAbstractTest { /** Number of nodes in grid. */ private static final int NODE_COUNT = 10; @@ -62,6 +66,7 @@ public class CacheBasedDatasetBuilderTest extends GridCommonAbstractTest { /** * Tests that partitions of the dataset cache are placed on the same nodes as upstream cache. */ + @Test public void testBuild() { IgniteCache<Integer, String> upstreamCache = createTestCache(100, 10); CacheBasedDatasetBuilder<Integer, String> builder = new CacheBasedDatasetBuilder<>(ignite, upstreamCache); @@ -91,6 +96,7 @@ public class CacheBasedDatasetBuilderTest extends GridCommonAbstractTest { /** * Tests that predicate works correctly. */ + @Test public void testBuildWithPredicate() { CacheConfiguration<Integer, Integer> upstreamCacheConfiguration = new CacheConfiguration<>(); upstreamCacheConfiguration.setAffinity(new RendezvousAffinityFunction(false, 1)); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java index 7e31b07..7a31380 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java @@ -41,10 +41,14 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.ml.TestUtils; import org.apache.ignite.ml.dataset.primitive.data.SimpleDatasetData; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link CacheBasedDataset}. */ +@RunWith(JUnit4.class) public class CacheBasedDatasetTest extends GridCommonAbstractTest { /** Number of nodes in grid. */ private static final int NODE_COUNT = 4; @@ -76,6 +80,7 @@ public class CacheBasedDatasetTest extends GridCommonAbstractTest { * computations on dataset. Reservation means that partitions won't be unloaded from the node before computation is * completed. */ + @Test public void testPartitionExchangeDuringComputeCall() { int partitions = 4; @@ -132,6 +137,7 @@ public class CacheBasedDatasetTest extends GridCommonAbstractTest { * computations on dataset. Reservation means that partitions won't be unloaded from the node before computation is * completed. */ + @Test public void testPartitionExchangeDuringComputeWithCtxCall() { int partitions = 4; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 66af506..bb8570d 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 @@ -36,6 +36,7 @@ import org.apache.ignite.ml.TestUtils; import org.apache.ignite.ml.dataset.UpstreamEntry; import org.apache.ignite.ml.dataset.UpstreamTransformerBuilder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; /** * Tests for {@link ComputeUtils}. @@ -69,6 +70,7 @@ public class ComputeUtilsTest extends GridCommonAbstractTest { /** * Tests that in case two caches maintain their partitions on different nodes, affinity call won't be completed. */ + @Test public void testAffinityCallWithRetriesNegative() { ClusterNode node1 = grid(1).cluster().localNode(); ClusterNode node2 = grid(2).cluster().localNode(); @@ -110,6 +112,7 @@ public class ComputeUtilsTest extends GridCommonAbstractTest { /** * Test that in case two caches maintain their partitions on the same node, affinity call will be completed. */ + @Test public void testAffinityCallWithRetriesPositive() { ClusterNode node = grid(1).cluster().localNode(); @@ -149,6 +152,7 @@ public class ComputeUtilsTest extends GridCommonAbstractTest { /** * Tests {@code getData()} method. */ + @Test public void testGetData() { ClusterNode node = grid(1).cluster().localNode(); @@ -208,6 +212,7 @@ public class ComputeUtilsTest extends GridCommonAbstractTest { /** * Tests {@code initContext()} method. */ + @Test public void testInitContext() { ClusterNode node = grid(1).cluster().localNode(); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 e81ceb7..9908b65 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 @@ -34,16 +34,13 @@ import org.junit.runners.AllTests; public class InferenceTestSuite { /** */ public static TestSuite suite() { - TestSuite suite = new TestSuite(); + TestSuite suite = new TestSuite(InferenceTestSuite.class.getSimpleName()); - /** 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); + suite.addTest(new JUnit4TestAdapter(IgniteDistributedInfModelBuilderTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 1cc8eb5..b17a3fd 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 @@ -22,6 +22,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.ml.inference.InfModel; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; /** * Tests for {@link IgniteDistributedInfModelBuilder} class. @@ -55,6 +56,7 @@ public class IgniteDistributedInfModelBuilderTest extends GridCommonAbstractTest } /** */ + @Test public void testBuild() { AsyncInfModelBuilder mdlBuilder = new IgniteDistributedInfModelBuilder(ignite, 1, 1); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 5cc0fd2..58eea8d 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 @@ -29,15 +29,12 @@ import org.junit.runners.AllTests; public class MLPTestSuite { /** */ public static TestSuite suite() { - TestSuite suite = new TestSuite(); + TestSuite suite = new TestSuite(MLPTestSuite.class.getSimpleName()); - /** 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); + suite.addTest(new JUnit4TestAdapter(MLPTrainerIntegrationTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 b0abf66..ff6754a 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 @@ -39,10 +39,14 @@ import org.apache.ignite.ml.optimization.updatecalculators.RPropUpdateCalculator import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDParameterUpdate; import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDUpdateCalculator; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link MLPTrainer} that require to start the whole Ignite infrastructure. */ +@RunWith(JUnit4.class) public class MLPTrainerIntegrationTest extends GridCommonAbstractTest { /** Number of nodes in grid */ private static final int NODE_COUNT = 3; @@ -74,6 +78,7 @@ public class MLPTrainerIntegrationTest extends GridCommonAbstractTest { /** * Test 'XOR' operation training with {@link SimpleGDUpdateCalculator}. */ + @Test public void testXORSimpleGD() { xorTest(new UpdatesStrategy<>( new SimpleGDUpdateCalculator(0.3), @@ -85,6 +90,7 @@ public class MLPTrainerIntegrationTest extends GridCommonAbstractTest { /** * Test 'XOR' operation training with {@link RPropUpdateCalculator}. */ + @Test public void testXORRProp() { xorTest(new UpdatesStrategy<>( new RPropUpdateCalculator(), @@ -96,6 +102,7 @@ public class MLPTrainerIntegrationTest extends GridCommonAbstractTest { /** * Test 'XOR' operation training with {@link NesterovUpdateCalculator}. */ + @Test public void testXORNesterov() { xorTest(new UpdatesStrategy<>( new NesterovUpdateCalculator<MultilayerPerceptron>(0.1, 0.7), http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 27c24f7..e406c31 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 @@ -36,10 +36,14 @@ import org.apache.ignite.ml.optimization.updatecalculators.RPropParameterUpdate; import org.apache.ignite.ml.optimization.updatecalculators.RPropUpdateCalculator; import org.apache.ignite.ml.util.MnistUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests {@link MLPTrainer} on the MNIST dataset that require to start the whole Ignite infrastructure. */ +@RunWith(JUnit4.class) public class MLPTrainerMnistIntegrationTest extends GridCommonAbstractTest { /** Number of nodes in grid */ private static final int NODE_COUNT = 3; @@ -69,6 +73,7 @@ public class MLPTrainerMnistIntegrationTest extends GridCommonAbstractTest { } /** Tests on the MNIST dataset. */ + @Test public void testMNIST() throws IOException { int featCnt = 28 * 28; int hiddenNeuronsCnt = 100; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 510ccee..e2f8feb 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 @@ -40,9 +40,8 @@ import org.junit.runners.AllTests; public class SelectionTestSuite { /** */ public static TestSuite suite() { - TestSuite suite = new TestSuite(); + TestSuite suite = new TestSuite(SelectionTestSuite.class.getSimpleName()); - /** JUnit 4 tests. */ suite.addTest(new JUnit4TestAdapter(CrossValidationTest.class)); suite.addTest(new JUnit4TestAdapter(ParameterSetGeneratorTest.class)); suite.addTest(new JUnit4TestAdapter(LocalLabelPairCursorTest.class)); @@ -52,10 +51,8 @@ public class SelectionTestSuite { 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); + suite.addTest(new JUnit4TestAdapter(EvaluatorTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheBasedLabelPairCursorTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java index 8d02077..33b0eed 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java @@ -24,10 +24,14 @@ import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.ml.math.primitives.vector.VectorUtils; import org.apache.ignite.ml.selection.scoring.LabelPair; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link CacheBasedLabelPairCursor}. */ +@RunWith(JUnit4.class) public class CacheBasedLabelPairCursorTest extends GridCommonAbstractTest { /** Number of nodes in grid. */ private static final int NODE_COUNT = 4; @@ -55,6 +59,7 @@ public class CacheBasedLabelPairCursorTest extends GridCommonAbstractTest { } /** */ + @Test public void testIterate() { IgniteCache<Integer, Integer> data = ignite.createCache(UUID.randomUUID().toString()); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java index f17ac73..16750d3 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java @@ -47,6 +47,9 @@ import org.apache.ignite.ml.tree.DecisionTreeClassificationTrainer; import org.apache.ignite.ml.tree.DecisionTreeNode; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.thread.IgniteThread; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.ml.TestUtils.testEnvBuilder; import static org.junit.Assert.assertArrayEquals; @@ -55,6 +58,7 @@ import static org.junit.Assert.assertArrayEquals; * Tests for {@link BinaryClassificationEvaluator} that require to start the whole Ignite infrastructure. IMPL NOTE based on * Step_8_CV_with_Param_Grid example. */ +@RunWith(JUnit4.class) public class EvaluatorTest extends GridCommonAbstractTest { /** Number of nodes in grid */ private static final int NODE_COUNT = 3; @@ -84,6 +88,7 @@ public class EvaluatorTest extends GridCommonAbstractTest { } /** */ + @Test public void testBasic() throws InterruptedException { AtomicReference<Double> actualAccuracy = new AtomicReference<>(null); AtomicReference<Double> actualAccuracy2 = new AtomicReference<>(null); @@ -130,6 +135,7 @@ public class EvaluatorTest extends GridCommonAbstractTest { } /** */ + @Test public void testBasic2() throws InterruptedException { AtomicReference<Double> actualAccuracy = new AtomicReference<>(null); AtomicReference<Double> actualAccuracy2 = new AtomicReference<>(null); @@ -163,6 +169,7 @@ public class EvaluatorTest extends GridCommonAbstractTest { } /** */ + @Test public void testBasic3() throws InterruptedException { AtomicReference<Double> actualAccuracy = new AtomicReference<>(null); AtomicReference<Double> actualAccuracy2 = new AtomicReference<>(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 30a522d..f7f13f2 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 @@ -26,10 +26,14 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.ml.math.primitives.vector.VectorUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link DecisionTreeClassificationTrainer} that require to start the whole Ignite infrastructure. */ +@RunWith(JUnit4.class) public class DecisionTreeClassificationTrainerIntegrationTest extends GridCommonAbstractTest { /** Number of nodes in grid */ private static final int NODE_COUNT = 3; @@ -59,6 +63,7 @@ public class DecisionTreeClassificationTrainerIntegrationTest extends GridCommon } /** */ + @Test public void testFit() { int size = 100; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 3f0dce3..9b25ce0 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 @@ -26,10 +26,14 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.ml.math.primitives.vector.VectorUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link DecisionTreeRegressionTrainer} that require to start the whole Ignite infrastructure. */ +@RunWith(JUnit4.class) public class DecisionTreeRegressionTrainerIntegrationTest extends GridCommonAbstractTest { /** Number of nodes in grid */ private static final int NODE_COUNT = 3; @@ -59,6 +63,7 @@ public class DecisionTreeRegressionTrainerIntegrationTest extends GridCommonAbst } /** */ + @Test public void testFit() { int size = 100; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 c67c8fd..7c984c1 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 @@ -36,9 +36,8 @@ import org.junit.runners.AllTests; public class DecisionTreeTestSuite { /** */ public static TestSuite suite() { - TestSuite suite = new TestSuite(); + TestSuite suite = new TestSuite(DecisionTreeTestSuite.class.getSimpleName()); - /** JUnit 4 tests. */ suite.addTest(new JUnit4TestAdapter(DecisionTreeClassificationTrainerTest.class)); suite.addTest(new JUnit4TestAdapter(DecisionTreeRegressionTrainerTest.class)); suite.addTest(new JUnit4TestAdapter(DecisionTreeDataTest.class)); @@ -48,10 +47,8 @@ public class DecisionTreeTestSuite { 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); + suite.addTest(new JUnit4TestAdapter(DecisionTreeRegressionTrainerIntegrationTest.class)); + suite.addTest(new JUnit4TestAdapter(DecisionTreeClassificationTrainerIntegrationTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/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 213c19f..e0cdc96 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 @@ -31,11 +31,15 @@ import org.apache.ignite.ml.tree.DecisionTreeNode; import org.apache.ignite.ml.tree.impurity.util.SimpleStepFunctionCompressor; import org.apache.ignite.ml.util.MnistUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests {@link DecisionTreeClassificationTrainer} on the MNIST dataset that require to start the whole Ignite * infrastructure. For manual run. */ +@RunWith(JUnit4.class) public class DecisionTreeMNISTIntegrationTest extends GridCommonAbstractTest { /** Number of nodes in grid */ private static final int NODE_COUNT = 3; @@ -65,6 +69,7 @@ public class DecisionTreeMNISTIntegrationTest extends GridCommonAbstractTest { } /** Tests on the MNIST dataset. For manual run. */ + @Test public void testMNIST() throws IOException { CacheConfiguration<Integer, MnistUtils.MnistLabeledImage> trainingSetCacheCfg = new CacheConfiguration<>(); trainingSetCacheCfg.setAffinity(new RendezvousAffinityFunction(false, 10)); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java b/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java index d02b614..8a53e51 100644 --- a/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java +++ b/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java @@ -18,11 +18,14 @@ package org.apache.ignite.internal.processors.rest.protocols.http.jetty; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Integration tests for Grid REST functionality; Jetty is under the hood. */ -public class GridRestSuite extends TestSuite { +@RunWith(AllTests.class) +public class GridRestSuite { /** * @return Suite that contains all tests for REST. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java b/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java index 4e54969..8649a13 100644 --- a/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java +++ b/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java @@ -19,11 +19,14 @@ package org.apache.ignite.stream.rocketmq; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Apache RocketMQ streamers tests. */ -public class RocketMQStreamerTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class RocketMQStreamerTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java b/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java index 7fc82ae..e1b95a7 100644 --- a/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java +++ b/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java @@ -20,11 +20,14 @@ package org.apache.ignite.testsuites; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.schedule.GridScheduleSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Scheduler tests. */ -public class IgniteSchedulerTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteSchedulerTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java ---------------------------------------------------------------------- diff --git a/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java b/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java index 03fb6c5..70b5206 100644 --- a/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java +++ b/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java @@ -18,18 +18,20 @@ package org.apache.ignite.logger.slf4j; 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 org.slf4j.LoggerFactory; +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertTrue; + /** * Testing that markers are supported by log4j2 implementation. */ -@RunWith(JUnit4.class) -public class Slf4jLoggerMarkerTest extends TestCase { +public class Slf4jLoggerMarkerTest { /** Path to full log. */ private static final String LOG_ALL = "work/log/all.log"; @@ -37,16 +39,14 @@ public class Slf4jLoggerMarkerTest extends TestCase { private static final String LOG_FILTERED = "work/log/filtered.log"; /** */ - @Override protected void setUp() throws Exception { - super.setUp(); - + @Before + public void setUp() { deleteLogs(); } /** */ - @Override protected void tearDown() throws Exception { - super.tearDown(); - + @After + public void tearDown() { deleteLogs(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java b/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java index abf1eb8..25deaea 100644 --- a/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java +++ b/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java @@ -20,11 +20,14 @@ package org.apache.ignite.testsuites; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.logger.slf4j.Slf4jLoggerMarkerTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Slf4j logging tests. */ -public class IgniteSlf4jTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteSlf4jTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java b/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java index 75534f1..e963dd1 100644 --- a/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java +++ b/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java @@ -21,11 +21,14 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.spark.JavaEmbeddedIgniteRDDSelfTest; import org.apache.ignite.spark.JavaStandaloneIgniteRDDSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Test suit for Ignite RDD */ -public class IgniteRDDTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteRDDTestSuite { /** * @return Java Ignite RDD test suit. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java b/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java index edfd57f..4fb9605 100644 --- a/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java +++ b/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java @@ -21,11 +21,14 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.springdata.IgniteSpringDataCrudSelfTest; import org.apache.ignite.springdata.IgniteSpringDataQueriesSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Ignite Spring Data 2.0 test suite. */ -public class IgniteSpringData2TestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteSpringData2TestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java b/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java index 6ac72fb..503c820 100644 --- a/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java +++ b/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java @@ -21,11 +21,14 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.springdata.IgniteSpringDataCrudSelfTest; import org.apache.ignite.springdata.IgniteSpringDataQueriesSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Ignite Spring Data test suite. */ -public class IgniteSpringDataTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteSpringDataTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java index 1822bec..39f3d31 100644 --- a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java @@ -32,6 +32,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.h2.jdbcx.JdbcDataSource; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -82,10 +83,9 @@ public class CacheJdbcBlobStoreFactorySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-10723";) @Test public void testIncorrectBeanConfiguration() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-10723";); - GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { try(Ignite ignite = Ignition.start("modules/spring/src/test/config/incorrect-store-cache.xml")) { http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java index 141bb63..7c20aa9 100644 --- a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.h2.jdbcx.JdbcDataSource; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -74,10 +75,9 @@ public class CacheJdbcPojoStoreFactorySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-10723";) @Test public void testIncorrectBeanConfiguration() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-10723";); - GridTestUtils.assertThrowsAnyCause(log, new Callable<Object>() { @Override public Object call() throws Exception { try (Ignite ignored = Ignition.start("modules/spring/src/test/config/pojo-incorrect-store-cache.xml")) { http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java index 39cda04..4b0ac6b 100644 --- a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java +++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java @@ -24,12 +24,15 @@ import org.apache.ignite.internal.processors.resource.GridResourceProcessorSelfT import org.apache.ignite.internal.processors.resource.GridServiceInjectionSelfTest; import org.apache.ignite.internal.processors.resource.GridSpringResourceInjectionSelfTest; import org.apache.ignite.testframework.IgniteTestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Ignite resource injection test Suite. */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) -public class IgniteResourceSelfTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteResourceSelfTestSuite { /** * @return Resource injection test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java index c16a045..5c14b98 100644 --- a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java +++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java @@ -46,16 +46,18 @@ import org.apache.ignite.testframework.IgniteTestSuite; import org.apache.ignite.transactions.spring.GridSpringTransactionManagerSelfTest; import org.apache.ignite.transactions.spring.GridSpringTransactionManagerSpringBeanSelfTest; import org.apache.ignite.transactions.spring.SpringTransactionManagerContextInjectionTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Spring tests. */ -public class IgniteSpringTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteSpringTestSuite { /** * @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("Spring Test Suite"); suite.addTest(new JUnit4TestAdapter(GridSpringBeanSerializationSelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java b/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java index 638d729..085b755 100644 --- a/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java +++ b/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java @@ -19,11 +19,14 @@ package org.apache.ignite.stream.storm; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Apache Storm streamer tests. */ -public class IgniteStormStreamerSelfTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteStormStreamerSelfTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTest.java ---------------------------------------------------------------------- diff --git a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTest.java b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTest.java index a3c9073..c607f55 100644 --- a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTest.java +++ b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTest.java @@ -18,11 +18,13 @@ package org.apache.ignite.stream.twitter; import com.github.tomakehurst.wiremock.WireMockServer; -import com.github.tomakehurst.wiremock.junit.WireMockRule; +import com.github.tomakehurst.wiremock.core.WireMockConfiguration; +import com.github.tomakehurst.wiremock.junit.WireMockClassRule; import com.twitter.hbc.core.HttpHosts; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; +import junit.framework.TestResult; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteDataStreamer; @@ -30,6 +32,7 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.events.CacheEvent; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.internal.runners.JUnit38ClassRunner; @@ -47,7 +50,7 @@ import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT; /** * Test for {@link TwitterStreamer}. Tests Public Status streaming API https://dev.twitter.com/streaming/public. */ -@RunWith(JUnit38ClassRunner.class) +@RunWith(JUnit38ClassRunner.class) // TODO IGNITE-10739 migrate to JUnit 4. public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { /** Cache entries count. */ private static final int CACHE_ENTRY_COUNT = 100; @@ -63,12 +66,43 @@ public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { super(true); } + /** See <a href="http://wiremock.org/docs/junit-rule/";>The JUnit 4.x Rule </a> */ + @ClassRule + public static WireMockClassRule wireMockClsRule = new WireMockClassRule(WireMockConfiguration.DYNAMIC_PORT); + /** Embedded mock HTTP server's for Twitter API rule. */ @Rule - public final WireMockRule wireMockRule = new WireMockRule(); + public WireMockClassRule wireMockRule = wireMockClsRule; /** Embedded mock HTTP server for Twitter API. */ - public final WireMockServer mockServer = new WireMockServer(); //Starts server on 8080 port. + public final WireMockServer mockSrv = new WireMockServer(); //Starts server on 8080 port. + + /** + * {@inheritDoc} + * <p> + * Fallback to TestCase functionality.</p> + */ + @Override public int countTestCases() { + return countTestCasesFallback(); + } + + /** + * {@inheritDoc} + * <p> + * Fallback to TestCase functionality.</p> + */ + @Override public void run(TestResult res) { + runFallback(res); + } + + /** + * {@inheritDoc} + * <p> + * Fallback to TestCase functionality.</p> + */ + @Override public String getName() { + return getNameFallback(); + } /** {@inheritDoc} */ @Override protected long getTestTimeout() { @@ -76,20 +110,20 @@ public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void beforeTest() throws Exception { + @Override public void beforeTest() { grid().getOrCreateCache(defaultCacheConfiguration()); - mockServer.start(); + mockSrv.start(); stubFor(get(urlMatching("/1.1" + MOCK_TWEET_PATH + ".*")).willReturn(aResponse(). withHeader("Content-Type", "text/plain").withBody(tweet.length() + "\n" + tweet))); } /** {@inheritDoc} */ - @Override public void afterTest() throws Exception { + @Override public void afterTest() { stopAllGrids(); - mockServer.stop(); + mockSrv.stop(); } /** @@ -122,7 +156,7 @@ public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { private void executeStreamer(TwitterStreamer streamer) throws InterruptedException, TwitterException { // Checking streaming. - CacheListener listener = subscribeToPutEvents(); + CacheListener lsnr = subscribeToPutEvents(); streamer.start(); @@ -135,12 +169,12 @@ public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { // No-op. } - CountDownLatch latch = listener.getLatch(); + CountDownLatch latch = lsnr.getLatch(); // Enough tweets was handled in 10 seconds. Limited by test's timeout. latch.await(); - unsubscribeToPutEvents(listener); + unsubscribeToPutEvents(lsnr); streamer.stop(); @@ -159,13 +193,13 @@ public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { IgniteCache<Long, String> cache = grid().cache(DEFAULT_CACHE_NAME); - String cachedValue = cache.get(status.getId()); + String cachedVal = cache.get(status.getId()); // Tweet successfully put to cache. - assertTrue(cachedValue != null && cachedValue.equals(status.getText())); + assertTrue(cachedVal != null && cachedVal.equals(status.getText())); // Same tweets does not produce duplicate entries. - assertTrue(cache.size() == 1); + assertEquals(1, cache.size()); } /** @@ -175,20 +209,20 @@ public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { Ignite ignite = grid(); // Listen to cache PUT events and expect as many as messages as test data items. - CacheListener listener = new CacheListener(); + CacheListener lsnr = new CacheListener(); - ignite.events(ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME)).localListen(listener, EVT_CACHE_OBJECT_PUT); + ignite.events(ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME)).localListen(lsnr, EVT_CACHE_OBJECT_PUT); - return listener; + return lsnr; } /** - * @param listener Cache listener. + * @param lsnr Cache listener. */ - private void unsubscribeToPutEvents(CacheListener listener) { + private void unsubscribeToPutEvents(CacheListener lsnr) { Ignite ignite = grid(); - ignite.events(ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME)).stopLocalListen(listener, EVT_CACHE_OBJECT_PUT); + ignite.events(ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME)).stopLocalListen(lsnr, EVT_CACHE_OBJECT_PUT); } /** @@ -212,7 +246,7 @@ public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { /** * Listener. */ - private class CacheListener implements IgnitePredicate<CacheEvent> { + private static class CacheListener implements IgnitePredicate<CacheEvent> { /** */ private final CountDownLatch latch = new CountDownLatch(CACHE_ENTRY_COUNT); @@ -228,8 +262,7 @@ public class IgniteTwitterStreamerTest extends GridCommonAbstractTest { * @param evt Cache Event. * @return {@code true}. */ - @Override - public boolean apply(CacheEvent evt) { + @Override public boolean apply(CacheEvent evt) { latch.countDown(); return true; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java index 7f17a46..5a0730a 100644 --- a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java +++ b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java @@ -19,11 +19,14 @@ package org.apache.ignite.stream.twitter; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Twitter streamer tests. */ -public class IgniteTwitterStreamerTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteTwitterStreamerTestSuite { /** * @return Twitter streamer tests suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java index 74512ec..b3e2642 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java @@ -100,7 +100,7 @@ public class GridUriDeploymentMd5CheckSelfTest extends GridUriDeploymentAbstract } /** {@inheritDoc} */ - protected void afterTest() throws Exception { + @Override protected void afterTest() throws Exception { U.delete(getGarDir()); U.delete(new File(getDeployDir(), "uri1.gar")); U.delete(new File(getDeployDir(), "uri2.gar")); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java index 37d6e7c..0cc6b17 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java @@ -20,11 +20,14 @@ package org.apache.ignite.testsuites; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.tools.GridToolsSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Tools self-test suite. */ -public class IgniteToolsSelfTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteToolsSelfTestSuite { /** * @return Grid ant tasks tests suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java index 934d523..86ad9f5 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/IgniteWebSessionSelfTestSuite.java @@ -21,13 +21,16 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.IgniteTestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP; /** * Test suite for web sessions caching functionality. */ -public class IgniteWebSessionSelfTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteWebSessionSelfTestSuite { /** * @return Test suite. */
