Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E14A718AA1 for ; Tue, 16 Jun 2015 16:18:47 +0000 (UTC) Received: (qmail 43465 invoked by uid 500); 16 Jun 2015 16:18:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 43434 invoked by uid 500); 16 Jun 2015 16:18:47 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 43425 invoked by uid 99); 16 Jun 2015 16:18:47 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 16:18:47 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 61353CE3AE for ; Tue, 16 Jun 2015 16:18:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.153 X-Spam-Level: * X-Spam-Status: No, score=1.153 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.648, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id I10m1zYGEKON for ; Tue, 16 Jun 2015 16:18:37 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id C515125016 for ; Tue, 16 Jun 2015 16:18:33 +0000 (UTC) Received: (qmail 41320 invoked by uid 99); 16 Jun 2015 16:18:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 16:18:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DEEBAE027F; Tue, 16 Jun 2015 16:18:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 16 Jun 2015 16:18:42 -0000 Message-Id: <41fa846251434ecb965ffd4afcf5e74e@git.apache.org> In-Reply-To: <2adbf731f79e4890be546fad8ccf2f25@git.apache.org> References: <2adbf731f79e4890be546fad8ccf2f25@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/25] incubator-ignite git commit: #IGNITE-960 Fixed test. #IGNITE-960 Fixed test. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd8048bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd8048bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd8048bd Branch: refs/heads/ignite-sprint-6 Commit: dd8048bd7c4c143395dbc0f18010d101698604cd Parents: a7ca45b Author: nikolay_tikhonov Authored: Tue Jun 16 17:51:57 2015 +0300 Committer: nikolay_tikhonov Committed: Tue Jun 16 17:51:57 2015 +0300 ---------------------------------------------------------------------- modules/spring/src/test/config/node1.xml | 2 +- modules/spring/src/test/config/store-cache1.xml | 2 +- .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 63 +++++++++++++++++++- .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 3 +- 4 files changed, 63 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd8048bd/modules/spring/src/test/config/node1.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/node1.xml b/modules/spring/src/test/config/node1.xml index 67bae12..76539f7 100644 --- a/modules/spring/src/test/config/node1.xml +++ b/modules/spring/src/test/config/node1.xml @@ -22,7 +22,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd8048bd/modules/spring/src/test/config/store-cache1.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/store-cache1.xml b/modules/spring/src/test/config/store-cache1.xml index bff88e9..a9e58d6 100644 --- a/modules/spring/src/test/config/store-cache1.xml +++ b/modules/spring/src/test/config/store-cache1.xml @@ -23,7 +23,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd"> - + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd8048bd/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java index 6d3d3fd..7638a46 100644 --- a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactorySelfTest.java @@ -22,9 +22,11 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.h2.jdbcx.*; -import sun.jdbc.odbc.ee.*; +import java.io.*; +import java.sql.*; import java.util.concurrent.*; +import java.util.logging.*; /** * Test for Cache jdbc blob store factory. @@ -44,7 +46,7 @@ public class CacheJdbcBlobStoreFactorySelfTest extends GridCommonAbstractTest { try(Ignite ignite1 = Ignition.start("modules/spring/src/test/config/store-cache1.xml")) { checkStore(ignite.cache(CACHE_NAME), JdbcDataSource.class); - checkStore(ignite1.cache(CACHE_NAME), ConnectionPoolDataSource.class); + checkStore(ignite1.cache(CACHE_NAME), DummyDataSource.class); } } } @@ -59,7 +61,7 @@ public class CacheJdbcBlobStoreFactorySelfTest extends GridCommonAbstractTest { try (IgniteCache cache1 = ignite1.getOrCreateCache(cacheConfiguration())) { checkStore(cache, JdbcDataSource.class); - checkStore(cache1, ConnectionPoolDataSource.class); + checkStore(cache1, DummyDataSource.class); } } } @@ -112,4 +114,59 @@ public class CacheJdbcBlobStoreFactorySelfTest extends GridCommonAbstractTest { assertEquals(dataSrcClass, GridTestUtils.getFieldValue(store, CacheJdbcBlobStore.class, "dataSrc").getClass()); } + + /** + * + */ + public static class DummyDataSource implements javax.sql.DataSource, Serializable { + /** */ + public DummyDataSource() { + // No-op. + } + + /** {@inheritDoc} */ + @Override public Connection getConnection() throws SQLException { + return null; + } + + /** {@inheritDoc} */ + @Override public Connection getConnection(String username, String password) throws SQLException { + return null; + } + + /** {@inheritDoc} */ + @Override public PrintWriter getLogWriter() throws SQLException { + return null; + } + + /** {@inheritDoc} */ + @Override public void setLogWriter(PrintWriter out) throws SQLException { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void setLoginTimeout(int seconds) throws SQLException { + // No-op. + } + + /** {@inheritDoc} */ + @Override public int getLoginTimeout() throws SQLException { + return 0; + } + + /** {@inheritDoc} */ + @Override public Logger getParentLogger() throws SQLFeatureNotSupportedException { + return null; + } + + /** {@inheritDoc} */ + @Override public T unwrap(Class iface) throws SQLException { + return null; + } + + /** {@inheritDoc} */ + @Override public boolean isWrapperFor(Class iface) throws SQLException { + return false; + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd8048bd/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java index 7b709d5..c456339 100644 --- a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactorySelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.h2.jdbcx.*; -import sun.jdbc.odbc.ee.*; import javax.cache.*; import java.io.*; @@ -47,7 +46,7 @@ public class CacheJdbcPojoStoreFactorySelfTest extends GridCommonAbstractTest { try (IgniteCache cache1 = ignite1.getOrCreateCache(cacheConfiguration())) { checkStore(cache, JdbcDataSource.class); - checkStore(cache1, ConnectionPoolDataSource.class); + checkStore(cache1, CacheJdbcBlobStoreFactorySelfTest.DummyDataSource.class); } } }