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 5ef1821 CAMEL-16400: adjust manual integration tests for camel-corda
(#5414)
5ef1821 is described below
commit 5ef1821d588078df105bcf7b6386b9f779ed7ef1
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Mon Apr 19 13:34:47 2021 +0200
CAMEL-16400: adjust manual integration tests for camel-corda (#5414)
---
components/camel-corda/pom.xml | 34 +++++-----------------
...estSupport.java => CordaConsumerITSupport.java} | 2 +-
...est.java => CordaConsumerNetworkMapFeedIT.java} | 4 ++-
...=> CordaConsumerStartTrackedFlowDynamicIT.java} | 4 ++-
...t.java => CordaConsumerStateMachineFeedIT.java} | 4 ++-
...java => CordaConsumerTransactionMapFeedIT.java} | 4 ++-
...va => CordaConsumerVaultTrackByCriteriaIT.java} | 4 ++-
...nTest.java => CordaConsumerVaultTrackByIT.java} | 4 ++-
...CordaConsumerVaultTrackByWithPagingSpecIT.java} | 4 ++-
...=> CordaConsumerVaultTrackByWithSortingIT.java} | 4 ++-
...ionTest.java => CordaConsumerVaultTrackIT.java} | 4 ++-
.../{CordaTestSupport.java => CordaITSupport.java} | 2 +-
...erIntegrationTest.java => CordaProducerIT.java} | 6 ++--
13 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/components/camel-corda/pom.xml b/components/camel-corda/pom.xml
index 13fab6a..9315ae1 100644
--- a/components/camel-corda/pom.xml
+++ b/components/camel-corda/pom.xml
@@ -61,30 +61,12 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>corda-integration</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
-
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <failIfNoTests>false</failIfNoTests>
- <runOrder>alphabetical</runOrder>
- <includes>
- <include>**/*IntegrationTest.java</include>
- </includes>
- <excludes>
- <exclude>**/*XXXTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTestSupport.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerITSupport.java
similarity index 97%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTestSupport.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerITSupport.java
index 0dc93ab..8529c1d 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTestSupport.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerITSupport.java
@@ -28,7 +28,7 @@ import org.apache.camel.BindToRegistry;
import static
net.corda.core.node.services.vault.QueryCriteriaUtils.DEFAULT_PAGE_NUM;
import static
net.corda.core.node.services.vault.QueryCriteriaUtils.MAX_PAGE_SIZE;
-public class CordaConsumerTestSupport extends CordaTestSupport {
+public class CordaConsumerITSupport extends CordaITSupport {
@Override
public boolean isUseAdviceWith() {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIT.java
similarity index 91%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIT.java
index 7011904..2a9bd11 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIT.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.NETWORK_MAP_FEED;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
-public class CordaConsumerNetworkMapFeedIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerNetworkMapFeedIT extends CordaConsumerITSupport {
@Test
public void networkMapFeedTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIT.java
similarity index 92%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIT.java
index 04a535e..73474c3 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIT.java
@@ -18,13 +18,15 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
import static
org.apache.camel.component.corda.CordaConstants.START_TRACKED_FLOW_DYNAMIC;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class CordaConsumerStartTrackedFlowDynamicIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerStartTrackedFlowDynamicIT extends
CordaConsumerITSupport {
@Test
public void startTrackedFlowDynamicTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIT.java
similarity index 91%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIT.java
index 12f9f11..c440af7 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIT.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
import static
org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_FEED;
-public class CordaConsumerStateMachineFeedIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerStateMachineFeedIT extends CordaConsumerITSupport {
@Test
public void stateMachineFeedTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIT.java
similarity index 91%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIT.java
index 9169aa2..3cfd1a6 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIT.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
import static
org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED;
-public class CordaConsumerTransactionMapFeedIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerTransactionMapFeedIT extends CordaConsumerITSupport {
@Test
public void transactionMapFeedTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIT.java
similarity index 91%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIT.java
index 23e3f78..0e17051 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIT.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
import static
org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_CRITERIA;
-public class CordaConsumerVaultTrackByCriteriaIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerVaultTrackByCriteriaIT extends
CordaConsumerITSupport {
@Test
public void vaultTrackByCriteriaTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIT.java
similarity index 92%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIT.java
index 8d26ad9..37afcea 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIT.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
-public class CordaConsumerVaultTrackByIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerVaultTrackByIT extends CordaConsumerITSupport {
@Test
public void vaultTrackByTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIT.java
similarity index 91%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIT.java
index 4bf4025..6d216e8 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIT.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
import static
org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_WITH_PAGING_SPEC;
-public class CordaConsumerVaultTrackByWithPagingSpecIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerVaultTrackByWithPagingSpecIT extends
CordaConsumerITSupport {
@Test
public void vaultTrackByWithPagingSpecTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIT.java
similarity index 91%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIT.java
index 0dc7f98..120e838 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIT.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
import static
org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_WITH_SORTING;
-public class CordaConsumerVaultTrackByWithSortingIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerVaultTrackByWithSortingIT extends
CordaConsumerITSupport {
@Test
public void vaultTrackByWithSortingTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIT.java
similarity index 91%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIT.java
index ce582d8..39460bb 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIT.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.corda;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.corda.CordaConstants.OPERATION;
import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK;
-public class CordaConsumerVaultTrackIntegrationTest extends
CordaConsumerTestSupport {
+@Disabled("Requires manual steps to setup and run")
+public class CordaConsumerVaultTrackIT extends CordaConsumerITSupport {
@Test
public void vaultTrackTest() throws Exception {
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaITSupport.java
similarity index 97%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaITSupport.java
index b069028..9a01bc8 100755
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaITSupport.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.MockitoAnnotations;
-public class CordaTestSupport extends CamelTestSupport {
+public class CordaITSupport extends CamelTestSupport {
@EndpointInject("mock:result")
protected MockEndpoint mockResult;
diff --git
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIntegrationTest.java
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIT.java
similarity index 99%
rename from
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIntegrationTest.java
rename to
components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIT.java
index 862210b..90af4e0 100644
---
a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIntegrationTest.java
+++
b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIT.java
@@ -48,6 +48,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,8 +60,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-public class CordaProducerIntegrationTest extends CordaTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(CordaProducerIntegrationTest.class);
+@Disabled("Requires manual steps to setup and run")
+public class CordaProducerIT extends CordaITSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(CordaProducerIT.class);
private static final SecureHash.SHA256 TEST_SHA_256
=
SecureHash.parse("6D1687C143DF792A011A1E80670A4E4E0C25D0D87A39514409B1ABFC2043581F");
