This is an automated email from the ASF dual-hosted git repository.
orpiske 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 c6027b4caaa (chores) camel-couchbase: rework setup to fix CI issues
c6027b4caaa is described below
commit c6027b4caaa619fdddf23f1ebe2eff440e6c9d72
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Mon Aug 22 15:50:27 2022 +0200
(chores) camel-couchbase: rework setup to fix CI issues
---
.../couchbase/integration/ConsumeMessagesWithLimitIT.java | 9 +++++++--
.../component/couchbase/integration/ConsumeResumeStrategyIT.java | 9 +++++++--
.../couchbase/integration/CouchbaseIntegrationTestBase.java | 3 ++-
.../component/couchbase/integration/ProduceMessagesSimpleIT.java | 3 ---
.../camel/component/couchbase/integration/RemoveMessagesIT.java | 8 ++++++--
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
index 0170aed8c8c..04ca50cf53e 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
@@ -21,15 +21,20 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public class ConsumeMessagesWithLimitIT extends CouchbaseIntegrationTestBase {
- @Test
- public void testQueryForBeers() throws Exception {
+ @BeforeEach
+ public void addToBucket() {
for (int i = 0; i < 15; i++) {
cluster.bucket(bucketName).defaultCollection().upsert("DocumentID_" + i,
"message" + i);
}
+ }
+
+ @Test
+ public void testQueryForBeers() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(10);
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
index c57dab3585a..dc341657529 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
@@ -28,6 +28,7 @@ import org.apache.camel.resume.ResumeActionAware;
import org.apache.camel.support.resume.Resumables;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_RESUME_ACTION;
@@ -53,11 +54,15 @@ public class ConsumeResumeStrategyIT extends
CouchbaseIntegrationTestBase {
private final TransientResumeStrategy resumeStrategy = new
TransientResumeStrategy(new TestCouchbaseResumeAdapter());
- @Test
- public void testQueryForBeers() throws Exception {
+ @BeforeEach
+ public void addToBucket() {
for (int i = 0; i < 15; i++) {
cluster.bucket(bucketName).defaultCollection().upsert("DocumentID_" + i,
"message" + i);
}
+ }
+
+ @Test
+ public void testQueryForBeers() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(10);
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java
index 2306dcc4069..f0b5c5bad1c 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.couchbase.integration;
+import java.time.Duration;
import java.util.Collections;
import com.couchbase.client.java.Bucket;
@@ -54,7 +55,7 @@ public class CouchbaseIntegrationTestBase extends
CamelTestSupport {
bucketName,
Collections.singletonMap(bucketName, new View("function (doc,
meta) { emit(meta.id, doc);}")));
cluster.bucket(bucketName).viewIndexes().upsertDesignDocument(designDoc,
DesignDocumentNamespace.PRODUCTION);
-
+ cluster.bucket(bucketName).waitUntilReady(Duration.ofSeconds(30));
}
@AfterAll
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
index 03507cef2f7..c39cf6f0fcb 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.couchbase.integration;
-import java.time.Duration;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.couchbase.CouchbaseConstants;
import org.apache.camel.component.mock.MockEndpoint;
@@ -27,7 +25,6 @@ public class ProduceMessagesSimpleIT extends
CouchbaseIntegrationTestBase {
@Test
public void testInsert() throws Exception {
- cluster.bucket(bucketName).waitUntilReady(Duration.ofSeconds(30));
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
index 3199ffbd51f..702385babff 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.couchbase.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_DELETE;
@@ -25,12 +26,15 @@ import static
org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_ID;
public class RemoveMessagesIT extends CouchbaseIntegrationTestBase {
- @Test
- public void testDelete() throws Exception {
+ @BeforeEach
+ public void addToBucket() {
for (int i = 0; i < 15; i++) {
cluster.bucket(bucketName).defaultCollection().upsert("DocumentID_" + i,
"message" + i);
}
+ }
+ @Test
+ public void testDelete() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
template.sendBodyAndHeader("direct:start", "delete the document ",
HEADER_ID, "DocumentID_1");
