You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/12/14 16:32:09 UTC
[camel] branch master updated: CAMEL-11807: Migrated camel-telegram
tests to JUnit 5
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 626196a CAMEL-11807: Migrated camel-telegram tests to JUnit 5
626196a is described below
commit 626196af0baf18a859c55bdf91526b447b367faf
Author: aldettinger <al...@gmail.com>
AuthorDate: Fri Dec 13 18:44:30 2019 +0100
CAMEL-11807: Migrated camel-telegram tests to JUnit 5
---
components/camel-ftp/pom.xml | 1 -
components/camel-telegram/pom.xml | 12 +++----
.../component/telegram/TelegramChatBotTest.java | 8 +++--
.../telegram/TelegramComponentParametersTest.java | 41 +++++++++++++---------
.../telegram/TelegramConfigurationTest.java | 4 ++-
.../telegram/TelegramConsumerChannelPostTest.java | 8 +++--
.../TelegramConsumerEmptyResponseTest.java | 19 +++++-----
.../TelegramConsumerFallbackConversionTest.java | 8 +++--
.../telegram/TelegramConsumerMappingTest.java | 9 +++--
.../TelegramConsumerMediaDocumentTest.java | 8 +++--
.../telegram/TelegramConsumerMediaPhotoTest.java | 9 +++--
.../telegram/TelegramConsumerMediaVideoTest.java | 8 +++--
.../telegram/TelegramConsumerMultipleTest.java | 6 ++--
.../telegram/TelegramConsumerServiceErrorTest.java | 6 ++--
.../telegram/TelegramConsumerSingleTest.java | 6 ++--
.../TelegramProducerChatIdResolutionTest.java | 4 ++-
.../telegram/TelegramProducerLocationTest.java | 13 +++----
.../telegram/TelegramProducerMediaTest.java | 4 ++-
.../telegram/TelegramWebhookCallTest.java | 2 +-
.../telegram/TelegramWebhookRegistrationTest.java | 2 +-
.../telegram/integration/TelegramServiceTest.java | 14 ++++----
.../telegram/util/TelegramTestSupport.java | 2 +-
parent/pom.xml | 5 +++
23 files changed, 120 insertions(+), 79 deletions(-)
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 89855e4..a6f82fa 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -163,7 +163,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>${mockito-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index e5b7e1b..f897b26 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -74,12 +74,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -93,6 +88,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
index 8f87935..c371ec6 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.verification.Timeout;
+import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
@@ -40,7 +42,7 @@ import static org.mockito.Mockito.when;
*/
public class TelegramChatBotTest extends TelegramTestSupport {
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService service = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java
index a26e071..05defa8 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java
@@ -17,7 +17,10 @@
package org.apache.camel.component.telegram;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-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;
/**
* Tests the usage of defaults in the component configuration
@@ -38,25 +41,31 @@ public class TelegramComponentParametersTest extends TelegramTestSupport {
assertEquals("ANOTHER", ep3.getConfiguration().getAuthorizationToken());
}
- @Test(expected = IllegalArgumentException.class)
- public void testNonDefaultConfig() throws Exception {
- TelegramComponent component = (TelegramComponent) context().getComponent("telegram");
- component.setAuthorizationToken(null);
- component.createEndpoint("telegram:bots");
+ @Test
+ public void testNonDefaultConfig() {
+ assertThrows(IllegalArgumentException.class, () -> {
+ TelegramComponent component = (TelegramComponent)context().getComponent("telegram");
+ component.setAuthorizationToken(null);
+ component.createEndpoint("telegram:bots");
+ });
}
- @Test(expected = IllegalArgumentException.class)
- public void testWrongURI1() throws Exception {
- TelegramComponent component = (TelegramComponent) context().getComponent("telegram");
- component.setAuthorizationToken("ANY");
- component.createEndpoint("telegram:bots/ ");
+ @Test
+ public void testWrongURI1() {
+ assertThrows(IllegalArgumentException.class, () -> {
+ TelegramComponent component = (TelegramComponent)context().getComponent("telegram");
+ component.setAuthorizationToken("ANY");
+ component.createEndpoint("telegram:bots/ ");
+ });
}
- @Test(expected = IllegalArgumentException.class)
- public void testWrongURI2() throws Exception {
- TelegramComponent component = (TelegramComponent) context().getComponent("telegram");
- component.setAuthorizationToken("ANY");
- component.createEndpoint("telegram:bots/token/s");
+ @Test
+ public void testWrongURI2() {
+ assertThrows(IllegalArgumentException.class, () -> {
+ TelegramComponent component = (TelegramComponent)context().getComponent("telegram");
+ component.setAuthorizationToken("ANY");
+ component.createEndpoint("telegram:bots/token/s");
+ });
}
}
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConfigurationTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConfigurationTest.java
index 8051eda..1abb14c 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConfigurationTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConfigurationTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.telegram;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests that the configuration is loaded properly.
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
index 983a064..7c34000 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
@@ -27,9 +27,11 @@ import org.apache.camel.component.telegram.model.Chat;
import org.apache.camel.component.telegram.model.IncomingMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -43,7 +45,7 @@ public class TelegramConsumerChannelPostTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java
index 97ed018..bdaa461 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java
@@ -22,9 +22,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -36,7 +37,7 @@ public class TelegramConsumerEmptyResponseTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
@@ -45,12 +46,14 @@ public class TelegramConsumerEmptyResponseTest extends TelegramTestSupport {
when(api.getUpdates(any(), any(), any(), any())).thenAnswer(i -> defaultRes);
}
- @Test(expected = AssertionError.class)
- public void testBehaviourWithEmptyUpdates() throws Exception {
- endpoint.setResultWaitTime(500L);
- endpoint.expectedMinimumMessageCount(1);
+ @Test
+ public void testBehaviourWithEmptyUpdates() {
+ assertThrows(AssertionError.class, () -> {
+ endpoint.setResultWaitTime(500L);
+ endpoint.expectedMinimumMessageCount(1);
- endpoint.assertIsSatisfied();
+ endpoint.assertIsSatisfied();
+ });
}
@Override
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java
index 1efe3bf..186235e 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java
@@ -24,10 +24,12 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
+import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
@@ -39,7 +41,7 @@ public class TelegramConsumerFallbackConversionTest extends TelegramTestSupport
@EndpointInject("direct:message")
protected ProducerTemplate template;
- @Before
+ @BeforeEach
public void mockAPIs() {
mockTelegramService();
}
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
index 61a6b0b..a1ce073 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
@@ -30,9 +30,12 @@ import org.apache.camel.component.telegram.model.MessageResult;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.model.User;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -44,7 +47,7 @@ public class TelegramConsumerMappingTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java
index 175efe1..c366593 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java
@@ -25,9 +25,11 @@ import org.apache.camel.component.telegram.model.IncomingDocument;
import org.apache.camel.component.telegram.model.IncomingMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -39,7 +41,7 @@ public class TelegramConsumerMediaDocumentTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java
index 7ee7f60..75d8f75 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java
@@ -24,9 +24,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.IncomingMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -38,7 +41,7 @@ public class TelegramConsumerMediaPhotoTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java
index 7f59fb7..9e96111 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java
@@ -26,9 +26,11 @@ import org.apache.camel.component.telegram.model.IncomingPhotoSize;
import org.apache.camel.component.telegram.model.IncomingVideo;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -40,7 +42,7 @@ public class TelegramConsumerMediaVideoTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java
index ec3e6c5..15f0594 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@ public class TelegramConsumerMultipleTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java
index b04e1f8..29d3c7e 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@ public class TelegramConsumerServiceErrorTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java
index 42ccafe..842d8d9 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@ public class TelegramConsumerSingleTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java
index cec6081..096d417 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java
@@ -23,10 +23,12 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.eq;
/**
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerLocationTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerLocationTest.java
index 7ae0fb4..8140c17 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerLocationTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerLocationTest.java
@@ -26,12 +26,13 @@ import org.apache.camel.component.telegram.model.StopMessageLiveLocationMessage;
import org.apache.camel.component.telegram.service.RestBotAPI;
import org.apache.camel.component.telegram.service.TelegramServiceRestBotAPIAdapter;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
@@ -39,7 +40,7 @@ import static org.mockito.Mockito.when;
/**
* Tests a producer that sends location information.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class TelegramProducerLocationTest extends TelegramTestSupport {
private final double latitude = 59.9386292;
@@ -51,7 +52,7 @@ public class TelegramProducerLocationTest extends TelegramTestSupport {
private RestBotAPI restBotAPI;
@Override
- @Before
+ @BeforeEach
public void setUp() {
service = new TelegramServiceRestBotAPIAdapter(restBotAPI);
TelegramServiceProvider.get().setAlternativeService(service);
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
index 873b56b..3d9ec56 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
@@ -28,10 +28,12 @@ import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.OutgoingVideoMessage;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
import org.apache.camel.component.telegram.util.TelegramTestUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.eq;
/**
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
index 6c77784..65fd3ef 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.telegram.util.TelegramTestSupport;
import org.apache.camel.component.webhook.WebhookConfiguration;
import org.apache.camel.component.webhook.WebhookEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests a producer that sends media information.
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
index 168d252..6c945c2 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.awaitility.Awaitility.waitAtMost;
import static org.mockito.ArgumentMatchers.anyString;
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
index b639ee4..16f585c 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
@@ -31,9 +31,11 @@ import org.apache.camel.component.telegram.model.OutgoingVideoMessage;
import org.apache.camel.component.telegram.model.ReplyKeyboardMarkup;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestUtil;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests if the BotAPI are working correctly.
@@ -44,7 +46,7 @@ public class TelegramServiceTest {
private static String chatId;
- @BeforeClass
+ @BeforeAll
public static void init() {
authorizationToken = System.getenv("TELEGRAM_AUTHORIZATION_TOKEN");
chatId = System.getenv("TELEGRAM_CHAT_ID");
@@ -56,8 +58,8 @@ public class TelegramServiceTest {
UpdateResult res = service.getUpdates(authorizationToken, null, null, null);
- Assert.assertNotNull(res);
- Assert.assertTrue(res.isOk());
+ assertNotNull(res);
+ assertTrue(res.isOk());
}
@Test
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
index 1246a0b..0de4aff 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.telegram.TelegramServiceProvider;
import org.apache.camel.component.telegram.model.InlineKeyboardButton;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.ReplyKeyboardMarkup;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.mockito.Mockito;
/**
diff --git a/parent/pom.xml b/parent/pom.xml
index 708846a..d219a6a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4954,6 +4954,11 @@
<version>${mockito-version}</version>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito-version}</version>
+ </dependency>
+ <dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>${httpunit-version}</version>