From b24441a6d68a72582cb7bdd2c0efab2c90ca5794 Mon Sep 17 00:00:00 2001 From: sboikov Date: Fri, 23 Jan 2015 14:53:31 +0300 Subject: [PATCH] # ignite-63 --- .../client/suite/IgniteClientTestSuite.java | 18 +- ...ava => AbstractRestProcessorSelfTest.java} | 2 +- ...a => ClientMemcachedProtocolSelfTest.java} | 2 +- ...> JettyRestProcessorAbstractSelfTest.java} | 2 +- ... => JettyRestProcessorSignedSelfTest.java} | 2 +- ...> JettyRestProcessorUnsignedSelfTest.java} | 2 +- ...st.java => MemcacheRestProcessorTest.java} | 2 +- ...t.java => RestBinaryProtocolSelfTest.java} | 8 +- ...java => RestMemcacheProtocolSelfTest.java} | 8 +- ...a => RestProcessorMultiStartSelfTest.java} | 2 +- ...t.java => RestProcessorStartSelfTest.java} | 2 +- ...cessorTest.java => RestProcessorTest.java} | 4 +- ...t.java => TaskCommandHandlerSelfTest.java} | 2 +- ...inaryClient.java => TestBinaryClient.java} | 4 +- ...cheClient.java => TestMemcacheClient.java} | 4 +- ...ockNioSession.java => MockNioSession.java} | 6 +- ...lfTest.java => TcpRestParserSelfTest.java} | 16 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 286 ++++++++++++++++++ 18 files changed, 329 insertions(+), 43 deletions(-) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridAbstractRestProcessorSelfTest.java => AbstractRestProcessorSelfTest.java} (97%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridClientMemcachedProtocolSelfTest.java => ClientMemcachedProtocolSelfTest.java} (99%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridJettyRestProcessorAbstractSelfTest.java => JettyRestProcessorAbstractSelfTest.java} (99%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridJettyRestProcessorSignedSelfTest.java => JettyRestProcessorSignedSelfTest.java} (96%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridJettyRestProcessorUnsignedSelfTest.java => JettyRestProcessorUnsignedSelfTest.java} (91%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridMemcacheRestProcessorTest.java => MemcacheRestProcessorTest.java} (96%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridRestBinaryProtocolSelfTest.java => RestBinaryProtocolSelfTest.java} (98%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridRestMemcacheProtocolSelfTest.java => RestMemcacheProtocolSelfTest.java} (97%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridRestProcessorMultiStartSelfTest.java => RestProcessorMultiStartSelfTest.java} (95%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridRestProcessorStartSelfTest.java => RestProcessorStartSelfTest.java} (98%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridRestProcessorTest.java => RestProcessorTest.java} (98%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridTaskCommandHandlerSelfTest.java => TaskCommandHandlerSelfTest.java} (98%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridTestBinaryClient.java => TestBinaryClient.java} (99%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/{GridTestMemcacheClient.java => TestMemcacheClient.java} (99%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/{GridMockNioSession.java => MockNioSession.java} (94%) rename modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/{GridTcpRestParserSelfTest.java => TcpRestParserSelfTest.java} (96%) create mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java diff --git a/modules/clients/src/test/java/org/apache/ignite/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/client/suite/IgniteClientTestSuite.java index ab3cca15ea5e1..c3eb1af6a0ea5 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/suite/IgniteClientTestSuite.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/suite/IgniteClientTestSuite.java @@ -39,28 +39,28 @@ public static TestSuite suite() { suite.addTest(new TestSuite(GridRouterFactorySelfTest.class)); // Parser standalone test. - suite.addTest(new TestSuite(GridTcpRestParserSelfTest.class)); + suite.addTest(new TestSuite(TcpRestParserSelfTest.class)); // Test memcache protocol with custom test client. - suite.addTest(new TestSuite(GridRestMemcacheProtocolSelfTest.class)); + suite.addTest(new TestSuite(RestMemcacheProtocolSelfTest.class)); // Test custom binary protocol with test client. - suite.addTest(new TestSuite(GridRestBinaryProtocolSelfTest.class)); + suite.addTest(new TestSuite(RestBinaryProtocolSelfTest.class)); // Test jetty rest processor - suite.addTest(new TestSuite(GridJettyRestProcessorSignedSelfTest.class)); - suite.addTest(new TestSuite(GridJettyRestProcessorUnsignedSelfTest.class)); + suite.addTest(new TestSuite(JettyRestProcessorSignedSelfTest.class)); + suite.addTest(new TestSuite(JettyRestProcessorUnsignedSelfTest.class)); // Test TCP rest processor with original memcache client. - suite.addTest(new TestSuite(GridClientMemcachedProtocolSelfTest.class)); + suite.addTest(new TestSuite(ClientMemcachedProtocolSelfTest.class)); - suite.addTest(new TestSuite(GridRestProcessorStartSelfTest.class)); + suite.addTest(new TestSuite(RestProcessorStartSelfTest.class)); // Test cache flag conversion. suite.addTest(new TestSuite(GridClientCacheFlagsCodecTest.class)); // Test multi-start. - suite.addTest(new TestSuite(GridRestProcessorMultiStartSelfTest.class)); + suite.addTest(new TestSuite(RestProcessorMultiStartSelfTest.class)); // Test clients. suite.addTest(new TestSuite(GridClientDataImplSelfTest.class)); @@ -89,7 +89,7 @@ public static TestSuite suite() { suite.addTest(new TestSuite(GridClientReconnectionSelfTest.class)); // Rest task command handler test. - suite.addTest(new TestSuite(GridTaskCommandHandlerSelfTest.class)); + suite.addTest(new TestSuite(TaskCommandHandlerSelfTest.class)); // Default cache only test. suite.addTest(new TestSuite(GridClientDefaultCacheSelfTest.class)); diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridAbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java similarity index 97% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridAbstractRestProcessorSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java index 74f7fca5a1131..f7decdf56f925 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridAbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java @@ -27,7 +27,7 @@ /** * Abstract class for REST protocols tests. */ -abstract class GridAbstractRestProcessorSelfTest extends GridCommonAbstractTest { +abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridClientMemcachedProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java similarity index 99% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridClientMemcachedProtocolSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java index d299436be8808..34439c250f1a2 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridClientMemcachedProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java @@ -32,7 +32,7 @@ /** * Tests for TCP binary protocol. */ -public class GridClientMemcachedProtocolSelfTest extends GridAbstractRestProcessorSelfTest { +public class ClientMemcachedProtocolSelfTest extends AbstractRestProcessorSelfTest { /** Grid count. */ private static final int GRID_CNT = 1; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java similarity index 99% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorAbstractSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index d7dc4aa58b7ab..21635633c3a98 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -30,7 +30,7 @@ * Tests for Jetty REST protocol. */ @SuppressWarnings("unchecked") -abstract class GridJettyRestProcessorAbstractSelfTest extends GridAbstractRestProcessorSelfTest { +abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorSelfTest { /** Grid count. */ private static final int GRID_CNT = 3; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorSignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java similarity index 96% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorSignedSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java index f072b38c6fb57..6a522e56dad9a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorSignedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java @@ -27,7 +27,7 @@ /** * */ -public class GridJettyRestProcessorSignedSelfTest extends GridJettyRestProcessorAbstractSelfTest { +public class JettyRestProcessorSignedSelfTest extends JettyRestProcessorAbstractSelfTest { /** */ protected static final String REST_SECRET_KEY = "secret-key"; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorUnsignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java similarity index 91% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorUnsignedSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java index 5a36eb74ce049..c3de70346f33b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridJettyRestProcessorUnsignedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java @@ -20,7 +20,7 @@ /** * */ -public class GridJettyRestProcessorUnsignedSelfTest extends GridJettyRestProcessorAbstractSelfTest { +public class JettyRestProcessorUnsignedSelfTest extends JettyRestProcessorAbstractSelfTest { /** {@inheritDoc} */ @Override protected int restPort() { return 8091; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridMemcacheRestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java similarity index 96% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridMemcacheRestProcessorTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java index 61b9f0c01bfbe..fd6129258cc99 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridMemcacheRestProcessorTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java @@ -26,7 +26,7 @@ /** */ -public class GridMemcacheRestProcessorTest extends GridCommonAbstractTest { +public class MemcacheRestProcessorTest extends GridCommonAbstractTest { /** Client. */ private MemcachedClientIF client; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java similarity index 98% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestBinaryProtocolSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index 08f3334d1dfad..4f7f14340b9a8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -44,7 +44,7 @@ * TCP protocol test. */ @SuppressWarnings("unchecked") -public class GridRestBinaryProtocolSelfTest extends GridCommonAbstractTest { +public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -58,7 +58,7 @@ public class GridRestBinaryProtocolSelfTest extends GridCommonAbstractTest { private static final int PORT = 11212; /** */ - private GridTestBinaryClient client; + private TestBinaryClient client; /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -127,8 +127,8 @@ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws * @return Client. * @throws IgniteCheckedException In case of error. */ - private GridTestBinaryClient client() throws IgniteCheckedException { - return new GridTestBinaryClient(HOST, PORT); + private TestBinaryClient client() throws IgniteCheckedException { + return new TestBinaryClient(HOST, PORT); } /** diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java similarity index 97% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestMemcacheProtocolSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java index d07037dd4d128..14bcca6c42762 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java @@ -36,7 +36,7 @@ * TCP protocol test. */ @SuppressWarnings("unchecked") -public class GridRestMemcacheProtocolSelfTest extends GridCommonAbstractTest { +public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -50,7 +50,7 @@ public class GridRestMemcacheProtocolSelfTest extends GridCommonAbstractTest { private static final int PORT = 11212; /** */ - private GridTestMemcacheClient client; + private TestMemcacheClient client; /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -119,8 +119,8 @@ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws * @return Client. * @throws IgniteCheckedException In case of error. */ - private GridTestMemcacheClient client() throws IgniteCheckedException { - return new GridTestMemcacheClient(HOST, PORT); + private TestMemcacheClient client() throws IgniteCheckedException { + return new TestMemcacheClient(HOST, PORT); } /** diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorMultiStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java similarity index 95% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorMultiStartSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java index 45bf212c6f6fb..92d625ddd8d36 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorMultiStartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java @@ -23,7 +23,7 @@ /** * Rest processor test. */ -public class GridRestProcessorMultiStartSelfTest extends GridCommonAbstractTest { +public class RestProcessorMultiStartSelfTest extends GridCommonAbstractTest { /** */ private static final int GRID_CNT = 3; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java similarity index 98% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorStartSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java index 74b081cc6b491..871e5925173e0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorStartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java @@ -34,7 +34,7 @@ /** * */ -public class GridRestProcessorStartSelfTest extends GridCommonAbstractTest { +public class RestProcessorStartSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java similarity index 98% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java index b722ab90473c2..9ccc397c6f004 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridRestProcessorTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java @@ -48,12 +48,12 @@ *
  • http://localhost:8080/gridgain?cmd=res&id=XXXX
    • * */ -public class GridRestProcessorTest extends GridCommonAbstractTest { +public class RestProcessorTest extends GridCommonAbstractTest { /** Counter */ private static int cntr; /** */ - public GridRestProcessorTest() { + public RestProcessorTest() { super(/*start grid*/false); } diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java similarity index 98% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTaskCommandHandlerSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index 7d1254e22aeea..9a9918fd43c30 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -43,7 +43,7 @@ /** * Test for {@code GridTaskCommandHandler} */ -public class GridTaskCommandHandlerSelfTest extends GridCommonAbstractTest { +public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTestBinaryClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java similarity index 99% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTestBinaryClient.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java index 9efdcc90a27e9..a6e7c7f4782cc 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTestBinaryClient.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java @@ -39,7 +39,7 @@ /** * Test client. */ -final class GridTestBinaryClient { +final class TestBinaryClient { /** Logger. */ private final IgniteLogger log = new IgniteJavaLogger(); @@ -74,7 +74,7 @@ final class GridTestBinaryClient { * @param port Port number. * @throws IgniteCheckedException In case of error. */ - GridTestBinaryClient(String host, int port) throws IgniteCheckedException { + TestBinaryClient(String host, int port) throws IgniteCheckedException { assert host != null; assert port > 0; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java similarity index 99% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTestMemcacheClient.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java index 67dfc5a3d185a..e7c625fa2b592 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/GridTestMemcacheClient.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java @@ -33,7 +33,7 @@ /** * Test client. */ -final class GridTestMemcacheClient { +final class TestMemcacheClient { /** Header length. */ private static final short HDR_LEN = 24; @@ -93,7 +93,7 @@ final class GridTestMemcacheClient { * @param port Port number. * @throws IgniteCheckedException In case of error. */ - GridTestMemcacheClient(String host, int port) throws IgniteCheckedException { + TestMemcacheClient(String host, int port) throws IgniteCheckedException { assert host != null; assert port > 0; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMockNioSession.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java similarity index 94% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMockNioSession.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java index 6ced9252c453f..48c4a0243fa7a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMockNioSession.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java @@ -26,7 +26,7 @@ /** * Mock nio session with disabled functionality for testing parser. */ -public class GridMockNioSession extends GridMetadataAwareAdapter implements GridNioSession { +public class MockNioSession extends GridMetadataAwareAdapter implements GridNioSession { /** Local address */ private InetSocketAddress locAddr = new InetSocketAddress(0); @@ -36,7 +36,7 @@ public class GridMockNioSession extends GridMetadataAwareAdapter implements Grid /** * Creates empty mock session. */ - public GridMockNioSession() { + public MockNioSession() { // No-op. } @@ -46,7 +46,7 @@ public GridMockNioSession() { * @param locAddr Local address. * @param rmtAddr Remote address. */ - public GridMockNioSession(InetSocketAddress locAddr, InetSocketAddress rmtAddr) { + public MockNioSession(InetSocketAddress locAddr, InetSocketAddress rmtAddr) { this(); this.locAddr = locAddr; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParserSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java similarity index 96% rename from modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParserSelfTest.java rename to modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java index a58ca1ef17d5f..e5923c50131c1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParserSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java @@ -40,7 +40,7 @@ * This class tests that parser confirms memcache extended specification. */ @SuppressWarnings("TypeMayBeWeakened") -public class GridTcpRestParserSelfTest extends GridCommonAbstractTest { +public class TcpRestParserSelfTest extends GridCommonAbstractTest { /** Marshaller. */ private GridClientMarshaller marshaller = new GridClientOptimizedMarshaller(); @@ -54,7 +54,7 @@ public class GridTcpRestParserSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSimplePacketParsing() throws Exception { - GridNioSession ses = new GridMockNioSession(); + GridNioSession ses = new MockNioSession(); GridTcpRestParser parser = new GridTcpRestParser(); @@ -89,7 +89,7 @@ public void testSimplePacketParsing() throws Exception { * @throws Exception If failed. */ public void testIncorrectPackets() throws Exception { - final GridNioSession ses = new GridMockNioSession(); + final GridNioSession ses = new MockNioSession(); final GridTcpRestParser parser = new GridTcpRestParser(); @@ -147,7 +147,7 @@ public void testCustomMessages() throws Exception { ByteBuffer raw = clientRequestPacket(req); - GridNioSession ses = new GridMockNioSession(); + GridNioSession ses = new MockNioSession(); ses.addMeta(MARSHALLER.ordinal(), new GridClientOptimizedMarshaller()); @@ -174,8 +174,8 @@ public void testCustomMessages() throws Exception { * @throws Exception If failed. */ public void testMixedParsing() throws Exception { - GridNioSession ses1 = new GridMockNioSession(); - GridNioSession ses2 = new GridMockNioSession(); + GridNioSession ses1 = new MockNioSession(); + GridNioSession ses2 = new MockNioSession(); ses1.addMeta(MARSHALLER.ordinal(), new GridClientOptimizedMarshaller()); ses2.addMeta(MARSHALLER.ordinal(), new GridClientOptimizedMarshaller()); @@ -262,7 +262,7 @@ public void testParseContinuousSplit() throws Exception { tmp.flip(); - GridNioSession ses = new GridMockNioSession(); + GridNioSession ses = new MockNioSession(); ses.addMeta(MARSHALLER.ordinal(), new GridClientOptimizedMarshaller()); @@ -304,7 +304,7 @@ public void testParseClientHandshake() throws Exception { ByteBuffer[] split = split(tmp, splitPos); - GridNioSession ses = new GridMockNioSession(); + GridNioSession ses = new MockNioSession(); ses.addMeta(MARSHALLER.ordinal(), new GridClientOptimizedMarshaller()); diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java new file mode 100644 index 0000000000000..5d3f0e8862c1a --- /dev/null +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java @@ -0,0 +1,286 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.jdbc; + +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.testframework.junits.common.*; + +import java.io.*; +import java.sql.*; + +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; + +/** + * Statement test. + */ +public class JdbcStatementSelfTest extends GridCommonAbstractTest { + /** IP finder. */ + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + + /** URL. */ + private static final String URL = "jdbc:gridgain://127.0.0.1/"; + + /** SQL query. */ + private static final String SQL = "select * from Person where age > 30"; + + /** Connection. */ + private Connection conn; + + /** Statement. */ + private Statement stmt; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + CacheConfiguration cache = defaultCacheConfiguration(); + + cache.setCacheMode(PARTITIONED); + cache.setBackups(1); + cache.setWriteSynchronizationMode(FULL_SYNC); + + cfg.setCacheConfiguration(cache); + + TcpDiscoverySpi disco = new TcpDiscoverySpi(); + + disco.setIpFinder(IP_FINDER); + + cfg.setDiscoverySpi(disco); + + cfg.setRestEnabled(true); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + startGridsMultiThreaded(3); + + GridCache cache = grid(0).cache(null); + + assert cache != null; + + cache.put("p1", new Person(1, "John", "White", 25)); + cache.put("p2", new Person(2, "Joe", "Black", 35)); + cache.put("p3", new Person(3, "Mike", "Green", 40)); + + Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver"); + } + + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + stopAllGrids(); + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + conn = DriverManager.getConnection(URL); + stmt = conn.createStatement(); + + assert stmt != null; + assert !stmt.isClosed(); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + if (stmt != null && !stmt.isClosed()) + stmt.close(); + + conn.close(); + + assert stmt.isClosed(); + assert conn.isClosed(); + } + + /** + * @throws Exception If failed. + */ + public void testExecuteQuery() throws Exception { + ResultSet rs = stmt.executeQuery(SQL); + + assert rs != null; + + int cnt = 0; + + while (rs.next()) { + int id = rs.getInt("id"); + + if (id == 2) { + assert "Joe".equals(rs.getString("firstName")); + assert "Black".equals(rs.getString("lastName")); + assert rs.getInt("age") == 35; + } + else if (id == 3) { + assert "Mike".equals(rs.getString("firstName")); + assert "Green".equals(rs.getString("lastName")); + assert rs.getInt("age") == 40; + } + else + assert false : "Wrong ID: " + id; + + cnt++; + } + + assert cnt == 2; + } + + /** + * @throws Exception If failed. + */ + public void testExecute() throws Exception { + assert stmt.execute(SQL); + + ResultSet rs = stmt.getResultSet(); + + assert rs != null; + + assert stmt.getResultSet() == null; + + int cnt = 0; + + while (rs.next()) { + int id = rs.getInt("id"); + + if (id == 2) { + assert "Joe".equals(rs.getString("firstName")); + assert "Black".equals(rs.getString("lastName")); + assert rs.getInt("age") == 35; + } + else if (id == 3) { + assert "Mike".equals(rs.getString("firstName")); + assert "Green".equals(rs.getString("lastName")); + assert rs.getInt("age") == 40; + } + else + assert false : "Wrong ID: " + id; + + cnt++; + } + + assert cnt == 2; + } + + /** + * @throws Exception If failed. + */ + public void testMaxRows() throws Exception { + stmt.setMaxRows(1); + + ResultSet rs = stmt.executeQuery(SQL); + + assert rs != null; + + int cnt = 0; + + while (rs.next()) { + int id = rs.getInt("id"); + + if (id == 2) { + assert "Joe".equals(rs.getString("firstName")); + assert "Black".equals(rs.getString("lastName")); + assert rs.getInt("age") == 35; + } + else if (id == 3) { + assert "Mike".equals(rs.getString("firstName")); + assert "Green".equals(rs.getString("lastName")); + assert rs.getInt("age") == 40; + } + else + assert false : "Wrong ID: " + id; + + cnt++; + } + + assert cnt == 1; + + stmt.setMaxRows(0); + + rs = stmt.executeQuery(SQL); + + assert rs != null; + + cnt = 0; + + while (rs.next()) { + int id = rs.getInt("id"); + + if (id == 2) { + assert "Joe".equals(rs.getString("firstName")); + assert "Black".equals(rs.getString("lastName")); + assert rs.getInt("age") == 35; + } + else if (id == 3) { + assert "Mike".equals(rs.getString("firstName")); + assert "Green".equals(rs.getString("lastName")); + assert rs.getInt("age") == 40; + } + else + assert false : "Wrong ID: " + id; + + cnt++; + } + + assert cnt == 2; + } + + /** + * Person. + */ + @SuppressWarnings("UnusedDeclaration") + private static class Person implements Serializable { + /** ID. */ + @GridCacheQuerySqlField + private final int id; + + /** First name. */ + @GridCacheQuerySqlField(index = false) + private final String firstName; + + /** Last name. */ + @GridCacheQuerySqlField(index = false) + private final String lastName; + + /** Age. */ + @GridCacheQuerySqlField + private final int age; + + /** + * @param id ID. + * @param firstName First name. + * @param lastName Last name. + * @param age Age. + */ + private Person(int id, String firstName, String lastName, int age) { + assert !F.isEmpty(firstName); + assert !F.isEmpty(lastName); + assert age > 0; + + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.age = age; + } + } +}