This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 269cc2c CAMEL-11807 Migrated camel-debezium-common/plugin/mongodb
tests to JUnit 5
269cc2c is described below
commit 269cc2c54220296ac1dc3d1552138f1e8ac309ad
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Fri May 1 14:48:07 2020 +0200
CAMEL-11807 Migrated camel-debezium-common/plugin/mongodb tests to JUnit 5
---
.../camel-debezium-common-component/pom.xml | 4 +-
.../component/debezium/DebeziumComponentTest.java | 8 +-
.../component/debezium/DebeziumConsumerTest.java | 26 +++--
.../component/debezium/DebeziumEndpointTest.java | 47 ++++-----
.../debezium/DebeziumTypeConverterTest.java | 12 +--
.../EmbeddedDebeziumConfigurationTest.java | 15 +--
.../camel-debezium-maven-plugin/pom.xml | 2 +-
.../maven/GenerateConnectorConfigMojoTest.java | 16 +--
.../maven/config/ConnectorConfigFieldTest.java | 12 +--
.../config/ConnectorConfigFieldsFactoryTest.java | 10 +-
.../maven/config/ConnectorConfigGeneratorTest.java | 23 +++--
components/camel-debezium-mongodb/pom.xml | 2 +-
.../debezium/DebeziumMongodbComponentTest.java | 107 +++++++++++----------
...ConnectorEmbeddedDebeziumConfigurationTest.java | 12 ++-
14 files changed, 153 insertions(+), 143 deletions(-)
diff --git
a/components/camel-debezium-common/camel-debezium-common-component/pom.xml
b/components/camel-debezium-common/camel-debezium-common-component/pom.xml
index 5bf24d5..e9534e6 100644
--- a/components/camel-debezium-common/camel-debezium-common-component/pom.xml
+++ b/components/camel-debezium-common/camel-debezium-common-component/pom.xml
@@ -35,12 +35,12 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumComponentTest.java
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumComponentTest.java
index ae0b35d..dda05cb 100644
---
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumComponentTest.java
+++
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumComponentTest.java
@@ -21,13 +21,15 @@ import java.util.HashMap;
import java.util.Map;
import
org.apache.camel.component.debezium.configuration.FileConnectorEmbeddedDebeziumConfiguration;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DebeziumComponentTest extends CamelTestSupport {
@Test
- public void testIfSetsAdditionalProperties() throws Exception {
+ void testIfSetsAdditionalProperties() throws Exception {
final DebeziumTestComponent component = new
DebeziumTestComponent(context);
final FileConnectorEmbeddedDebeziumConfiguration configuration = new
FileConnectorEmbeddedDebeziumConfiguration();
diff --git
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java
index 1b91915..6acc0af 100644
---
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java
+++
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java
@@ -32,11 +32,11 @@ import org.apache.camel.builder.RouteBuilder;
import
org.apache.camel.component.debezium.configuration.EmbeddedDebeziumConfiguration;
import
org.apache.camel.component.debezium.configuration.FileConnectorEmbeddedDebeziumConfiguration;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class DebeziumConsumerTest extends CamelTestSupport {
@@ -54,23 +54,21 @@ public class DebeziumConsumerTest extends CamelTestSupport {
@EndpointInject("mock:result")
private MockEndpoint to;
-
-
- @Before
+ @BeforeEach
public void beforeEach() {
linesAdded = 0;
inputFile = createTestingFile(TEST_FILE_PATH);
offsetStore = createTestingFile(TEST_OFFSET_STORE_PATH);
}
- @After
+ @AfterEach
public void afterEach() {
// clean all data files
deletePath(TEST_FILE_PATH);
deletePath(TEST_OFFSET_STORE_PATH);
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
// make sure to clean all data files
deletePath(TEST_FILE_PATH);
@@ -78,7 +76,7 @@ public class DebeziumConsumerTest extends CamelTestSupport {
}
@Test
- public void camelShouldConsumeDebeziumMessages() throws Exception {
+ void camelShouldConsumeDebeziumMessages() throws Exception {
// add initial lines to the file
appendLinesToSource(NUMBER_OF_LINES);
@@ -101,7 +99,7 @@ public class DebeziumConsumerTest extends CamelTestSupport {
}
@Test
- public void camelShouldContinueConsumeDebeziumMessagesWhenRouteIsOffline()
throws Exception {
+ void camelShouldContinueConsumeDebeziumMessagesWhenRouteIsOffline() throws
Exception {
// add initial lines to the file
appendLinesToSource(NUMBER_OF_LINES);
@@ -147,10 +145,10 @@ public class DebeziumConsumerTest extends
CamelTestSupport {
}
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("debezium:dummy")
.to(to);
}
diff --git
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumEndpointTest.java
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumEndpointTest.java
index 05d71a3..25e1431 100644
---
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumEndpointTest.java
+++
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumEndpointTest.java
@@ -25,25 +25,25 @@ import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.Producer;
import
org.apache.camel.component.debezium.configuration.FileConnectorEmbeddedDebeziumConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaBuilder;
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.source.SourceRecord;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class DebeziumEndpointTest {
private DebeziumEndpoint debeziumEndpoint;
@@ -51,26 +51,28 @@ public class DebeziumEndpointTest {
@Mock
private Processor processor;
- @Before
+ @BeforeEach
public void setUp() {
debeziumEndpoint = new DebeziumTestEndpoint("", new
DebeziumTestComponent(new DefaultCamelContext()),
new FileConnectorEmbeddedDebeziumConfiguration());
}
@Test
- public void testIfCreatesConsumer() throws Exception {
+ void testIfCreatesConsumer() throws Exception {
final Consumer debeziumConsumer =
debeziumEndpoint.createConsumer(processor);
assertNotNull(debeziumConsumer);
}
- @Test(expected = UnsupportedOperationException.class)
- public void testIfFailsToCreateProducer() throws Exception {
- final Producer debeziumConsumer = debeziumEndpoint.createProducer();
+ @Test
+ void testIfFailsToCreateProducer() {
+ assertThrows(UnsupportedOperationException.class, () -> {
+ debeziumEndpoint.createProducer();
+ });
}
@Test
- public void testIfCreatesExchangeFromSourceCreateRecord() {
+ void testIfCreatesExchangeFromSourceCreateRecord() {
final SourceRecord sourceRecord = createCreateRecord();
final Exchange exchange =
debeziumEndpoint.createDbzExchange(sourceRecord);
@@ -96,7 +98,7 @@ public class DebeziumEndpointTest {
}
@Test
- public void testIfCreatesExchangeFromSourceDeleteRecord() {
+ void testIfCreatesExchangeFromSourceDeleteRecord() {
final SourceRecord sourceRecord = createDeleteRecord();
final Exchange exchange =
debeziumEndpoint.createDbzExchange(sourceRecord);
@@ -117,7 +119,7 @@ public class DebeziumEndpointTest {
}
@Test
- public void testIfCreatesExchangeFromSourceDeleteRecordWithNull() {
+ void testIfCreatesExchangeFromSourceDeleteRecordWithNull() {
final SourceRecord sourceRecord = createDeleteRecordWithNull();
final Exchange exchange =
debeziumEndpoint.createDbzExchange(sourceRecord);
@@ -135,7 +137,7 @@ public class DebeziumEndpointTest {
}
@Test
- public void testIfCreatesExchangeFromSourceUpdateRecord() {
+ void testIfCreatesExchangeFromSourceUpdateRecord() {
final SourceRecord sourceRecord = createUpdateRecord();
final Exchange exchange =
debeziumEndpoint.createDbzExchange(sourceRecord);
@@ -160,7 +162,7 @@ public class DebeziumEndpointTest {
}
@Test
- public void testIfCreatesExchangeFromSourceRecordOtherThanStruct() {
+ void testIfCreatesExchangeFromSourceRecordOtherThanStruct() {
final SourceRecord sourceRecord = createStringRecord();
final Exchange exchange =
debeziumEndpoint.createDbzExchange(sourceRecord);
@@ -178,7 +180,7 @@ public class DebeziumEndpointTest {
}
@Test
- public void testIfHandlesUnknownSchema() {
+ void testIfHandlesUnknownSchema() {
final SourceRecord sourceRecord = createUnknownUnnamedSchemaRecord();
final Exchange exchange =
debeziumEndpoint.createDbzExchange(sourceRecord);
@@ -224,8 +226,7 @@ public class DebeziumEndpointTest {
private SourceRecord createDeleteRecordWithNull() {
final Schema recordSchema = SchemaBuilder.struct().field("id",
SchemaBuilder.int8()).build();
- Envelope envelope =
Envelope.defineSchema().withName("dummy.Envelope").withRecord(recordSchema)
- .withSource(SchemaBuilder.struct().build()).build();
+
Envelope.defineSchema().withName("dummy.Envelope").withRecord(recordSchema).withSource(SchemaBuilder.struct().build()).build();
final Struct before = new Struct(recordSchema);
before.put("id", (byte)1);
return new SourceRecord(new HashMap<>(), createSourceOffset(),
"dummy", createKeySchema(),
diff --git
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumTypeConverterTest.java
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumTypeConverterTest.java
index cae63be..4a210ac 100644
---
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumTypeConverterTest.java
+++
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumTypeConverterTest.java
@@ -21,17 +21,17 @@ import java.util.Map;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaBuilder;
import org.apache.kafka.connect.data.Struct;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DebeziumTypeConverterTest {
@Test
- public void testToMapFromStruct() {
+ void testToMapFromStruct() {
final Struct inputValue = createTestStruct(12, "test-name", true);
// convert toMap
diff --git
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/configuration/EmbeddedDebeziumConfigurationTest.java
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/configuration/EmbeddedDebeziumConfigurationTest.java
index 6406504..4a5cbaa 100644
---
a/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/configuration/EmbeddedDebeziumConfigurationTest.java
+++
b/components/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/configuration/EmbeddedDebeziumConfigurationTest.java
@@ -21,14 +21,16 @@ import java.util.Collections;
import io.debezium.config.Configuration;
import io.debezium.embedded.EmbeddedEngine;
import org.apache.camel.component.debezium.DebeziumConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class EmbeddedDebeziumConfigurationTest {
@Test
- public void testIfCreatesConfig() {
+ void testIfCreatesConfig() {
final TestEmbeddedDebeziumConfiguration configuration = new
TestEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setOffsetStorageReplicationFactor(2);
@@ -36,8 +38,7 @@ public class EmbeddedDebeziumConfigurationTest {
final Configuration dbzEmbeddedConfiguration =
configuration.createDebeziumConfiguration();
- assertEquals("Expect the same name", "test_config",
-
dbzEmbeddedConfiguration.getString(EmbeddedEngine.ENGINE_NAME));
+ assertEquals("test_config",
dbzEmbeddedConfiguration.getString(EmbeddedEngine.ENGINE_NAME), "Expect the
same name");
assertEquals(2, dbzEmbeddedConfiguration
.getInteger(EmbeddedEngine.OFFSET_STORAGE_KAFKA_REPLICATION_FACTOR));
assertEquals(DebeziumConstants.DEFAULT_OFFSET_STORAGE,
@@ -47,7 +48,7 @@ public class EmbeddedDebeziumConfigurationTest {
}
@Test
- public void testIfValidatesConfigurationCorrectly() {
+ void testIfValidatesConfigurationCorrectly() {
final TestEmbeddedDebeziumConfiguration configuration = new
TestEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setOffsetStorageReplicationFactor(2);
@@ -63,7 +64,7 @@ public class EmbeddedDebeziumConfigurationTest {
}
@Test
- public void testIfCreatesAdditionalProperties() {
+ void testIfCreatesAdditionalProperties() {
final TestEmbeddedDebeziumConfiguration configuration = new
TestEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setAdditionalProperties(Collections.singletonMap("test.additional",
"test_additional"));
diff --git
a/components/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
b/components/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
index cb2b8eb..f43a158 100644
--- a/components/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
+++ b/components/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<!-- only mysql connector used for testing -->
diff --git
a/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/GenerateConnectorConfigMojoTest.java
b/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/GenerateConnectorConfigMojoTest.java
index d3f816c..85fa61c 100644
---
a/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/GenerateConnectorConfigMojoTest.java
+++
b/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/GenerateConnectorConfigMojoTest.java
@@ -25,21 +25,21 @@ import io.debezium.connector.mysql.MySqlConnectorConfig;
import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.SystemStreamLog;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class GenerateConnectorConfigMojoTest {
- @Rule
- public TemporaryFolder configFolder = new TemporaryFolder();
+ @TempDir
+ public File configFolder;
@Test
- public void testIfGeneratedConfigFileCorrectly() throws
MojoFailureException, IOException {
+ void testIfGeneratedConfigFileCorrectly() throws MojoFailureException,
IOException {
final GenerateConnectorConfigMojo generateConnectorConfigMojo = new
GenerateConnectorConfigMojo();
- final File connectorConfigFolder =
configFolder.newFolder("connector-configurations");
+ final File connectorConfigFolder = new File(configFolder,
"connector-configurations");
generateConnectorConfigMojo.setLog(new SystemStreamLog());
generateConnectorConfigMojo.setGeneratedSrcDir(connectorConfigFolder);
diff --git
a/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigFieldTest.java
b/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigFieldTest.java
index b46f79f..ba8e4de 100644
---
a/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigFieldTest.java
+++
b/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigFieldTest.java
@@ -19,16 +19,16 @@ package org.apache.camel.maven.config;
import java.util.Collections;
import org.apache.kafka.common.config.ConfigDef;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConnectorConfigFieldTest {
@Test
- public void testIfReturnsCorrectly() {
+ void testIfReturnsCorrectly() {
final ConfigDef.ConfigKey configKey = new
ConfigDef.ConfigKey("field.test", ConfigDef.Type.STRING, "empty",
null, ConfigDef.Importance.MEDIUM, "testing", "testGroup", 1,
ConfigDef.Width.MEDIUM, "displayName", Collections.emptyList(),
null, false);
@@ -46,7 +46,7 @@ public class ConnectorConfigFieldTest {
}
@Test
- public void testIfHandlesUnderscoreFieldsCorrectly() {
+ void testIfHandlesUnderscoreFieldsCorrectly() {
final ConfigDef.ConfigKey configKey = new
ConfigDef.ConfigKey("field.test_underscore", ConfigDef.Type.STRING, "empty",
null, ConfigDef.Importance.MEDIUM, "testing", "testGroup", 1,
ConfigDef.Width.MEDIUM, "displayName", Collections.emptyList(),
null, false);
diff --git
a/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigFieldsFactoryTest.java
b/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigFieldsFactoryTest.java
index 675dba8..8f294c2 100644
---
a/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigFieldsFactoryTest.java
+++
b/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigFieldsFactoryTest.java
@@ -22,16 +22,16 @@ import java.util.Map;
import java.util.Set;
import org.apache.kafka.common.config.ConfigDef;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConnectorConfigFieldsFactoryTest {
@Test
- public void testIfCreatesFieldsMapWithDeprecatedFields() {
+ void testIfCreatesFieldsMapWithDeprecatedFields() {
final ConfigDef configDef = new ConfigDef()
.define("test.field.1", ConfigDef.Type.STRING,
ConfigDef.Importance.MEDIUM, "docs1")
.define("test.field.2", ConfigDef.Type.CLASS,
ConfigDef.Importance.MEDIUM, "docs2")
diff --git
a/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigGeneratorTest.java
b/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigGeneratorTest.java
index cb87ae1..0a9e481 100644
---
a/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigGeneratorTest.java
+++
b/components/camel-debezium-common/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigGeneratorTest.java
@@ -29,15 +29,16 @@ import io.debezium.connector.mysql.MySqlConnectorConfig;
import io.debezium.relational.RelationalDatabaseConnectorConfig;
import io.debezium.relational.history.FileDatabaseHistory;
import org.apache.kafka.connect.source.SourceConnector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConnectorConfigGeneratorTest {
@Test
- public void testIfCorrectlyGeneratedMySQLFile() {
+ void testIfCorrectlyGeneratedMySQLFile() {
final Set<String> requiredFields = new
HashSet<>(Arrays.asList(MySqlConnectorConfig.PASSWORD.name(),
RelationalDatabaseConnectorConfig.SERVER_NAME.name()));
final Map<String, Object> overrideFields = new HashMap<>();
overrideFields.put(MySqlConnectorConfig.DATABASE_HISTORY.name(),
FileDatabaseHistory.class);
@@ -47,9 +48,11 @@ public class ConnectorConfigGeneratorTest {
testIfCorrectlyGeneratedFile(new MySqlConnector(),
MySqlConnectorConfig.class, requiredFields, overrideFields);
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesWrongClassInput() {
- final ConnectorConfigGenerator connectorConfigGenerator =
ConnectorConfigGenerator.create(new MySqlConnector(), getClass(),
Collections.emptySet(), Collections.emptyMap());
+ @Test
+ void testIfItHandlesWrongClassInput() {
+ assertThrows(IllegalArgumentException.class, () -> {
+ ConnectorConfigGenerator.create(new MySqlConnector(), getClass(),
Collections.emptySet(), Collections.emptyMap());
+ });
}
private void testIfCorrectlyGeneratedFile(final SourceConnector connector,
final Class<?> configClass, final Set<String> requiredFields, final Map<String,
Object> overrideFields) {
@@ -64,13 +67,13 @@ public class ConnectorConfigGeneratorTest {
connectorConfigFields.forEach((name, field) -> {
if (!field.isDeprecated() && !field.isInternal()) {
// check fields names
- assertTrue(field.getFieldName(),
connectorFieldsAsString.contains(field.getFieldName()));
+
assertTrue(connectorFieldsAsString.contains(field.getFieldName()),
field.getFieldName());
// check setters
- assertTrue(field.getFieldSetterMethodName(),
connectorFieldsAsString.contains(field.getFieldSetterMethodName()));
+
assertTrue(connectorFieldsAsString.contains(field.getFieldSetterMethodName()),
field.getFieldSetterMethodName());
// check getters
- assertTrue(field.getFieldGetterMethodName(),
connectorFieldsAsString.contains(field.getFieldGetterMethodName()));
+
assertTrue(connectorFieldsAsString.contains(field.getFieldGetterMethodName()),
field.getFieldGetterMethodName());
}
});
}
diff --git a/components/camel-debezium-mongodb/pom.xml
b/components/camel-debezium-mongodb/pom.xml
index 7bbcf8c..419bfe3 100644
--- a/components/camel-debezium-mongodb/pom.xml
+++ b/components/camel-debezium-mongodb/pom.xml
@@ -48,7 +48,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/DebeziumMongodbComponentTest.java
b/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/DebeziumMongodbComponentTest.java
index abc00f9..0b06f29 100644
---
a/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/DebeziumMongodbComponentTest.java
+++
b/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/DebeziumMongodbComponentTest.java
@@ -22,15 +22,16 @@ import java.util.Map;
import
org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class DebeziumMongodbComponentTest {
@Test
- public void testIfConnectorEndpointCreatedWithConfig() throws Exception {
+ void testIfConnectorEndpointCreatedWithConfig() throws Exception {
final Map<String, Object> params = new HashMap<>();
params.put("offsetStorageFileName", "/offset_test_file");
params.put("mongodbHosts", "localhost");
@@ -44,26 +45,26 @@ public class DebeziumMongodbComponentTest {
+
"databaseHostName=localhost&databaseServerId=1234&databaseUser=dbz&databasePassword=pwd&"
+ "databaseServerName=test&databaseHistoryFileName=/test";
- final DebeziumComponent debeziumComponent = new
DebeziumMongodbComponent(new DefaultCamelContext());
- debeziumComponent.start();
- final DebeziumEndpoint debeziumEndpoint =
debeziumComponent.createEndpoint(uri, remaining, params);
-
- assertNotNull(debeziumEndpoint);
-
- // test for config
- final MongoDbConnectorEmbeddedDebeziumConfiguration configuration =
(MongoDbConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint
- .getConfiguration();
- assertEquals("test_name", configuration.getName());
- assertEquals("/offset_test_file",
configuration.getOffsetStorageFileName());
- assertEquals("localhost", configuration.getMongodbHosts());
- assertEquals("dbz", configuration.getMongodbUser());
- assertEquals("pwd", configuration.getMongodbPassword());
- assertEquals("test", configuration.getMongodbName());
- assertEquals("/db_history_file_test",
configuration.getDatabaseHistoryFileFilename());
+ try (final DebeziumComponent debeziumComponent = new
DebeziumMongodbComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
+ final DebeziumEndpoint debeziumEndpoint =
debeziumComponent.createEndpoint(uri, remaining, params);
+
+ assertNotNull(debeziumEndpoint);
+
+ // test for config
+ final MongoDbConnectorEmbeddedDebeziumConfiguration configuration
=
(MongoDbConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint.getConfiguration();
+ assertEquals("test_name", configuration.getName());
+ assertEquals("/offset_test_file",
configuration.getOffsetStorageFileName());
+ assertEquals("localhost", configuration.getMongodbHosts());
+ assertEquals("dbz", configuration.getMongodbUser());
+ assertEquals("pwd", configuration.getMongodbPassword());
+ assertEquals("test", configuration.getMongodbName());
+ assertEquals("/db_history_file_test",
configuration.getDatabaseHistoryFileFilename());
+ }
}
@Test
- public void testIfCreatesComponentWithExternalConfiguration() throws
Exception {
+ void testIfCreatesComponentWithExternalConfiguration() throws Exception {
final MongoDbConnectorEmbeddedDebeziumConfiguration configuration =
new MongoDbConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setMongodbUser("test_db");
@@ -72,52 +73,54 @@ public class DebeziumMongodbComponentTest {
configuration.setMongodbName("test");
final String uri = "debezium:dummy";
- final DebeziumComponent debeziumComponent = new
DebeziumMongodbComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new
DebeziumMongodbComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(configuration);
+ // set configurations
+ debeziumComponent.setConfiguration(configuration);
- final DebeziumEndpoint debeziumEndpoint =
debeziumComponent.createEndpoint(uri, null,
- Collections.emptyMap());
+ final DebeziumEndpoint debeziumEndpoint =
debeziumComponent.createEndpoint(uri, null, Collections.emptyMap());
- assertNotNull(debeziumEndpoint);
+ assertNotNull(debeziumEndpoint);
- // assert configurations
- final MongoDbConnectorEmbeddedDebeziumConfiguration
actualConfigurations =
(MongoDbConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint
- .getConfiguration();
- assertNotNull(actualConfigurations);
- assertEquals(configuration.getName(), actualConfigurations.getName());
- assertEquals(configuration.getMongodbUser(),
- actualConfigurations.getMongodbUser());
- assertEquals(configuration.getConnectorClass(),
actualConfigurations.getConnectorClass());
+ // assert configurations
+ final MongoDbConnectorEmbeddedDebeziumConfiguration
actualConfigurations =
(MongoDbConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint.getConfiguration();
+ assertNotNull(actualConfigurations);
+ assertEquals(configuration.getName(),
actualConfigurations.getName());
+ assertEquals(configuration.getMongodbUser(),
actualConfigurations.getMongodbUser());
+ assertEquals(configuration.getConnectorClass(),
actualConfigurations.getConnectorClass());
+ }
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesNullExternalConfigurations() throws Exception {
+ @Test
+ void testIfItHandlesNullExternalConfigurations() throws Exception {
final String remaining = "";
final String uri = "debezium:";
- final DebeziumComponent debeziumComponent = new
DebeziumMongodbComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new
DebeziumMongodbComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(null);
+ // set configurations
+ debeziumComponent.setConfiguration(null);
- final DebeziumEndpoint debeziumEndpoint =
debeziumComponent.createEndpoint(uri, remaining,
- Collections.emptyMap());
+ assertThrows(IllegalArgumentException.class, () -> {
+ debeziumComponent.createEndpoint(uri, remaining,
Collections.emptyMap());
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesNullExternalConfigurationsWithValidUri() throws
Exception {
+ @Test
+ void testIfItHandlesNullExternalConfigurationsWithValidUri() throws
Exception {
final String remaining = "dummy";
final String uri = "debezium:dummy";
- final DebeziumComponent debeziumComponent = new
DebeziumMongodbComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new
DebeziumMongodbComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(null);
+ // set configurations
+ debeziumComponent.setConfiguration(null);
- final DebeziumEndpoint debeziumEndpoint =
debeziumComponent.createEndpoint(uri, remaining,
- Collections.emptyMap());
+ assertThrows(IllegalArgumentException.class, () -> {
+ debeziumComponent.createEndpoint(uri, remaining,
Collections.emptyMap());
+ });
+ }
}
}
diff --git
a/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/configuration/MongodbConnectorEmbeddedDebeziumConfigurationTest.java
b/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/configuration/MongodbConnectorEmbeddedDebeziumConfigurationTest.java
index ac8136e..c663960 100644
---
a/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/configuration/MongodbConnectorEmbeddedDebeziumConfigurationTest.java
+++
b/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/configuration/MongodbConnectorEmbeddedDebeziumConfigurationTest.java
@@ -22,14 +22,16 @@ import io.debezium.connector.mongodb.MongoDbConnector;
import io.debezium.connector.mongodb.MongoDbConnectorConfig;
import io.debezium.embedded.EmbeddedEngine;
import org.apache.camel.component.debezium.DebeziumConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MongodbConnectorEmbeddedDebeziumConfigurationTest {
@Test
- public void testIfCreatesConfig() {
+ void testIfCreatesConfig() {
final MongoDbConnectorEmbeddedDebeziumConfiguration configuration =
new MongoDbConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setMongodbUser("test_user");
@@ -46,7 +48,7 @@ public class
MongodbConnectorEmbeddedDebeziumConfigurationTest {
}
@Test
- public void testIfValidatesConfigurationCorrectly() {
+ void testIfValidatesConfigurationCorrectly() {
final MongoDbConnectorEmbeddedDebeziumConfiguration configuration =
new MongoDbConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
@@ -64,7 +66,7 @@ public class
MongodbConnectorEmbeddedDebeziumConfigurationTest {
}
@Test
- public void testValidateConfigurationsForAllRequiredFields() {
+ void testValidateConfigurationsForAllRequiredFields() {
final MongoDbConnectorEmbeddedDebeziumConfiguration configuration =
new MongoDbConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setMongodbUser("test_db");
