This is an automated email from the ASF dual-hosted git repository.
orpiske 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 9ad9db7 CAMEL-16400: split unit and integration tests for
camel-weather (#5433)
9ad9db7 is described below
commit 9ad9db71f29b7f44fbeb4006d82054fe0c9a6c91
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Apr 19 17:06:50 2021 +0200
CAMEL-16400: split unit and integration tests for camel-weather (#5433)
---
components/camel-weather/pom.xml | 23 ++--------------------
...onsumerTest.java => BaseWeatherConsumerIT.java} | 2 +-
...Test.java => CurrentWeatherConsumerHtmlIT.java} | 5 ++++-
...umerTest.java => CurrentWeatherConsumerIT.java} | 5 ++++-
...lTest.java => CurrentWeatherConsumerXmlIT.java} | 5 ++++-
...st.java => CurrentWeatherMadridConsumerIT.java} | 5 ++++-
...st.java => CurrentWeatherMadridProducerIT.java} | 5 ++++-
....java => Forecast7WeatherMadridConsumerIT.java} | 5 ++++-
.../camel/component/weather/WeatherQueryTest.java | 3 +++
9 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index fff50d1..9ba949f 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -81,30 +81,11 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>weather-test</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
-
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
</build>
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/BaseWeatherConsumerIT.java
similarity index 97%
rename from
components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java
rename to
components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java
index a9c7d2a..b9e763b 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/BaseWeatherConsumerIT.java
@@ -30,7 +30,7 @@ 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 abstract class BaseWeatherConsumerIT extends CamelTestSupport {
public static final String LS = System.lineSeparator();
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/CurrentWeatherConsumerHtmlIT.java
similarity index 86%
rename from
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
rename to
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlIT.java
index dbf3b2d..b83ee33 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/CurrentWeatherConsumerHtmlIT.java
@@ -17,10 +17,13 @@
package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
-public class CurrentWeatherConsumerHtmlTest extends BaseWeatherConsumerTest {
+@EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true",
+ disabledReason = "Disabled to avoid hitting API
limits")
+public class CurrentWeatherConsumerHtmlIT extends BaseWeatherConsumerIT {
@Override
protected void checkWeatherContent(String weather) {
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/CurrentWeatherConsumerIT.java
similarity index 85%
rename from
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
rename to
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerIT.java
index 3d3bd8b..489da89 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/CurrentWeatherConsumerIT.java
@@ -17,10 +17,13 @@
package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
-public class CurrentWeatherConsumerTest extends BaseWeatherConsumerTest {
+@EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true",
+ disabledReason = "Disabled to avoid hitting API
limits")
+public class CurrentWeatherConsumerIT extends BaseWeatherConsumerIT {
@Override
protected void checkWeatherContent(String weather) {
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/CurrentWeatherConsumerXmlIT.java
similarity index 84%
rename from
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
rename to
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlIT.java
index f88eb5d..054fd38 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/CurrentWeatherConsumerXmlIT.java
@@ -17,10 +17,13 @@
package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
-public class CurrentWeatherConsumerXmlTest extends BaseWeatherConsumerTest {
+@EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true",
+ disabledReason = "Disabled to avoid hitting API
limits")
+public class CurrentWeatherConsumerXmlIT extends BaseWeatherConsumerIT {
@Override
protected void checkWeatherContent(String weather) {
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerIT.java
similarity index 80%
rename from
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
rename to
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerIT.java
index e7f97e2..876f591 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerIT.java
@@ -17,8 +17,11 @@
package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class CurrentWeatherMadridConsumerTest extends BaseWeatherConsumerTest {
+@EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true",
+ disabledReason = "Disabled to avoid hitting API
limits")
+public class CurrentWeatherMadridConsumerIT extends BaseWeatherConsumerIT {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
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/CurrentWeatherMadridProducerIT.java
similarity index 92%
rename from
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
rename to
components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerIT.java
index 5a64057..6a66cbb 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/CurrentWeatherMadridProducerIT.java
@@ -21,11 +21,14 @@ import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class CurrentWeatherMadridProducerTest extends BaseWeatherConsumerTest {
+@EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true",
+ disabledReason = "Disabled to avoid hitting API
limits")
+public class CurrentWeatherMadridProducerIT extends BaseWeatherConsumerIT {
@Override
@Test
diff --git
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerIT.java
similarity index 81%
rename from
components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
rename to
components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerIT.java
index 1c43e14..791bc01 100644
---
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
+++
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerIT.java
@@ -17,8 +17,11 @@
package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class Forecast7WeatherMadridConsumerTest extends
BaseWeatherConsumerTest {
+@EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true",
+ disabledReason = "Disabled to avoid hitting API
limits")
+public class Forecast7WeatherMadridConsumerIT extends BaseWeatherConsumerIT {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
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 a59ba06..fff2d27 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
@@ -20,6 +20,7 @@ import
org.apache.camel.component.weather.geolocation.GeoLocation;
import org.apache.camel.component.weather.geolocation.GeoLocationProvider;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
@@ -29,6 +30,8 @@ import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.when;
@MockitoSettings(strictness = Strictness.LENIENT)
+@EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true",
+ disabledReason = "Disabled to avoid hitting API
limits")
public class WeatherQueryTest {
private static final String LONGITUDE = "4.13";
