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 d3b7545 CAMEL-16400: split unit and integration tests for
camel-dropbox (#5427)
d3b7545 is described below
commit d3b75458aaf777a9d0a5df2691747edaf143d442
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Apr 19 15:40:03 2021 +0200
CAMEL-16400: split unit and integration tests for camel-dropbox (#5427)
---
components/camel-dropbox/pom.xml | 30 +---------------------
.../dropbox/integration/DropboxTestSupport.java | 27 ++++++++++++++-----
...leTest.java => DropboxConsumerGetSingleIT.java} | 4 ++-
...Test.java => DropboxConsumerSearchQueryIT.java} | 4 ++-
...ducerDelTest.java => DropboxProducerDelIT.java} | 4 ++-
...erTest.java => DropboxProducerGetFolderIT.java} | 4 ++-
...leTest.java => DropboxProducerGetSingleIT.java} | 4 ++-
...cerMoveTest.java => DropboxProducerMoveIT.java} | 4 ++-
...st.java => DropboxProducerPutSingleFileIT.java} | 4 ++-
...Test.java => DropboxProducerSearchQueryIT.java} | 4 ++-
.../src/test/resources/test-options.properties | 2 +-
11 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/components/camel-dropbox/pom.xml b/components/camel-dropbox/pom.xml
index c3cdb74..3a2e9cad 100644
--- a/components/camel-dropbox/pom.xml
+++ b/components/camel-dropbox/pom.xml
@@ -93,36 +93,8 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>
- **/integration/**
- </exclude>
- </excludes>
- </configuration>
+ <artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>dropbox-test</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration combine.self="override">
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- </profile>
- </profiles>
-
</project>
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java
index 60c2c5c..4548370 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java
@@ -42,13 +42,7 @@ public class DropboxTestSupport extends CamelTestSupport {
private DbxClientV2 client;
protected DropboxTestSupport() {
- properties = new Properties();
- try (InputStream inStream =
getClass().getResourceAsStream("/test-options.properties")) {
- properties.load(inStream);
- } catch (IOException e) {
- LOG.error("I/O error: reading test-options.properties: {}",
e.getMessage(), e);
- throw new IllegalAccessError("test-options.properties could not be
found");
- }
+ properties = loadProperties();
workdir = properties.getProperty("workDir");
token = properties.getProperty("accessToken");
@@ -58,6 +52,25 @@ public class DropboxTestSupport extends CamelTestSupport {
}
+ private static Properties loadProperties() {
+ final Properties properties = new Properties();
+ try (InputStream inStream =
DropboxTestSupport.class.getResourceAsStream("/test-options.properties")) {
+ properties.load(inStream);
+ } catch (IOException e) {
+ LOG.error("I/O error: reading test-options.properties: {}",
e.getMessage(), e);
+ throw new IllegalAccessError("test-options.properties could not be
found");
+ }
+ return properties;
+ }
+
+ // Used by JUnit to automatically trigger the integration tests
+ @SuppressWarnings("unused")
+ private static boolean hasCredentials() {
+ Properties properties = loadProperties();
+
+ return !properties.getProperty("accessToken", "").isEmpty();
+ }
+
@BeforeEach
public void setUpWorkingFolder() throws DbxException {
createDir(workdir);
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleIT.java
similarity index 90%
rename from
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
rename to
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleIT.java
index 819801b..056be40 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleIT.java
@@ -21,8 +21,10 @@ import
org.apache.camel.component.dropbox.integration.DropboxTestSupport;
import org.apache.camel.component.dropbox.util.DropboxResultHeader;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class DropboxConsumerGetSingleTest extends DropboxTestSupport {
+@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
+public class DropboxConsumerGetSingleIT extends DropboxTestSupport {
public static final String FILE_NAME = "myFile.txt";
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryIT.java
similarity index 90%
rename from
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
rename to
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryIT.java
index 3879ed6..9682321 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryIT.java
@@ -21,8 +21,10 @@ import
org.apache.camel.component.dropbox.integration.DropboxTestSupport;
import org.apache.camel.component.dropbox.util.DropboxResultHeader;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class DropboxConsumerSearchQueryTest extends DropboxTestSupport {
+@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
+public class DropboxConsumerSearchQueryIT extends DropboxTestSupport {
public static final String FILE_NAME = "myTestFile.txt";
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelIT.java
similarity index 92%
rename from
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
rename to
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelIT.java
index 1b7d4cd..2ebcb84 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelIT.java
@@ -25,8 +25,10 @@ import
org.apache.camel.component.dropbox.util.DropboxResultHeader;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class DropboxProducerDelTest extends DropboxTestSupport {
+@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
+public class DropboxProducerDelIT extends DropboxTestSupport {
public static final String FILE_NAME = "file.txt";
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderIT.java
similarity index 94%
rename from
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
rename to
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderIT.java
index ec2b505..c4e4f88 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderIT.java
@@ -26,10 +26,12 @@ import
org.apache.camel.component.dropbox.util.DropboxResultHeader;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class DropboxProducerGetFolderTest extends DropboxTestSupport {
+@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
+public class DropboxProducerGetFolderIT extends DropboxTestSupport {
public static final String FILE_NAME1 = "myFile.txt";
public static final String FILE_NAME2 = "myFile2.txt";
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleIT.java
similarity index 92%
rename from
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
rename to
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleIT.java
index 785aa74..151a5ec 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleIT.java
@@ -25,8 +25,10 @@ import
org.apache.camel.component.dropbox.util.DropboxResultHeader;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class DropboxProducerGetSingleTest extends DropboxTestSupport {
+@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
+public class DropboxProducerGetSingleIT extends DropboxTestSupport {
public static final String FILE_NAME = "myFile.txt";
public static final String CONTENT = "Hi camels";
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveIT.java
similarity index 93%
rename from
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
rename to
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveIT.java
index 242bd83..8dde112 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveIT.java
@@ -26,8 +26,10 @@ import
org.apache.camel.component.dropbox.util.DropboxResultHeader;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class DropboxProducerMoveTest extends DropboxTestSupport {
+@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
+public class DropboxProducerMoveIT extends DropboxTestSupport {
public static final String COPY_WORKDIR = "/test-workdir";
public static final String FILE = "file.txt";
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
similarity index 95%
rename from
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
rename to
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
index 080bab5..758c2a8 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
@@ -32,11 +32,13 @@ import
org.apache.camel.component.dropbox.util.DropboxResultHeader;
import org.apache.camel.component.dropbox.util.DropboxUploadMode;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-public class DropboxProducerPutSingleFileTest extends DropboxTestSupport {
+@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
+public class DropboxProducerPutSingleFileIT extends DropboxTestSupport {
public static final String FILENAME = "newFile.txt";
@Test
diff --git
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryIT.java
similarity index 92%
rename from
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
rename to
components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryIT.java
index 823870d..f671884 100644
---
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
+++
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryIT.java
@@ -25,8 +25,10 @@ import
org.apache.camel.component.dropbox.util.DropboxResultHeader;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class DropboxProducerSearchQueryTest extends DropboxTestSupport {
+@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
+public class DropboxProducerSearchQueryIT extends DropboxTestSupport {
public static final String FILE_NAME = "myTestFile.txt";
diff --git
a/components/camel-dropbox/src/test/resources/test-options.properties
b/components/camel-dropbox/src/test/resources/test-options.properties
index 5c07059..67c9ec5 100644
--- a/components/camel-dropbox/src/test/resources/test-options.properties
+++ b/components/camel-dropbox/src/test/resources/test-options.properties
@@ -15,6 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-accessToken=<api-token>
+accessToken=
clientIdentifier=camel-dropbox
workDir=/camel-test