http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java index 1ea2a1f..ff27354 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.client.suite; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.TaskEventSubjectIdSelfTest; import org.apache.ignite.internal.client.ClientDefaultCacheSelfTest; @@ -81,92 +82,92 @@ public class IgniteClientTestSuite extends TestSuite { public static TestSuite suite() { TestSuite suite = new IgniteTestSuite("Ignite Clients Test Suite"); - suite.addTestSuite(RouterFactorySelfTest.class); + suite.addTest(new JUnit4TestAdapter(RouterFactorySelfTest.class)); // Parser standalone test. - suite.addTestSuite(TcpRestParserSelfTest.class); + suite.addTest(new JUnit4TestAdapter(TcpRestParserSelfTest.class)); // Test memcache protocol with custom test client. - suite.addTestSuite(RestMemcacheProtocolSelfTest.class); + suite.addTest(new JUnit4TestAdapter(RestMemcacheProtocolSelfTest.class)); // Test custom binary protocol with test client. - suite.addTestSuite(RestBinaryProtocolSelfTest.class); - suite.addTestSuite(TcpRestUnmarshalVulnerabilityTest.class); + suite.addTest(new JUnit4TestAdapter(RestBinaryProtocolSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(TcpRestUnmarshalVulnerabilityTest.class)); // Test jetty rest processor - suite.addTestSuite(JettyRestProcessorSignedSelfTest.class); - suite.addTestSuite(JettyRestProcessorUnsignedSelfTest.class); - suite.addTestSuite(JettyRestProcessorAuthenticationWithCredsSelfTest.class); - suite.addTestSuite(JettyRestProcessorAuthenticationWithTokenSelfTest.class); - suite.addTestSuite(JettyRestProcessorGetAllAsArrayTest.class); + suite.addTest(new JUnit4TestAdapter(JettyRestProcessorSignedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(JettyRestProcessorUnsignedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(JettyRestProcessorAuthenticationWithCredsSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(JettyRestProcessorAuthenticationWithTokenSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(JettyRestProcessorGetAllAsArrayTest.class)); // Test TCP rest processor with original memcache client. - suite.addTestSuite(ClientMemcachedProtocolSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientMemcachedProtocolSelfTest.class)); // Test TCP rest processor with original REDIS client. - suite.addTestSuite(RedisProtocolStringSelfTest.class); - suite.addTestSuite(RedisProtocolGetAllAsArrayTest.class); - suite.addTestSuite(RedisProtocolConnectSelfTest.class); - suite.addTestSuite(RedisProtocolServerSelfTest.class); - suite.addTestSuite(RedisProtocolStringAtomicDatastructuresSelfTest.class); + suite.addTest(new JUnit4TestAdapter(RedisProtocolStringSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(RedisProtocolGetAllAsArrayTest.class)); + suite.addTest(new JUnit4TestAdapter(RedisProtocolConnectSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(RedisProtocolServerSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(RedisProtocolStringAtomicDatastructuresSelfTest.class)); - suite.addTestSuite(RestProcessorStartSelfTest.class); + suite.addTest(new JUnit4TestAdapter(RestProcessorStartSelfTest.class)); // Test cache flag conversion. - suite.addTestSuite(ClientCacheFlagsCodecTest.class); + suite.addTest(new JUnit4TestAdapter(ClientCacheFlagsCodecTest.class)); // Test multi-start. - suite.addTestSuite(RestProcessorMultiStartSelfTest.class); + suite.addTest(new JUnit4TestAdapter(RestProcessorMultiStartSelfTest.class)); // Test clients. - suite.addTestSuite(ClientDataImplSelfTest.class); - suite.addTestSuite(ClientComputeImplSelfTest.class); - suite.addTestSuite(ClientTcpSelfTest.class); - suite.addTestSuite(ClientTcpDirectSelfTest.class); - suite.addTestSuite(ClientTcpSslSelfTest.class); - suite.addTestSuite(ClientTcpSslDirectSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientDataImplSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientComputeImplSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpDirectSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpSslSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpSslDirectSelfTest.class)); // Test client with many nodes. - suite.addTestSuite(ClientTcpMultiNodeSelfTest.class); - suite.addTestSuite(ClientTcpDirectMultiNodeSelfTest.class); - suite.addTestSuite(ClientTcpSslMultiNodeSelfTest.class); - suite.addTestSuite(ClientTcpSslDirectMultiNodeSelfTest.class); - suite.addTestSuite(ClientTcpUnreachableMultiNodeSelfTest.class); - suite.addTestSuite(ClientPreferDirectSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientTcpMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpDirectMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpSslMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpSslDirectMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpUnreachableMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientPreferDirectSelfTest.class)); // Test client with many nodes and in multithreaded scenarios - suite.addTestSuite(ClientTcpMultiThreadedSelfTest.class); - suite.addTestSuite(ClientTcpSslMultiThreadedSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientTcpMultiThreadedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientTcpSslMultiThreadedSelfTest.class)); // Test client authentication. - suite.addTestSuite(ClientTcpSslAuthenticationSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientTcpSslAuthenticationSelfTest.class)); - suite.addTestSuite(ClientTcpConnectivitySelfTest.class); - suite.addTestSuite(ClientReconnectionSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientTcpConnectivitySelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientReconnectionSelfTest.class)); // Rest task command handler test. - suite.addTestSuite(TaskCommandHandlerSelfTest.class); - suite.addTestSuite(ChangeStateCommandHandlerTest.class); - suite.addTestSuite(TaskEventSubjectIdSelfTest.class); + suite.addTest(new JUnit4TestAdapter(TaskCommandHandlerSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ChangeStateCommandHandlerTest.class)); + suite.addTest(new JUnit4TestAdapter(TaskEventSubjectIdSelfTest.class)); // Default cache only test. - suite.addTestSuite(ClientDefaultCacheSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientDefaultCacheSelfTest.class)); - suite.addTestSuite(ClientFutureAdapterSelfTest.class); - suite.addTestSuite(ClientPropertiesConfigurationSelfTest.class); - suite.addTestSuite(ClientConsistentHashSelfTest.class); - suite.addTestSuite(ClientJavaHasherSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientFutureAdapterSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientPropertiesConfigurationSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientConsistentHashSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientJavaHasherSelfTest.class)); - suite.addTestSuite(ClientByteUtilsTest.class); + suite.addTest(new JUnit4TestAdapter(ClientByteUtilsTest.class)); // Router tests. - suite.addTestSuite(TcpRouterSelfTest.class); - suite.addTestSuite(TcpSslRouterSelfTest.class); - suite.addTestSuite(TcpRouterMultiNodeSelfTest.class); + suite.addTest(new JUnit4TestAdapter(TcpRouterSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(TcpSslRouterSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(TcpRouterMultiNodeSelfTest.class)); - suite.addTestSuite(ClientFailedInitSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientFailedInitSelfTest.class)); - suite.addTestSuite(ClientTcpTaskExecutionAfterTopologyRestartSelfTest.class); + suite.addTest(new JUnit4TestAdapter(ClientTcpTaskExecutionAfterTopologyRestartSelfTest.class)); // SSL params. suite.addTestSuite(ClientSslParametersTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java index 72112cb..93aa8cd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java @@ -25,6 +25,9 @@ import java.util.UUID; import org.apache.ignite.internal.util.GridClientByteUtils; 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.internal.util.GridClientByteUtils.bytesToInt; import static org.apache.ignite.internal.util.GridClientByteUtils.bytesToLong; @@ -36,12 +39,14 @@ import static org.apache.ignite.internal.util.GridClientByteUtils.shortToBytes; /** * Test case for client's byte convertion utility. */ +@RunWith(JUnit4.class) public class ClientByteUtilsTest extends GridCommonAbstractTest { /** * Test UUID conversions from string to binary and back. * * @throws Exception On any exception. */ + @Test public void testUuidConvertions() throws Exception { Map<String, byte[]> map = new LinkedHashMap<>(); @@ -92,6 +97,7 @@ public class ClientByteUtilsTest extends GridCommonAbstractTest { } } + @Test public void testShortToBytes() throws Exception { Map<String, Short> map = new HashMap<>(); @@ -116,6 +122,7 @@ public class ClientByteUtilsTest extends GridCommonAbstractTest { } } + @Test public void testIntToBytes() throws Exception { Map<String, Integer> map = new HashMap<>(); @@ -140,6 +147,7 @@ public class ClientByteUtilsTest extends GridCommonAbstractTest { } } + @Test public void testLongToBytes() throws Exception { Map<String, Long> map = new LinkedHashMap<>(); @@ -177,4 +185,4 @@ public class ClientByteUtilsTest extends GridCommonAbstractTest { return b; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java index 9ee274f..b0c7217 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java @@ -31,10 +31,14 @@ import java.util.Set; import java.util.TreeSet; import java.util.UUID; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test for consistent hash management class. */ +@RunWith(JUnit4.class) public class ClientConsistentHashSelfTest extends GridCommonAbstractTest { /** Replicas count. */ private static final int REPLICAS = 512; @@ -44,6 +48,7 @@ public class ClientConsistentHashSelfTest extends GridCommonAbstractTest { * * @throws Exception In case of any exception. */ + @Test public void testCollisions() throws Exception { Map<Integer, Set<UUID>> map = new HashMap<>(); @@ -95,6 +100,7 @@ public class ClientConsistentHashSelfTest extends GridCommonAbstractTest { * * @throws Exception In case of any exception. */ + @Test public void testTreeSetRestrictions() throws Exception { // Constructs hash without explicit node's comparator. GridClientConsistentHash<Object> hash = new GridClientConsistentHash<>(); @@ -129,6 +135,7 @@ public class ClientConsistentHashSelfTest extends GridCommonAbstractTest { * Validate generated hashes.<p> * Note! This test should be ported into all supported platforms. */ + @Test public void testHashGeneraton() { // Validate strings. checkHash("", -1484017934); @@ -167,6 +174,7 @@ public class ClientConsistentHashSelfTest extends GridCommonAbstractTest { /** * Test mapping to nodes. */ + @Test public void testMappingToNodes() { String n1 = "node #1"; String n2 = "node #2"; @@ -288,4 +296,4 @@ public class ClientConsistentHashSelfTest extends GridCommonAbstractTest { assertEquals("Check affinity for object: " + o, code, i); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java index 765c58d..432cd89 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java @@ -21,14 +21,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test for Java hash codes calculations - SHOULD BE PORTED to other languages. */ +@RunWith(JUnit4.class) public class ClientJavaHasherSelfTest extends GridCommonAbstractTest { /** * Validate known Java hash codes. */ + @Test public void testPredefined() { Map<Object, Integer> map = new LinkedHashMap<>(); @@ -82,4 +87,4 @@ public class ClientJavaHasherSelfTest extends GridCommonAbstractTest { fail("Java hash codes validation fails."); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java index 9e0e0d2..1f1536f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java @@ -22,14 +22,19 @@ import java.io.InputStream; import java.sql.SQLException; import java.util.Arrays; import junit.framework.TestCase; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testLength() throws Exception { JdbcBlob blob = new JdbcBlob(new byte[16]); @@ -50,6 +55,7 @@ public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testGetBytes() throws Exception { byte[] arr = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; @@ -124,6 +130,7 @@ public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testGetBinaryStream() throws Exception { byte[] arr = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; @@ -150,6 +157,7 @@ public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testGetBinaryStreamWithParams() throws Exception { byte[] arr = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; @@ -222,6 +230,7 @@ public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testPositionBytePattern() throws Exception { byte[] arr = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; @@ -256,6 +265,7 @@ public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testPositionBlobPattern() throws Exception { byte[] arr = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; @@ -290,6 +300,7 @@ public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testSetBytes() throws Exception { byte[] arr = new byte[] {0, 1, 2, 3, 4, 5, 6, 7}; @@ -341,6 +352,7 @@ public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testSetBytesWithOffsetAndLength() throws Exception { byte[] arr = new byte[] {0, 1, 2, 3, 4, 5, 6, 7}; @@ -419,6 +431,7 @@ public class JdbcBlobTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testTruncate() throws Exception { byte[] arr = new byte[] {0, 1, 2, 3, 4, 5, 6, 7}; @@ -482,4 +495,4 @@ public class JdbcBlobTest extends TestCase { return res; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java index f6958ab..eb936e0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java @@ -37,12 +37,16 @@ import java.sql.Statement; import java.util.Collections; import java.util.Properties; import java.util.concurrent.Callable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** COPY command test for the regular JDBC driver. */ +@RunWith(JUnit4.class) public class JdbcBulkLoadSelfTest extends GridCommonAbstractTest { /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + @@ -124,6 +128,7 @@ public class JdbcBulkLoadSelfTest extends GridCommonAbstractTest { * * @throws Exception if failed. */ + @Test public void testBulkLoadThrows() throws Exception { GridTestUtils.assertThrows(null, new Callable<Object>() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java index 62b3840..93d74c1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java @@ -33,6 +33,9 @@ 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.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -42,6 +45,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests for complex queries (joins, etc.). */ +@RunWith(JUnit4.class) public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -131,6 +135,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testJoin() throws Exception { ResultSet rs = stmt.executeQuery( "select p.id, p.name, o.name as orgName from \"pers\".Person p, \"org\".Organization o where p.orgId = o.id"); @@ -166,6 +171,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testJoinWithoutAlias() throws Exception { ResultSet rs = stmt.executeQuery( "select p.id, p.name, o.name from \"pers\".Person p, \"org\".Organization o where p.orgId = o.id"); @@ -204,6 +210,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testIn() throws Exception { ResultSet rs = stmt.executeQuery("select name from \"pers\".Person where age in (25, 35)"); @@ -224,6 +231,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBetween() throws Exception { ResultSet rs = stmt.executeQuery("select name from \"pers\".Person where age between 24 and 36"); @@ -244,6 +252,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCalculatedValue() throws Exception { ResultSet rs = stmt.executeQuery("select age * 2 from \"pers\".Person"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionReopenTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionReopenTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionReopenTest.java index 531b4e5..554626b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionReopenTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionReopenTest.java @@ -22,12 +22,16 @@ import java.sql.DriverManager; import org.apache.ignite.Ignite; import org.apache.ignite.internal.IgnitionEx; 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.IgniteJdbcDriver.CFG_URL_PREFIX; /** * Connection test. */ +@RunWith(JUnit4.class) public class JdbcConnectionReopenTest extends GridCommonAbstractTest { /** * @return Config URL to use in test. @@ -39,6 +43,7 @@ public class JdbcConnectionReopenTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testReopenSameInstanceName() throws Exception { String url = CFG_URL_PREFIX + configURL(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java index d560d74..0fb66bc 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java @@ -31,12 +31,16 @@ 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.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; /** * Connection test. */ +@RunWith(JUnit4.class) public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -100,6 +104,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDefaults() throws Exception { String url = CFG_URL_PREFIX + configURL(); @@ -117,6 +122,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNodeId() throws Exception { String url = CFG_URL_PREFIX + "nodeId=" + grid(0).localNode().id() + '@' + configURL(); @@ -134,6 +140,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWrongNodeId() throws Exception { UUID wrongId = UUID.randomUUID(); @@ -156,6 +163,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClientNodeId() throws Exception { client = true; @@ -182,6 +190,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDaemonNodeId() throws Exception { daemon = true; @@ -208,6 +217,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCustomCache() throws Exception { String url = CFG_URL_PREFIX + "cache=" + CUSTOM_CACHE_NAME + '@' + configURL(); @@ -219,6 +229,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWrongCache() throws Exception { final String url = CFG_URL_PREFIX + "cache=wrongCacheName@" + configURL(); @@ -239,6 +250,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClose() throws Exception { String url = CFG_URL_PREFIX + configURL(); @@ -268,6 +280,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxAllowedCommit() throws Exception { String url = CFG_URL_PREFIX + "transactionsAllowed=true@" + configURL(); @@ -285,6 +298,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxAllowedRollback() throws Exception { String url = CFG_URL_PREFIX + "transactionsAllowed=true@" + configURL(); @@ -302,6 +316,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSqlHints() throws Exception { try (final Connection conn = DriverManager.getConnection(CFG_URL_PREFIX + "enforceJoinOrder=true@" + configURL())) { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDeleteStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDeleteStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDeleteStatementSelfTest.java index 3eec5a0..5652fb1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDeleteStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDeleteStatementSelfTest.java @@ -21,14 +21,19 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Arrays; import java.util.HashSet; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class JdbcDeleteStatementSelfTest extends JdbcAbstractUpdateStatementSelfTest { /** * */ + @Test public void testExecute() throws SQLException { conn.createStatement().execute("delete from Person where cast(substring(_key, 2, 1) as int) % 2 = 0"); @@ -39,6 +44,7 @@ public class JdbcDeleteStatementSelfTest extends JdbcAbstractUpdateStatementSelf /** * */ + @Test public void testExecuteUpdate() throws SQLException { int res = conn.createStatement().executeUpdate("delete from Person where cast(substring(_key, 2, 1) as int) % 2 = 0"); @@ -51,6 +57,7 @@ public class JdbcDeleteStatementSelfTest extends JdbcAbstractUpdateStatementSelf /** * */ + @Test public void testBatch() throws SQLException { PreparedStatement ps = conn.prepareStatement("delete from Person where firstName = ?"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java index bcf6159..59e3bf4 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java @@ -31,6 +31,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.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -40,6 +43,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests for complex queries with distributed joins enabled (joins, etc.). */ +@RunWith(JUnit4.class) public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -116,6 +120,7 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testJoin() throws Exception { ResultSet rs = stmt.executeQuery( "select p.id, p.name, o.name as orgName from Person p, Organization o where p.orgId = o.id"); @@ -151,6 +156,7 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testJoinWithoutAlias() throws Exception { ResultSet rs = stmt.executeQuery( "select p.id, p.name, o.name from Person p, Organization o where p.orgId = o.id"); @@ -189,6 +195,7 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testIn() throws Exception { ResultSet rs = stmt.executeQuery("select name from Person where age in (25, 35)"); @@ -209,6 +216,7 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBetween() throws Exception { ResultSet rs = stmt.executeQuery("select name from Person where age between 24 and 36"); @@ -229,6 +237,7 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCalculatedValue() throws Exception { ResultSet rs = stmt.executeQuery("select age * 2 from Person"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java index 13efcdf..c5219dd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java @@ -31,10 +31,14 @@ import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.util.typedef.F; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test that checks indexes handling with JDBC. */ +@RunWith(JUnit4.class) public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlStatementSelfTest { /** */ private static final String CREATE_INDEX = "create index idx on Person (id desc)"; @@ -136,6 +140,7 @@ public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlSt /** * Test that after index creation index is used by queries. */ + @Test public void testCreateIndex() throws SQLException { assertSize(3); @@ -165,6 +170,7 @@ public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlSt /** * Test that creating an index with duplicate name yields an error. */ + @Test public void testCreateIndexWithDuplicateName() throws SQLException { jdbcRun(CREATE_INDEX); @@ -179,6 +185,7 @@ public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlSt /** * Test that creating an index with duplicate name does not yield an error with {@code IF NOT EXISTS}. */ + @Test public void testCreateIndexIfNotExists() throws SQLException { jdbcRun(CREATE_INDEX); @@ -189,6 +196,7 @@ public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlSt /** * Test that after index drop there are no attempts to use it, and data state remains intact. */ + @Test public void testDropIndex() throws SQLException { assertSize(3); @@ -218,6 +226,7 @@ public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlSt /** * Test that dropping a non-existent index yields an error. */ + @Test public void testDropMissingIndex() { assertSqlException(new RunnableX() { /** {@inheritDoc} */ @@ -230,6 +239,7 @@ public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlSt /** * Test that dropping a non-existent index does not yield an error with {@code IF EXISTS}. */ + @Test public void testDropMissingIndexIfExists() throws SQLException { // Despite index missing, this does not yield an error. jdbcRun(DROP_INDEX_IF_EXISTS); @@ -238,6 +248,7 @@ public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlSt /** * Test that changes in cache affect index, and vice versa. */ + @Test public void testIndexState() throws SQLException { IgniteCache<String, Person> cache = cache(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java index 25b97ea..13c4df3 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java @@ -24,6 +24,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import java.sql.*; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.*; import static org.apache.ignite.cache.CacheMode.*; @@ -32,6 +35,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for empty cache. */ +@RunWith(JUnit4.class) public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -99,6 +103,7 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSelectNumber() throws Exception { ResultSet rs = stmt.executeQuery("select 1"); @@ -117,6 +122,7 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSelectString() throws Exception { ResultSet rs = stmt.executeQuery("select 'str'"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcErrorsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcErrorsSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcErrorsSelfTest.java index 63f0c84..a701b91 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcErrorsSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcErrorsSelfTest.java @@ -22,10 +22,14 @@ import java.sql.DriverManager; import java.sql.SQLException; import org.apache.ignite.jdbc.JdbcErrorsAbstractSelfTest; import org.apache.ignite.lang.IgniteCallable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test SQLSTATE codes propagation with thin client driver. */ +@RunWith(JUnit4.class) public class JdbcErrorsSelfTest extends JdbcErrorsAbstractSelfTest { /** Path to JDBC configuration for node that is to start. */ private static final String CFG_PATH = "modules/clients/src/test/config/jdbc-config.xml"; @@ -40,6 +44,7 @@ public class JdbcErrorsSelfTest extends JdbcErrorsAbstractSelfTest { * due to <b>communication problems</b> (not due to clear misconfiguration). * @throws SQLException if failed. */ + @Test public void testConnectionError() throws SQLException { final String path = "jdbc:ignite:Ñfg://cache=test@/unknown/path"; @@ -56,6 +61,7 @@ public class JdbcErrorsSelfTest extends JdbcErrorsAbstractSelfTest { * Test error code for the case when connection string is a mess. * @throws SQLException if failed. */ + @Test public void testInvalidConnectionStringFormat() throws SQLException { final String cfgPath = "cache="; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcInsertStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcInsertStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcInsertStatementSelfTest.java index 3c37871..0680184 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcInsertStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcInsertStatementSelfTest.java @@ -28,10 +28,14 @@ import java.util.concurrent.Callable; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Statement test. */ +@RunWith(JUnit4.class) public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTest { /** SQL query. */ private static final String SQL = "insert into Person(_key, id, firstName, lastName, age, data) values " + @@ -135,6 +139,7 @@ public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTes /** * @throws SQLException If failed. */ + @Test public void testExecuteUpdate() throws SQLException { int res = stmt.executeUpdate(SQL); @@ -144,6 +149,7 @@ public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTes /** * @throws SQLException If failed. */ + @Test public void testExecute() throws SQLException { boolean res = stmt.execute(SQL); @@ -153,6 +159,7 @@ public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTes /** * */ + @Test public void testDuplicateKeys() { jcache(0).put("p2", new Person(2, "Joe", "Black", 35)); @@ -176,6 +183,7 @@ public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTes /** * @throws SQLException if failed. */ + @Test public void testBatch() throws SQLException { formBatch(1, 2); formBatch(3, 4); @@ -188,6 +196,7 @@ public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTes /** * @throws SQLException if failed. */ + @Test public void testSingleItemBatch() throws SQLException { formBatch(1, 2); @@ -199,6 +208,7 @@ public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTes /** * @throws SQLException if failed. */ + @Test public void testSingleItemBatchError() throws SQLException { formBatch(1, 2); @@ -222,6 +232,7 @@ public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTes /** * @throws SQLException if failed. */ + @Test public void testErrorAmidstBatch() throws SQLException { formBatch(1, 2); formBatch(3, 1); // Duplicate key @@ -247,6 +258,7 @@ public class JdbcInsertStatementSelfTest extends JdbcAbstractDmlStatementSelfTes /** * @throws Exception If failed. */ + @Test public void testClearBatch() throws Exception { GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws SQLException { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java index 46379cb..56ebb90 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.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.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.IgniteJdbcDriver.PROP_NODE_ID; @@ -38,6 +41,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Test JDBC with several local caches. */ +@RunWith(JUnit4.class) public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -98,6 +102,7 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCache1() throws Exception { Properties cfg = new Properties(); @@ -129,6 +134,7 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testCountAll() throws Exception { Properties cfg = new Properties(); @@ -154,6 +160,7 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCache2() throws Exception { Properties cfg = new Properties(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMergeStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMergeStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMergeStatementSelfTest.java index 489bacd..b9fc04e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMergeStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMergeStatementSelfTest.java @@ -23,10 +23,14 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import org.apache.ignite.cache.CachePeekMode; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * MERGE statement test. */ +@RunWith(JUnit4.class) public class JdbcMergeStatementSelfTest extends JdbcAbstractDmlStatementSelfTest { /** SQL query. */ private static final String SQL = "merge into Person(_key, id, firstName, lastName, age, data) values " + @@ -130,6 +134,7 @@ public class JdbcMergeStatementSelfTest extends JdbcAbstractDmlStatementSelfTest /** * @throws SQLException If failed. */ + @Test public void testExecuteUpdate() throws SQLException { int res = stmt.executeUpdate(SQL); @@ -139,6 +144,7 @@ public class JdbcMergeStatementSelfTest extends JdbcAbstractDmlStatementSelfTest /** * @throws SQLException If failed. */ + @Test public void testExecute() throws SQLException { boolean res = stmt.execute(SQL); @@ -148,6 +154,7 @@ public class JdbcMergeStatementSelfTest extends JdbcAbstractDmlStatementSelfTest /** * @throws SQLException if failed. */ + @Test public void testBatch() throws SQLException { prepStmt.setString(1, "p1"); prepStmt.setInt(2, 1); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java index b18e4d5..e718cb6 100755 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java @@ -52,6 +52,9 @@ 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.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.sql.Types.INTEGER; import static java.sql.Types.VARCHAR; @@ -65,6 +68,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Metadata tests. */ +@RunWith(JUnit4.class) public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -145,6 +149,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testResultSetMetaData() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL)) { Statement stmt = conn.createStatement(); @@ -179,6 +184,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDecimalAndDateTypeMetaData() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL)) { Statement stmt = conn.createStatement(); @@ -213,6 +219,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetTables() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL)) { DatabaseMetaData meta = conn.getMetaData(); @@ -254,6 +261,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { * Negative scenarios for catalog name. * Perform metadata lookups, that use incorrect catalog names. */ + @Test public void testCatalogWithNotExistingName() throws SQLException { checkNoEntitiesFoundForCatalog(""); checkNoEntitiesFoundForCatalog("NOT_EXISTING_CATALOG"); @@ -305,6 +313,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetColumns() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL)) { DatabaseMetaData meta = conn.getMetaData(); @@ -393,6 +402,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMetadataResultSetClose() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL); ResultSet tbls = conn.getMetaData().getTables(null, null, "%", null)) { @@ -411,6 +421,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testIndexMetadata() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL); ResultSet rs = conn.getMetaData().getIndexInfo(null, "pers", "PERSON", false, false)) { @@ -449,6 +460,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPrimaryKeyMetadata() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL); ResultSet rs = conn.getMetaData().getPrimaryKeys(null, "pers", "PERSON")) { @@ -468,6 +480,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testParametersMetadata() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL)) { conn.setSchema("pers"); @@ -492,6 +505,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSchemasMetadata() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL)) { ResultSet rs = conn.getMetaData().getSchemas(); @@ -514,6 +528,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testVersions() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL)) { assertEquals("Apache Ignite", conn.getMetaData().getDatabaseProductName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java index e32e070..e3bdfec 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java @@ -31,6 +31,9 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Data streaming test for thick driver and no explicit caches. */ +@RunWith(JUnit4.class) public class JdbcNoCacheStreamingSelfTest extends GridCommonAbstractTest { /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + @@ -123,6 +127,7 @@ public class JdbcNoCacheStreamingSelfTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testStreamedInsert() throws Exception { for (int i = 10; i <= 100; i += 10) ignite(0).cache(DEFAULT_CACHE_NAME).put(i, i * 100); @@ -152,6 +157,7 @@ public class JdbcNoCacheStreamingSelfTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testStreamedInsertWithOverwritesAllowed() throws Exception { for (int i = 10; i <= 100; i += 10) ignite(0).cache(DEFAULT_CACHE_NAME).put(i, i * 100); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java index 5c549a8..5e6cac6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java @@ -32,12 +32,16 @@ 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.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; /** * */ +@RunWith(JUnit4.class) public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -102,6 +106,7 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDefaults() throws Exception { String url = CFG_URL_PREFIX + CFG_URL; @@ -119,6 +124,7 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNoCacheNameQuery() throws Exception { try ( Connection conn = DriverManager.getConnection(CFG_URL_PREFIX + CFG_URL); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java index b6afc94..30f2fad 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java @@ -37,6 +37,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.sql.Types.BIGINT; import static java.sql.Types.BINARY; @@ -59,6 +62,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Prepared statement test. */ +@RunWith(JUnit4.class) public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -154,6 +158,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRepeatableUsage() throws Exception { stmt = conn.prepareStatement("select * from TestObject where id = ?"); @@ -189,6 +194,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBoolean() throws Exception { stmt = conn.prepareStatement("select * from TestObject where boolVal is not distinct from ?"); @@ -226,6 +232,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testByte() throws Exception { stmt = conn.prepareStatement("select * from TestObject where byteVal is not distinct from ?"); @@ -263,6 +270,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testShort() throws Exception { stmt = conn.prepareStatement("select * from TestObject where shortVal is not distinct from ?"); @@ -300,6 +308,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testInteger() throws Exception { stmt = conn.prepareStatement("select * from TestObject where intVal is not distinct from ?"); @@ -337,6 +346,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLong() throws Exception { stmt = conn.prepareStatement("select * from TestObject where longVal is not distinct from ?"); @@ -374,6 +384,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFloat() throws Exception { stmt = conn.prepareStatement("select * from TestObject where floatVal is not distinct from ?"); @@ -411,6 +422,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDouble() throws Exception { stmt = conn.prepareStatement("select * from TestObject where doubleVal is not distinct from ?"); @@ -448,6 +460,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBigDecimal() throws Exception { stmt = conn.prepareStatement("select * from TestObject where bigVal is not distinct from ?"); @@ -485,6 +498,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testString() throws Exception { stmt = conn.prepareStatement("select * from TestObject where strVal is not distinct from ?"); @@ -522,6 +536,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testArray() throws Exception { stmt = conn.prepareStatement("select * from TestObject where arrVal is not distinct from ?"); @@ -559,6 +574,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBlob() throws Exception { stmt = conn.prepareStatement("select * from TestObject where blobVal is not distinct from ?"); @@ -600,6 +616,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDate() throws Exception { stmt = conn.prepareStatement("select * from TestObject where dateVal is not distinct from ?"); @@ -637,6 +654,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTime() throws Exception { stmt = conn.prepareStatement("select * from TestObject where timeVal is not distinct from ?"); @@ -674,6 +692,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTimestamp() throws Exception { stmt = conn.prepareStatement("select * from TestObject where tsVal is not distinct from ?"); @@ -711,6 +730,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUrl() throws Exception { stmt = conn.prepareStatement("select * from TestObject where urlVal is not distinct from ?"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java index 486af7f..3cbd461 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java @@ -45,6 +45,9 @@ 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; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -55,6 +58,7 @@ import static org.apache.ignite.jdbc.JdbcResultSetSelfTest.assertEqualsToStringR * Result set test. */ @SuppressWarnings("FloatingPointEquality") +@RunWith(JUnit4.class) public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -164,6 +168,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBoolean() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -244,6 +249,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBoolean2() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -264,6 +270,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBoolean3() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -284,6 +291,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBoolean4() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -304,6 +312,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testByte() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -344,6 +353,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testShort() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -384,6 +394,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testInteger() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -424,6 +435,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLong() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -464,6 +476,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFloat() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -504,6 +517,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDouble() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -544,6 +558,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBigDecimal() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -584,6 +599,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBigDecimalScale() throws Exception { assert "0.12".equals(convertStringToBigDecimalViaJdbc("0.1234", 2).toString()); assert "1.001".equals(convertStringToBigDecimalViaJdbc("1.0005", 3).toString()); @@ -608,6 +624,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testString() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -647,6 +664,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testArray() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -668,6 +686,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("deprecation") + @Test public void testDate() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -696,6 +715,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("deprecation") + @Test public void testTime() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -723,6 +743,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTimestamp() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -750,6 +771,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUrl() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -770,6 +792,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testObject() throws Exception { final Ignite ignite = ignite(0); final boolean binaryMarshaller = ignite.configuration().getMarshaller() instanceof BinaryMarshaller; @@ -804,6 +827,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNavigation() throws Exception { ResultSet rs = stmt.executeQuery("select * from TestObject where id > 0"); @@ -849,6 +873,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFetchSize() throws Exception { stmt.setFetchSize(1); @@ -864,6 +889,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNewQueryTaskFetchSize() throws Exception { stmt.setFetchSize(1); @@ -883,6 +909,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFindColumn() throws Exception { final ResultSet rs = stmt.executeQuery(SQL); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java index 7a29b13..f5ab95c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java @@ -31,12 +31,16 @@ import org.apache.ignite.internal.processors.resource.GridResourceIoc; import org.apache.ignite.internal.util.spring.IgniteSpringHelper; import org.apache.ignite.resources.SpringApplicationContextResource; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; /** * Test of cluster and JDBC driver with config that contains cache with POJO store and datasource bean. */ +@RunWith(JUnit4.class) public class JdbcSpringSelfTest extends JdbcConnectionSelfTest { /** Grid count. */ private static final int GRID_CNT = 2; @@ -61,6 +65,7 @@ public class JdbcSpringSelfTest extends JdbcConnectionSelfTest { } /** {@inheritDoc} */ + @Test @Override public void testClientNodeId() throws Exception { IgniteEx client = (IgniteEx) startGridWithSpringCtx(getTestIgniteInstanceName(), true, configURL()); @@ -96,6 +101,7 @@ public class JdbcSpringSelfTest extends JdbcConnectionSelfTest { * * @throws Exception If test failed. */ + @Test public void testSpringBean() throws Exception { String url = CFG_URL_PREFIX + configURL(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java index c9169b9..88fe235 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementBatchingSelfTest.java @@ -23,10 +23,14 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.concurrent.Callable; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Statement batch test. */ +@RunWith(JUnit4.class) public class JdbcStatementBatchingSelfTest extends JdbcAbstractDmlStatementSelfTest { /** {@inheritDoc} */ @@ -39,6 +43,7 @@ public class JdbcStatementBatchingSelfTest extends JdbcAbstractDmlStatementSelfT /** * @throws SQLException If failed. */ + @Test public void testDatabaseMetadataBatchSupportFlag() throws SQLException { DatabaseMetaData meta = conn.getMetaData(); @@ -50,6 +55,7 @@ public class JdbcStatementBatchingSelfTest extends JdbcAbstractDmlStatementSelfT /** * @throws SQLException If failed. */ + @Test public void testBatch() throws SQLException { try (Statement stmt = conn.createStatement()) { stmt.addBatch("INSERT INTO Person(_key, id, firstName, lastName, age, data) " + @@ -78,6 +84,7 @@ public class JdbcStatementBatchingSelfTest extends JdbcAbstractDmlStatementSelfT /** * @throws SQLException If failed. */ + @Test public void testErrorAmidstBatch() throws SQLException { BatchUpdateException reason = (BatchUpdateException) GridTestUtils.assertThrows(log, @@ -110,6 +117,7 @@ public class JdbcStatementBatchingSelfTest extends JdbcAbstractDmlStatementSelfT /** * @throws Exception If failed. */ + @Test public void testClearBatch() throws Exception { try (Statement stmt = conn.createStatement()) { GridTestUtils.assertThrows(log, new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java index 2762b53..2e5ce85 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java @@ -32,6 +32,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.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -40,6 +43,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Statement test. */ +@RunWith(JUnit4.class) public class JdbcStatementSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -119,6 +123,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecuteQuery() throws Exception { ResultSet rs = stmt.executeQuery(SQL); @@ -151,6 +156,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecute() throws Exception { assert stmt.execute(SQL); @@ -185,6 +191,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMaxRows() throws Exception { stmt.setMaxRows(1); @@ -248,6 +255,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecuteQueryMultipleOnlyResultSets() throws Exception { assert conn.getMetaData().supportsMultipleResultSets(); @@ -276,6 +284,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecuteQueryMultipleOnlyDml() throws Exception { assert conn.getMetaData().supportsMultipleResultSets(); @@ -312,6 +321,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExecuteQueryMultipleMixed() throws Exception { assert conn.getMetaData().supportsMultipleResultSets(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java index ab66a84..bd390ba 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java @@ -38,6 +38,9 @@ import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -46,6 +49,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Data streaming test. */ +@RunWith(JUnit4.class) public class JdbcStreamingSelfTest extends JdbcThinAbstractSelfTest { /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + @@ -163,6 +167,7 @@ public class JdbcStreamingSelfTest extends JdbcThinAbstractSelfTest { /** * @throws Exception if failed. */ + @Test public void testStreamedInsert() throws Exception { for (int i = 10; i <= 100; i += 10) put(i, nameForId(i * 100)); @@ -193,6 +198,7 @@ public class JdbcStreamingSelfTest extends JdbcThinAbstractSelfTest { /** * @throws Exception if failed. */ + @Test public void testStreamedInsertWithoutColumnsList() throws Exception { for (int i = 10; i <= 100; i += 10) put(i, nameForId(i * 100)); @@ -223,6 +229,7 @@ public class JdbcStreamingSelfTest extends JdbcThinAbstractSelfTest { /** * @throws Exception if failed. */ + @Test public void testStreamedInsertWithOverwritesAllowed() throws Exception { for (int i = 10; i <= 100; i += 10) put(i, nameForId(i * 100)); @@ -248,6 +255,7 @@ public class JdbcStreamingSelfTest extends JdbcThinAbstractSelfTest { } /** */ + @Test public void testOnlyInsertsAllowed() { assertStatementForbidden("CREATE TABLE PUBLIC.X (x int primary key, y int)"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java index 20fd0fb..e4491ae 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java @@ -31,6 +31,9 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Data streaming test. */ +@RunWith(JUnit4.class) public class JdbcStreamingToPublicCacheTest extends GridCommonAbstractTest { /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + "cache=%s@modules/clients/src/test/config/jdbc-config.xml"; @@ -105,6 +109,7 @@ public class JdbcStreamingToPublicCacheTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testStreamedInsert() throws Exception { // Create table try (Connection conn = createConnection(DEFAULT_CACHE_NAME, false)) { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcUpdateStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcUpdateStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcUpdateStatementSelfTest.java index 07b5587..3da079f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcUpdateStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcUpdateStatementSelfTest.java @@ -22,14 +22,19 @@ import java.sql.SQLException; import java.util.Arrays; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.internal.util.typedef.F; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class JdbcUpdateStatementSelfTest extends JdbcAbstractUpdateStatementSelfTest { /** * */ + @Test public void testExecute() throws SQLException { conn.createStatement().execute("update Person set firstName = 'Jack' where " + "cast(substring(_key, 2, 1) as int) % 2 = 0"); @@ -41,6 +46,7 @@ public class JdbcUpdateStatementSelfTest extends JdbcAbstractUpdateStatementSelf /** * */ + @Test public void testExecuteUpdate() throws SQLException { conn.createStatement().executeUpdate("update Person set firstName = 'Jack' where " + "cast(substring(_key, 2, 1) as int) % 2 = 0"); @@ -52,6 +58,7 @@ public class JdbcUpdateStatementSelfTest extends JdbcAbstractUpdateStatementSelf /** * @throws SQLException If failed. */ + @Test public void testBatch() throws SQLException { PreparedStatement ps = conn.prepareStatement("update Person set lastName = concat(firstName, 'son') " + "where firstName = ?"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java index cb882e7..a012139 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java @@ -30,12 +30,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.internal.client.GridClientProtocol.TCP; /** * */ +@RunWith(JUnit4.class) public class ChangeStateCommandHandlerTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -94,6 +98,7 @@ public class ChangeStateCommandHandlerTest extends GridCommonAbstractTest { /** * */ + @Test public void testActivateDeActivate() throws GridClientException { GridClientClusterState state = client.state();
