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 35e4563fe47f3437876b1ded73538f82082e550e Author: Nikita Konovalov <nkono...@redhat.com> AuthorDate: Tue Jul 30 13:03:35 2024 +0200 CAMEL-19538: added awaitility to the classpath, replaced awaitility lib in tests --- components/camel-mllp/pom.xml | 6 ++++++ .../java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java | 2 +- .../apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java | 2 +- .../mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java | 2 +- .../camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java | 2 +- .../camel/component/mllp/MllpTcpServerConsumerConnectionTest.java | 2 +- .../mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java | 2 +- .../test/java/org/apache/camel/test/tcp/JavaSocketManualTests.java | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml index b48929492ac..31d3705d687 100644 --- a/components/camel-mllp/pom.xml +++ b/components/camel-mllp/pom.xml @@ -83,6 +83,12 @@ <scope>test</scope> <type>test-jar</type> </dependency> + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <version>4.2.1</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java index 953984e6bcd..6dae69c084a 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java @@ -29,7 +29,7 @@ import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.testcontainers.shaded.org.awaitility.Awaitility; +import org.awaitility.Awaitility; import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; import static org.apache.camel.test.junit5.TestSupport.assertStringContains; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java index e735790e119..4f9ee0ffb58 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java @@ -37,7 +37,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.Mockito; -import org.testcontainers.shaded.org.awaitility.Awaitility; +import org.awaitility.Awaitility; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java index b593b2e1d41..02d79063651 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.shaded.org.awaitility.Awaitility; +import org.awaitility.Awaitility; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java index 972294c930e..bc74e1d7137 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java @@ -33,7 +33,7 @@ import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.testcontainers.shaded.org.awaitility.Awaitility; +import org.awaitility.Awaitility; public class MllpTcpServerConsumerBindTimeoutTest extends CamelTestSupport { diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java index a0e952a94ac..4ebe99d56bd 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java @@ -28,7 +28,7 @@ import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceException; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.testcontainers.shaded.org.awaitility.Awaitility; +import org.awaitility.Awaitility; import static org.apache.camel.test.junit5.ThrottlingExecutor.slowly; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java index 89b8fe1d0ff..1a3a569ef5a 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.shaded.org.awaitility.Awaitility; +import org.awaitility.Awaitility; import static org.apache.camel.component.mllp.MllpExceptionTestSupport.LOG_PHI_TRUE; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketManualTests.java b/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketManualTests.java index 1c0eac3fd42..4741a539dcd 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketManualTests.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketManualTests.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.shaded.org.awaitility.Awaitility; +import org.awaitility.Awaitility; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail;