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 bb614975d3297c3c8242857ac30d6d21cf77c38a Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 17:45:54 2020 +0200 [CAMEL-11807] Upgrade camel-geocoder to junit5 --- components/camel-geocoder/pom.xml | 6 +++--- .../camel/component/geocoder/GeoCoderApiKeyTestBase.java | 14 ++++++-------- .../component/geocoder/GeoCoderComponentAddressTest.java | 2 +- .../component/geocoder/GeoCoderCurrentAddressTest.java | 2 +- .../camel/component/geocoder/GeoCoderEmptyAddressTest.java | 2 +- .../component/geocoder/GeoCoderLatLngComponentTest.java | 2 +- .../component/geocoder/GeoCoderNominatimAddressTest.java | 4 ++-- .../camel/component/geocoder/GeoCoderNominatimTest.java | 4 ++-- .../apache/camel/component/geocoder/GeoCoderProxyTest.java | 14 +++++++++----- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/components/camel-geocoder/pom.xml b/components/camel-geocoder/pom.xml index 3bc8bb4..28df5b1 100644 --- a/components/camel-geocoder/pom.xml +++ b/components/camel-geocoder/pom.xml @@ -63,12 +63,12 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderApiKeyTestBase.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderApiKeyTestBase.java index b11cbaf..02dbfce 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderApiKeyTestBase.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderApiKeyTestBase.java @@ -16,18 +16,16 @@ */ package org.apache.camel.component.geocoder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.AssumptionViolatedException; -import org.junit.Before; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; + +import static org.junit.jupiter.api.Assumptions.assumeTrue; public class GeoCoderApiKeyTestBase extends CamelTestSupport { - @Before + @BeforeEach public void before() { - String apiKey = getApiKey(); - if (apiKey == null) { - throw new AssumptionViolatedException("API key not found in CAMEL_GEOCODER_APIKEY environment variable, skipping this test"); - } + assumeTrue(getApiKey() != null, "API key not found in CAMEL_GEOCODER_APIKEY environment variable, skipping this test"); } protected String getApiKey() { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java index cbdd945..473eadc 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.geocoder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GeoCoderComponentAddressTest extends GeoCoderApiKeyTestBase { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java index 3a7a9fd..3310c6b 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.geocoder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GeoCoderCurrentAddressTest extends GeoCoderApiKeyTestBase { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderEmptyAddressTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderEmptyAddressTest.java index 55ac515..1bfd9f9 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderEmptyAddressTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderEmptyAddressTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.geocoder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GeoCoderEmptyAddressTest extends GeoCoderApiKeyTestBase { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java index f945a9c..e1b147b 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.geocoder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GeoCoderLatLngComponentTest extends GeoCoderApiKeyTestBase { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimAddressTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimAddressTest.java index 304a12a..432b150 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimAddressTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimAddressTest.java @@ -18,8 +18,8 @@ package org.apache.camel.component.geocoder; import org.apache.camel.builder.RouteBuilder; 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; public class GeoCoderNominatimAddressTest extends CamelTestSupport { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimTest.java index 6419db5..fcc8ce5 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimTest.java @@ -18,8 +18,8 @@ package org.apache.camel.component.geocoder; import org.apache.camel.builder.RouteBuilder; 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; public class GeoCoderNominatimTest extends CamelTestSupport { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java index 31f6fa4..df26ddc 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java @@ -21,12 +21,16 @@ import com.google.maps.GeocodingApi; import com.google.maps.GeocodingApiRequest; import com.google.maps.model.GeocodingResult; import com.google.maps.model.LatLng; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -@Ignore("This test should be executed manually with a proxy set up") +@Disabled("This test should be executed manually with a proxy set up") public class GeoCoderProxyTest extends GeoCoderApiKeyTestBase { + private static final Logger LOG = LoggerFactory.getLogger(GeoCoderProxyTest.class); + @Test public void testGeoCoderProxyNoAuth() throws Exception { GeoCoderEndpoint endpoint = context.getEndpoint("geocoder:address:current?headersOnly=true&proxyHost=localhost" + "&proxyPort=8888&apiKey=" + getApiKey(), @@ -36,7 +40,7 @@ public class GeoCoderProxyTest extends GeoCoderApiKeyTestBase { GeocodingApiRequest geocodingApiRequest = GeocodingApi.reverseGeocode(context, new LatLng(45.4643, 9.1895)); GeocodingResult[] results = geocodingApiRequest.await(); - log.info("Response {}", results); + LOG.info("Response {}", results); } @Test @@ -49,7 +53,7 @@ public class GeoCoderProxyTest extends GeoCoderApiKeyTestBase { GeocodingApiRequest geocodingApiRequest = GeocodingApi.reverseGeocode(context, new LatLng(45.4643, 9.1895)); GeocodingResult[] results = geocodingApiRequest.await(); - log.info("Response {}", results); + LOG.info("Response {}", results); } }
