http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java index c4c9527..fa82f15 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java @@ -40,11 +40,15 @@ import org.apache.ignite.resources.TaskSessionResource; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstractTest { /** */ private static final int WAIT_TIME = 20000; @@ -69,6 +73,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac /** * @throws Exception if failed. */ + @Test public void testSetAttribute() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -83,6 +88,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac /** * @throws Exception if failed. */ + @Test public void testMultiThreaded() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -253,4 +259,4 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac return sum; } } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java index 78f3160..e0aad4c 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java @@ -42,11 +42,15 @@ import org.apache.ignite.resources.TaskSessionResource; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstractTest { /** */ private static final int WAIT_TIME = 2000; @@ -71,6 +75,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra /** * @throws Exception if failed. */ + @Test public void testSetAttribute() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -85,6 +90,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra /** * @throws Exception if failed. */ + @Test public void testMultiThreaded() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -259,4 +265,4 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra return sum; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java index 85b2e93..009d1f6 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java @@ -36,11 +36,15 @@ import org.apache.ignite.resources.TaskSessionResource; import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Job failover test. */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionJobFailoverSelfTest extends GridCommonAbstractTest { /** * Default constructor. @@ -61,6 +65,7 @@ public class GridSessionJobFailoverSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFailoverJobSession() throws Exception { try { Ignite ignite1 = startGrid(1); @@ -166,4 +171,4 @@ public class GridSessionJobFailoverSelfTest extends GridCommonAbstractTest { return results.get(0).getData(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java index f93e991..58d05d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java @@ -43,11 +43,15 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractTest { /** */ public static final int SPLIT_COUNT = 5; @@ -78,6 +82,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT /** * @throws Exception if failed. */ + @Test public void testSetAttribute() throws Exception { for (int i = 0; i < EXEC_COUNT; i++) checkTask(i); @@ -86,6 +91,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT /** * @throws Exception if failed. */ + @Test public void testMultiThreaded() throws Exception { final GridThreadSerialNumber sNum = new GridThreadSerialNumber(); @@ -220,4 +226,4 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT return sum; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java index ae75a2f..98c9d93 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java @@ -44,11 +44,15 @@ import org.apache.ignite.resources.TaskSessionResource; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Task session load self test. */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionLoadSelfTest extends GridCommonAbstractTest { /** */ private static final int THREAD_CNT = 40; @@ -82,6 +86,7 @@ public class GridSessionLoadSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSessionLoad() throws Exception { locMarsh = true; @@ -91,6 +96,7 @@ public class GridSessionLoadSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSessionLoadNoLocalMarshalling() throws Exception { locMarsh = false; @@ -284,4 +290,4 @@ public class GridSessionLoadSelfTest extends GridCommonAbstractTest { return val; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java index bab4c4c..c030540 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java @@ -45,11 +45,15 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTest { /** */ private static final int WAIT_TIME = 20000; @@ -87,6 +91,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes /** * @throws Exception if failed. */ + @Test public void testSetAttribute() throws Exception { refreshInitialData(); @@ -97,6 +102,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes /** * @throws Exception if failed. */ + @Test public void testMultiThreaded() throws Exception { refreshInitialData(); @@ -256,4 +262,4 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes return sum; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index 078a7a5..8092a5b 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -45,11 +45,15 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommonAbstractTest { /** */ public static final int SPLIT_COUNT = 5; @@ -89,6 +93,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testSetAttribute() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -247,4 +252,4 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo attrs.clear(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java index b466093..0395e99 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java @@ -35,11 +35,15 @@ import org.apache.ignite.compute.ComputeTaskSessionFullSupport; import org.apache.ignite.resources.TaskSessionResource; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Job attribute test. */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionSetJobAttribute2SelfTest extends GridCommonAbstractTest { /** */ private static final String TEST_ATTR_KEY = "grid.tasksession.test.attr"; @@ -52,6 +56,7 @@ public class GridSessionSetJobAttribute2SelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testJobSetAttribute() throws Exception { try { Ignite ignite1 = startGrid(1); @@ -141,4 +146,4 @@ public class GridSessionSetJobAttribute2SelfTest extends GridCommonAbstractTest return argument(0); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java index 0c28e7e..90bd7d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java @@ -37,11 +37,15 @@ import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.resources.TaskSessionResource; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid session set job attribute self test. */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractTest { /** */ private static final String TEST_ATTR_KEY = "grid.task.session.test.attr"; @@ -55,6 +59,7 @@ public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testJobSetAttribute() throws Exception { try { Ignite ignite1 = startGrid(1); @@ -159,4 +164,4 @@ public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractT return null; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java index b2b1724..c5c6b91 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java @@ -43,11 +43,15 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { /** */ public static final int SPLIT_COUNT = 5; @@ -78,6 +82,7 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testSetAttribute() throws Exception { for (int i = 0; i < EXEC_COUNT; i++) checkTask(i); @@ -86,6 +91,7 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testMultiThreaded() throws Exception { final GridThreadSerialNumber sNum = new GridThreadSerialNumber(); @@ -209,4 +215,4 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { return sum; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index d94ca49..dfbfe66 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -45,11 +45,15 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAbstractTest { /** */ public static final int SPLIT_COUNT = 5; @@ -83,6 +87,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb /** * @throws Exception If failed. */ + @Test public void testSetAttribute() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -246,4 +251,4 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb return attrs; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java index 497623c..a15c46f 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java @@ -39,11 +39,15 @@ import org.apache.ignite.resources.TaskSessionResource; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest { /** */ public static final int SPLIT_COUNT = 5; @@ -59,6 +63,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest /** * @throws Exception if failed. */ + @Test public void testSetAttribute() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -71,6 +76,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest /** * @throws Exception if failed. */ + @Test public void testMultiThreaded() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -199,4 +205,4 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest return sum; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java index 4bb94aa..f7e713b 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java @@ -39,11 +39,15 @@ import org.apache.ignite.resources.TaskSessionResource; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractTest { /** */ public static final int SPLIT_COUNT = 5; @@ -59,6 +63,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT /** * @throws Exception if failed. */ + @Test public void testSetAttribute() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -71,6 +76,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT /** * @throws Exception if failed. */ + @Test public void testMultiThreaded() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -192,4 +198,4 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT return sum; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java index d5732a0..ac7aaf7 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java @@ -44,12 +44,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests waiting for session attributes. */ @GridCommonTest(group = "Task Session") @SuppressWarnings({"PublicInnerClass"}) +@RunWith(JUnit4.class) public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** */ private static final int ATTR_NUM = 100; @@ -138,6 +142,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitAttribute() throws Exception { checkWaitAttributeMethod(WaitAttributeType.WAIT_FOR_ATTRIBUTE_KEY); } @@ -145,6 +150,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitAttributeWithTimeout() throws Exception { checkWaitAttributeMethod(WaitAttributeType.WAIT_FOR_ATTRIBUTE_KEY_TIMEOUT); } @@ -152,6 +158,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitAttributeValue() throws Exception { checkWaitAttributeMethod(WaitAttributeType.WAIT_FOR_ATTRIBUTE_KEY_VAL); } @@ -159,6 +166,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitAttributeValueWithTimeout() throws Exception { checkWaitAttributeMethod(WaitAttributeType.WAIT_FOR_ATTRIBUTE_KEY_VAL_TIMEOUT); } @@ -166,6 +174,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitAttributeValues() throws Exception { checkWaitAttributeMethod(WaitAttributeType.WAIT_FOR_ATTRIBUTES_ATTRS); } @@ -173,6 +182,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitAttributeValuesWithTimeout() throws Exception { checkWaitAttributeMethod(WaitAttributeType.WAIT_FOR_ATTRIBUTES_ATTRS_TIMEOUT); } @@ -180,6 +190,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitAttributes() throws Exception { checkWaitAttributeMethod(WaitAttributeType.WAIT_FOR_ATTRIBUTES_KEYS); } @@ -187,6 +198,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitAttributesWithTimeout() throws Exception { checkWaitAttributeMethod(WaitAttributeType.WAIT_FOR_ATTRIBUTES_KEYS_TIMEOUT); } @@ -471,4 +483,4 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { return null; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java index 82205ff..79fc96e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridSpiLocalHostInjectionTest.java @@ -24,10 +24,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.junits.GridTestKernalContext; 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; /** * This class tests injection of {@code localHost} property to various SPIs. */ +@RunWith(JUnit4.class) public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** Value to be set globally in config. */ public static final String CONFIG_LOCAL_ADDR_VALUE = "127.0.0.3"; @@ -38,6 +42,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If test fails. */ + @Test public void testTcpDiscoverySpiBothSet() throws IgniteCheckedException { processTcpDiscoverySpiTestInjection(true, true, SPI_LOCAL_ADDR_VALUE); } @@ -45,6 +50,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If test fails. */ + @Test public void testTcpDiscoverySpiOnlySet() throws IgniteCheckedException { processTcpDiscoverySpiTestInjection(false, true, SPI_LOCAL_ADDR_VALUE); } @@ -52,6 +58,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If test fails. */ + @Test public void testTcpDiscoverySpiConfigOnlySet() throws IgniteCheckedException { processTcpDiscoverySpiTestInjection(true, false, CONFIG_LOCAL_ADDR_VALUE); } @@ -59,6 +66,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If test fails. */ + @Test public void testTcpDiscoverySpiBothNotSet() throws IgniteCheckedException { processTcpDiscoverySpiTestInjection(false, false, null); } @@ -66,6 +74,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If test fails. */ + @Test public void testTcpCommunicationSpiBothSet() throws IgniteCheckedException { processTcpCommunicationSpiTestInjection(true, true, SPI_LOCAL_ADDR_VALUE); } @@ -73,6 +82,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If test fails. */ + @Test public void testTcpCommunicationSpiOnlySet() throws IgniteCheckedException { processTcpCommunicationSpiTestInjection(false, true, SPI_LOCAL_ADDR_VALUE); } @@ -80,6 +90,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If test fails. */ + @Test public void testTcpCommunicationSpiConfigOnlySet() throws IgniteCheckedException { processTcpCommunicationSpiTestInjection(true, false, CONFIG_LOCAL_ADDR_VALUE); } @@ -87,6 +98,7 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If test fails. */ + @Test public void testTcpCommunicationSpiBothNotSet() throws IgniteCheckedException { processTcpCommunicationSpiTestInjection(false, false, null); } @@ -153,4 +165,4 @@ public class GridSpiLocalHostInjectionTest extends GridCommonAbstractTest { return proc; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java index 2d339bb..0b92b16 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridSpiStartStopAbstractTest.java @@ -18,11 +18,15 @@ package org.apache.ignite.spi; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Base SPI start-stop test class. * @param <T> SPI implementation class. */ +@RunWith(JUnit4.class) public abstract class GridSpiStartStopAbstractTest<T extends IgniteSpi> extends GridSpiAbstractTest<T> { /** */ public static final int COUNT = 5; @@ -42,6 +46,7 @@ public abstract class GridSpiStartStopAbstractTest<T extends IgniteSpi> extends /** * @throws Exception If test failed. */ + @Test public void testStartStop() throws Exception { info("Spi start-stop test [count=" + getCount() + ", spi=" + getSpiClass().getSimpleName() + ']'); @@ -67,6 +72,7 @@ public abstract class GridSpiStartStopAbstractTest<T extends IgniteSpi> extends /** * @throws Exception If test failed. */ + @Test public void testStop() throws Exception { IgniteSpi spi = getSpiClass().newInstance(); @@ -76,4 +82,4 @@ public abstract class GridSpiStartStopAbstractTest<T extends IgniteSpi> extends spi.spiStop(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java index e004781..5441586 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java @@ -39,10 +39,14 @@ import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; 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; /** * Test for {@link TcpDiscoverySpi} and {@link TcpCommunicationSpi}. */ +@RunWith(JUnit4.class) public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { /** */ private static final int locPort1 = 47500; @@ -140,6 +144,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { /** * @throws Exception If any error occurs. */ + @Test public void testCustomResolver() throws Exception { final Map<InetSocketAddress, Collection<InetSocketAddress>> map = new HashMap<>(); @@ -160,6 +165,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBasicResolverMapPorts() throws Exception { Map<String, String> map = new HashMap<>(); @@ -176,6 +182,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBasicResolverMapAddress() throws Exception { Map<String, String> map = new HashMap<>(); @@ -191,6 +198,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBasicResolverErrors() throws Exception { GridTestUtils.assertThrows( log, http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/GridCheckpointSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/GridCheckpointSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/GridCheckpointSpiAbstractTest.java index 03fd5e6..92cf0b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/GridCheckpointSpiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/GridCheckpointSpiAbstractTest.java @@ -19,11 +19,15 @@ package org.apache.ignite.spi.checkpoint; import org.apache.ignite.GridTestIoUtils; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid checkpoint SPI abstract test. * @param <T> Concrete SPI class. */ +@RunWith(JUnit4.class) public abstract class GridCheckpointSpiAbstractTest<T extends CheckpointSpi> extends GridSpiAbstractTest<T> { /** */ @@ -35,6 +39,7 @@ public abstract class GridCheckpointSpiAbstractTest<T extends CheckpointSpi> /** * @throws Exception Thrown in case of any errors. */ + @Test public void testSaveLoadRemoveWithoutExpire() throws Exception { String dataPrefix = "Test check point data "; @@ -85,6 +90,7 @@ public abstract class GridCheckpointSpiAbstractTest<T extends CheckpointSpi> /** * @throws Exception Thrown in case of any errors. */ + @Test public void testSaveWithExpire() throws Exception { // Save states. for (int i = 0; i < CHECK_POINT_COUNT; i++) { @@ -111,6 +117,7 @@ public abstract class GridCheckpointSpiAbstractTest<T extends CheckpointSpi> /** * @throws Exception Thrown in case of any errors. */ + @Test public void testDuplicates() throws Exception { int idx1 = 1; int idx2 = 2; @@ -137,4 +144,4 @@ public abstract class GridCheckpointSpiAbstractTest<T extends CheckpointSpi> assert finalSerState == null : "Checkpoint state should not be loaded with key: " + CHECK_POINT_KEY_PREFIX; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java index a933333..af0dcdd 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java @@ -19,17 +19,22 @@ package org.apache.ignite.spi.checkpoint.cache; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid cache checkpoint SPI config self test. */ @GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI") +@RunWith(JUnit4.class) public class CacheCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<CacheCheckpointSpi> { /** * @throws Exception If failed. */ + @Test public void testNegativeConfig() throws Exception { checkNegativeSpiProperty(new CacheCheckpointSpi(), "cacheName", null); checkNegativeSpiProperty(new CacheCheckpointSpi(), "cacheName", ""); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java index 4397783..05e4311 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java @@ -24,6 +24,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -31,6 +34,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Test for cache checkpoint SPI with second cache configured. */ +@RunWith(JUnit4.class) public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -79,6 +83,7 @@ public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testSecondCachePutRemove() throws Exception { IgniteCache<Integer, Integer> data = grid().cache(DEFAULT_CACHE_NAME); IgniteCache<Integer, String> cp = grid().cache(CP_CACHE); @@ -101,4 +106,4 @@ public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTes assertEquals("1", cp.get(1)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java index 1affc9c..53d28de 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java @@ -21,6 +21,9 @@ import javax.sql.DataSource; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.hsqldb.jdbc.jdbcDataSource; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi.DFLT_CHECKPOINT_TABLE_NAME; import static org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi.DFLT_EXPIRE_DATE_FIELD_NAME; @@ -33,10 +36,12 @@ import static org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi.DFLT_VALUE * Grid jdbc checkpoint SPI config self test. */ @GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI") +@RunWith(JUnit4.class) public class JdbcCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<JdbcCheckpointSpi> { /** * @throws Exception If failed. */ + @Test public void testNegativeConfig() throws Exception { checkNegativeSpiProperty(new JdbcCheckpointSpi(), "dataSource", null); @@ -79,4 +84,4 @@ public class JdbcCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<J checkNegativeSpiProperty(spi, "expireDateFieldType", null); checkNegativeSpiProperty(spi, "expireDateFieldType", ""); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java index 983a358..54757f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java @@ -20,17 +20,22 @@ package org.apache.ignite.spi.checkpoint.sharedfs; import java.util.LinkedList; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid shared file system checkpoint SPI config self test. */ @GridSpiTest(spi = SharedFsCheckpointSpi.class, group = "Checkpoint SPI") +@RunWith(JUnit4.class) public class GridSharedFsCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<SharedFsCheckpointSpi> { /** * @throws Exception If failed. */ + @Test public void testNegativeConfig() throws Exception { checkNegativeSpiProperty(new SharedFsCheckpointSpi(), "directoryPaths", null); checkNegativeSpiProperty(new SharedFsCheckpointSpi(), "directoryPaths", new LinkedList<String>()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java index 85c19bc..df1e6f4 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java @@ -31,11 +31,15 @@ import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.apache.ignite.testframework.junits.spi.GridSpiTestConfig; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests SPI in multi-threaded environment. */ @GridSpiTest(spi = SharedFsCheckpointSpi.class, group = "Checkpoint SPI") +@RunWith(JUnit4.class) public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends GridSpiAbstractTest<SharedFsCheckpointSpi> { /** */ @@ -65,6 +69,7 @@ public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends * * @throws Exception If failed. */ + @Test public void testSpi() throws Exception { final AtomicInteger writeFinished = new AtomicInteger(); @@ -198,4 +203,4 @@ public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends @Override protected void afterTestsStopped() throws Exception { deleteFolder(new File(U.getIgniteHome(), PATH)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java index 2eea7c1..22bd4cf 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java @@ -27,11 +27,15 @@ import org.apache.ignite.spi.checkpoint.GridCheckpointTestState; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.apache.ignite.testframework.junits.spi.GridSpiTestConfig; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests multiple shared directories. */ @GridSpiTest(spi = SharedFsCheckpointSpi.class, group = "Checkpoint SPI") +@RunWith(JUnit4.class) public class GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest extends GridSpiAbstractTest<SharedFsCheckpointSpi> { /** */ @@ -59,6 +63,7 @@ public class GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest extends /** * @throws Exception If failed. */ + @Test public void testMultipleSharedDirectories() throws Exception { String data = "Test check point data."; @@ -117,4 +122,4 @@ public class GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest extends assert error : "Check point should not be saved."; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java index 5b5cdb2..fb0a298 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java @@ -19,17 +19,22 @@ package org.apache.ignite.spi.collision.fifoqueue; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Unit tests for {@link FifoQueueCollisionSpi} config. */ @GridSpiTest(spi = FifoQueueCollisionSpi.class, group = "Collision SPI") +@RunWith(JUnit4.class) public class GridFifoQueueCollisionSpiConfigSelfTest extends GridSpiAbstractConfigTest<FifoQueueCollisionSpi> { /** * @throws Exception If failed. */ + @Test public void testNegativeConfig() throws Exception { checkNegativeSpiProperty(new FifoQueueCollisionSpi(), "parallelJobsNumber", 0); checkNegativeSpiProperty(new FifoQueueCollisionSpi(), "waitingJobsNumber", -1); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java index 1195bcb..ec0f571 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java @@ -26,15 +26,20 @@ import org.apache.ignite.spi.collision.GridTestCollisionJobContext; import org.apache.ignite.spi.collision.GridTestCollisionTaskSession; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Unit tests for {@link FifoQueueCollisionSpi}. */ @GridSpiTest(spi = FifoQueueCollisionSpi.class, group = "Collision SPI") +@RunWith(JUnit4.class) public class GridFifoQueueCollisionSpiSelfTest extends GridSpiAbstractTest<FifoQueueCollisionSpi> { /** * @throws Exception If failed. */ + @Test public void testCollision0() throws Exception { int activeCnt = 2; @@ -67,6 +72,7 @@ public class GridFifoQueueCollisionSpiSelfTest extends GridSpiAbstractTest<FifoQ /** * @throws Exception If failed. */ + @Test public void testCollision1() throws Exception { getSpi().setParallelJobsNumber(32); @@ -95,6 +101,7 @@ public class GridFifoQueueCollisionSpiSelfTest extends GridSpiAbstractTest<FifoQ /** * @throws Exception If failed. */ + @Test public void testCollision2() throws Exception { getSpi().setParallelJobsNumber(3); @@ -116,6 +123,7 @@ public class GridFifoQueueCollisionSpiSelfTest extends GridSpiAbstractTest<FifoQ /** * @throws Exception If failed. */ + @Test public void testCollision3() throws Exception { getSpi().setParallelJobsNumber(15); @@ -175,4 +183,4 @@ public class GridFifoQueueCollisionSpiSelfTest extends GridSpiAbstractTest<FifoQ return new GridCollisionTestContext(activeJobs, passiveJobs); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java index 2eea92a..da1b80d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java @@ -34,6 +34,9 @@ import org.apache.ignite.testframework.GridTestNode; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.apache.ignite.testframework.junits.spi.GridSpiTestConfig; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SPI_CLASS; import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.WAIT_JOBS_THRESHOLD_NODE_ATTR; @@ -42,6 +45,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp * Job stealing attributes test. */ @GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@RunWith(JUnit4.class) public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstractTest<JobStealingCollisionSpi> { /** */ private static GridTestNode rmtNode; @@ -129,6 +133,7 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra /** * @throws Exception If test failed. */ + @Test public void testSameAttribute() throws Exception { List<CollisionJobContext> waitCtxs = Collections.emptyList(); @@ -162,6 +167,7 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra /** * @throws Exception If test failed. */ + @Test public void testEmptyRemoteAttribute() throws Exception { List<CollisionJobContext> waitCtxs = Collections.emptyList(); @@ -189,6 +195,7 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra /** * @throws Exception If test failed. */ + @Test public void testEmptyLocalAttribute() throws Exception { // Collision SPI does not allow to send more than 1 message in a // certain period of time (see getMessageExpireTime() method). @@ -221,6 +228,7 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra /** * @throws Exception If test failed. */ + @Test public void testDiffAttribute() throws Exception { List<CollisionJobContext> waitCtxs = Collections.emptyList(); @@ -254,6 +262,7 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra /** * @throws Exception If test failed. */ + @Test public void testBothEmptyAttribute() throws Exception { // Collision SPI does not allow to send more than 1 message in a // certain period of time (see getMessageExpireTime() method). @@ -281,6 +290,7 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra /** * @throws Exception If test failed. */ + @Test public void testIsStealingOff() throws Exception { // Collision SPI does not allow to send more than 1 message in a // certain period of time (see getMessageExpireTime() method). @@ -309,6 +319,7 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra /** * @throws Exception If test failed. */ + @Test public void testIsStealingOn() throws Exception { // Collision SPI does not allow to send more than 1 message in a // certain period of time (see getMessageExpireTime() method). @@ -333,4 +344,4 @@ public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstra // Message should not be sent to remote node because stealing is on assert msg != null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java index 1772754..d7db2a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java @@ -19,19 +19,24 @@ package org.apache.ignite.spi.collision.jobstealing; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Job stealing collision SPI config test. */ @GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@RunWith(JUnit4.class) public class GridJobStealingCollisionSpiConfigSelfTest extends GridSpiAbstractConfigTest<JobStealingCollisionSpi> { /** * @throws Exception If failed. */ + @Test public void testNegativeConfig() throws Exception { checkNegativeSpiProperty(new JobStealingCollisionSpi(), "messageExpireTime", 0); checkNegativeSpiProperty(new JobStealingCollisionSpi(), "waitJobsThreshold", -1); checkNegativeSpiProperty(new JobStealingCollisionSpi(), "activeJobsThreshold", -1); checkNegativeSpiProperty(new JobStealingCollisionSpi(), "maximumStealingAttempts", 0); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java index 2b88dbb..f061cbb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java @@ -38,6 +38,9 @@ import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.apache.ignite.testframework.junits.spi.GridSpiTestConfig; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SPI_CLASS; import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.THIEF_NODE_ATTR; @@ -46,6 +49,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp * Job stealing collision SPI topology test. */ @GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@RunWith(JUnit4.class) public class GridJobStealingCollisionSpiCustomTopologySelfTest extends GridSpiAbstractTest<JobStealingCollisionSpi> { /** */ @@ -125,6 +129,7 @@ public class GridJobStealingCollisionSpiCustomTopologySelfTest extends /** * @throws Exception If test failed. */ + @Test public void testThiefNodeNotInTopology() throws Exception { List<CollisionJobContext> waitCtxs = new ArrayList<>(2); @@ -177,4 +182,4 @@ public class GridJobStealingCollisionSpiCustomTopologySelfTest extends } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java index 05e0cee..5e33548 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java @@ -40,6 +40,9 @@ import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.apache.ignite.testframework.junits.spi.GridSpiTestConfig; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SPI_CLASS; import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.STEALING_ATTEMPT_COUNT_ATTR; @@ -50,6 +53,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp * Job stealing SPI test. */ @GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@RunWith(JUnit4.class) public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<JobStealingCollisionSpi> { /** */ public GridJobStealingCollisionSpiSelfTest() { @@ -148,6 +152,7 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job /** * @throws Exception If test failed. */ + @Test public void testTwoPassiveJobs() throws Exception { final List<CollisionJobContext> waitCtxs = new ArrayList<>(2); final List<CollisionJobContext> activeCtxs = new ArrayList<>(1); @@ -184,6 +189,7 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job /** * @throws Exception If test failed. */ + @Test public void testOnePassiveOneActiveJobs() throws Exception { List<CollisionJobContext> waitCtxs = new ArrayList<>(1); @@ -217,6 +223,7 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job /** * @throws Exception If test failed. */ + @Test public void testMultiplePassiveOneActive() throws Exception { List<CollisionJobContext> waitCtxs = new ArrayList<>(2); @@ -254,6 +261,7 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job /** * @throws Exception If test failed. */ + @Test public void testMultiplePassiveZeroActive() throws Exception { final List<CollisionJobContext> waitCtxs = new ArrayList<>(2); final List<CollisionJobContext> activeCtxs = new ArrayList<>(2); @@ -309,6 +317,7 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job /** * @throws Exception If test failed. */ + @Test public void testOnePassiveZeroActive() throws Exception { List<CollisionJobContext> waitCtxs = new ArrayList<>(1); @@ -335,6 +344,7 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job /** * @throws Exception If test failed. */ + @Test public void testZeroPassiveOneActive() throws Exception { Collection<CollisionJobContext> empty = Collections.emptyList(); @@ -362,6 +372,7 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job /** * @throws Exception If test failed. */ + @Test public void testZeroPassiveZeroActive() throws Exception { Collection<CollisionJobContext> empty = Collections.emptyList(); @@ -383,6 +394,7 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job /** * @throws Exception If test failed. */ + @Test public void testMaxHopsExceeded() throws Exception { Collection<CollisionJobContext> waitCtxs = new ArrayList<>(2); @@ -424,4 +436,4 @@ public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<Job assert msg == null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java index a303da8..53bb96f 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java @@ -19,16 +19,21 @@ package org.apache.ignite.spi.collision.priorityqueue; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Priority queue collision SPI config test. */ @GridSpiTest(spi = PriorityQueueCollisionSpi.class, group = "Collision SPI") +@RunWith(JUnit4.class) public class GridPriorityQueueCollisionSpiConfigSelfTest extends GridSpiAbstractConfigTest<PriorityQueueCollisionSpi> { /** * @throws Exception If failed. */ + @Test public void testNegativeConfig() throws Exception { checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "parallelJobsNumber", 0); checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "waitingJobsNumber", -1); @@ -36,4 +41,4 @@ public class GridPriorityQueueCollisionSpiConfigSelfTest checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "priorityAttributeKey", null); checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "jobPriorityAttributeKey", null); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java index 6ecf5cf..4f2a3fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java @@ -29,6 +29,9 @@ import org.apache.ignite.spi.collision.GridTestCollisionTaskSession; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisionSpi.DFLT_JOB_PRIORITY_ATTRIBUTE_KEY; import static org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisionSpi.DFLT_PARALLEL_JOBS_NUM; @@ -39,6 +42,7 @@ import static org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisi * Priority queue collision SPI test. */ @GridSpiTest(spi = PriorityQueueCollisionSpi.class, group = "Collision SPI") +@RunWith(JUnit4.class) public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<PriorityQueueCollisionSpi> { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { @@ -49,6 +53,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P * @throws Exception If failed. */ @SuppressWarnings({"TooBroadScope"}) + @Test public void testCollisionAttributeName() throws Exception { String taskAttrKey = "testTaskPriority"; String jobAttrKey = "testJobPriority"; @@ -93,6 +98,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollision() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null); List<CollisionJobContext> passiveJobs = makeContextList(null); @@ -115,6 +121,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollision0() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null); List<CollisionJobContext> passiveJobs = makeContextList(null); @@ -137,6 +144,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollision1() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null); List<CollisionJobContext> passiveJobs = makeContextList(null); @@ -175,6 +183,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollision2() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null); List<CollisionJobContext> passiveJobs = makeContextList(null); @@ -197,6 +206,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollision3() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null); List<CollisionJobContext> passiveJobs = makeContextList(null); @@ -219,6 +229,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollisionEmpty() throws Exception { Collection<CollisionJobContext> activeJobs = new ArrayList<>(); Collection<CollisionJobContext> passiveJobs = new ArrayList<>(); @@ -232,6 +243,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollisionWithoutPriorityAttribute() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null); List<CollisionJobContext> passiveJobs = makeContextList(null); @@ -278,6 +290,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollisionWithWrongPriorityAttribute() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null); List<CollisionJobContext> passiveJobs = makeContextList(null); @@ -334,6 +347,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P * @throws Exception If failed. */ @SuppressWarnings({"TooBroadScope"}) + @Test public void testCollision4() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null, false); List<CollisionJobContext> passiveJobs = makeContextList(null, false); @@ -379,6 +393,7 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P /** * @throws Exception If failed. */ + @Test public void testCollision5() throws Exception { List<CollisionJobContext> activeJobs = makeContextList(null, false); List<CollisionJobContext> passiveJobs = makeContextList(null, false); @@ -438,4 +453,4 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P private List<CollisionJobContext> makeContextList(@Nullable String attrKey) { return makeContextList(attrKey, true); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java index cec63df..26cd67f 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java @@ -44,6 +44,9 @@ import org.apache.ignite.testframework.junits.GridTestKernalContext; import org.apache.ignite.testframework.junits.IgniteMock; import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; @@ -51,6 +54,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; * Super class for all communication self tests. * @param <T> Type of communication SPI. */ +@RunWith(JUnit4.class) public abstract class GridAbstractCommunicationSelfTest<T extends CommunicationSpi> extends GridSpiAbstractTest<T> { /** */ private static long msgId = 1; @@ -151,6 +155,7 @@ public abstract class GridAbstractCommunicationSelfTest<T extends CommunicationS /** * @throws Exception If failed. */ + @Test public void testSendToOneNode() throws Exception { info(">>> Starting send to one node test. <<<"); @@ -193,6 +198,7 @@ public abstract class GridAbstractCommunicationSelfTest<T extends CommunicationS /** * @throws Exception If failed. */ + @Test public void testSendToManyNodes() throws Exception { msgDestMap.clear(); @@ -377,4 +383,4 @@ public abstract class GridAbstractCommunicationSelfTest<T extends CommunicationS for (IgniteTestResources rsrcs : spiRsrcs) rsrcs.stopThreads(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java index 8ddfd44..9e758c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java @@ -47,6 +47,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -54,6 +57,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Messaging test. */ +@RunWith(JUnit4.class) public class GridCacheMessageSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -137,6 +141,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSendMessage() throws Exception { try { startGridsMultiThreaded(2); @@ -151,6 +156,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSendBadMessage() throws Exception { try { startGrids(2); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java index ee1f180..aeb6e50 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java @@ -41,6 +41,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestThread; 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.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; @@ -48,6 +51,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; /** * Special cases for GG-2329. */ +@RunWith(JUnit4.class) public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { /** Ip-finder. */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -102,6 +106,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { /** * @throws Exception If test failed. */ + @Test public void testLock() throws Exception { final int kv = 1; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java index e89a4c8..eda8d8e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java @@ -36,10 +36,14 @@ import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.communication.CommunicationSpi; import org.apache.ignite.spi.communication.GridAbstractCommunicationSelfTest; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test for {@link TcpCommunicationSpi} */ +@RunWith(JUnit4.class) abstract class GridTcpCommunicationSpiAbstractTest extends GridAbstractCommunicationSelfTest<CommunicationSpi> { /** */ private static final int SPI_COUNT = 3; @@ -82,6 +86,7 @@ abstract class GridTcpCommunicationSpiAbstractTest extends GridAbstractCommunica } /** {@inheritDoc} */ + @Test @Override public void testSendToManyNodes() throws Exception { super.testSendToManyNodes(); @@ -98,6 +103,7 @@ abstract class GridTcpCommunicationSpiAbstractTest extends GridAbstractCommunica /** * */ + @Test public void testCheckConnection1() { for (int i = 0; i < 100; i++) { for (Map.Entry<UUID, CommunicationSpi<Message>> entry : spis.entrySet()) { @@ -120,6 +126,7 @@ abstract class GridTcpCommunicationSpiAbstractTest extends GridAbstractCommunica /** * @throws Exception If failed. */ + @Test public void testCheckConnection2() throws Exception { final int THREADS = spis.size(); @@ -193,4 +200,4 @@ abstract class GridTcpCommunicationSpiAbstractTest extends GridAbstractCommunica fail("Failed to wait when clients are closed."); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java index 9013016..8683ef8 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java @@ -59,11 +59,15 @@ import org.apache.ignite.testframework.junits.IgniteMock; import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") +@RunWith(JUnit4.class) public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends CommunicationSpi> extends GridSpiAbstractTest<T> { /** */ @@ -160,6 +164,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic /** * @throws Exception If failed. */ + @Test public void testTwoThreads() throws Exception { concurrentConnect(2, 10, ITERS, false, false); } @@ -167,6 +172,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic /** * @throws Exception If failed. */ + @Test public void testMultithreaded() throws Exception { int threads = Runtime.getRuntime().availableProcessors() * 5; @@ -176,6 +182,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic /** * @throws Exception If failed. */ + @Test public void testMultithreaded_10Connections() throws Exception { connectionsPerNode = 10; @@ -185,6 +192,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic /** * @throws Exception If failed. */ + @Test public void testMultithreaded_NoPairedConnections() throws Exception { pairedConnections = false; @@ -194,6 +202,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic /** * @throws Exception If failed. */ + @Test public void testMultithreaded_10ConnectionsNoPaired() throws Exception { pairedConnections = false; connectionsPerNode = 10; @@ -204,6 +213,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic /** * @throws Exception If failed. */ + @Test public void testWithLoad() throws Exception { int threads = Runtime.getRuntime().availableProcessors() * 5; @@ -213,6 +223,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic /** * @throws Exception If failed. */ + @Test public void testRandomSleep() throws Exception { concurrentConnect(4, 1, ITERS, true, false); }
