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
commit e580ba346da1f47b81520d8a4e2cbfb563052d0a Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Fri Jul 14 12:57:35 2023 +0200 (chores) camel-core: data set test fixes and cleanups - use Assumptions instead of asserts for test assumptions - increase timeouts --- .../component/dataset/FileDataSetConsumerWithSplitTest.java | 13 +++++++------ .../camel/component/dataset/ListDataSetConsumerTest.java | 7 ++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java index 0db9c284149..1910c020f97 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java @@ -16,15 +16,16 @@ */ package org.apache.camel.component.dataset; +import java.time.Duration; + import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class FileDataSetConsumerWithSplitTest extends ContextTestSupport { protected FileDataSet dataSet; @@ -48,7 +49,7 @@ public class FileDataSetConsumerWithSplitTest extends ContextTestSupport { MockEndpoint result = getMockEndpoint(resultUri); result.expectedMinimumMessageCount((int) dataSet.getSize()); - result.assertIsSatisfied(); + result.assertIsSatisfied(Duration.ofSeconds(5).toMillis()); } @Test @@ -57,21 +58,21 @@ public class FileDataSetConsumerWithSplitTest extends ContextTestSupport { dataSet.setSize(20); result.expectedMinimumMessageCount((int) dataSet.getSize()); - result.assertIsSatisfied(); + result.assertIsSatisfied(Duration.ofSeconds(5).toMillis()); } @Override @BeforeEach public void setUp() throws Exception { dataSet = new FileDataSet(testDataFileName, "\n"); - assertEquals(testDataFileRecordCount, dataSet.getSize(), "Unexpected DataSet size"); + Assumptions.assumeTrue(testDataFileRecordCount == dataSet.getSize(), "Unexpected DataSet size"); super.setUp(); } @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from(dataSetUri).to("mock://result"); } }; diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java index cda7106cfd7..ac0ac395cf1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.component.dataset; +import java.time.Duration; import java.util.LinkedList; import java.util.List; @@ -46,7 +47,7 @@ public class ListDataSetConsumerTest extends ContextTestSupport { MockEndpoint result = getMockEndpoint(resultUri); result.expectedMinimumMessageCount((int) dataSet.getSize()); - result.assertIsSatisfied(); + result.assertIsSatisfied(Duration.ofSeconds(5).toMillis()); } @Test @@ -55,7 +56,7 @@ public class ListDataSetConsumerTest extends ContextTestSupport { dataSet.setSize(10); result.expectedMinimumMessageCount((int) dataSet.getSize()); - result.assertIsSatisfied(); + result.assertIsSatisfied(Duration.ofSeconds(5).toMillis()); } @Override @@ -71,7 +72,7 @@ public class ListDataSetConsumerTest extends ContextTestSupport { @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from(dataSetUri).to("mock://result"); } };