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 4f9a3ca5c142cc7cc813623defa3c5c965f42226
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 12:39:15 2020 +0200
[CAMEL-11807] Upgrade camel-web3j to junit5
---
components/camel-web3j/pom.xml | 8 ++--
.../Web3jConsumerBlockObservableMockTest.java | 2 +-
...tAndSubscribeToNewBlocksObservableMockTest.java | 2 +-
...bscribeToNewTransactionsObservableMockTest.java | 2 +-
...merCatchUpToLatestBlocksObservableMockTest.java | 2 +-
...chUpToLatestTransactionsObservableMockTest.java | 2 +-
...eb3jConsumerEthBlockHashObservableMockTest.java | 2 +-
.../Web3jConsumerEthLogObservableMockTest.java | 2 +-
...thPendingTransactionHashObservableMockTest.java | 2 +-
...nsumerPendingTransactionObservableMockTest.java | 2 +-
...Web3jConsumerReplyBlocksObservableMockTest.java | 2 +-
...onsumerReplyTransactionsObservableMockTest.java | 2 +-
...Web3jConsumerTransactionObservableMockTest.java | 2 +-
.../component/web3j/Web3jMockTestSupport.java | 14 +++----
.../camel/component/web3j/Web3jProducerTest.java | 3 +-
.../component/web3j/Web3jQuorumProducerTest.java | 4 +-
.../integration/Web3jConsumerBlockHashTest.java | 6 +--
.../web3j/integration/Web3jConsumerBlockTest.java | 6 +--
.../web3j/integration/Web3jConsumerLogTest.java | 6 +--
.../integration/Web3jConsumerMainnetTest.java | 6 +--
.../integration/Web3jConsumerReplayBlockTest.java | 6 +--
.../integration/Web3jConsumerTransactionsTest.java | 6 +--
.../integration/Web3jIntegrationTestSupport.java | 2 +-
.../integration/Web3jProducerGanacheTest.java | 43 +++++++++++-----------
.../integration/Web3jProducerMainnetTest.java | 7 ++--
25 files changed, 73 insertions(+), 68 deletions(-)
diff --git a/components/camel-web3j/pom.xml b/components/camel-web3j/pom.xml
index 11a48aa..84f3dc3 100644
--- a/components/camel-web3j/pom.xml
+++ b/components/camel-web3j/pom.xml
@@ -62,12 +62,12 @@
<!-- for 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>
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerBlockObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerBlockObservableMockTest.java
index 79d2f4c..2e60cdd 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerBlockObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerBlockObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewBlocksObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewBlocksObservableMockTest.java
index a87948f..cf5c7b1 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewBlocksObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewBlocksObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewTransactionsObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewTransactionsObservableMockTest.java
index 89b11ce..af37ce2 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewTransactionsObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewTransactionsObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestBlocksObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestBlocksObservableMockTest.java
index 36c7e5b..e8db9fd 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestBlocksObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestBlocksObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestTransactionsObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestTransactionsObservableMockTest.java
index 68fce1c..7257548 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestTransactionsObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestTransactionsObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthBlockHashObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthBlockHashObservableMockTest.java
index b2d8b3c..9255e7d 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthBlockHashObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthBlockHashObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthLogObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthLogObservableMockTest.java
index f44a401..1b6609e 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthLogObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthLogObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthPendingTransactionHashObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthPendingTransactionHashObservableMockTest.java
index c5e34e0..66cee52 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthPendingTransactionHashObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthPendingTransactionHashObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerPendingTransactionObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerPendingTransactionObservableMockTest.java
index 00bc430..d1b10c5 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerPendingTransactionObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerPendingTransactionObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyBlocksObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyBlocksObservableMockTest.java
index 9bc8fcc..764063b 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyBlocksObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyBlocksObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyTransactionsObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyTransactionsObservableMockTest.java
index 5f650aa..5690bc9 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyTransactionsObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyTransactionsObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerTransactionObservableMockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerTransactionObservableMockTest.java
index 1daba8d..ef32d62 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerTransactionObservableMockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerTransactionObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
index 5824457..237adda 100755
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
@@ -21,10 +21,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.Mock;
import org.mockito.MockitoAnnotations;
import org.web3j.protocol.Web3j;
@@ -61,16 +61,16 @@ public class Web3jMockTestSupport 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();
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java
index 8178e71..bd7fc61 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java
@@ -26,7 +26,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.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.web3j.protocol.core.DefaultBlockParameterName;
@@ -86,6 +86,7 @@ import
org.web3j.protocol.core.methods.response.Web3ClientVersion;
import org.web3j.protocol.core.methods.response.Web3Sha3;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
index 808e581..6257cd0 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
@@ -21,7 +21,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.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.web3j.protocol.core.Request;
@@ -37,6 +37,8 @@ import org.web3j.quorum.methods.response.Vote;
import org.web3j.quorum.methods.response.Voter;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
public class Web3jQuorumProducerTest extends Web3jMockTestSupport {
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockHashTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockHashTest.java
index 2c41b8f..909dce9 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockHashTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockHashTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
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.Disabled;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.web3j.Web3jConstants.ETH_BLOCK_HASH_OBSERVABLE;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
-@Ignore("Requires Ganache instance with few transactions")
+@Disabled("Requires Ganache instance with few transactions")
public class Web3jConsumerBlockHashTest extends Web3jIntegrationTestSupport {
@Test
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockTest.java
index 396052c..6456bef 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
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.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.BLOCK_OBSERVABLE;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
-@Ignore("Requires Ganache instance with few transactions")
+@Disabled("Requires Ganache instance with few transactions")
public class Web3jConsumerBlockTest extends Web3jIntegrationTestSupport {
@Test
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerLogTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerLogTest.java
index eae8edc..7c2b111 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerLogTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerLogTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
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.Disabled;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.web3j.Web3jConstants.ETH_LOG_OBSERVABLE;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
-@Ignore("Requires Ganache instance with few transactions")
+@Disabled("Requires Ganache instance with few transactions")
public class Web3jConsumerLogTest extends Web3jIntegrationTestSupport {
@Test
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerMainnetTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerMainnetTest.java
index 43ceadf..ab1683c 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerMainnetTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerMainnetTest.java
@@ -22,14 +22,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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.Disabled;
+import org.junit.jupiter.api.Test;
import org.web3j.protocol.core.methods.response.EthBlock;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
import static
org.apache.camel.component.web3j.Web3jConstants.REPLAY_BLOCKS_OBSERVABLE;
-@Ignore("Requires a local node or registration at Infura")
+@Disabled("Requires a local node or registration at Infura")
public class Web3jConsumerMainnetTest extends Web3jIntegrationTestSupport {
@Override
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerReplayBlockTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerReplayBlockTest.java
index 8f68e07..1392b54 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerReplayBlockTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerReplayBlockTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
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.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
import static
org.apache.camel.component.web3j.Web3jConstants.REPLAY_BLOCKS_OBSERVABLE;
-@Ignore("Requires Ganache instance with 10 transactions")
+@Disabled("Requires Ganache instance with 10 transactions")
public class Web3jConsumerReplayBlockTest extends Web3jIntegrationTestSupport {
@Test
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerTransactionsTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerTransactionsTest.java
index a920ef3..43396fe 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerTransactionsTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerTransactionsTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
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.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
import static
org.apache.camel.component.web3j.Web3jConstants.TRANSACTION_OBSERVABLE;
-@Ignore("Requires Ganache instance with few transactions")
+@Disabled("Requires Ganache instance with few transactions")
public class Web3jConsumerTransactionsTest extends Web3jIntegrationTestSupport
{
@Test
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java
index c9ce794..a6f2dd1 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java
@@ -20,7 +20,7 @@ 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.apache.camel.test.junit5.CamelTestSupport;
public class Web3jIntegrationTestSupport extends CamelTestSupport {
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
index 3268709..6290262 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
@@ -24,8 +24,8 @@ 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.Disabled;
+import org.junit.jupiter.api.Test;
import org.web3j.protocol.core.methods.response.EthBlock;
import org.web3j.protocol.core.methods.response.EthCompileSolidity;
import org.web3j.protocol.core.methods.response.EthLog;
@@ -117,8 +117,9 @@ import static
org.apache.camel.component.web3j.Web3jConstants.TTL;
import static org.apache.camel.component.web3j.Web3jConstants.VALUE;
import static
org.apache.camel.component.web3j.Web3jConstants.WEB3_CLIENT_VERSION;
import static org.apache.camel.component.web3j.Web3jConstants.WEB3_SHA3;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-@Ignore("Requires a locally running Ganache instance")
+@Disabled("Requires a locally running Ganache instance")
public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
@Produce("direct:start")
@@ -158,7 +159,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//a bug in Ganache returns wrong formatted data
- @Ignore
+ @Disabled
@Test
public void ethNetPeerCountTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
NET_PEER_COUNT);
@@ -271,7 +272,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//a bug in Ganache returns wrong formatted data
- @Ignore
+ @Disabled
@Test
public void ethGetBlockTransactionCountByHashTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
ETH_GET_BLOCK_TRANSACTION_COUNT_BY_HASH);
@@ -282,7 +283,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//a bug in Ganache returns wrong formatted data
- @Ignore
+ @Disabled
@Test
public void ethGetBlockTransactionCountByNumberTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
ETH_GET_BLOCK_TRANSACTION_COUNT_BY_NUMBER);
@@ -293,7 +294,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethGetUncleCountByBlockHashTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
ETH_GET_UNCLE_COUNT_BY_BLOCK_HASH);
@@ -304,7 +305,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethGetUncleCountByBlockNumberTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
ETH_GET_UNCLE_COUNT_BY_BLOCK_HASH);
@@ -352,7 +353,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//wrong reminder
- @Ignore
+ @Disabled
@Test
public void ethSendRawTransactionTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
ETH_SEND_RAW_TRANSACTION);
@@ -447,7 +448,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethGetUncleByBlockHashAndIndexTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
ETH_GET_UNCLE_BY_BLOCK_HASH_AND_INDEX);
@@ -460,7 +461,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethGetUncleByBlockNumberAndIndexTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
ETH_GET_UNCLE_BY_BLOCK_NUMBER_AND_INDEX);
@@ -482,7 +483,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethCompileSolidityTest() throws Exception {
String soliditySample =
@@ -501,7 +502,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethCompileLLLTest() throws Exception {
String sampleCode = "(returnlll (suicide (caller)))";
@@ -513,7 +514,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethCompileSerpentTest() throws Exception {
String serpentSample = "(returnlll (suicide (caller)))";
@@ -640,7 +641,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhPostTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
SHH_POST);
@@ -657,7 +658,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhNewIdentityTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
SHH_NEW_IDENTITY);
@@ -668,7 +669,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhHasIdentityTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
SHH_HAS_IDENTITY);
@@ -680,7 +681,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhNewGroupTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
SHH_NEW_GROUP);
@@ -691,7 +692,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhAddToGroupTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
SHH_ADD_TO_GROUP);
@@ -703,7 +704,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhNewFilterTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
SHH_NEW_FILTER);
@@ -716,7 +717,7 @@ public class Web3jProducerGanacheTest extends
Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhUninstallFilterTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION,
SHH_UNINSTALL_FILTER);
diff --git
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java
index 5a68c8f..7bee939 100644
---
a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java
+++
b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java
@@ -20,8 +20,8 @@ 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.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.ETH_BLOCK_NUMBER;
import static org.apache.camel.component.web3j.Web3jConstants.NET_VERSION;
@@ -29,8 +29,9 @@ import static
org.apache.camel.component.web3j.Web3jConstants.OPERATION;
import static org.apache.camel.component.web3j.Web3jConstants.TRANSACTION;
import static
org.apache.camel.component.web3j.Web3jConstants.WEB3_CLIENT_VERSION;
import static org.apache.camel.component.web3j.Web3jConstants.WEB3_SHA3;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-@Ignore("Requires a local node or registration at Infura")
+@Disabled("Requires a local node or registration at Infura")
public class Web3jProducerMainnetTest extends Web3jIntegrationTestSupport {
@Produce("direct:start")
