http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java index 9564a18..d2e78c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java @@ -21,16 +21,21 @@ import org.apache.ignite.igfs.IgfsInputStream; import org.apache.ignite.igfs.mapreduce.IgfsFileRange; import org.apache.ignite.igfs.mapreduce.records.IgfsByteDelimiterRecordResolver; import org.apache.ignite.internal.util.typedef.F; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Byte delimiter split resolver self test. */ +@RunWith(JUnit4.class) public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordResolverSelfTest { /** * Test split resolution when there are no delimiters in the file. * * @throws Exception If failed. */ + @Test public void testNoDelimiters() throws Exception { byte[] delim = wrap(2); byte[] data = array(F.t(wrap(1), 8)); @@ -47,6 +52,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR * * @throws Exception If failed. */ + @Test public void testHeadDelimiter() throws Exception { byte[] delim = array(F.t(wrap(2), 8)); byte[] data = array(F.t(delim, 1), F.t(wrap(1), 8)); @@ -73,6 +79,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR * * @throws Exception If failed. */ + @Test public void testEndDelimiter() throws Exception { byte[] delim = array(F.t(wrap(2), 8)); byte[] data = array(F.t(wrap(1), 8), F.t(delim, 1)); @@ -99,6 +106,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR * * @throws Exception If failed. */ + @Test public void testMiddleDelimiter() throws Exception { byte[] delim = array(F.t(wrap(2), 8)); byte[] data = array(F.t(wrap(1), 8), F.t(delim, 1), F.t(wrap(1), 8)); @@ -139,6 +147,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR * * @throws Exception If failed. */ + @Test public void testTwoHeadDelimiters() throws Exception { byte[] delim = array(F.t(wrap(2), 8)); byte[] data = array(F.t(delim, 2), F.t(wrap(1), 8)); @@ -179,6 +188,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR * * @throws Exception If failed. */ + @Test public void testTwoTailDelimiters() throws Exception { byte[] delim = array(F.t(wrap(2), 8)); byte[] data = array(F.t(wrap(1), 8), F.t(delim, 2)); @@ -219,6 +229,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR * * @throws Exception If failed. */ + @Test public void testHeadAndTailDelimiters() throws Exception { byte[] delim = array(F.t(wrap(2), 8)); byte[] data = array(F.t(delim, 1), F.t(wrap(1), 8), F.t(delim, 1)); @@ -259,6 +270,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR * * @throws Exception If failed. */ + @Test public void testDelimiterStartsWithTheSameBytesAsLastPreviousDataByte() throws Exception { byte[] delim = array(F.t(wrap(1, 1, 2), 1)); byte[] data = array(F.t(wrap(1), 1), F.t(delim, 1), F.t(wrap(1), 1)); @@ -332,4 +344,4 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR private IgfsByteDelimiterRecordResolver resolver(byte[]... delims) { return new IgfsByteDelimiterRecordResolver(delims); } -} \ 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/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java index d869d5c..6e07f85 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java @@ -21,16 +21,21 @@ import org.apache.ignite.igfs.IgfsInputStream; import org.apache.ignite.igfs.mapreduce.IgfsFileRange; import org.apache.ignite.igfs.mapreduce.records.IgfsFixedLengthRecordResolver; import org.apache.ignite.internal.util.typedef.F; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Fixed length split resolver self test. */ +@RunWith(JUnit4.class) public class IgfsFixedLengthRecordResolverSelfTest extends IgfsAbstractRecordResolverSelfTest { /** * Test split resolver. * * @throws Exception If failed. */ + @Test public void testResolver() throws Exception { byte[] data = array(F.t(wrap(1), 24)); @@ -144,4 +149,4 @@ public class IgfsFixedLengthRecordResolverSelfTest extends IgfsAbstractRecordRes private IgfsFixedLengthRecordResolver resolver(int len) { return new IgfsFixedLengthRecordResolver(len); } -} \ 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/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java index d005061..8ea1afa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java @@ -21,6 +21,9 @@ import org.apache.ignite.igfs.IgfsInputStream; import org.apache.ignite.igfs.mapreduce.IgfsFileRange; import org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver; import org.apache.ignite.internal.util.typedef.F; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver.SYM_CR; import static org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver.SYM_LF; @@ -28,12 +31,14 @@ import static org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver /** * New line split resolver self test. */ +@RunWith(JUnit4.class) public class IgfsNewLineDelimiterRecordResolverSelfTest extends IgfsAbstractRecordResolverSelfTest { /** * Test new line delimtier record resovler. * * @throws Exception If failed. */ + @Test public void test() throws Exception{ byte[] data = array(F.t(wrap(1), 8), F.t(wrap(SYM_LF), 1), F.t(wrap(1), 8), F.t(wrap(SYM_CR, SYM_LF), 1), F.t(wrap(1), 8)); @@ -127,4 +132,4 @@ public class IgfsNewLineDelimiterRecordResolverSelfTest extends IgfsAbstractReco private IgfsNewLineRecordResolver resolver() { return IgfsNewLineRecordResolver.NEW_LINE; } -} \ 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/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java index cc4c2db..6539e5b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java @@ -23,10 +23,14 @@ import org.apache.ignite.igfs.mapreduce.IgfsFileRange; import org.apache.ignite.igfs.mapreduce.records.IgfsByteDelimiterRecordResolver; import org.apache.ignite.igfs.mapreduce.records.IgfsStringDelimiterRecordResolver; import org.apache.ignite.internal.util.typedef.F; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * String delimiter split resolver self-test. */ +@RunWith(JUnit4.class) public class IgfsStringDelimiterRecordResolverSelfTest extends IgfsAbstractRecordResolverSelfTest { /** Charset used in tests. */ private static final Charset UTF8 = Charset.forName("UTF-8"); @@ -36,6 +40,7 @@ public class IgfsStringDelimiterRecordResolverSelfTest extends IgfsAbstractRecor * * @throws Exception If failed. */ + @Test public void testResolver() throws Exception { String delim = "aaaaaaaa"; @@ -134,4 +139,4 @@ public class IgfsStringDelimiterRecordResolverSelfTest extends IgfsAbstractRecor private IgfsStringDelimiterRecordResolver resolver(String... delims) { return new IgfsStringDelimiterRecordResolver(UTF8, delims); } -} \ 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/internal/processors/jobmetrics/GridJobMetricsProcessorLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessorLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessorLoadTest.java index c75f002..1fab235 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessorLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessorLoadTest.java @@ -21,10 +21,14 @@ import org.apache.ignite.internal.processors.resource.GridResourceProcessor; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.GridTestKernalContext; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Grid job metrics processor load test. */ +@RunWith(JUnit4.class) public class GridJobMetricsProcessorLoadTest extends GridCommonAbstractTest { /** */ private static final int THREADS_CNT = 10; @@ -55,6 +59,7 @@ public class GridJobMetricsProcessorLoadTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testJobMetricsMultiThreaded() throws Exception { GridTestUtils.runMultiThreaded(new Runnable() { @Override public void run() { @@ -86,4 +91,4 @@ public class GridJobMetricsProcessorLoadTest extends GridCommonAbstractTest { ctx.jobMetric().getJobMetrics(); } -} \ 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/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java index 33a8a73..339c9f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java @@ -27,10 +27,14 @@ import org.apache.ignite.Ignite; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.testframework.junits.IgniteConfigVariationsAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * The test checks process messaging. */ +@RunWith(JUnit4.class) public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVariationsAbstractTest { /** * Message topic. @@ -55,6 +59,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testLocalServer() throws Exception { runInAllDataModes(new TestRunnable() { @Override public void run() throws Exception { @@ -66,6 +71,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testLocalServerAsync() throws Exception { runInAllDataModes(new TestRunnable() { @Override public void run() throws Exception { @@ -77,6 +83,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testLocalListener() throws Exception { runInAllDataModes(new TestRunnable() { @Override public void run() throws Exception { @@ -88,6 +95,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testServerClientMessage() throws Exception { if (!testsCfg.withClients()) return; @@ -102,6 +110,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testServerClientMessageAsync() throws Exception { if (!testsCfg.withClients()) return; @@ -116,6 +125,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testClientClientMessage() throws Exception { if (!testsCfg.withClients()) return; @@ -130,6 +140,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testClientClientMessageAsync() throws Exception { if (!testsCfg.withClients()) return; @@ -144,6 +155,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testClientServerMessage() throws Exception { if (!testsCfg.withClients()) return; @@ -158,6 +170,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testClientServerMessageAsync() throws Exception { if (!testsCfg.withClients()) return; @@ -172,6 +185,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testCollectionMessage() throws Exception { runInAllDataModes(new TestRunnable() { @Override public void run() throws Exception { @@ -183,6 +197,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testOrderedMessage() throws Exception { runInAllDataModes(new TestRunnable() { @Override public void run() throws Exception { @@ -194,6 +209,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testClientServerOrderedMessage() throws Exception { if (!testsCfg.withClients()) return; @@ -208,6 +224,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testClientClientOrderedMessage() throws Exception { if (!testsCfg.withClients()) return; @@ -222,6 +239,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria /** * @throws Exception If failed. */ + @Test public void testServerClientOrderedMessage() throws Exception { if (!testsCfg.withClients()) return; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java index f7e9aca..6583ec4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java @@ -27,11 +27,15 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * ODBC configuration validation tests. */ @SuppressWarnings("deprecation") +@RunWith(JUnit4.class) public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest { /** Node index generator. */ private static final AtomicInteger NODE_IDX_GEN = new AtomicInteger(); @@ -46,6 +50,7 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testAddressDefault() throws Exception { check(new OdbcConfiguration(), true); } @@ -55,6 +60,7 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testAddressHostOnly() throws Exception { check(new OdbcConfiguration().setEndpointAddress("127.0.0.1"), true); } @@ -64,6 +70,7 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testAddressHostAndPort() throws Exception { check(new OdbcConfiguration().setEndpointAddress("127.0.0.1:9999"), true); @@ -76,6 +83,7 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testAddressHostAndPortRange() throws Exception { check(new OdbcConfiguration().setEndpointAddress("127.0.0.1:9999..10000"), true); check(new OdbcConfiguration().setEndpointAddress("127.0.0.1:9999..10000"), true); @@ -89,6 +97,7 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testAddressInvalidHost() throws Exception { check(new OdbcConfiguration().setEndpointAddress("126.0.0.1"), false); } @@ -98,6 +107,7 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testAddressInvalidFormat() throws Exception { check(new OdbcConfiguration().setEndpointAddress("127.0.0.1:"), false); @@ -121,6 +131,7 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testConnectionParams() throws Exception { check(new OdbcConfiguration().setEndpointAddress("127.0.0.1:9998..10000") .setSocketSendBufferSize(4 * 1024), true); @@ -140,6 +151,7 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest * * @throws Exception If failed. */ + @Test public void testThreadPoolSize() throws Exception { check(new OdbcConfiguration().setThreadPoolSize(0), false); check(new OdbcConfiguration().setThreadPoolSize(-1), false); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java index 6eed580..44c9e0c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcEscapeSequenceSelfTest.java @@ -23,14 +23,19 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import java.util.concurrent.Callable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Escape sequence parser tests. */ +@RunWith(JUnit4.class) public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test simple cases. */ + @Test public void testTrivial() { check( "select * from table;", @@ -41,6 +46,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequence series. */ + @Test public void testSimpleFunction() throws Exception { check( "test()", @@ -76,6 +82,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequence for explicit data type conversion */ + @Test public void testConvertFunction() throws Exception { check( "CONVERT ( CURDATE(), CHAR )", @@ -207,6 +214,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test simple nested escape sequences. Depth = 2. */ + @Test public void testNestedFunction() throws Exception { check( "func1(field1, func2(field2))", @@ -227,6 +235,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test nested escape sequences. Depth > 2. */ + @Test public void testDeepNestedFunction() { check( "func1(func2(func3(field1)))", @@ -252,6 +261,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test series of nested escape sequences. */ + @Test public void testNestedFunctionMixed() { check( "func1(func2(field1), func3(field2))", @@ -272,6 +282,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test invalid escape sequence. */ + @Test public void testFailedOnInvalidFunctionSequence() { checkFail("{fnfunc1()}"); @@ -283,6 +294,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequences with additional whitespace characters */ + @Test public void testFunctionEscapeSequenceWithWhitespaces() throws Exception { check("func1()", "{ fn func1()}"); @@ -296,6 +308,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test guid escape sequences */ + @Test public void testGuidEscapeSequence() { check( "CAST('12345678-9abc-def0-1234-123456789abc' AS UUID)", @@ -316,6 +329,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test invalid escape sequence. */ + @Test public void testFailedOnInvalidGuidSequence() { checkFail("select {guid'12345678-9abc-def0-1234-123456789abc'}"); @@ -341,6 +355,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequences with additional whitespace characters */ + @Test public void testGuidEscapeSequenceWithWhitespaces() throws Exception { check( "CAST('12345678-9abc-def0-1234-123456789abc' AS UUID)", @@ -361,6 +376,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test date escape sequences */ + @Test public void testDateEscapeSequence() throws Exception { check( "'2016-08-26'", @@ -381,6 +397,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test date escape sequences with additional whitespace characters */ + @Test public void testDateEscapeSequenceWithWhitespaces() throws Exception { check("'2016-08-26'", "{ d '2016-08-26'}"); @@ -392,6 +409,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test invalid escape sequence. */ + @Test public void testFailedOnInvalidDateSequence() { checkFail("{d'2016-08-26'}"); @@ -411,6 +429,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test date escape sequences */ + @Test public void testTimeEscapeSequence() throws Exception { check("'13:15:08'", "{t '13:15:08'}"); @@ -423,6 +442,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test date escape sequences with additional whitespace characters */ + @Test public void testTimeEscapeSequenceWithWhitespaces() throws Exception { check("'13:15:08'", "{ t '13:15:08'}"); @@ -434,6 +454,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test invalid escape sequence. */ + @Test public void testFailedOnInvalidTimeSequence() { checkFail("{t'13:15:08'}"); @@ -453,6 +474,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test timestamp escape sequences */ + @Test public void testTimestampEscapeSequence() throws Exception { check( "'2016-08-26 13:15:08'", @@ -478,6 +500,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test timestamp escape sequences with additional whitespace characters */ + @Test public void testTimestampEscapeSequenceWithWhitespaces() throws Exception { check("'2016-08-26 13:15:08'", "{ ts '2016-08-26 13:15:08'}" @@ -495,6 +518,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test invalid escape sequence. */ + @Test public void testFailedOnInvalidTimestampSequence() { checkFail("{ts '2016-08-26 13:15:08,12345'}"); @@ -523,6 +547,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequence series. */ + @Test public void testOuterJoinFunction() throws Exception { check( "t OUTER JOIN t2 ON t.id=t2.id", @@ -543,6 +568,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test simple nested escape sequences. Depth = 2. */ + @Test public void testNestedOuterJoin() throws Exception { check( "t OUTER JOIN (t2 OUTER JOIN t3 ON t2.id=t3.id) ON t.id=t2.id", @@ -563,6 +589,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test nested escape sequences. Depth > 2. */ + @Test public void testDeepNestedOuterJoin() { check( "t OUTER JOIN (t2 OUTER JOIN (t3 OUTER JOIN t4 ON t3.id=t4.id) ON t2.id=t3.id) ON t.id=t2.id", @@ -588,6 +615,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test invalid escape sequence. */ + @Test public void testFailedOnInvalidOuterJoinSequence() { checkFail("{ojt OUTER JOIN t2 ON t.id=t2.id}"); @@ -599,6 +627,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequences with additional whitespace characters */ + @Test public void testOuterJoinSequenceWithWhitespaces() throws Exception { check( "t OUTER JOIN t2 ON t.id=t2.id", @@ -619,6 +648,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test non-escape sequences. */ + @Test public void testNonEscapeSequence() throws Exception { check("'{fn test()}'", "'{fn test()}'"); @@ -676,6 +706,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequence series. */ + @Test public void testSimpleCallProc() throws Exception { check( "CALL test()", @@ -711,6 +742,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test simple nested escape sequences. Depth = 2. */ + @Test public void testNestedCallProc() throws Exception { check( "CALL func1(field1, CALL func2(field2))", @@ -731,6 +763,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test nested escape sequences. Depth > 2. */ + @Test public void testDeepNestedCallProc() { check( "CALL func1(CALL func2(CALL func3(field1)))", @@ -756,6 +789,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test series of nested escape sequences. */ + @Test public void testNestedCallProcMixed() { check( "CALL func1(CALL func2(field1), CALL func3(field2))", @@ -776,6 +810,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test invalid escape sequence. */ + @Test public void testFailedOnInvalidCallProcSequence() { checkFail("{callfunc1()}"); @@ -787,6 +822,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequences with additional whitespace characters */ + @Test public void testCallProcEscapeSequenceWithWhitespaces() throws Exception { check("CALL func1()", "{ call func1()}"); @@ -800,6 +836,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequence series. */ + @Test public void testLikeEscapeSequence() throws Exception { check( "ESCAPE '\\'", @@ -850,6 +887,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test escape sequences with additional whitespace characters */ + @Test public void testLikeEscapeSequenceWithWhitespaces() throws Exception { check("ESCAPE '\\'", "{ '\\' }"); check("ESCAPE '\\'", "{ escape '\\'}"); @@ -864,6 +902,7 @@ public class OdbcEscapeSequenceSelfTest extends GridCommonAbstractTest { /** * Test invalid escape sequence. */ + @Test public void testLikeOnInvalidLikeEscapeSequence() { checkFail("LIKE 'AAA's'"); checkFail("LIKE 'AAA\'s'"); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/port/GridPortProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/port/GridPortProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/port/GridPortProcessorSelfTest.java index 9d5d52b..5b6a2ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/port/GridPortProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/port/GridPortProcessorSelfTest.java @@ -22,6 +22,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.testframework.junits.GridTestKernalContext; 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.spi.IgnitePortProtocol.TCP; import static org.apache.ignite.spi.IgnitePortProtocol.UDP; @@ -29,6 +32,7 @@ import static org.apache.ignite.spi.IgnitePortProtocol.UDP; /** * */ +@RunWith(JUnit4.class) public class GridPortProcessorSelfTest extends GridCommonAbstractTest { /** */ private GridTestKernalContext ctx; @@ -52,6 +56,7 @@ public class GridPortProcessorSelfTest extends GridCommonAbstractTest { /** * @throws Exception If any exception occurs. */ + @Test public void testA() throws Exception { Class cls1 = TcpCommunicationSpi.class; @@ -81,6 +86,7 @@ public class GridPortProcessorSelfTest extends GridCommonAbstractTest { /** * @throws Exception If any exception occurs. */ + @Test public void testB() throws Exception { final AtomicInteger ai = new AtomicInteger(); @@ -126,4 +132,4 @@ public class GridPortProcessorSelfTest extends GridCommonAbstractTest { assertEquals(i, ai.get()); } -} \ 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/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index 6f89915..08ec39f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -47,10 +47,14 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import javax.cache.processor.EntryProcessorException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests command handler directly. */ +@RunWith(JUnit4.class) public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { /** * Constructor. @@ -102,6 +106,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testCacheGetFailsSyncNotify() throws Exception { GridRestCommandHandler hnd = new TestableCacheCommandHandler(grid().context(), "getAsync"); @@ -128,6 +133,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { * * @throws Exception In case of any exception. */ + @Test public void testAppendPrepend() throws Exception { assertEquals("as" + "df", testAppend("as", "df", true)); assertEquals("df" + "as", testAppend("as", "df", false)); @@ -216,6 +222,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testCacheClear() throws Exception { GridRestCommandHandler hnd = new GridCacheCommandHandler(((IgniteKernal)grid()).context()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java index 7f0a6de..bb31ce2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java @@ -31,10 +31,14 @@ import org.apache.ignite.internal.processors.rest.GridRestResponse; import org.apache.ignite.internal.processors.rest.request.GridRestLogRequest; import org.apache.ignite.testframework.junits.GridTestKernalContext; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * REST log command handler tests. */ +@RunWith(JUnit4.class) public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** */ private String igniteHome = System.getProperty("user.dir"); @@ -69,6 +73,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSupportedCommands() throws Exception { GridLogCommandHandler cmdHandler = new GridLogCommandHandler(newContext()); @@ -81,6 +86,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUnSupportedCommands() throws Exception { GridLogCommandHandler cmdHandler = new GridLogCommandHandler(newContext()); @@ -93,6 +99,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testHandleAsync() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setIgniteHome(igniteHome); @@ -114,6 +121,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testHandleAsyncForNonExistingLines() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setIgniteHome(igniteHome); @@ -135,6 +143,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testHandleAsyncFromAndToNotSet() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setIgniteHome(igniteHome); @@ -153,6 +162,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testHandleAsyncPathNotSet() throws Exception { GridTestKernalContext ctx = newContext(); ctx.config().setIgniteHome(igniteHome); @@ -172,6 +182,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testHandleAsyncPathIsOutsideIgniteHome() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setIgniteHome(igniteHome); @@ -193,6 +204,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testHandleAsyncFromGreaterThanTo() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setIgniteHome(igniteHome); @@ -214,6 +226,7 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testHandleAsyncFromEqualTo() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setIgniteHome(igniteHome); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java index f0ff25a..0d8fe5c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java @@ -28,10 +28,14 @@ import org.apache.ignite.testframework.junits.GridTestKernalContext; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import java.util.Collection; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * REST query command handler tests. */ +@RunWith(JUnit4.class) public class GridQueryCommandHandlerTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -51,6 +55,7 @@ public class GridQueryCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSupportedCommands() throws Exception { GridTestKernalContext ctx = newContext(grid().configuration()); @@ -72,6 +77,7 @@ public class GridQueryCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUnsupportedCommands() throws Exception { GridTestKernalContext ctx = newContext(grid().configuration()); @@ -87,6 +93,7 @@ public class GridQueryCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNullCache() throws Exception { QueryCommandHandler cmdHnd = new QueryCommandHandler(grid().context()); @@ -116,6 +123,7 @@ public class GridQueryCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNullPageSize() throws Exception { grid().getOrCreateCache(getName()); @@ -151,6 +159,7 @@ public class GridQueryCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQuery() throws Exception { grid().getOrCreateCache(getName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/top/CacheTopologyCommandHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/top/CacheTopologyCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/top/CacheTopologyCommandHandlerTest.java index 5d7dfd7..cebd96d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/top/CacheTopologyCommandHandlerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/top/CacheTopologyCommandHandlerTest.java @@ -33,10 +33,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheTopologyCommandHandlerTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration() throws Exception { @@ -70,6 +74,7 @@ public class CacheTopologyCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTopologyCommandOnDynamicCacheCreateDestroy() throws Exception { GridRestTopologyRequest req = new GridRestTopologyRequest(); req.command(GridRestCommand.TOPOLOGY); @@ -80,6 +85,7 @@ public class CacheTopologyCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNodeCommandOnDynamicCacheCreateDestroy1() throws Exception { Ignite node = startGrid(); @@ -93,6 +99,7 @@ public class CacheTopologyCommandHandlerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNodeCommandOnDynamicCacheCreateDestroy2() throws Exception { Ignite node = startGrid(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java index c3a3a1e..6f25f1b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java @@ -41,10 +41,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; /** * Test that compute and service run only on server nodes by default. */ +@RunWith(JUnit4.class) public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { /** Number of grids started for tests. */ private static final int NODES_CNT = 4; @@ -82,6 +86,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDefaultClosure() throws Exception { Set<String> srvNames = new HashSet<>(NODES_CNT - 1); @@ -116,6 +121,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClientClosure() throws Exception { for (int i = 0 ; i < NODES_CNT; i++) { log.info("Iteration: " + i); @@ -143,6 +149,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCustomClosure() throws Exception { for (int i = 0 ; i < NODES_CNT; i++) { log.info("Iteration: " + i); @@ -166,6 +173,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDefaultService() throws Exception { UUID clientNodeId = grid(CLIENT_IDX).cluster().localNode().id(); @@ -207,6 +215,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClientService() throws Exception { UUID clientNodeId = grid(CLIENT_IDX).cluster().localNode().id(); @@ -267,4 +276,4 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { log.info("Executing test service."); } } -} \ 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/internal/processors/service/GridServiceClientNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java index 1d6cbae..d0474c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java @@ -26,10 +26,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; /** * */ +@RunWith(JUnit4.class) public class GridServiceClientNodeTest extends GridCommonAbstractTest { /** */ protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -61,6 +65,7 @@ public class GridServiceClientNodeTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDeployFromClient() throws Exception { startGrids(3); @@ -74,6 +79,7 @@ public class GridServiceClientNodeTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDeployFromClientAfterRouterStop1() throws Exception { startGrid(0); @@ -102,6 +108,7 @@ public class GridServiceClientNodeTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDeployFromClientAfterRouterStop2() throws Exception { startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceContinuousQueryRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceContinuousQueryRedeployTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceContinuousQueryRedeployTest.java index 2437b47..e4157e2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceContinuousQueryRedeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceContinuousQueryRedeployTest.java @@ -39,11 +39,15 @@ import org.apache.ignite.services.ServiceConfiguration; import org.apache.ignite.services.ServiceContext; 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; /** * Tests whether concurrent service cancel and registering ContinuousQuery doesn't causes * service redeployment. */ +@RunWith(JUnit4.class) public class GridServiceContinuousQueryRedeployTest extends GridCommonAbstractTest { /** */ private static final String CACHE_NAME = "TEST_CACHE"; @@ -62,6 +66,7 @@ public class GridServiceContinuousQueryRedeployTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testServiceRedeploymentAfterCancel() throws Exception { final Ignite ignite = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java index ad93c6a..f2563d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java @@ -28,12 +28,17 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.services.ServiceConfiguration; import org.apache.ignite.services.ServiceDeploymentException; 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 GridServiceDeploymentCompoundFutureSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitForCompletionOnFailingFuture() throws Exception { GridServiceDeploymentCompoundFuture compFut = new GridServiceDeploymentCompoundFuture(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java index d987ce6..d5df828 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java @@ -23,11 +23,16 @@ import org.apache.ignite.services.Service; import org.apache.ignite.services.ServiceContext; import org.apache.ignite.testframework.GridStringLogger; 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 GridServiceDeploymentExceptionPropagationTest extends GridCommonAbstractTest { /** */ @SuppressWarnings("unused") + @Test public void testExceptionPropagation() throws Exception { try (Ignite srv = startGrid("server")) { http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServicePackagePrivateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServicePackagePrivateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServicePackagePrivateSelfTest.java index c085192..c87b8de 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServicePackagePrivateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServicePackagePrivateSelfTest.java @@ -22,14 +22,19 @@ import org.apache.ignite.Ignition; import org.apache.ignite.internal.processors.service.inner.MyService; import org.apache.ignite.internal.processors.service.inner.MyServiceFactory; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test for package-private service implementation. */ +@RunWith(JUnit4.class) public class GridServicePackagePrivateSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPackagePrivateService() throws Exception { try { Ignite server = startGrid("server"); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java index 79e2260..3d5a77b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.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; /** * Tests for {@link GridAffinityProcessor}. */ @GridCommonTest(group = "Service Processor") +@RunWith(JUnit4.class) public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbstractTest { /** Cache name. */ public static final String CACHE_NAME = "testServiceCache"; @@ -154,6 +158,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testSameConfigurationOld() throws Exception { String name = "dupServiceOld"; @@ -183,6 +188,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testSameConfiguration() throws Exception { String name = "dupServiceOld"; @@ -208,6 +214,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDifferentConfigurationOld() throws Exception { String name = "dupServiceOld"; @@ -241,6 +248,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDifferentConfiguration() throws Exception { String name = "dupService"; @@ -270,6 +278,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testGetServiceByName() throws Exception { String name = "serviceByName"; @@ -289,6 +298,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testGetServicesByName() throws Exception { final String name = "servicesByName"; @@ -315,6 +325,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDeployOnEachNodeOld() throws Exception { Ignite g = randomGrid(); @@ -347,6 +358,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDeployOnEachNode() throws Exception { Ignite g = randomGrid(); @@ -375,6 +387,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDeploySingletonOld() throws Exception { Ignite g = randomGrid(); @@ -407,6 +420,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDeploySingleton() throws Exception { Ignite g = randomGrid(); @@ -435,6 +449,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testAffinityDeployOld() throws Exception { Ignite g = randomGrid(); @@ -464,6 +479,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testAffinityDeploy() throws Exception { Ignite g = randomGrid(); @@ -489,6 +505,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDeployMultiple1Old() throws Exception { Ignite g = randomGrid(); @@ -521,6 +538,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDeployMultiple1() throws Exception { Ignite g = randomGrid(); @@ -549,6 +567,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDeployMultiple2Old() throws Exception { Ignite g = randomGrid(); @@ -583,6 +602,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testDeployMultiple2() throws Exception { Ignite g = randomGrid(); @@ -613,6 +633,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testCancelSingleton() throws Exception { Ignite g = randomGrid(); @@ -648,6 +669,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testCancelSingletonAsync() throws Exception { Ignite g = randomGrid(); @@ -683,6 +705,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testCancelEachNode() throws Exception { Ignite g = randomGrid(); @@ -718,6 +741,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * @throws Exception If failed. */ + @Test public void testCancelAsyncEachNode() throws Exception { Ignite g = randomGrid(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java index c461ce2..83d9b2b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java @@ -41,12 +41,16 @@ 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.testframework.GridTestUtils.runAsync; /** * Test for deployment of multiple configurations at a time. */ +@RunWith(JUnit4.class) public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractTest { /** Number of services to be deployed. */ private static final int NUM_SERVICES = 100; @@ -91,6 +95,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testDeployAll() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); @@ -110,6 +115,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testDeployAllAsync() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); @@ -131,6 +137,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testDeployAllTopologyChange() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); @@ -183,6 +190,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testDeployAllTopologyChangeFail() throws Exception { final Ignite client = grid(CLIENT_NODE_NAME); @@ -260,6 +268,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testDeployAllFail() throws Exception { deployAllFail(false); } @@ -267,6 +276,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testDeployAllAsyncFail() throws Exception { deployAllFail(true); } @@ -298,6 +308,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testClashingNames() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); @@ -324,6 +335,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testClashingNamesFail() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); @@ -356,6 +368,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testClashingNameDifferentConfig() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); @@ -390,6 +403,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testCancelAll() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); @@ -411,6 +425,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testCancelAllAsync() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); @@ -434,6 +449,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testCancelAllTopologyChange() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-10021";); @@ -486,6 +502,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testCancelAllClashingNames() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java index e43d029..d328db2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java @@ -27,10 +27,14 @@ import org.apache.ignite.internal.util.lang.GridAbsPredicateX; import org.apache.ignite.services.ServiceConfiguration; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Single node services test. */ +@RunWith(JUnit4.class) public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProcessorAbstractSelfTest { /** Cluster singleton name. */ private static final String CLUSTER_SINGLE = "serviceConfigSingleton"; @@ -144,6 +148,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc /** * @throws Exception If failed. */ + @Test public void testSingletonUpdateTopology() throws Exception { checkSingletonUpdateTopology(CLUSTER_SINGLE); } @@ -151,6 +156,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc /** * @throws Exception If failed. */ + @Test public void testDeployOnEachNodeUpdateTopology() throws Exception { checkDeployOnEachNodeUpdateTopology(NODE_SINGLE); } @@ -158,6 +164,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc /** * @throws Exception If failed. */ + @Test public void testDeployOnEachNodeButClientUpdateTopology() throws Exception { checkDeployOnEachNodeButClientUpdateTopology(NODE_SINGLE_BUT_CLIENT); } @@ -165,6 +172,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc /** * @throws Exception If failed. */ + @Test public void testAll() throws Exception { checkSingletonUpdateTopology(CLUSTER_SINGLE); @@ -182,6 +190,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc /** * @throws Exception If failed. */ + @Test public void testAffinityUpdateTopology() throws Exception { Ignite g = randomGrid(); @@ -204,6 +213,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc /** * @throws Exception If failed. */ + @Test public void testDeployLimits() throws Exception { final Ignite g = randomGrid(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java index 517f061..ed331fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java @@ -25,10 +25,14 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.services.Service; import org.apache.ignite.services.ServiceConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Single node services test. */ +@RunWith(JUnit4.class) public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorAbstractSelfTest { /** {@inheritDoc} */ @Override protected int nodeCount() { @@ -38,6 +42,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA /** * @throws Exception If failed. */ + @Test public void testSingletonUpdateTopology() throws Exception { String name = "serviceSingletonUpdateTopology"; @@ -82,6 +87,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA /** * @throws Exception If failed. */ + @Test public void testAffinityDeployUpdateTopology() throws Exception { Ignite g = randomGrid(); @@ -120,6 +126,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA /** * @throws Exception If failed. */ + @Test public void testDeployOnEachNodeButClientUpdateTopology() throws Exception { // Prestart client node. Ignite client = startGrid("client", getConfiguration("client").setClientMode(true)); @@ -185,6 +192,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA /** * @throws Exception If failed. */ + @Test public void testDeployOnEachProjectionNodeUpdateTopology() throws Exception { // Prestart client node. Ignite client = startGrid("client", getConfiguration("client").setClientMode(true)); @@ -252,6 +260,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA /** * @throws Exception If failed. */ + @Test public void testDeployOnEachNodeUpdateTopology() throws Exception { // Prestart client node. Ignite client = startGrid("client", getConfiguration("client").setClientMode(true)); @@ -329,6 +338,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA * @throws Exception If failed. */ @SuppressWarnings("deprecation") + @Test public void testDeployLimits() throws Exception { final String name = "serviceWithLimitsUpdateTopology"; @@ -390,4 +400,4 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA stopExtraNodes(extraNodes); } } -} \ 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/internal/processors/service/GridServiceProcessorProxySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorProxySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorProxySelfTest.java index 014aae5..b022622 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorProxySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorProxySelfTest.java @@ -28,10 +28,14 @@ import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.services.Service; import org.apache.ignite.services.ServiceContext; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Service proxy test. */ +@RunWith(JUnit4.class) public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstractSelfTest { /** {@inheritDoc} */ @Override protected int nodeCount() { @@ -41,6 +45,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testNodeSingletonProxy() throws Exception { String name = "testNodeSingletonProxy"; @@ -73,6 +78,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr * @throws Exception If failed. */ @SuppressWarnings("ThrowableNotThrown") + @Test public void testException() throws Exception { String name = "errorService"; @@ -95,6 +101,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testClusterSingletonProxy() throws Exception { String name = "testClusterSingletonProxy"; @@ -113,6 +120,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testMultiNodeProxy() throws Exception { Ignite ignite = randomGrid(); @@ -138,6 +146,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testNodeSingletonRemoteNotStickyProxy() throws Exception { String name = "testNodeSingletonRemoteNotStickyProxy"; @@ -176,6 +185,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testNodeSingletonRemoteStickyProxy() throws Exception { String name = "testNodeSingletonRemoteStickyProxy"; @@ -211,6 +221,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testSingletonProxyInvocation() throws Exception { final String name = "testProxyInvocationFromSeveralNodes"; @@ -233,6 +244,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testLocalProxyInvocation() throws Exception { final String name = "testLocalProxyInvocation"; @@ -273,6 +285,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testRemoteNotStickProxyInvocation() throws Exception { final String name = "testRemoteNotStickProxyInvocation"; @@ -308,6 +321,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * @throws Exception If failed. */ + @Test public void testRemoteStickyProxyInvocation() throws Exception { final String name = "testRemoteStickyProxyInvocation"; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorSingleNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorSingleNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorSingleNodeSelfTest.java index 202b4b63..e2e5a5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorSingleNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorSingleNodeSelfTest.java @@ -19,10 +19,14 @@ package org.apache.ignite.internal.processors.service; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Single node services test. */ +@RunWith(JUnit4.class) public class GridServiceProcessorSingleNodeSelfTest extends GridServiceProcessorAbstractSelfTest { /** {@inheritDoc} */ @Override protected int nodeCount() { @@ -33,6 +37,7 @@ public class GridServiceProcessorSingleNodeSelfTest extends GridServiceProcessor /** * @throws Exception If failed. */ + @Test public void testNodeSingletonNotDeployedProxy() throws Exception { String name = "testNodeSingletonNotDeployedProxy"; @@ -55,4 +60,4 @@ public class GridServiceProcessorSingleNodeSelfTest extends GridServiceProcessor info("Got expected exception: " + e.getMessage()); } } -} \ 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/internal/processors/service/GridServiceProcessorStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java index 8eefa20..d17b015 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java @@ -37,10 +37,14 @@ import org.apache.ignite.services.Service; import org.apache.ignite.services.ServiceContext; 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; /** * Tests that {@link GridServiceProcessor} completes deploy/undeploy futures during node stop. */ +@RunWith(JUnit4.class) public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { @@ -52,6 +56,7 @@ public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStopDuringDeployment() throws Exception { final CountDownLatch depLatch = new CountDownLatch(1); @@ -98,6 +103,7 @@ public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStopDuringHangedDeployment() throws Exception { final CountDownLatch depLatch = new CountDownLatch(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java index 5fdcdc4..823e1c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java @@ -30,10 +30,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; /** * Service proxy test with client reconnect. */ +@RunWith(JUnit4.class) public class GridServiceProxyClientReconnectSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -57,6 +61,7 @@ public class GridServiceProxyClientReconnectSelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testClientReconnect() throws Exception { startGrid("server"); @@ -93,6 +98,7 @@ public class GridServiceProxyClientReconnectSelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testClientReconnectLongServiceInit() throws Exception { startGrid("server"); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java index f09b744..2f01662 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java @@ -28,10 +28,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; /** * Test for service proxy after client node stopped. */ +@RunWith(JUnit4.class) public class GridServiceProxyNodeStopSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -53,6 +57,7 @@ public class GridServiceProxyNodeStopSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testProxyHashCode() throws Exception { Ignite server = startGrid("server");
