You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/05 10:02:47 UTC
[camel] branch main updated: Upgrade to jooq 3.18.5 and make camel-jooq tests more stable
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4e361be816b Upgrade to jooq 3.18.5 and make camel-jooq tests more stable
4e361be816b is described below
commit 4e361be816bdab0078e393e905fd8e7e25ea1b58
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jul 5 12:02:33 2023 +0200
Upgrade to jooq 3.18.5 and make camel-jooq tests more stable
---
components/camel-jooq/pom.xml | 5 +++
...nSQLTest.java => JooqPlainSQLConsumerTest.java} | 36 +-----------------
.../camel/component/jooq/JooqPlainSQLTest.java | 44 +++++++++-------------
parent/pom.xml | 2 +-
4 files changed, 25 insertions(+), 62 deletions(-)
diff --git a/components/camel-jooq/pom.xml b/components/camel-jooq/pom.xml
index 20a419859a2..138354f8e78 100644
--- a/components/camel-jooq/pom.xml
+++ b/components/camel-jooq/pom.xml
@@ -96,6 +96,11 @@
<version>${spring-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility-version}</version>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
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/JooqPlainSQLConsumerTest.java
similarity index 61%
copy from components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java
copy to components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLConsumerTest.java
index 0422ad2597f..aea6111b0c7 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/JooqPlainSQLConsumerTest.java
@@ -22,13 +22,11 @@ import org.apache.camel.RoutesBuilder;
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.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-public class JooqPlainSQLTest extends BaseJooqTest {
+public class JooqPlainSQLConsumerTest extends BaseJooqTest {
@Test
public void testSQLConsumer() throws InterruptedException {
@@ -45,28 +43,6 @@ public class JooqPlainSQLTest extends BaseJooqTest {
assertEquals(bookStoreRecord, mockResult.getExchanges().get(0).getMessage().getBody());
}
- @Test
- public void testSQLProducer() {
- ProducerTemplate producerTemplate = context.createProducerTemplate();
-
- // Insert
- BookStoreRecord bookStoreRecord = new BookStoreRecord("test");
- producerTemplate.sendBody(context.getEndpoint("direct:insert"), ExchangePattern.InOut, bookStoreRecord);
-
- // Select
- Result actual
- = (Result) producerTemplate.sendBody(context.getEndpoint("direct:selectSQL"), ExchangePattern.InOut, null);
- assertEquals(bookStoreRecord, actual.get(0));
-
- // Delete
- actual = (Result) producerTemplate.sendBody(context.getEndpoint("direct:deleteSQL"), ExchangePattern.InOut, null);
- assertNull(actual);
-
- // Select
- actual = (Result) producerTemplate.sendBody(context.getEndpoint("direct:selectSQL"), ExchangePattern.InOut, null);
- assertEquals(0, actual.size());
- }
-
@Override
protected RoutesBuilder createRouteBuilder() {
JooqComponent jooqComponent = (JooqComponent) context().getComponent("jooq");
@@ -81,16 +57,8 @@ public class JooqPlainSQLTest extends BaseJooqTest {
from("direct:insert")
.to("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord");
- // Producer SQL query select
- from("direct:selectSQL")
- .to("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?operation=fetch&query=select * from book_store x where x.name = 'test'");
-
- // Producer SQL query delete
- from("direct:deleteSQL")
- .to("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?operation=execute&query=delete from book_store x where x.name = 'test'");
-
// Consumer SQL query
- from("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?query=select * from book_store x where x.name = 'test'&initialDelay=0&delay=100")
+ from("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?initialDelay=0&delay=100")
.to("mock:result");
}
};
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 0422ad2597f..af1f7188b4e 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
@@ -16,35 +16,22 @@
*/
package org.apache.camel.component.jooq;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.RoutesBuilder;
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.jupiter.api.Test;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
public class JooqPlainSQLTest extends BaseJooqTest {
- @Test
- public void testSQLConsumer() throws InterruptedException {
- MockEndpoint mockResult = getMockEndpoint("mock:result");
- mockResult.expectedMessageCount(1);
-
- ProducerTemplate producerTemplate = context.createProducerTemplate();
-
- // Insert
- BookStoreRecord bookStoreRecord = new BookStoreRecord("test");
- producerTemplate.sendBody(context.getEndpoint("direct:insert"), ExchangePattern.InOut, bookStoreRecord);
-
- MockEndpoint.assertIsSatisfied(context);
- assertEquals(bookStoreRecord, mockResult.getExchanges().get(0).getMessage().getBody());
- }
-
@Test
public void testSQLProducer() {
ProducerTemplate producerTemplate = context.createProducerTemplate();
@@ -53,18 +40,25 @@ public class JooqPlainSQLTest extends BaseJooqTest {
BookStoreRecord bookStoreRecord = new BookStoreRecord("test");
producerTemplate.sendBody(context.getEndpoint("direct:insert"), ExchangePattern.InOut, bookStoreRecord);
- // Select
- Result actual
- = (Result) producerTemplate.sendBody(context.getEndpoint("direct:selectSQL"), ExchangePattern.InOut, null);
- assertEquals(bookStoreRecord, actual.get(0));
+ await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+ // Select
+ Result res
+ = (Result) producerTemplate.sendBody(context.getEndpoint("direct:selectSQL"), ExchangePattern.InOut, null);
+ assertEquals(1, res.size());
+ assertEquals(bookStoreRecord, res.get(0));
+ });
// Delete
- actual = (Result) producerTemplate.sendBody(context.getEndpoint("direct:deleteSQL"), ExchangePattern.InOut, null);
+ Result actual
+ = (Result) producerTemplate.sendBody(context.getEndpoint("direct:deleteSQL"), ExchangePattern.InOut, null);
assertNull(actual);
// Select
- actual = (Result) producerTemplate.sendBody(context.getEndpoint("direct:selectSQL"), ExchangePattern.InOut, null);
- assertEquals(0, actual.size());
+ await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+ Result res
+ = (Result) producerTemplate.sendBody(context.getEndpoint("direct:selectSQL"), ExchangePattern.InOut, null);
+ assertEquals(0, res.size());
+ });
}
@Override
@@ -88,10 +82,6 @@ public class JooqPlainSQLTest extends BaseJooqTest {
// Producer SQL query delete
from("direct:deleteSQL")
.to("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?operation=execute&query=delete from book_store x where x.name = 'test'");
-
- // Consumer SQL query
- from("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?query=select * from book_store x where x.name = 'test'&initialDelay=0&delay=100")
- .to("mock:result");
}
};
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 5a42384bb73..5727899cf67 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -284,7 +284,7 @@
<jolokia-version>1.7.2</jolokia-version>
<jolt-version>0.1.8</jolt-version>
<jool-version>0.9.15</jool-version>
- <jooq-version>3.18.4</jooq-version>
+ <jooq-version>3.18.5</jooq-version>
<joor-version>0.9.14</joor-version>
<johnzon-version>1.2.20</johnzon-version>
<jslt-version>0.1.14</jslt-version>