This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4685
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-4685 by this
push:
new 27a0d87 GEODE-4685: Amended JDBC connector code to pass in a Cache
for testing
27a0d87 is described below
commit 27a0d8786f8f5e873446af31985b54ea3b43c355
Author: Udo <[email protected]>
AuthorDate: Wed Feb 28 10:19:42 2018 -0800
GEODE-4685: Amended JDBC connector code to pass in a Cache for testing
---
.../org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java | 6 +++---
.../java/org/apache/geode/connectors/jdbc/JdbcLoader.java | 6 +++---
.../java/org/apache/geode/connectors/jdbc/JdbcWriter.java | 6 +++---
.../geode/connectors/jdbc/internal/AbstractJdbcCallback.java | 3 ++-
.../geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java | 7 ++++---
.../org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java | 5 +++--
.../geode/connectors/jdbc/JdbcLoaderIntegrationTest.java | 7 ++++---
.../java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java | 7 ++++++-
.../geode/connectors/jdbc/JdbcWriterIntegrationTest.java | 7 ++++---
.../java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java | 5 +++--
.../connectors/jdbc/internal/AbstractJdbcCallbackTest.java | 11 +++++++----
11 files changed, 42 insertions(+), 28 deletions(-)
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
index 6ba3255..3981764 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
@@ -31,7 +31,7 @@ import org.apache.geode.pdx.PdxInstance;
/**
* This class provides write behind cache semantics for a JDBC data source
using AsyncEventListener.
- *
+ *
* @since Geode 1.4
*/
@Experimental
@@ -48,8 +48,8 @@ public class JdbcAsyncWriter extends AbstractJdbcCallback
implements AsyncEventL
}
// Constructor for test purposes only
- JdbcAsyncWriter(SqlHandler sqlHandler) {
- super(sqlHandler);
+ JdbcAsyncWriter(SqlHandler sqlHandler, InternalCache cache) {
+ super(sqlHandler, cache);
}
@Override
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
index f3ba9a5..69618f1 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.cache.InternalCache;
/**
* This class provides loading from a data source using JDBC.
- *
+ *
* @since Geode 1.4
*/
@Experimental
@@ -36,8 +36,8 @@ public class JdbcLoader<K, V> extends AbstractJdbcCallback
implements CacheLoade
}
// Constructor for test purposes only
- JdbcLoader(SqlHandler sqlHandler) {
- super(sqlHandler);
+ JdbcLoader(SqlHandler sqlHandler, InternalCache cache) {
+ super(sqlHandler, cache);
}
/**
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
index 2f65cb2..665109a 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
@@ -28,7 +28,7 @@ import org.apache.geode.pdx.PdxInstance;
/**
* This class provides synchronous write through to a data source using JDBC.
- *
+ *
* @since Geode 1.4
*/
@Experimental
@@ -40,8 +40,8 @@ public class JdbcWriter<K, V> extends AbstractJdbcCallback
implements CacheWrite
}
// Constructor for test purposes only
- JdbcWriter(SqlHandler sqlHandler) {
- super(sqlHandler);
+ JdbcWriter(SqlHandler sqlHandler, InternalCache cache) {
+ super(sqlHandler, cache);
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
index 98bb42a..9074e68 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
@@ -30,8 +30,9 @@ public abstract class AbstractJdbcCallback implements
CacheCallback {
// nothing
}
- protected AbstractJdbcCallback(SqlHandler sqlHandler) {
+ protected AbstractJdbcCallback(SqlHandler sqlHandler, InternalCache cache) {
this.sqlHandler = sqlHandler;
+ this.cache = cache;
}
@Override
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
index e8c7e63..28188d2 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
@@ -39,6 +39,7 @@ import
org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -49,7 +50,7 @@ public class JdbcAsyncWriterIntegrationTest {
private static final String REGION_TABLE_NAME = "employees";
private static final String CONNECTION_URL = "jdbc:derby:memory:" + DB_NAME
+ ";create=true";
- private Cache cache;
+ private InternalCache cache;
private Region<String, PdxInstance> employees;
private Connection connection;
private Statement statement;
@@ -61,7 +62,7 @@ public class JdbcAsyncWriterIntegrationTest {
@Before
public void setup() throws Exception {
- cache = new CacheFactory().set("locators", "").set("mcast-port", "0")
+ cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
.setPdxReadSerialized(false).create();
employees = createRegionWithJDBCAsyncWriter(REGION_TABLE_NAME);
connection = DriverManager.getConnection(CONNECTION_URL);
@@ -235,7 +236,7 @@ public class JdbcAsyncWriterIntegrationTest {
private Region<String, PdxInstance> createRegionWithJDBCAsyncWriter(String
regionName)
throws ConnectionConfigExistsException, RegionMappingExistsException {
- jdbcWriter = new JdbcAsyncWriter(createSqlHandler());
+ jdbcWriter = new JdbcAsyncWriter(createSqlHandler(), cache);
cache.createAsyncEventQueueFactory().setBatchSize(1).setBatchTimeInterval(1)
.create("jdbcAsyncQueue", jdbcWriter);
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
index 0e5c8de..23e8eff 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
@@ -34,6 +34,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -45,7 +46,7 @@ public class JdbcAsyncWriterTest {
private InternalRegion region;
private JdbcAsyncWriter writer;
- private Cache cache;
+ private InternalCache cache;
@Before
public void setup() {
@@ -53,7 +54,7 @@ public class JdbcAsyncWriterTest {
region = mock(InternalRegion.class);
cache = Fakes.cache();
- writer = new JdbcAsyncWriter(sqlHandler);
+ writer = new JdbcAsyncWriter(sqlHandler, cache);
when(region.getRegionService()).thenReturn(cache);
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
index f162c3d..f37087f 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
@@ -35,6 +35,7 @@ import
org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -45,13 +46,13 @@ public class JdbcLoaderIntegrationTest {
private static final String REGION_TABLE_NAME = "employees";
private static final String CONNECTION_URL = "jdbc:derby:memory:" + DB_NAME
+ ";create=true";
- private Cache cache;
+ private InternalCache cache;
private Connection connection;
private Statement statement;
@Before
public void setUp() throws Exception {
- cache = new CacheFactory().set("locators", "").set("mcast-port", "0")
+ cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
.setPdxReadSerialized(false).create();
connection = DriverManager.getConnection(CONNECTION_URL);
statement = connection.createStatement();
@@ -102,7 +103,7 @@ public class JdbcLoaderIntegrationTest {
private Region<String, PdxInstance> createRegionWithJDBCLoader(String
regionName)
throws ConnectionConfigExistsException, RegionMappingExistsException {
- JdbcLoader<String, PdxInstance> jdbcLoader = new
JdbcLoader<>(createSqlHandler());
+ JdbcLoader<String, PdxInstance> jdbcLoader = new
JdbcLoader<>(createSqlHandler(), cache);
RegionFactory<String, PdxInstance> regionFactory =
cache.createRegionFactory(REPLICATE);
regionFactory.setCacheLoader(jdbcLoader);
return regionFactory.create(regionName);
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
index 620c9f8..726c772 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
@@ -26,7 +26,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.LoaderHelper;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
@@ -37,14 +39,17 @@ public class JdbcLoaderTest {
private JdbcLoader<Object, Object> loader;
+ private InternalCache cache;
+
@Before
public void setUp() throws Exception {
+ cache = Fakes.cache();
sqlHandler = mock(SqlHandler.class);
loaderHelper = mock(LoaderHelper.class);
when(loaderHelper.getRegion()).thenReturn(mock(InternalRegion.class));
- loader = new JdbcLoader<>(sqlHandler);
+ loader = new JdbcLoader<>(sqlHandler, cache);
}
@Test
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
index 8401c42..8945838 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
@@ -42,6 +42,7 @@ import
org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -52,7 +53,7 @@ public class JdbcWriterIntegrationTest {
private static final String REGION_TABLE_NAME = "employees";
private static final String CONNECTION_URL = "jdbc:derby:memory:" + DB_NAME
+ ";create=true";
- private Cache cache;
+ private InternalCache cache;
private Region<String, PdxInstance> employees;
private Connection connection;
private Statement statement;
@@ -64,7 +65,7 @@ public class JdbcWriterIntegrationTest {
@Before
public void setup() throws Exception {
- cache = new CacheFactory().set("locators", "").set("mcast-port", "0")
+ cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
.setPdxReadSerialized(false).create();
employees = createRegionWithJDBCSynchronousWriter(REGION_TABLE_NAME);
@@ -209,7 +210,7 @@ public class JdbcWriterIntegrationTest {
private Region<String, PdxInstance>
createRegionWithJDBCSynchronousWriter(String regionName)
throws ConnectionConfigExistsException, RegionMappingExistsException {
- jdbcWriter = new JdbcWriter(createSqlHandler());
+ jdbcWriter = new JdbcWriter(createSqlHandler(), cache);
RegionFactory<String, PdxInstance> regionFactory =
cache.createRegionFactory(RegionShortcut.REPLICATE);
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
index 92a58a4..93c69ef 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
@@ -32,6 +32,7 @@ import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.SerializedCacheValue;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.fake.Fakes;
@@ -45,7 +46,7 @@ public class JdbcWriterTest {
private SqlHandler sqlHandler;
private SerializedCacheValue<Object> serializedNewValue;
private RegionEvent<Object, Object> regionEvent;
- private Cache cache;
+ private InternalCache cache;
private JdbcWriter<Object, Object> writer;
@@ -63,7 +64,7 @@ public class JdbcWriterTest {
when(entryEvent.getSerializedNewValue()).thenReturn(serializedNewValue);
when(serializedNewValue.getDeserializedValue()).thenReturn(pdxInstance);
- writer = new JdbcWriter<>(sqlHandler);
+ writer = new JdbcWriter<>(sqlHandler, cache);
}
@Test
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
index 95fcdf0..c089b76 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
@@ -34,21 +35,23 @@ public class AbstractJdbcCallbackTest {
private AbstractJdbcCallback jdbcCallback;
private SqlHandler sqlHandler;
+ private InternalCache cache;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
+ cache = Fakes.cache();
sqlHandler = mock(SqlHandler.class);
- jdbcCallback = new AbstractJdbcCallback(sqlHandler) {};
+ jdbcCallback = new AbstractJdbcCallback(sqlHandler, cache) {};
}
@Test
- public void closesSqlHandler() throws Exception {
+ public void closesSqlHandler() {
jdbcCallback.close();
verify(sqlHandler, times(1)).close();
}
@Test
- public void returnsCorrectSqlHander() throws Exception {
+ public void returnsCorrectSqlHander() {
assertThat(jdbcCallback.getSqlHandler()).isSameAs(sqlHandler);
}
--
To stop receiving notification emails like this one, please contact
[email protected].
