This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f8a37cceb3a728c62fd50e96995938cef69e9580 Author: JiriOndrusek <[email protected]> AuthorDate: Thu Nov 4 16:19:48 2021 +0100 DebeziumMongodbTest skipped tests #3213 --- .../common/it/mongodb/DebeziumMongodbTest.java | 13 ++------ .../common/it/mysql/DebeziumMysqlTest.java | 36 +++------------------- .../common/it/sqlserver/DebeziumSqlserverTest.java | 33 ++++---------------- 3 files changed, 14 insertions(+), 68 deletions(-) diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java index 5ef6cf6..cbf9390 100644 --- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java +++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java @@ -40,12 +40,12 @@ import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assumptions.assumeTrue; @QuarkusTest @@ -54,9 +54,6 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; class DebeziumMongodbTest extends AbstractDebeziumTest { private static final Logger LOG = Logger.getLogger(DebeziumMongodbTest.class); - //constant with value of Type.mongodb.getJdbcProperty - public static final String PROPERTY_JDBC = "mongodb_jdbc"; - private static MongoClient mongoClient; private static MongoCollection companies; @@ -74,10 +71,10 @@ class DebeziumMongodbTest extends AbstractDebeziumTest { if (mongoUrl.isPresent()) { mongoClient = MongoClients.create(mongoUrl.get()); } else { - LOG.warn("Container is not running. Connection is not created."); + fail("Container is not running. Connection is not created."); } - assumeTrue(mongoClient != null); + assertNotNull(mongoClient, String.format("Can not create client for url '%s'.", mongoUrl.get())); MongoDatabase db = mongoClient.getDatabase("test"); @@ -108,7 +105,6 @@ class DebeziumMongodbTest extends AbstractDebeziumTest { @Test @Order(0) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") public void testReceiveInit() { receiveResponse() .then() @@ -131,14 +127,12 @@ class DebeziumMongodbTest extends AbstractDebeziumTest { @Test @Order(1) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") public void testInsert() throws SQLException { super.testInsert(); } @Test @Order(2) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") public void testUpdate() throws SQLException { Document doc = new Document().append("name", COMPANY_2).append("city", CITY_2); companies.insertOne(doc); @@ -156,7 +150,6 @@ class DebeziumMongodbTest extends AbstractDebeziumTest { @Test @Order(3) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") public void testDelete() throws SQLException { DeleteResult dr = companies.deleteMany(new Document().append("name", COMPANY_2)); assertEquals(1, dr.getDeletedCount(), "Only one company should be deleted."); diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java index 734ecc2..8530879 100644 --- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java +++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java @@ -29,12 +29,12 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; @QuarkusTest @QuarkusTestResource(DebeziumMysqlTestResource.class) @@ -42,8 +42,6 @@ import org.junit.jupiter.api.condition.EnabledIfSystemProperty; class DebeziumMysqlTest extends AbstractDebeziumTest { private static final Logger LOG = Logger.getLogger(DebeziumMysqlTest.class); - //has to be constant and has to be equal to Type.mysql.getJdbcProperty - public static final String PROPERTY_JDBC = "mysql_jdbc"; private static Connection connection; public DebeziumMysqlTest() { @@ -53,13 +51,11 @@ class DebeziumMysqlTest extends AbstractDebeziumTest { @BeforeAll public static void setUp() throws SQLException { Config config = ConfigProvider.getConfig(); - Optional<String> jdbcUrl = config.getOptionalValue(PROPERTY_JDBC, String.class); + Optional<String> jdbcUrl = config.getOptionalValue(Type.mysql.getPropertyJdbc(), String.class); - if (jdbcUrl.isPresent()) { - connection = DriverManager.getConnection(jdbcUrl.get()); - } else { - LOG.warn("Container is not running. Connection is not created."); - } + Assumptions.assumeTrue(jdbcUrl.isPresent(), "Driver for mySql database is not provided. Container won't start."); + + connection = DriverManager.getConnection(jdbcUrl.get()); } @AfterAll @@ -71,7 +67,6 @@ class DebeziumMysqlTest extends AbstractDebeziumTest { @Test @Order(0) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") public void testReceiveEmptyMessages() { //receive all empty messages before other tests receiveResponse("/receiveEmptyMessages") @@ -79,27 +74,6 @@ class DebeziumMysqlTest extends AbstractDebeziumTest { .statusCode(204); } - @Test - @Order(1) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") - public void testInsert() throws SQLException { - super.testInsert(); - } - - @Test - @Order(2) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") - public void testUpdate() throws SQLException { - super.testUpdate(); - } - - @Test - @Order(3) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") - public void testDelete() throws SQLException { - super.testDelete(); - } - @Override protected Connection getConnection() { return connection; diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTest.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTest.java index 6f29e19..84d24f2 100644 --- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTest.java +++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTest.java @@ -37,7 +37,6 @@ import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assumptions.assumeTrue; @@ -48,9 +47,6 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; class DebeziumSqlserverTest extends AbstractDebeziumTest { private static final Logger LOG = Logger.getLogger(DebeziumSqlserverTest.class); - //has to be constant and has to be equal to Type.mysql.getJdbcProperty - public static final String PROPERTY_JDBC = "sqlserver_jdbc"; - private static Connection connection; public DebeziumSqlserverTest() { @@ -62,6 +58,9 @@ class DebeziumSqlserverTest extends AbstractDebeziumTest { Config config = ConfigProvider.getConfig(); final Optional<String> jdbcUrl = config.getOptionalValue(Type.sqlserver.getPropertyJdbc(), String.class); + assumeTrue(jdbcUrl.isPresent(), + "Ms SQL EULA is not accepted. Container won't start."); + if (jdbcUrl.isPresent()) { connection = DriverManager.getConnection(jdbcUrl.get()); } else { @@ -93,8 +92,10 @@ class DebeziumSqlserverTest extends AbstractDebeziumTest { @Test @Order(0) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") public void testReceiveInitCompany() { + Config config = ConfigProvider.getConfig(); + assumeTrue(config.getOptionalValue(Type.sqlserver.getPropertyJdbc(), String.class).isPresent()); + int i = 0; while (i++ < AbstractDebeziumTest.REPEAT_COUNT) { @@ -115,26 +116,4 @@ class DebeziumSqlserverTest extends AbstractDebeziumTest { break; } } - - @Test - @Order(1) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") - public void testInsert() throws SQLException { - super.testInsert(); - } - - @Test - @Order(2) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") - public void testUpdate() throws SQLException { - super.testUpdate(); - } - - @Test - @Order(3) - @EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*") - public void testDelete() throws SQLException { - super.testDelete(); - } - }
