You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ag...@apache.org on 2018/04/05 17:53:49 UTC
[geode] 10/23: GEODE-4947: Fix docker compose yml file references
This is an automated email from the ASF dual-hosted git repository.
agingade pushed a commit to branch feature/GEODE-4947
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a9838197f00d6c51fb39ec2c6790370e3f853d10
Author: Nick Reich <nr...@pivotal.io>
AuthorDate: Thu Mar 29 11:52:42 2018 -0700
GEODE-4947: Fix docker compose yml file references
---
.../org/apache/geode/connectors/jdbc/JdbcDistributedTest.java | 5 -----
.../apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java | 2 +-
.../geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java | 2 +-
.../geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java | 2 +-
.../connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java | 2 +-
.../geode/connectors/jdbc/PostgresJdbcDistributedTest.java | 2 +-
.../geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java | 2 +-
.../geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java | 2 +-
.../jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java | 9 ++++++---
.../internal/PostgresTableMetaDataManagerIntegrationTest.java | 9 ++++++---
10 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
index cfd6562..3c01a40 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
@@ -155,11 +155,6 @@ public abstract class JdbcDistributedTest implements Serializable {
@After
public void tearDown() throws Exception {
closeDB();
- /*
- * server.invoke(() -> {
- * closeDB();
- * });
- */
}
private void closeDB() throws SQLException {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
index 32fb9f3..a21ea07 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
public class MySqlJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcAsyncWriterIntegrationTest.class.getResource("docker/mysql.yml");
+ MySqlJdbcDistributedTest.class.getResource("docker/mysql.yml");
@ClassRule
public static transient SqlDatabaseConnectionRule dbRule = createConnectionRule();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
index 9ab31a0..14bd3f2 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.rules.MySqlConnectionRule;
public class MySqlJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcAsyncWriterIntegrationTest.class.getResource("docker/mysql.yml");
+ MySqlJdbcLoaderIntegrationTest.class.getResource("docker/mysql.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new MySqlConnectionRule.Builder()
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
index 50df180..12ceec9 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.rules.MySqlConnectionRule;
public class MySqlJdbcWriterIntegrationTest extends JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcAsyncWriterIntegrationTest.class.getResource("docker/mysql.yml");
+ MySqlJdbcWriterIntegrationTest.class.getResource("docker/mysql.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new MySqlConnectionRule.Builder()
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
index 3b363c2..fbaa93d 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.rules.PostgresConnectionRule;
public class PostgresJdbcAsyncWriterIntegrationTest extends JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcAsyncWriterIntegrationTest.class.getResource("docker/postgres.yml");
+ PostgresJdbcAsyncWriterIntegrationTest.class.getResource("docker/postgres.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new PostgresConnectionRule.Builder()
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
index 82e0ec6..5009cd7 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
public class PostgresJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcAsyncWriterIntegrationTest.class.getResource("docker/postgres.yml");
+ PostgresJdbcDistributedTest.class.getResource("docker/postgres.yml");
@ClassRule
public static transient SqlDatabaseConnectionRule dbRule = createConnectionRule();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
index 904a5b8..d9acdea 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.rules.PostgresConnectionRule;
public class PostgresJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcAsyncWriterIntegrationTest.class.getResource("docker/postgres.yml");
+ PostgresJdbcLoaderIntegrationTest.class.getResource("docker/postgres.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new PostgresConnectionRule.Builder()
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
index 1009119..e3f273e 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.rules.PostgresConnectionRule;
public class PostgresJdbcWriterIntegrationTest extends JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcAsyncWriterIntegrationTest.class.getResource("docker/postgres.yml");
+ PostgresJdbcWriterIntegrationTest.class.getResource("docker/postgres.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new PostgresConnectionRule.Builder()
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
index b69f88c..4749b55 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.connectors.jdbc.internal;
+import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
@@ -27,10 +28,12 @@ import org.apache.geode.test.junit.rules.MySqlConnectionRule;
@Category(IntegrationTest.class)
public class MySqlTableMetaDataManagerIntegrationTest extends TableMetaDataManagerIntegrationTest {
+ private static final URL COMPOSE_RESOURCE_PATH =
+ MySqlTableMetaDataManagerIntegrationTest.class.getResource("../docker/mysql.yml");
+
@ClassRule
- public static DatabaseConnectionRule dbRule =
- new MySqlConnectionRule.Builder().file("src/test/resources/docker/mysql.yml")
- .serviceName("db").port(3306).database(DB_NAME).build();
+ public static DatabaseConnectionRule dbRule = new MySqlConnectionRule.Builder()
+ .file(COMPOSE_RESOURCE_PATH.getPath()).serviceName("db").port(3306).database(DB_NAME).build();
@Override
public Connection getConnection() throws SQLException {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
index 21573e9..4a7a1a7 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.connectors.jdbc.internal;
+import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
@@ -28,10 +29,12 @@ import org.apache.geode.test.junit.rules.PostgresConnectionRule;
public class PostgresTableMetaDataManagerIntegrationTest
extends TableMetaDataManagerIntegrationTest {
+ private static final URL COMPOSE_RESOURCE_PATH =
+ PostgresTableMetaDataManagerIntegrationTest.class.getResource("../docker/postgres.yml");
+
@ClassRule
- public static DatabaseConnectionRule dbRule =
- new PostgresConnectionRule.Builder().file("src/test/resources/docker/postgres.yml")
- .serviceName("db").port(5432).database(DB_NAME).build();
+ public static DatabaseConnectionRule dbRule = new PostgresConnectionRule.Builder()
+ .file(COMPOSE_RESOURCE_PATH.getPath()).serviceName("db").port(5432).database(DB_NAME).build();
@Override
public Connection getConnection() throws SQLException {
--
To stop receiving notification emails like this one, please contact
agingade@apache.org.