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 cd2f32f905210424d7591588d00d6061643a0ae4 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 09:59:23 2020 +0200 [CAMEL-11807] Upgrade camel-corda to junit5 --- components/camel-corda/pom.xml | 30 ++++++++++++- ...ordaConsumerNetworkMapFeedIntegrationTest.java} | 6 +-- ...merStartTrackedFlowDynamicIntegrationTest.java} | 7 ++- ...daConsumerStateMachineFeedIntegrationTest.java} | 6 +-- .../component/corda/CordaConsumerTestSupport.java | 2 - ...ConsumerTransactionMapFeedIntegrationTest.java} | 6 +-- ...nsumerVaultTrackByCriteriaIntegrationTest.java} | 6 +-- ... CordaConsumerVaultTrackByIntegrationTest.java} | 6 +-- ...VaultTrackByWithPagingSpecIntegrationTest.java} | 6 +-- ...merVaultTrackByWithSortingIntegrationTest.java} | 6 +-- ...=> CordaConsumerVaultTrackIntegrationTest.java} | 6 +-- ...Test.java => CordaProducerIntegrationTest.java} | 52 ++++------------------ .../camel/component/corda/CordaTestSupport.java | 14 +++--- 13 files changed, 62 insertions(+), 91 deletions(-) diff --git a/components/camel-corda/pom.xml b/components/camel-corda/pom.xml index 3ede03b..3e50174 100644 --- a/components/camel-corda/pom.xml +++ b/components/camel-corda/pom.xml @@ -51,14 +51,40 @@ <!-- for testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </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> + </project> diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIntegrationTest.java similarity index 88% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIntegrationTest.java index a622501..7011904 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedIntegrationTest.java @@ -18,14 +18,12 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerNetworkMapFeedTest extends CordaConsumerTestSupport { +public class CordaConsumerNetworkMapFeedIntegrationTest extends CordaConsumerTestSupport { @Test public void networkMapFeedTest() throws Exception { diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIntegrationTest.java similarity index 89% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIntegrationTest.java index bcc9eff..aa9cf9c 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicIntegrationTest.java @@ -18,14 +18,13 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerStartTrackedFlowDynamicTest extends CordaConsumerTestSupport { +public class CordaConsumerStartTrackedFlowDynamicIntegrationTest extends CordaConsumerTestSupport { @Test diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIntegrationTest.java similarity index 88% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIntegrationTest.java index da2b631..12f9f11 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedIntegrationTest.java @@ -18,14 +18,12 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerStateMachineFeedTest extends CordaConsumerTestSupport { +public class CordaConsumerStateMachineFeedIntegrationTest extends CordaConsumerTestSupport { @Test public void stateMachineFeedTest() throws Exception { 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/CordaConsumerTestSupport.java index 7a9d811..a6dac88 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/CordaConsumerTestSupport.java @@ -24,12 +24,10 @@ import net.corda.core.node.services.vault.QueryCriteria; import net.corda.core.node.services.vault.Sort; import net.corda.core.node.services.vault.SortAttribute; import org.apache.camel.BindToRegistry; -import org.junit.Ignore; import static net.corda.core.node.services.vault.QueryCriteriaUtils.DEFAULT_PAGE_NUM; import static net.corda.core.node.services.vault.QueryCriteriaUtils.MAX_PAGE_SIZE; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") public class CordaConsumerTestSupport extends CordaTestSupport { @Override diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIntegrationTest.java similarity index 88% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIntegrationTest.java index 2c5a7c5..9169aa2 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedIntegrationTest.java @@ -18,14 +18,12 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerTransactionMapFeedTest extends CordaConsumerTestSupport { +public class CordaConsumerTransactionMapFeedIntegrationTest extends CordaConsumerTestSupport { @Test public void transactionMapFeedTest() throws Exception { diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIntegrationTest.java similarity index 88% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIntegrationTest.java index 497ad80..cfdea85 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaIntegrationTest.java @@ -18,14 +18,12 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerVaultTrackByCriteriaTest extends CordaConsumerTestSupport { +public class CordaConsumerVaultTrackByCriteriaIntegrationTest extends CordaConsumerTestSupport { @Test public void vaultTrackByCriteriaTest() throws Exception { diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIntegrationTest.java similarity index 89% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIntegrationTest.java index d8fee89..342ae66 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByIntegrationTest.java @@ -18,14 +18,12 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerVaultTrackByTest extends CordaConsumerTestSupport { +public class CordaConsumerVaultTrackByIntegrationTest extends CordaConsumerTestSupport { @Test public void vaultTrackByTest() throws Exception { diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIntegrationTest.java similarity index 89% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIntegrationTest.java index f4930b0..67f9c29 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecIntegrationTest.java @@ -18,14 +18,12 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerVaultTrackByWithPagingSpecTest extends CordaConsumerTestSupport { +public class CordaConsumerVaultTrackByWithPagingSpecIntegrationTest extends CordaConsumerTestSupport { @Test public void vaultTrackByWithPagingSpecTest() throws Exception { diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIntegrationTest.java similarity index 88% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIntegrationTest.java index e04ef40..eabbd27 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingIntegrationTest.java @@ -18,14 +18,12 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerVaultTrackByWithSortingTest extends CordaConsumerTestSupport { +public class CordaConsumerVaultTrackByWithSortingIntegrationTest extends CordaConsumerTestSupport { @Test public void vaultTrackByWithSortingTest() throws Exception { diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIntegrationTest.java similarity index 88% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIntegrationTest.java index cd99a5a..4614280 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackIntegrationTest.java @@ -18,14 +18,12 @@ package org.apache.camel.component.corda; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +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; -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaConsumerVaultTrackTest extends CordaConsumerTestSupport { +public class CordaConsumerVaultTrackIntegrationTest extends CordaConsumerTestSupport { @Test public void vaultTrackTest() throws Exception { diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIntegrationTest.java similarity index 84% rename from components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerTest.java rename to components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIntegrationTest.java index 50f09e6..43c62b4 100644 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerTest.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerIntegrationTest.java @@ -48,52 +48,16 @@ import org.apache.camel.Exchange; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static net.corda.core.node.services.vault.QueryCriteriaUtils.DEFAULT_PAGE_NUM; import static net.corda.core.node.services.vault.QueryCriteriaUtils.MAX_PAGE_SIZE; -import static org.apache.camel.component.corda.CordaConstants.ADD_VAULT_TRANSACTION_NOTE; -import static org.apache.camel.component.corda.CordaConstants.ARGUMENTS; -import static org.apache.camel.component.corda.CordaConstants.ATTACHMENT_EXISTS; -import static org.apache.camel.component.corda.CordaConstants.ATTACHMENT_QUERY_CRITERIA; -import static org.apache.camel.component.corda.CordaConstants.CLEAR_NETWORK_MAP_CACHE; -import static org.apache.camel.component.corda.CordaConstants.CURRENT_NODE_TIME; -import static org.apache.camel.component.corda.CordaConstants.DRAINING_MODE; -import static org.apache.camel.component.corda.CordaConstants.EXACT_MATCH; -import static org.apache.camel.component.corda.CordaConstants.GET_PROTOCOL_VERSION; -import static org.apache.camel.component.corda.CordaConstants.GET_VAULT_TRANSACTION_NOTES; -import static org.apache.camel.component.corda.CordaConstants.IS_FLOWS_DRAINING_MODE_ENABLED; -import static org.apache.camel.component.corda.CordaConstants.NETWORK_MAP_SNAPSHOT; -import static org.apache.camel.component.corda.CordaConstants.NODE_INFO; -import static org.apache.camel.component.corda.CordaConstants.NODE_INFO_FROM_PARTY; -import static org.apache.camel.component.corda.CordaConstants.NOTARY_IDENTITIES; -import static org.apache.camel.component.corda.CordaConstants.NOTARY_PARTY_FROM_X500_NAME; -import static org.apache.camel.component.corda.CordaConstants.OPEN_ATTACHMENT; -import static org.apache.camel.component.corda.CordaConstants.OPERATION; -import static org.apache.camel.component.corda.CordaConstants.PAGE_SPECIFICATION; -import static org.apache.camel.component.corda.CordaConstants.PARTIES_FROM_KEY; -import static org.apache.camel.component.corda.CordaConstants.PARTIES_FROM_NAME; -import static org.apache.camel.component.corda.CordaConstants.QUERY_ATTACHMENTS; -import static org.apache.camel.component.corda.CordaConstants.QUERY_CRITERIA; -import static org.apache.camel.component.corda.CordaConstants.REGISTERED_FLOWS; -import static org.apache.camel.component.corda.CordaConstants.SECURE_HASH; -import static org.apache.camel.component.corda.CordaConstants.SET_FLOWS_DRAINING_MODE_ENABLED; -import static org.apache.camel.component.corda.CordaConstants.SORT; -import static org.apache.camel.component.corda.CordaConstants.START_FLOW_DYNAMIC; -import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_SNAPSHOT; -import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_SNAPSHOT; -import static org.apache.camel.component.corda.CordaConstants.UPLOAD_ATTACHMENT; -import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY; -import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY_BY; -import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY_BY_CRITERIA; -import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY_BY_WITH_PAGING_SPEC; -import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY_BY_WITH_SORTING; -import static org.apache.camel.component.corda.CordaConstants.WELL_KNOWN_PARTY_FROM_ANONYMOUS; -import static org.apache.camel.component.corda.CordaConstants.WELL_KNOWN_PARTY_FROM_X500_NAME; - -@Ignore("This integration test requires a locally running corda node such cordapp-template-java") -public class CordaProducerTest extends CordaTestSupport { +import static org.apache.camel.component.corda.CordaConstants.*; +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 SecureHash.SHA256 TEST_SHA_256 = SecureHash.parse("6D1687C143DF792A011A1E80670A4E4E0C25D0D87A39514409B1ABFC2043581F"); @Produce("direct:start") @@ -168,7 +132,7 @@ public class CordaProducerTest extends CordaTestSupport { public void clearNetworkMapCacheTest() throws Exception { Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, CLEAR_NETWORK_MAP_CACHE); template.send(exchange); - Object body = exchange.getException(); + Object body = exchange.getIn().getBody(); assertNull(body); Object exception = exchange.getException(); assertNull(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/CordaTestSupport.java index fe59207..b069028 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/CordaTestSupport.java @@ -20,10 +20,10 @@ import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.mockito.MockitoAnnotations; public class CordaTestSupport extends CamelTestSupport { @@ -50,16 +50,16 @@ public class CordaTestSupport extends CamelTestSupport { return exchange; } - @BeforeClass + @BeforeAll public static void startServer() throws Exception { } - @AfterClass + @AfterAll public static void stopServer() throws Exception { } @Override - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); super.setUp();
