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 e269218b57b765970a0fa318e814f53eaaa0b76e
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 17 17:30:39 2020 +0200
[CAMEL-11807] Upgrade camel-pubnub to junit5
---
components/camel-pubnub/pom.xml | 8 +++++--
.../component/pubnub/PubNubConfigurationTest.java | 14 ++++++++----
.../camel/component/pubnub/PubNubFireTest.java | 2 +-
.../component/pubnub/PubNubOperationsTest.java | 5 ++++-
.../camel/component/pubnub/PubNubPresenceTest.java | 3 ++-
.../camel/component/pubnub/PubNubPublishTest.java | 8 ++++---
.../component/pubnub/PubNubSubscriberTest.java | 2 +-
.../camel/component/pubnub/PubNubTestBase.java | 25 +++++++++-------------
.../pubnub/example/PubNubStateExample.java | 10 +++++----
9 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index f8c3fe2..b72544a 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -77,7 +77,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -86,6 +91,5 @@
<version>${wiremock-version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java
index 06fe4f5..8bb8608 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java
@@ -16,15 +16,21 @@
*/
package org.apache.camel.component.pubnub;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class PubNubConfigurationTest extends CamelTestSupport {
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithIllegalArguments() throws Exception {
PubNubComponent component = new PubNubComponent(context);
- component.createEndpoint("pubnub");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("pubnub"));
}
@Test
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java
index aeb6cab..d3709a3 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.pubnub;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
index c2303e4..ed6feb3 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
@@ -26,12 +26,15 @@ import
com.pubnub.api.models.consumer.presence.PNGetStateResult;
import com.pubnub.api.models.consumer.presence.PNHereNowResult;
import com.pubnub.api.models.consumer.presence.PNSetStateResult;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static org.apache.camel.test.junit5.TestSupport.assertListSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class PubNubOperationsTest extends PubNubTestBase {
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java
index ff6a579..3f90243 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java
@@ -20,13 +20,14 @@ import
com.pubnub.api.models.consumer.pubsub.PNPresenceEventResult;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
public class PubNubPresenceTest extends PubNubTestBase {
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java
index 5d16314..0c2c1f7 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -28,6 +28,7 @@ import static
com.github.tomakehurst.wiremock.client.WireMock.post;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
import static org.apache.camel.component.pubnub.PubNubConstants.TIMETOKEN;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class PubNubPublishTest extends PubNubTestBase {
private String endpoint = "pubnub:someChannel?pubnub=#pubnub";
@@ -44,9 +45,10 @@ public class PubNubPublishTest extends PubNubTestBase {
assertMockEndpointsSatisfied();
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testPublishEmptyBody() throws Exception {
- template.sendBody("direct:publish", null);
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:publish", null));
}
@Test
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java
index 22135ab..cc08ea6 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.pubnub;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
index feca647..6aae396 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
@@ -16,39 +16,34 @@
*/
package org.apache.camel.component.pubnub;
-import java.io.IOException;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
import com.pubnub.api.PNConfiguration;
import com.pubnub.api.PubNub;
import com.pubnub.api.enums.PNLogVerbosity;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
+import org.apache.camel.test.junit5.CamelTestSupport;
import static
com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
import static com.pubnub.api.enums.PNHeartbeatNotificationOptions.NONE;
public class PubNubTestBase extends CamelTestSupport {
+
private final int port = AvailablePortFinder.getNextAvailable();
@BindToRegistry("pubnub")
private PubNub pubnub = createPubNubInstance();
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(options().port(port));
-
+ private WireMockServer wireMockServer = new
WireMockServer(options().port(port));
- @Before
- public void beforeEach() throws IOException {
- wireMockRule.start();
+ protected void setupResources() throws Exception {
+ wireMockServer.start();
+ WireMock.configureFor("localhost", wireMockServer.port());
}
- @After
- public void afterEach() {
+ protected void cleanupResources() throws Exception {
+ wireMockServer.stop();
pubnub.destroy();
}
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
index 071af53..be392b2 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
@@ -24,14 +24,16 @@ import
com.pubnub.api.models.consumer.presence.PNSetStateResult;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.pubnub.PubNubConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.pubnub.example.PubNubExampleConstants.PUBNUB_PUBLISH_KEY;
import static
org.apache.camel.component.pubnub.example.PubNubExampleConstants.PUBNUB_SUBSCRIBE_KEY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-@Ignore("Integration test that requires a pub/sub key to run")
+@Disabled("Integration test that requires a pub/sub key to run")
public class PubNubStateExample extends CamelTestSupport {
@Test
