http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index 1b8aac6..1c03310 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -57,12 +57,16 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.testframework.GridTestUtils.assertThrows; /** * Various tests for Messaging public API. */ +@RunWith(JUnit4.class) public class GridMessagingSelfTest extends GridCommonAbstractTest implements Serializable { /** */ private static final String MSG_1 = "MSG-1"; @@ -213,6 +217,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If error occurs. */ + @Test public void testSendReceiveMessage() throws Exception { final Collection<Object> rcvMsgs = new GridConcurrentHashSet<>(); @@ -262,6 +267,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * @throws Exception If error occurs. */ @SuppressWarnings("TooBroadScope") + @Test public void testStopLocalListen() throws Exception { final AtomicInteger msgCnt1 = new AtomicInteger(); @@ -374,6 +380,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If error occurs. */ + @Test public void testSendReceiveMessageWithStringTopic() throws Exception { final Collection<Object> rcvMsgs = new GridConcurrentHashSet<>(); @@ -497,6 +504,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If error occurs. */ + @Test public void testSendReceiveMessageWithEnumTopic() throws Exception { final Collection<Object> rcvMsgs = new GridConcurrentHashSet<>(); @@ -621,6 +629,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If error occurs. */ + @Test public void testRemoteListen() throws Exception { final Collection<Object> rcvMsgs = new GridConcurrentHashSet<>(); @@ -658,6 +667,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * @throws Exception If failed. */ @SuppressWarnings("TooBroadScope") + @Test public void testStopRemoteListen() throws Exception { final AtomicInteger msgCnt1 = new AtomicInteger(); @@ -751,6 +761,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If error occurs. */ + @Test public void testRemoteListenOrderedMessages() throws Exception { List<TestMessage> msgs = Arrays.asList( new TestMessage(MSG_1), @@ -804,6 +815,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If error occurs. */ + @Test public void testRemoteListenWithIntTopic() throws Exception { final Collection<Object> rcvMsgs = new GridConcurrentHashSet<>(); @@ -943,6 +955,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If error occurs. */ + @Test public void testSendMessageWithExternalClassLoader() throws Exception { URL[] urls = new URL[] {new URL(GridTestProperties.getProperty("p2p.uri.cls"))}; @@ -987,6 +1000,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If failed. */ + @Test public void testNullMessages() throws Exception { assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -1024,6 +1038,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser /** * @throws Exception If failed. */ + @Test public void testAsyncOld() throws Exception { final AtomicInteger msgCnt = new AtomicInteger(); @@ -1136,6 +1151,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser /** * @throws Exception If failed. */ + @Test public void testAsync() throws Exception { final AtomicInteger msgCnt = new AtomicInteger(); @@ -1212,6 +1228,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser * * @throws Exception If an error occurred. */ + @Test public void testRemoteListenForOldest() throws Exception { remoteListenForOldest(ignite1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java index d51a5dd..e8f03ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java @@ -37,10 +37,14 @@ 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.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest implements Serializable { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -75,6 +79,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme * * @throws Exception If failed. */ + @Test public void testSendDefaultMode() throws Exception { Ignite ignite1 = startGrid(1); @@ -91,6 +96,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme * * @throws Exception If failed. */ + @Test public void testSendAsyncMode() throws Exception { Ignite ignite1 = startGrid(1); @@ -107,6 +113,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme * * @throws Exception If failed. */ + @Test public void testSendDefaultMode2Nodes() throws Exception { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); @@ -124,6 +131,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme * * @throws Exception If failed. */ + @Test public void testSendAsyncMode2Node() throws Exception { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); @@ -141,6 +149,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme * * @throws Exception If failed. */ + @Test public void testSendOrderedDefaultMode() throws Exception { Ignite ignite1 = startGrid(1); @@ -159,6 +168,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme * * @throws Exception If failed. */ + @Test public void testSendOrderedDefaultMode2Node() throws Exception { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); @@ -176,6 +186,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme /** * @throws Exception If failed. */ + @Test public void testSendOrderedDefaultModeMultiThreads() throws Exception { Ignite ignite = startGrid(1); @@ -185,6 +196,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme /** * @throws Exception If failed. */ + @Test public void testSendOrderedDefaultModeMultiThreadsWith2Node() throws Exception { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java index b96728f..4e800cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java @@ -36,10 +36,14 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; 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; /** * */ +@RunWith(JUnit4.class) public class IgniteMessagingWithClientTest extends GridCommonAbstractTest implements Serializable { /** */ protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -77,6 +81,7 @@ public class IgniteMessagingWithClientTest extends GridCommonAbstractTest implem /** * @throws Exception If failed. */ + @Test public void testMessageSendWithClientJoin() throws Exception { startGrid(0); @@ -162,4 +167,4 @@ public class IgniteMessagingWithClientTest extends GridCommonAbstractTest implem return 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/p2p/DeploymentClassLoaderCallableTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/DeploymentClassLoaderCallableTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/DeploymentClassLoaderCallableTest.java index 9c0e446..ca75752 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/DeploymentClassLoaderCallableTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/DeploymentClassLoaderCallableTest.java @@ -25,9 +25,13 @@ import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.testframework.GridTestExternalClassLoader; import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** */ +@RunWith(JUnit4.class) public class DeploymentClassLoaderCallableTest extends GridCommonAbstractTest { /** */ private static final String RUN_CLS = "org.apache.ignite.tests.p2p.compute.ExternalCallable"; @@ -47,6 +51,7 @@ public class DeploymentClassLoaderCallableTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testDeploymentFromSecondAndThird() throws Exception { try { startGrid(1); @@ -67,6 +72,7 @@ public class DeploymentClassLoaderCallableTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testDeploymentFromEach() throws Exception { try { final Ignite ignite1 = startGrid(1); @@ -87,6 +93,7 @@ public class DeploymentClassLoaderCallableTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testDeploymentFromOne() throws Exception { try { startGrid(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployContinuousModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployContinuousModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployContinuousModeSelfTest.java index 865fff4..a7b035f 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployContinuousModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployContinuousModeSelfTest.java @@ -18,6 +18,9 @@ package org.apache.ignite.p2p; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; @@ -25,13 +28,15 @@ import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; * Continuous deployment mode test. */ @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridMultinodeRedeployContinuousModeSelfTest extends GridAbstractMultinodeRedeployTest { /** * Test GridDeploymentMode.CONTINUOUS mode. * * @throws Throwable if error occur. */ + @Test public void testContinuousMode() throws Throwable { processTest(CONTINUOUS); } -} \ 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/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java index 25cb8af..cfcc055 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java @@ -18,6 +18,9 @@ package org.apache.ignite.p2p; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.configuration.DeploymentMode.ISOLATED; @@ -25,13 +28,15 @@ import static org.apache.ignite.configuration.DeploymentMode.ISOLATED; * Isolated deployment mode test. */ @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridMultinodeRedeployIsolatedModeSelfTest extends GridAbstractMultinodeRedeployTest { /** * Test GridDeploymentMode.ISOLATED mode. * * @throws Throwable if error occur. */ + @Test public void testIsolatedMode() throws Throwable { processTest(ISOLATED); } -} \ 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/p2p/GridMultinodeRedeployPrivateModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployPrivateModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployPrivateModeSelfTest.java index 708e62d..bad6f5b 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployPrivateModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeployPrivateModeSelfTest.java @@ -18,6 +18,9 @@ package org.apache.ignite.p2p; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.configuration.DeploymentMode.PRIVATE; @@ -25,13 +28,15 @@ import static org.apache.ignite.configuration.DeploymentMode.PRIVATE; * Private deployment mode test. */ @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridMultinodeRedeployPrivateModeSelfTest extends GridAbstractMultinodeRedeployTest { /** * Test GridDeploymentMode.PRIVATE mode. * * @throws Throwable if error occur. */ + @Test public void testPrivateMode() throws Throwable { processTest(PRIVATE); } -} \ 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/p2p/GridMultinodeRedeploySharedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeploySharedModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeploySharedModeSelfTest.java index 93df50b..ade643f 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeploySharedModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridMultinodeRedeploySharedModeSelfTest.java @@ -18,6 +18,9 @@ package org.apache.ignite.p2p; import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.configuration.DeploymentMode.SHARED; @@ -25,13 +28,15 @@ import static org.apache.ignite.configuration.DeploymentMode.SHARED; * Shared deployment mode test. */ @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridMultinodeRedeploySharedModeSelfTest extends GridAbstractMultinodeRedeployTest { /** * Test GridDeploymentMode.SHARED mode. * * @throws Throwable if error occur. */ + @Test public void testSharedMode() throws Throwable { processTest(SHARED); } -} \ 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/p2p/GridP2PClassLoadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PClassLoadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PClassLoadingSelfTest.java index 1e93587..8f2aa7e 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PClassLoadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PClassLoadingSelfTest.java @@ -35,6 +35,9 @@ import org.apache.ignite.testframework.GridTestClassLoader; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.lang.IgniteProductVersion.fromString; @@ -42,6 +45,7 @@ import static org.apache.ignite.lang.IgniteProductVersion.fromString; * P2P test. */ @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PClassLoadingSelfTest extends GridCommonAbstractTest { /** */ private final ClassLoader tstClsLdr; @@ -61,6 +65,7 @@ public class GridP2PClassLoadingSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings({"ConstantConditions"}) + @Test public void testClassLoading() throws Exception { ComputeTask<?, ?> task = (ComputeTask<?, ?>)tstClsLdr.loadClass(GridP2PTestTask.class.getName()).newInstance(); @@ -159,4 +164,4 @@ public class GridP2PClassLoadingSelfTest extends GridCommonAbstractTest { return id().hashCode(); } } -} \ 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/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java index 28dab3f..c53cbf7 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -29,6 +29,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.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -38,6 +41,7 @@ import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; /** * Tests for continuous deployment with cache and changing topology. */ +@RunWith(JUnit4.class) public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -114,6 +118,7 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest * @throws Exception If failed. */ @SuppressWarnings("unchecked") + @Test public void testDeployment() throws Exception { startGridsMultiThreaded(GRID_CNT); @@ -139,6 +144,7 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testServerJoinWithP2PClassDeployedInCluster() throws Exception { startGrids(GRID_CNT); @@ -176,4 +182,4 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest awaitPartitionMapExchange(); } -} \ 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/p2p/GridP2PDifferentClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java index bf32060..f73991c 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java @@ -27,12 +27,16 @@ import org.apache.ignite.testframework.GridTestExternalClassLoader; import org.apache.ignite.testframework.config.GridTestProperties; 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; /** * Test P2P deployment tasks which loaded from different class loaders. */ @SuppressWarnings({"ProhibitedExceptionDeclared", "ProhibitedExceptionThrown"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest { /** * Class Name of task 1. @@ -125,6 +129,7 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest * * @throws Exception if error occur. */ + @Test public void testPrivateMode() throws Exception { depMode = DeploymentMode.PRIVATE; @@ -136,6 +141,7 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest * * @throws Exception if error occur. */ + @Test public void testIsolatedMode() throws Exception { depMode = DeploymentMode.ISOLATED; @@ -147,6 +153,7 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest * * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { depMode = DeploymentMode.CONTINUOUS; @@ -158,6 +165,7 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest * * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { depMode = DeploymentMode.SHARED; @@ -169,6 +177,7 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest * * @throws Exception if error occur. */ + @Test public void testRedeployPrivateMode() throws Exception { depMode = DeploymentMode.PRIVATE; @@ -180,6 +189,7 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest * * @throws Exception if error occur. */ + @Test public void testRedeployIsolatedMode() throws Exception { depMode = DeploymentMode.ISOLATED; @@ -191,6 +201,7 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest * * @throws Exception if error occur. */ + @Test public void testRedeployContinuousMode() throws Exception { depMode = DeploymentMode.CONTINUOUS; @@ -202,6 +213,7 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest * * @throws Exception if error occur. */ + @Test public void testRedeploySharedMode() throws Exception { depMode = DeploymentMode.SHARED; @@ -221,4 +233,4 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest return m1[0] != m2[0] && m1[1] != m2[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/p2p/GridP2PDoubleDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java index f384090..4358f02 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java @@ -28,12 +28,16 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestClassLoader; 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; /** * */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { /** Deployment mode. */ private DeploymentMode depMode; @@ -114,6 +118,7 @@ public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { /** * @throws Exception if error occur. */ + @Test public void testPrivateMode() throws Exception { processTestBothNodesDeploy(DeploymentMode.PRIVATE); } @@ -121,6 +126,7 @@ public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { /** * @throws Exception if error occur. */ + @Test public void testIsolatedMode() throws Exception { processTestBothNodesDeploy(DeploymentMode.ISOLATED); } @@ -128,6 +134,7 @@ public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { /** * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { processTestBothNodesDeploy(DeploymentMode.CONTINUOUS); } @@ -135,7 +142,8 @@ public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { /** * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { processTestBothNodesDeploy(DeploymentMode.SHARED); } -} \ 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/p2p/GridP2PHotRedeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java index 6b06d43..4127449 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java @@ -24,12 +24,16 @@ import org.apache.ignite.configuration.DeploymentMode; import org.apache.ignite.configuration.IgniteConfiguration; 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; /** * */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { /** Task name. */ private static final String TASK_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; @@ -164,6 +168,7 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSameClassLoaderIsolatedMode() throws Exception { processTestHotRedeployment(DeploymentMode.PRIVATE); } @@ -173,6 +178,7 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSameClassLoaderIsolatedClassLoaderMode() throws Exception { processTestHotRedeployment(DeploymentMode.ISOLATED); } @@ -182,6 +188,7 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSameClassLoaderContinuousMode() throws Exception { processTestHotRedeployment(DeploymentMode.CONTINUOUS); } @@ -191,6 +198,7 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSameClassLoaderSharedMode() throws Exception { processTestHotRedeployment(DeploymentMode.SHARED); } @@ -200,6 +208,7 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testNewClassLoaderHotRedeploymentPrivateMode() throws Exception { processTestClassLoaderHotRedeployment(DeploymentMode.PRIVATE); } @@ -209,6 +218,7 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testNewClassLoaderHotRedeploymentIsolatedMode() throws Exception { processTestClassLoaderHotRedeployment(DeploymentMode.ISOLATED); } @@ -218,6 +228,7 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testNewClassLoaderHotRedeploymentContinuousMode() throws Exception { processTestClassLoaderHotRedeployment(DeploymentMode.CONTINUOUS); } @@ -227,7 +238,8 @@ public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testNewClassLoaderHotRedeploymentSharedMode() throws Exception { processTestClassLoaderHotRedeployment(DeploymentMode.SHARED); } -} \ 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/p2p/GridP2PJobClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java index 0120a31..431fb0d 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PJobClassLoaderSelfTest.java @@ -30,12 +30,16 @@ import org.apache.ignite.configuration.DeploymentMode; import org.apache.ignite.configuration.IgniteConfiguration; 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; /** * Test to make sure that if job executes on the same node, it reuses the same class loader as task. */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PJobClassLoaderSelfTest extends GridCommonAbstractTest { /** * Current deployment mode. Used in {@link #getConfiguration(String)}. @@ -74,6 +78,7 @@ public class GridP2PJobClassLoaderSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testPrivateMode() throws Exception { processTest(DeploymentMode.PRIVATE); } @@ -83,6 +88,7 @@ public class GridP2PJobClassLoaderSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testIsolatedMode() throws Exception { processTest(DeploymentMode.ISOLATED); } @@ -92,6 +98,7 @@ public class GridP2PJobClassLoaderSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { processTest(DeploymentMode.CONTINUOUS); } @@ -101,6 +108,7 @@ public class GridP2PJobClassLoaderSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { processTest(DeploymentMode.SHARED); } @@ -144,4 +152,4 @@ public class GridP2PJobClassLoaderSelfTest 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/p2p/GridP2PLocalDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java index ca2aeb6..a33d16f 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java @@ -43,6 +43,9 @@ import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.testframework.config.GridTestProperties; 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; import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_REMOVED_ENTRIES_TTL; import static org.apache.ignite.spi.deployment.local.LocalDeploymentSpi.IGNITE_DEPLOYMENT_ADDITIONAL_CHECK; @@ -52,6 +55,7 @@ import static org.apache.ignite.spi.deployment.local.LocalDeploymentSpi.IGNITE_D */ @SuppressWarnings({"ProhibitedExceptionDeclared", "ObjectEquality"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { /** * Current deployment mode. Used in {@link #getConfiguration(String)}. @@ -105,6 +109,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { * @throws Exception if error occur. */ @SuppressWarnings({"unchecked"}) + @Test public void testLocalDeployment() throws Exception { depMode = DeploymentMode.PRIVATE; @@ -182,6 +187,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testPrivateMode() throws Exception { processIsolatedModeTest(DeploymentMode.PRIVATE); } @@ -191,6 +197,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testIsolatedMode() throws Exception { processIsolatedModeTest(DeploymentMode.ISOLATED); } @@ -200,6 +207,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { processSharedModeTest(DeploymentMode.CONTINUOUS); } @@ -209,6 +217,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { processSharedModeTest(DeploymentMode.SHARED); } @@ -216,6 +225,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { /** * Tests concurrent deployment using delegating classloader for the task. */ + @Test public void testConcurrentDeploymentWithDelegatingClassloader() throws Exception { depMode = DeploymentMode.SHARED; @@ -368,4 +378,4 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { } } } -} \ 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/p2p/GridP2PMissedResourceCacheSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java index a00fbdb..3e87c42 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java @@ -33,11 +33,15 @@ import org.apache.ignite.testframework.GridTestExternalClassLoader; import org.apache.ignite.testframework.config.GridTestProperties; 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 = "P2P") +@RunWith(JUnit4.class) public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTest { /** Task name. */ private static final String TASK_NAME1 = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; @@ -227,6 +231,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * * @throws Exception if error occur. */ + @Test public void testSize0PrivateMode() throws Exception { processSize0Test(DeploymentMode.PRIVATE); } @@ -236,6 +241,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * * @throws Exception if error occur. */ + @Test public void testSize0IsolatedMode() throws Exception { processSize0Test(DeploymentMode.ISOLATED); } @@ -245,6 +251,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * * @throws Exception if error occur. */ + @Test public void testSize0ContinuousMode() throws Exception { processSize0Test(DeploymentMode.CONTINUOUS); } @@ -254,6 +261,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * * @throws Exception if error occur. */ + @Test public void testSize0SharedMode() throws Exception { processSize0Test(DeploymentMode.SHARED); } @@ -262,6 +270,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * * @throws Exception if error occur. */ + @Test public void testSize2PrivateMode() throws Exception { // processSize2Test(GridDeploymentMode.PRIVATE); } @@ -271,6 +280,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * * @throws Exception if error occur. */ + @Test public void testSize2IsolatedMode() throws Exception { // processSize2Test(GridDeploymentMode.ISOLATED); } @@ -280,6 +290,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * * @throws Exception if error occur. */ + @Test public void testSize2ContinuousMode() throws Exception { // processSize2Test(GridDeploymentMode.CONTINUOUS); } @@ -289,7 +300,8 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * * @throws Exception if error occur. */ + @Test public void testSize2SharedMode() throws Exception { // processSize2Test(GridDeploymentMode.SHARED); } -} \ 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/p2p/GridP2PNodeLeftSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java index bc0d787..3735cc0 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java @@ -26,12 +26,16 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.testframework.config.GridTestProperties; 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; /** * Test P2P class loading in SHARED_CLASSLOADER_UNDEPLOY mode. */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PNodeLeftSelfTest extends GridCommonAbstractTest { /** */ private static final ClassLoader urlClsLdr1; @@ -105,6 +109,7 @@ public class GridP2PNodeLeftSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { depMode = DeploymentMode.CONTINUOUS; @@ -116,9 +121,10 @@ public class GridP2PNodeLeftSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { depMode = DeploymentMode.SHARED; processTest(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/p2p/GridP2PRecursionTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java index a35409d..879e6fd 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java @@ -32,12 +32,16 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.resources.IgniteInstanceResource; 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; /** * */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PRecursionTaskSelfTest extends GridCommonAbstractTest { /** * Current deployment mode. Used in {@link #getConfiguration(String)}. @@ -85,6 +89,7 @@ public class GridP2PRecursionTaskSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testPrivateMode() throws Exception { processTest(DeploymentMode.PRIVATE); } @@ -94,6 +99,7 @@ public class GridP2PRecursionTaskSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testIsolatedMode() throws Exception { processTest(DeploymentMode.ISOLATED); } @@ -103,6 +109,7 @@ public class GridP2PRecursionTaskSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { processTest(DeploymentMode.CONTINUOUS); } @@ -112,6 +119,7 @@ public class GridP2PRecursionTaskSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { processTest(DeploymentMode.SHARED); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java index 623c962..f761e25 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java @@ -37,12 +37,16 @@ import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.testframework.GridTestClassLoader; 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; /** * */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { /** Current deployment mode. Used in {@link #getConfiguration(String)}. */ private DeploymentMode depMode; @@ -178,6 +182,7 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSameClassLoaderPrivateMode() throws Exception { processTestSameRemoteClassLoader(DeploymentMode.PRIVATE); } @@ -187,6 +192,7 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSameClassLoaderIsolatedMode() throws Exception { processTestSameRemoteClassLoader(DeploymentMode.ISOLATED); } @@ -196,6 +202,7 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testDifferentClassLoaderPrivateMode() throws Exception { processTestDifferentRemoteClassLoader(DeploymentMode.PRIVATE); } @@ -205,6 +212,7 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testDifferentClassLoaderIsolatedMode() throws Exception { processTestDifferentRemoteClassLoader(DeploymentMode.ISOLATED); } @@ -289,4 +297,4 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { public static class GridP2PRemoteTestTask1 extends GridP2PRemoteTestTask { // No-op. } -} \ 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/p2p/GridP2PSameClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java index d2878e0..1b54c81 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java @@ -31,12 +31,16 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.config.GridTestProperties; 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; /** * Test P2P deployment tasks which loaded from different class loaders. */ @SuppressWarnings({"ProhibitedExceptionDeclared", "ProhibitedExceptionThrown"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest { /** Class Name of task 1. */ private static final String TEST_TASK1_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; @@ -123,6 +127,7 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testPrivateMode() throws Exception { depMode = DeploymentMode.PRIVATE; @@ -134,6 +139,7 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testIsolatedMode() throws Exception { depMode = DeploymentMode.ISOLATED; @@ -145,6 +151,7 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { depMode = DeploymentMode.CONTINUOUS; @@ -156,6 +163,7 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { depMode = DeploymentMode.SHARED; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTaskExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTaskExecutionTest.java index 93c2a79..97f7e6b 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTaskExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTaskExecutionTest.java @@ -23,15 +23,21 @@ import org.apache.ignite.compute.ComputeTaskFuture; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + /** * Test executes GridP2PTestTask on the remote node. * Before running of test you MUST start at least one remote node. */ +@RunWith(JUnit4.class) public final class GridP2PTestTaskExecutionTest extends GridCommonAbstractTest { /** * Method executes GridP2PTestTask. * @throws IgniteCheckedException If failed. */ + @Test public void testGridP2PTestTask() throws IgniteCheckedException { try (Ignite g = G.start()) { assert g != null; @@ -49,4 +55,4 @@ public final class GridP2PTestTaskExecutionTest extends GridCommonAbstractTest { assert res > 0 : "Result of execution is: " + res + " for more information see GridP2PTestJob"; } } -} \ 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/p2p/GridP2PTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java index 56aab0e..0cd4e7b 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java @@ -28,12 +28,16 @@ import org.apache.ignite.testframework.GridTestExternalClassLoader; import org.apache.ignite.testframework.config.GridTestProperties; 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; /** * */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { /** Current deployment mode. Used in {@link #getConfiguration(String)}. */ private DeploymentMode depMode; @@ -138,6 +142,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testPrivateMode() throws Exception { processTest(DeploymentMode.PRIVATE); } @@ -147,6 +152,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testIsolatedMode() throws Exception { processTest(DeploymentMode.ISOLATED); } @@ -156,6 +162,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { processTest(DeploymentMode.CONTINUOUS); } @@ -165,6 +172,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { processTest(DeploymentMode.SHARED); } @@ -174,6 +182,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testFilterPrivateMode() throws Exception { processFilterTest(DeploymentMode.PRIVATE); } @@ -183,6 +192,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testFilterIsolatedMode() throws Exception { processFilterTest(DeploymentMode.ISOLATED); } @@ -192,6 +202,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testFilterContinuousMode() throws Exception { processFilterTest(DeploymentMode.CONTINUOUS); } @@ -201,7 +212,8 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testFilterSharedMode() throws Exception { processFilterTest(DeploymentMode.SHARED); } -} \ 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/p2p/GridP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java index 4eae064..42eae7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java @@ -31,12 +31,16 @@ import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.IgniteTestResources; 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; /** * */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) @GridCommonTest(group = "P2P") +@RunWith(JUnit4.class) public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { /** Current deployment mode. Used in {@link #getConfiguration(String)}. */ private DeploymentMode depMode; @@ -171,6 +175,7 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testUndeployLocalPrivateMode() throws Exception { processTestUndeployLocalTasks(DeploymentMode.PRIVATE); } @@ -180,6 +185,7 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testUndeployLocalIsolatedMode() throws Exception { processTestUndeployLocalTasks(DeploymentMode.ISOLATED); } @@ -189,6 +195,7 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testUndeployLocalContinuousMode() throws Exception { processTestUndeployLocalTasks(DeploymentMode.CONTINUOUS); } @@ -198,6 +205,7 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testUndeployLocalSharedMode() throws Exception { processTestUndeployLocalTasks(DeploymentMode.SHARED); } @@ -207,6 +215,7 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testUndeployP2PPrivateMode() throws Exception { processTestUndeployP2PTasks(DeploymentMode.PRIVATE); } @@ -216,6 +225,7 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testUndeployP2PIsolatedMode() throws Exception { processTestUndeployP2PTasks(DeploymentMode.ISOLATED); } @@ -225,6 +235,7 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testUndeployP2PContinuousMode() throws Exception { processTestUndeployP2PTasks(DeploymentMode.CONTINUOUS); } @@ -234,7 +245,8 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testUndeployP2PSharedMode() throws Exception { processTestUndeployP2PTasks(DeploymentMode.SHARED); } -} \ 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/p2p/P2PScanQueryUndeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/P2PScanQueryUndeployTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/P2PScanQueryUndeployTest.java index 73ce917..b16fa98 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/P2PScanQueryUndeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/P2PScanQueryUndeployTest.java @@ -44,8 +44,12 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestExternalClassLoader; import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** */ +@RunWith(JUnit4.class) public class P2PScanQueryUndeployTest extends GridCommonAbstractTest { /** Predicate classname. */ private static final String PREDICATE_CLASSNAME = "org.apache.ignite.tests.p2p.AlwaysTruePredicate"; @@ -108,6 +112,7 @@ public class P2PScanQueryUndeployTest extends GridCommonAbstractTest { * * @throws Exception if test failed. */ + @Test public void testAfterClientDisconnect() throws Exception { ClassLoader extClsLdr = new GridTestExternalClassLoader(new URL[] {new URL(GridTestProperties.getProperty("p2p.uri.cls"))}); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/p2p/P2PStreamingClassLoaderTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/P2PStreamingClassLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/P2PStreamingClassLoaderTest.java index a541813..cc38f04 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/P2PStreamingClassLoaderTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/P2PStreamingClassLoaderTest.java @@ -27,9 +27,13 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.stream.StreamTransformer; 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 = "P2P") +@RunWith(JUnit4.class) public class P2PStreamingClassLoaderTest extends GridCommonAbstractTest { /** */ private static final String ENTRY_PROCESSOR_CLASS_NAME = "org.apache.ignite.tests.p2p.NoopCacheEntryProcessor"; @@ -91,6 +95,7 @@ public class P2PStreamingClassLoaderTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testPrivateMode() throws Exception { depMode = DeploymentMode.PRIVATE; @@ -102,6 +107,7 @@ public class P2PStreamingClassLoaderTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testContinuousMode() throws Exception { depMode = DeploymentMode.CONTINUOUS; @@ -113,6 +119,7 @@ public class P2PStreamingClassLoaderTest extends GridCommonAbstractTest { * * @throws Exception if error occur. */ + @Test public void testSharedMode() throws Exception { depMode = DeploymentMode.SHARED; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java index cc0340e..e35468a 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java @@ -27,9 +27,13 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import java.lang.reflect.Constructor; import java.net.URL; import java.util.Collection; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** */ +@RunWith(JUnit4.class) public class SharedDeploymentTest extends GridCommonAbstractTest { /** */ private static final String RUN_CLS = "org.apache.ignite.tests.p2p.compute.ExternalCallable"; @@ -50,6 +54,7 @@ public class SharedDeploymentTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testDeploymentFromSecondAndThird() throws Exception { try { startGrid(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/platform/PlatformDefaultJavaObjectFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformDefaultJavaObjectFactorySelfTest.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformDefaultJavaObjectFactorySelfTest.java index ad935df..851c482 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformDefaultJavaObjectFactorySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformDefaultJavaObjectFactorySelfTest.java @@ -29,10 +29,14 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.concurrent.Callable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Dedicated tests for {@link PlatformDefaultJavaObjectFactory}. */ +@RunWith(JUnit4.class) public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstractTest { /** Name of the class. */ private static final String CLS_NAME = TestJavaObject.class.getName(); @@ -43,6 +47,7 @@ public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstract /** * Test normal object creation. */ + @Test public void testNormal() { final PlatformDefaultJavaObjectFactory factory = new PlatformDefaultJavaObjectFactory(); @@ -76,6 +81,7 @@ public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstract /** * Test object creation with boxed property. */ + @Test public void testBoxedProperty() { final PlatformDefaultJavaObjectFactory factory = new PlatformDefaultJavaObjectFactory(); @@ -89,6 +95,7 @@ public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstract /** * Test object creation without properties. */ + @Test public void testNoProperties() { final PlatformDefaultJavaObjectFactory factory = new PlatformDefaultJavaObjectFactory(); @@ -102,6 +109,7 @@ public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstract /** * Test object creation with invalid property name. */ + @Test public void testInvalidPropertyName() { final PlatformDefaultJavaObjectFactory factory = new PlatformDefaultJavaObjectFactory(); @@ -117,6 +125,7 @@ public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstract /** * Test object creation with invalid property value. */ + @Test public void testInvalidPropertyValue() { final PlatformDefaultJavaObjectFactory factory = new PlatformDefaultJavaObjectFactory(); @@ -132,6 +141,7 @@ public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstract /** * Test object creation without default constructor. */ + @Test public void testNoDefaultConstructor() { final PlatformDefaultJavaObjectFactory factory = new PlatformDefaultJavaObjectFactory(); @@ -147,6 +157,7 @@ public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstract /** * Test object creation with null class name. */ + @Test public void testNullClassName() { final PlatformDefaultJavaObjectFactory factory = new PlatformDefaultJavaObjectFactory(); @@ -170,6 +181,7 @@ public class PlatformDefaultJavaObjectFactorySelfTest extends GridCommonAbstract /** * Test object creation with invalid class name. */ + @Test public void testInvalidClassName() { final PlatformDefaultJavaObjectFactory factory = new PlatformDefaultJavaObjectFactory(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java index 5153d49..38ad669 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformJavaObjectFactoryProxySelfTest.java @@ -33,10 +33,14 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.concurrent.Callable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Dedicated tests for {@link PlatformJavaObjectFactoryProxy}. */ +@RunWith(JUnit4.class) public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTest { /** Name of the class. */ private static final String CLS_NAME = TestJavaObject.class.getName(); @@ -63,6 +67,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe /** * Test normal object creation using default factory. */ + @Test public void testDefaultFactoryNormal() { Map<String, Object> props = new HashMap<>(); @@ -95,6 +100,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe /** * Test normal object creation using custom factory. */ + @Test public void testCustomFactoryNormal() { Map<String, Object> props = new HashMap<>(); @@ -129,6 +135,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe /** * Test object creation with boxed property. */ + @Test public void testCustomFactoryBoxedProperty() { PlatformJavaObjectFactoryProxy proxy = proxyForCustom(NO_DFLT_CTOR_FACTORY_CLS_NAME, Collections.singletonMap("fIntBoxed", (Object)1)); @@ -141,6 +148,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe /** * Test object creation without properties. */ + @Test public void testCustomFactoryNoProperties() { PlatformJavaObjectFactoryProxy proxy = proxyForCustom(NO_DFLT_CTOR_FACTORY_CLS_NAME, Collections.<String, Object>emptyMap()); @@ -153,6 +161,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe /** * Test object creation with invalid property name. */ + @Test public void testCustomFactoryInvalidPropertyName() { final PlatformJavaObjectFactoryProxy proxy = proxyForCustom(NO_DFLT_CTOR_FACTORY_CLS_NAME, Collections.singletonMap("invalid", (Object)1)); @@ -167,6 +176,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe /** * Test object creation with invalid property value. */ + @Test public void testCustomFactoryInvalidPropertyValue() { final PlatformJavaObjectFactoryProxy proxy = proxyForCustom(NO_DFLT_CTOR_FACTORY_CLS_NAME, Collections.singletonMap("fInt", (Object)1L)); @@ -181,6 +191,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe /** * Test object creation with null class name. */ + @Test public void testCustomFactoryNullClassName() { GridTestUtils.assertThrows(null, new Callable<Object>() { @Override public Object call() throws Exception { @@ -198,6 +209,7 @@ public class PlatformJavaObjectFactoryProxySelfTest extends GridCommonAbstractTe /** * Test object creation with invalid class name. */ + @Test public void testCustomFactoryInvalidClassName() { GridTestUtils.assertThrows(null, new Callable<Object>() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java index bf37ae5..f6dd039 100644 --- a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java +++ b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java @@ -25,6 +25,9 @@ import java.util.concurrent.Callable; import org.apache.ignite.IgniteException; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.plugin.security.SecurityPermission.ADMIN_VIEW; import static org.apache.ignite.plugin.security.SecurityPermission.CACHE_CREATE; @@ -43,10 +46,12 @@ import static org.apache.ignite.testframework.GridTestUtils.assertThrows; /** * Test for check correct work {@link SecurityPermissionSetBuilder permission builder} */ +@RunWith(JUnit4.class) public class SecurityPermissionSetBuilderTest extends GridCommonAbstractTest { /** */ @SuppressWarnings({"ThrowableNotThrown"}) + @Test public void testPermissionBuilder() { SecurityBasicPermissionSet exp = new SecurityBasicPermissionSet(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/services/ServiceThreadPoolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/services/ServiceThreadPoolSelfTest.java b/modules/core/src/test/java/org/apache/ignite/services/ServiceThreadPoolSelfTest.java index 40efdfa..a54865c 100644 --- a/modules/core/src/test/java/org/apache/ignite/services/ServiceThreadPoolSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/services/ServiceThreadPoolSelfTest.java @@ -24,10 +24,14 @@ 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; /** * Test verifying that services thread pool is properly used. */ +@RunWith(JUnit4.class) public class ServiceThreadPoolSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -49,6 +53,7 @@ public class ServiceThreadPoolSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDefaultPoolSize() throws Exception { Ignite ignite = startGrid("grid", new IgniteConfiguration()); @@ -61,6 +66,7 @@ public class ServiceThreadPoolSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testInheritedPoolSize() throws Exception { Ignite ignite = startGrid("grid", new IgniteConfiguration().setPublicThreadPoolSize(42)); @@ -73,6 +79,7 @@ public class ServiceThreadPoolSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCustomPoolSize() throws Exception { Ignite ignite = startGrid("grid", new IgniteConfiguration().setServiceThreadPoolSize(42)); @@ -85,6 +92,7 @@ public class ServiceThreadPoolSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecution() throws Exception { startGrid(0); // Server. http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java index 21bd113..a613482 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.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; /** * Test of session siblings cancellation from future. */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstractTest { /** */ private static final int WAIT_TIME = 20000; @@ -94,6 +98,7 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr /** * @throws Exception if failed */ + @Test public void testCancelSiblings() throws Exception { refreshInitialData(); @@ -104,6 +109,7 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr /** * @throws Exception if failed */ + @Test public void testMultiThreaded() throws Exception { refreshInitialData(); @@ -283,4 +289,4 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr return "interrupt-task-data"; } } -} \ 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/GridSessionCancelSiblingsFromJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java index b68081f..1860042 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java @@ -49,11 +49,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; /** * Session cancellation tests. */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstractTest { /** */ private static final int WAIT_TIME = 20000; @@ -96,6 +100,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ + @Test public void testCancelSiblings() throws Exception { refreshInitialData(); @@ -106,6 +111,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ + @Test public void testMultiThreaded() throws Exception { refreshInitialData(); @@ -295,4 +301,4 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract return "interrupt-task-data"; } } -} \ 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/GridSessionCancelSiblingsFromTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java index b3cf556..b8868a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java @@ -47,11 +47,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; /** * Session cancellation tests. */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstractTest { /** */ private static final int WAIT_TIME = 20000; @@ -94,6 +98,7 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testCancelSiblings() throws Exception { refreshInitialData(); @@ -104,6 +109,7 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testMultiThreaded() throws Exception { refreshInitialData(); @@ -299,4 +305,4 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac return "interrupt-task-data"; } } -} \ 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/GridSessionCheckpointSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java index a3df301..1ac3e3e 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java @@ -31,15 +31,20 @@ import org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi; import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi; import org.apache.ignite.testframework.junits.common.GridCommonTest; import org.hsqldb.jdbc.jdbcDataSource; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid session checkpoint self test. */ @GridCommonTest(group = "Task Session") +@RunWith(JUnit4.class) public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testSharedFsCheckpoint() throws Exception { IgniteConfiguration cfg = getConfiguration(); @@ -51,6 +56,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract /** * @throws Exception If failed. */ + @Test public void testJdbcCheckpoint() throws Exception { IgniteConfiguration cfg = getConfiguration(); @@ -79,6 +85,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract /** * @throws Exception If failed. */ + @Test public void testCacheCheckpoint() throws Exception { IgniteConfiguration cfg = getConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java index 1b111a0..010d866 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java @@ -40,10 +40,14 @@ import org.apache.ignite.spi.collision.CollisionContext; import org.apache.ignite.spi.collision.CollisionJobContext; import org.apache.ignite.spi.collision.fifoqueue.FifoQueueCollisionSpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid session collision SPI self test. */ +@RunWith(JUnit4.class) public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { /** * Constructs a test. @@ -64,6 +68,7 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCollisionSessionAttribute() throws Exception { Ignite ignite = G.ignite(getTestIgniteInstanceName()); @@ -151,4 +156,4 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { } } } -} \ No newline at end of file +}
