Skip to content

Commit c18a203

Browse files
authored
Split JDBC tests (#2556)
1 parent 2f8bbdd commit c18a203

File tree

61 files changed

+596
-521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+596
-521
lines changed

modules/clickhouse/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ description = "Testcontainers :: JDBC :: ClickHouse"
33
dependencies {
44
compile project(':testcontainers')
55
compile project(':jdbc')
6+
7+
testCompile project(':jdbc-test')
8+
testCompile 'ru.yandex.clickhouse:clickhouse-jdbc:0.2.4'
69
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.testcontainers.jdbc.clickhouse;
2+
3+
import org.junit.runner.RunWith;
4+
import org.junit.runners.Parameterized;
5+
import org.testcontainers.jdbc.AbstractJDBCDriverTest;
6+
7+
import java.util.EnumSet;
8+
9+
import static java.util.Arrays.asList;
10+
11+
@RunWith(Parameterized.class)
12+
public class ClickhouseJDBCDriverTest extends AbstractJDBCDriverTest {
13+
14+
@Parameterized.Parameters(name = "{index} - {0}")
15+
public static Iterable<Object[]> data() {
16+
return asList(
17+
new Object[][]{
18+
{"jdbc:tc:clickhouse://hostname/databasename", EnumSet.of(Options.PmdKnownBroken)},
19+
});
20+
}
21+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.testcontainers.junit.clickhouse;
2+
3+
import org.junit.Test;
4+
import org.testcontainers.containers.ClickHouseContainer;
5+
import org.testcontainers.db.AbstractContainerDatabaseTest;
6+
7+
import java.sql.ResultSet;
8+
import java.sql.SQLException;
9+
10+
import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
11+
12+
public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
13+
14+
@Test
15+
public void testSimple() throws SQLException {
16+
try (ClickHouseContainer clickhouse = new ClickHouseContainer()) {
17+
clickhouse.start();
18+
19+
ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
20+
21+
int resultSetInt = resultSet.getInt(1);
22+
assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
23+
}
24+
}
25+
}

modules/cockroachdb/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ description = "Testcontainers :: JDBC :: CockroachDB"
22

33
dependencies {
44
compile project(':jdbc')
5+
6+
testCompile project(':jdbc-test')
7+
testCompile 'org.postgresql:postgresql:42.2.12'
58
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.testcontainers.jdbc.cockroachdb;
2+
3+
import org.junit.runner.RunWith;
4+
import org.junit.runners.Parameterized;
5+
import org.testcontainers.jdbc.AbstractJDBCDriverTest;
6+
7+
import java.util.EnumSet;
8+
9+
import static java.util.Arrays.asList;
10+
11+
@RunWith(Parameterized.class)
12+
public class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
13+
14+
@Parameterized.Parameters(name = "{index} - {0}")
15+
public static Iterable<Object[]> data() {
16+
return asList(
17+
new Object[][]{
18+
{"jdbc:tc:cockroach://hostname/databasename", EnumSet.noneOf(Options.class)},
19+
});
20+
}
21+
}

modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleCockroachDBTest.java renamed to modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package org.testcontainers.junit;
1+
package org.testcontainers.junit.cockroachdb;
22

33
import org.junit.Test;
44
import org.testcontainers.containers.CockroachContainer;
5+
import org.testcontainers.db.AbstractContainerDatabaseTest;
56

67
import java.sql.ResultSet;
78
import java.sql.SQLException;

modules/db2/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ description = "Testcontainers :: JDBC :: DB2"
22

33
dependencies {
44
compile project(':jdbc')
5+
6+
testCompile project(':jdbc-test')
7+
testCompile 'com.ibm.db2:jcc:11.5.0.0'
58
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.testcontainers.jdbc.db2;
2+
3+
import org.junit.runner.RunWith;
4+
import org.junit.runners.Parameterized;
5+
import org.testcontainers.jdbc.AbstractJDBCDriverTest;
6+
7+
import java.util.EnumSet;
8+
9+
import static java.util.Arrays.asList;
10+
11+
@RunWith(Parameterized.class)
12+
public class DB2JDBCDriverTest extends AbstractJDBCDriverTest {
13+
14+
@Parameterized.Parameters(name = "{index} - {0}")
15+
public static Iterable<Object[]> data() {
16+
return asList(
17+
new Object[][]{
18+
{"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)}
19+
});
20+
}
21+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package org.testcontainers.junit.db2;
2+
3+
import org.junit.Test;
4+
import org.testcontainers.containers.Db2Container;
5+
import org.testcontainers.db.AbstractContainerDatabaseTest;
6+
7+
import java.sql.ResultSet;
8+
import java.sql.SQLException;
9+
10+
import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
11+
12+
public class SimpleDb2Test extends AbstractContainerDatabaseTest {
13+
14+
@Test
15+
public void testSimple() throws SQLException {
16+
try (Db2Container db2 = new Db2Container()
17+
.acceptLicense()) {
18+
19+
db2.start();
20+
21+
ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1");
22+
23+
int resultSetInt = resultSet.getInt(1);
24+
assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
25+
}
26+
}
27+
}

0 commit comments

Comments
 (0)