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 35b2029f776d4d13aa8173d766d9582a122d12b4
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 17 16:04:42 2020 +0200
[CAMEL-11807] Upgrade camel-pgevent to junit5
---
components/camel-pgevent/pom.xml | 4 ++--
.../apache/camel/pgevent/PgEventConsumerTest.java | 10 ++++-----
.../apache/camel/pgevent/PgEventHelperTest.java | 24 +++++++++-------------
.../apache/camel/pgevent/PgEventProducerTest.java | 16 ++++++++-------
.../AbstractPgEventIntegrationTest.java | 2 +-
.../integration/PgEventPubSubIntegrationTest.java | 2 +-
...gEventWithDefinedDatasourceIntegrationTest.java | 2 +-
7 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml
index e8602c9..edfaf2d 100644
--- a/components/camel-pgevent/pom.xml
+++ b/components/camel-pgevent/pom.xml
@@ -49,12 +49,12 @@
<!-- 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>
diff --git
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventConsumerTest.java
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventConsumerTest.java
index fa39c62..82ff432 100644
---
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventConsumerTest.java
+++
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventConsumerTest.java
@@ -25,16 +25,16 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.pgevent.PgEventConsumer;
import org.apache.camel.component.pgevent.PgEventEndpoint;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class PgEventConsumerTest {
@Test
diff --git
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventHelperTest.java
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventHelperTest.java
index 5bfe2a9..c144786 100644
---
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventHelperTest.java
+++
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventHelperTest.java
@@ -20,26 +20,22 @@ import java.sql.Connection;
import com.impossibl.postgres.api.jdbc.PGConnection;
import org.apache.camel.component.pgevent.PgEventHelper;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class PgEventHelperTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
@Test
public void testToPGConnectionWithNullConnection() throws Exception {
- expectedException.expect(IllegalArgumentException.class);
- PgEventHelper.toPGConnection(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> PgEventHelper.toPGConnection(null));
}
@Test
@@ -61,9 +57,9 @@ public class PgEventHelperTest {
@Test
public void testToPGConnectionWithInvalidWrappedConnection() throws
Exception {
- expectedException.expect(IllegalStateException.class);
Connection wrapperConnection = mock(Connection.class);
when(wrapperConnection.isWrapperFor(PGConnection.class)).thenReturn(false);
- PgEventHelper.toPGConnection(wrapperConnection);
+ assertThrows(IllegalStateException.class,
+ () -> PgEventHelper.toPGConnection(wrapperConnection));
}
}
diff --git
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventProducerTest.java
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventProducerTest.java
index d2dc345..439013a 100644
---
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventProducerTest.java
+++
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventProducerTest.java
@@ -27,17 +27,18 @@ import org.apache.camel.Message;
import org.apache.camel.component.pgevent.InvalidStateException;
import org.apache.camel.component.pgevent.PgEventEndpoint;
import org.apache.camel.component.pgevent.PgEventProducer;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentMatchers;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class PgEventProducerTest {
private PgEventEndpoint endpoint = mock(PgEventEndpoint.class);
@@ -71,7 +72,7 @@ public class PgEventProducerTest {
assertTrue(producer.isStopped());
}
- @Test(expected = InvalidStateException.class)
+ @Test
public void testPgEventProducerProcessDbThrowsInvalidStateException()
throws Exception {
when(endpoint.getDatasource()).thenReturn(dataSource);
when(dataSource.getConnection()).thenReturn(connection);
@@ -79,7 +80,8 @@ public class PgEventProducerTest {
PgEventProducer producer = new PgEventProducer(endpoint);
producer.start();
- producer.process(exchange);
+ assertThrows(InvalidStateException.class,
+ () -> producer.process(exchange));
}
@Test
diff --git
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/AbstractPgEventIntegrationTest.java
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/AbstractPgEventIntegrationTest.java
index dbede14..89e0214 100644
---
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/AbstractPgEventIntegrationTest.java
+++
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/AbstractPgEventIntegrationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.pgevent.integration;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
public class AbstractPgEventIntegrationTest extends CamelTestSupport {
diff --git
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java
index ae8c954..8a38e79 100644
---
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java
+++
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PgEventPubSubIntegrationTest extends
AbstractPgEventIntegrationTest {
diff --git
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
index 4ecbcac..3138eaf 100644
---
a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
+++
b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PgEventWithDefinedDatasourceIntegrationTest extends
AbstractPgEventIntegrationTest {
