This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d52350da7a4de2db1adbafbc8e11c4d94eb58ba2
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 10:47:02 2020 +0200
[CAMEL-11807] Upgrade camel-jooq to junit5
---
components/camel-jooq/pom.xml | 11 ++++++++---
.../org/apache/camel/component/jooq/BaseJooqTest.java | 11 +++++------
.../apache/camel/component/jooq/JooqComponentTest.java | 10 +++++++---
.../apache/camel/component/jooq/JooqConsumerTest.java | 17 +++++++++--------
.../apache/camel/component/jooq/JooqPlainSQLTest.java | 14 ++++++++------
.../apache/camel/component/jooq/JooqProducerTest.java | 14 +++++++-------
.../org/apache/camel/component/jooq/JooqXMLTest.java | 7 ++++---
7 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/components/camel-jooq/pom.xml b/components/camel-jooq/pom.xml
index c0c54c0..390a822 100644
--- a/components/camel-jooq/pom.xml
+++ b/components/camel-jooq/pom.xml
@@ -67,12 +67,17 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java
index bb568dc..fe73d69 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java
@@ -19,17 +19,16 @@ package org.apache.camel.component.jooq;
import java.nio.file.Files;
import java.sql.Connection;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.jooq.DSLContext;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration(locations = {"/jooq-spring.xml"})
public abstract class BaseJooqTest extends CamelTestSupport {
@@ -39,7 +38,7 @@ public abstract class BaseJooqTest extends CamelTestSupport {
@Value("classpath:db-hsql.sql")
Resource ddlScriptFile;
- @Before
+ @BeforeEach
public void init() throws Exception {
String sql = new
String(Files.readAllBytes(ddlScriptFile.getFile().toPath()));
Connection conn =
create.configuration().connectionProvider().acquire();
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
index d2e7269..ba137f4 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.jooq;
import org.apache.camel.PropertyBindingException;
import org.apache.camel.component.jooq.db.tables.records.BookStoreRecord;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class JooqComponentTest extends BaseJooqTest {
@@ -39,9 +42,10 @@ public class JooqComponentTest extends BaseJooqTest {
assertEquals(BookStoreRecord.class,
ep3.getConfiguration().getEntityType());
}
- @Test(expected = PropertyBindingException.class)
+ @Test
public void testNonDefaultConfig() throws Exception {
JooqComponent component = (JooqComponent)
context().getComponent("jooq");
-
component.createEndpoint("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?operation=unexpectedOperation");
+ assertThrows(PropertyBindingException.class,
+ () ->
component.createEndpoint("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?operation=unexpectedOperation"));
}
}
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java
index 65f08da..3b7fcb2 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java
@@ -25,16 +25,17 @@ import
org.apache.camel.component.jooq.db.tables.records.AuthorRecord;
import org.apache.camel.component.jooq.db.tables.records.BookStoreRecord;
import org.apache.camel.component.mock.MockEndpoint;
import org.jooq.Result;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JooqConsumerTest extends BaseJooqTest {
@Test
public void testConsumerConfig() {
JooqConsumer consumer = (JooqConsumer)
context.getRoute("consumer-config").getConsumer();
- Assert.assertEquals(1000, consumer.getInitialDelay());
- Assert.assertEquals(2000, consumer.getDelay());
+ assertEquals(1000, consumer.getInitialDelay());
+ assertEquals(2000, consumer.getDelay());
}
@Test
@@ -51,8 +52,8 @@ public class JooqConsumerTest extends BaseJooqTest {
producerTemplate.sendBody(context.getEndpoint("direct:insertBookStoreRecord"),
ExchangePattern.InOut, bookStoreRecord);
assertMockEndpointsSatisfied();
- Assert.assertEquals(bookStoreRecord,
mockInserted.getExchanges().get(0).getMessage().getBody());
- Assert.assertEquals(1,
((Result)mockResult.getExchanges().get(0).getMessage().getBody()).size());
+ assertEquals(bookStoreRecord,
mockInserted.getExchanges().get(0).getMessage().getBody());
+ assertEquals(1,
((Result)mockResult.getExchanges().get(0).getMessage().getBody()).size());
}
@Test
@@ -69,8 +70,8 @@ public class JooqConsumerTest extends BaseJooqTest {
producerTemplate.sendBody(context.getEndpoint("direct:insertAuthorRecord"),
ExchangePattern.InOut, authorRecord);
assertMockEndpointsSatisfied();
- Assert.assertEquals(authorRecord,
mockInserted.getExchanges().get(0).getMessage().getBody());
- Assert.assertEquals(0,
((Result)mockResult.getExchanges().get(0).getMessage().getBody()).size());
+ assertEquals(authorRecord,
mockInserted.getExchanges().get(0).getMessage().getBody());
+ assertEquals(0,
((Result)mockResult.getExchanges().get(0).getMessage().getBody()).size());
}
@Override
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java
index 2908902..c136ed5 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jooq.db.tables.records.BookStoreRecord;
import org.apache.camel.component.mock.MockEndpoint;
import org.jooq.Result;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class JooqPlainSQLTest extends BaseJooqTest {
@@ -40,7 +42,7 @@ public class JooqPlainSQLTest extends BaseJooqTest {
producerTemplate.sendBody(context.getEndpoint("direct:insert"),
ExchangePattern.InOut, bookStoreRecord);
assertMockEndpointsSatisfied();
- Assert.assertEquals(bookStoreRecord,
mockResult.getExchanges().get(0).getMessage().getBody());
+ assertEquals(bookStoreRecord,
mockResult.getExchanges().get(0).getMessage().getBody());
}
@Test
@@ -53,15 +55,15 @@ public class JooqPlainSQLTest extends BaseJooqTest {
// Select
Result actual = (Result)
producerTemplate.sendBody(context.getEndpoint("direct:selectSQL"),
ExchangePattern.InOut, null);
- Assert.assertEquals(bookStoreRecord, actual.get(0));
+ assertEquals(bookStoreRecord, actual.get(0));
// Delete
actual = (Result)
producerTemplate.sendBody(context.getEndpoint("direct:deleteSQL"),
ExchangePattern.InOut, null);
- Assert.assertNull(actual);
+ assertNull(actual);
// Select
actual = (Result)
producerTemplate.sendBody(context.getEndpoint("direct:selectSQL"),
ExchangePattern.InOut, null);
- Assert.assertEquals(0, actual.size());
+ assertEquals(0, actual.size());
}
@Override
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqProducerTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqProducerTest.java
index 76ab63f..ab7de78 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqProducerTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqProducerTest.java
@@ -24,10 +24,10 @@ import
org.apache.camel.component.jooq.db.tables.records.BookStoreRecord;
import org.jooq.Query;
import org.jooq.Result;
import org.jooq.ResultQuery;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.jooq.db.Tables.BOOK_STORE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JooqProducerTest extends BaseJooqTest {
@@ -40,8 +40,8 @@ public class JooqProducerTest extends BaseJooqTest {
producerTemplate.sendBody(context.getEndpoint("direct:insert"),
ExchangePattern.InOut, bookStoreRecord);
ResultQuery querySelect =
create.selectFrom(BOOK_STORE).where(BOOK_STORE.NAME.eq("test"));
Result actual =
(Result)producerTemplate.sendBody(context.getEndpoint("direct:select"),
ExchangePattern.InOut, querySelect);
- Assert.assertEquals(1, actual.size());
- Assert.assertEquals(bookStoreRecord, actual.get(0));
+ assertEquals(1, actual.size());
+ assertEquals(bookStoreRecord, actual.get(0));
// Update and select
String newName = "testNew";
@@ -49,15 +49,15 @@ public class JooqProducerTest extends BaseJooqTest {
producerTemplate.sendBody(context.getEndpoint("direct:update"),
ExchangePattern.InOut, query);
querySelect =
create.selectFrom(BOOK_STORE).where(BOOK_STORE.NAME.eq(newName));
actual =
(Result)producerTemplate.sendBody(context.getEndpoint("direct:select"),
ExchangePattern.InOut, querySelect);
- Assert.assertEquals(1, actual.size());
- Assert.assertEquals(newName,
((BookStoreRecord)actual.get(0)).getName());
+ assertEquals(1, actual.size());
+ assertEquals(newName, ((BookStoreRecord)actual.get(0)).getName());
// Delete and select
query = create.delete(BOOK_STORE).where(BOOK_STORE.NAME.eq(newName));
producerTemplate.sendBody(context.getEndpoint("direct:delete"),
ExchangePattern.InOut, query);
querySelect =
create.selectFrom(BOOK_STORE).where(BOOK_STORE.NAME.eq(newName));
actual =
(Result)producerTemplate.sendBody(context.getEndpoint("direct:select"),
ExchangePattern.InOut, querySelect);
- Assert.assertEquals(0, actual.size());
+ assertEquals(0, actual.size());
}
@Override
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqXMLTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqXMLTest.java
index b8ecc3b..058aa83 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqXMLTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqXMLTest.java
@@ -20,11 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.jooq.UpdatableRecord;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Only for testing XML DSL. All basic tests are located here: {@link
JooqProducerTest}, {@link JooqConsumerTest}.
*/
@@ -38,7 +39,7 @@ public class JooqXMLTest extends BaseJooqTest {
public void testInsert() {
ProducerTemplate producerTemplate = context.createProducerTemplate();
UpdatableRecord entity =
(UpdatableRecord)producerTemplate.sendBody(context.getEndpoint("direct:insert"),
ExchangePattern.InOut, "empty");
- Assert.assertNotNull(entity);
+ assertNotNull(entity);
}
@Test
