This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 50e6d4d3ee0a9dfdcb623fc27f7e29529e27dc84
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 12:36:13 2020 +0200
[CAMEL-11807] Upgrade camel-weather to junit5
---
components/camel-weather/pom.xml | 9 +++++++--
.../camel/component/weather/BaseWeatherConsumerTest.java | 14 ++++++++++++--
.../CurrentWeatherConsumerGeolocationProviderTest.java | 7 +++++--
.../component/weather/CurrentWeatherConsumerHtmlTest.java | 2 ++
.../component/weather/CurrentWeatherConsumerTest.java | 2 ++
.../component/weather/CurrentWeatherConsumerXmlTest.java | 2 ++
.../weather/CurrentWeatherMadridProducerTest.java | 5 ++++-
.../apache/camel/component/weather/WeatherQueryTest.java | 12 ++++++------
8 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index 5786712..0ac364a 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -61,7 +61,12 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -71,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java
index a330a35..a9c7d2a 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java
@@ -21,11 +21,21 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public abstract class BaseWeatherConsumerTest extends CamelTestSupport {
+ public static final String LS = System.lineSeparator();
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
protected void checkWeatherContent(String weather) {
// the default mode is json
log.debug("The weather in {} format is {}{}", WeatherMode.JSON, LS,
weather);
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java
index 2795c5e..3821f6a 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.weather;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class CurrentWeatherConsumerGeolocationProviderTest extends
CamelTestSupport {
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
index abcd1c7..5ce71ea 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+
public class CurrentWeatherConsumerHtmlTest extends BaseWeatherConsumerTest {
@Override
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
index 52172c3..a5bad86 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+
public class CurrentWeatherConsumerTest extends BaseWeatherConsumerTest {
@Override
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
index 9d16c2b..f88eb5d 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+
public class CurrentWeatherConsumerXmlTest extends BaseWeatherConsumerTest {
@Override
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
index e3ecaa1..5b5923b 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class CurrentWeatherMadridProducerTest extends BaseWeatherConsumerTest {
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
index e006549..7be07e0 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
@@ -18,17 +18,17 @@ package org.apache.camel.component.weather;
import org.apache.camel.component.weather.geolocation.GeoLocation;
import org.apache.camel.component.weather.geolocation.GeoLocationProvider;
-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.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class WeatherQueryTest {
private static final String LONGITUDE = "4.13";
@@ -41,7 +41,7 @@ public class WeatherQueryTest {
@Mock
private GeoLocationProvider exceptionThrowingGeoLocationProvider;
- @Before
+ @BeforeEach
public void setup() throws Exception {
GeoLocation location = new GeoLocation(LONGITUDE, LATITUDE);
when(geoLocationProvider.getCurrentGeoLocation()).thenReturn(location);
