Skip to content

Commit 5860516

Browse files
authored
Merge pull request #2432 from ClickHouse/fix_tests_running
[repo] Make tests run even if group is not set
2 parents 9c7829a + 4c9c3bf commit 5860516

File tree

14 files changed

+25
-8
lines changed

14 files changed

+25
-8
lines changed

clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void testPingFailure() {
233233
}
234234
}
235235

236-
@Test // (groups = "integration")
236+
@Test(groups = "integration")
237237
public void testTransaction() throws ClickHouseException {
238238
if (isCloud()) return; //TODO: testTransaction - Revisit, see: https://github.com/ClickHouse/clickhouse-java/issues/1747
239239
testAbortTransaction();

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.Arrays;
1818
import java.util.Properties;
1919

20+
@Test(groups = { "integration" })
2021
public class AccessManagementTest extends JdbcIntegrationTest {
2122
@BeforeMethod(groups = "integration")
2223
public void setV1() {

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import java.util.concurrent.TimeUnit;
6161
import java.util.concurrent.atomic.AtomicReference;
6262

63+
@Test(groups = { "integration" })
6364
public class ClickHouseStatementTest extends JdbcIntegrationTest {
6465
@BeforeMethod(groups = "integration")
6566
public void setV1() {

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import static org.testng.Assert.assertThrows;
1111

12+
@Test(groups = { "integration" })
1213
public class GenericJDBCTest extends JdbcIntegrationTest {
1314
public Connection getConnection(Properties properties) throws SQLException {
1415
if (properties == null) {

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIssuesTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.sql.Statement;
1313
import java.util.Properties;
1414

15+
@Test(groups = { "integration" })
1516
public class JdbcIssuesTest extends JdbcIntegrationTest {
1617
@BeforeMethod(groups = "integration")
1718
public void setV1() {

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImplTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@
1212

1313
import org.testng.Assert;
1414
import org.testng.annotations.BeforeClass;
15+
import org.testng.annotations.BeforeMethod;
1516
import org.testng.annotations.Test;
1617

18+
@Test(groups = "integration")
1719
public class ClickHouseConnectionImplTest extends JdbcIntegrationTest {
20+
@BeforeMethod(groups = "integration")
21+
public void setV1() {
22+
System.setProperty("clickhouse.jdbc.v1","true");
23+
}
1824
@Test(groups = "integration")
1925
public void testManualCommit() throws SQLException {
2026
if (isCloud()) return; //TODO: testManualCommit - Revisit, see: https://github.com/ClickHouse/clickhouse-java/issues/1747

client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
5555
import static org.junit.Assert.fail;
5656

57+
@Test(groups = {"integration"})
5758
public class HttpTransportTests extends BaseIntegrationTest {
5859

5960
@Test(groups = {"integration"},dataProvider = "testConnectionTTLProvider")

client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
import static org.testng.Assert.assertTrue;
6969
import static org.testng.Assert.fail;
7070

71+
@Test(groups = {"integration"})
7172
public class InsertTests extends BaseIntegrationTest {
7273
private Client client;
7374
private InsertSettings settings;

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
import java.util.stream.Collectors;
9191
import java.util.stream.IntStream;
9292

93+
@Test(groups = {"integration"})
9394
public class QueryTests extends BaseIntegrationTest {
9495

9596
private final static Random RANDOM = new Random();
@@ -314,7 +315,8 @@ public void testQueryAll() throws Exception {
314315
public void testQueryAllSimple() throws Exception {
315316
testQueryAllSimple(10);
316317
}
317-
public void testQueryAllSimple(int numberOfRecords) throws Exception {
318+
319+
void testQueryAllSimple(int numberOfRecords) throws Exception {
318320
GenericRecord record = client.queryAll("SELECT number FROM system.numbers LIMIT " + numberOfRecords).stream().findFirst().get();
319321
Assert.assertNotNull(record);
320322
}
@@ -1304,7 +1306,7 @@ private static String sq(String str) {
13041306
return "\'" + str + "\'";
13051307
}
13061308

1307-
public void testDataTypes(List<String> columns, List<Supplier<String>> valueGenerators, List<Consumer<ClickHouseBinaryFormatReader>> verifiers) {
1309+
void testDataTypes(List<String> columns, List<Supplier<String>> valueGenerators, List<Consumer<ClickHouseBinaryFormatReader>> verifiers) {
13081310
final String table = "data_types_test_table";
13091311

13101312
try {

jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import static org.testng.Assert.assertThrows;
4040
import static org.testng.Assert.assertTrue;
4141

42+
@Test(groups = { "integration" })
4243
public class PreparedStatementTest extends JdbcIntegrationTest {
4344

4445
@Test(groups = { "integration" })

0 commit comments

Comments
 (0)