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 a6a5a129fefde48b8da4ee604b8089524bb45edb
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 12:30:06 2020 +0200
[CAMEL-11807] Upgrade camel-twitter to junit5
---
components/camel-twitter/pom.xml | 11 ++++++--
.../AbstractComponentVerifierExtensionTest.java | 33 +++++++++++-----------
.../twitter/AbstractComponentVerifierTest.java | 31 ++++++++++----------
.../twitter/CamelTwitterConsumerTestSupport.java | 2 +-
.../component/twitter/CamelTwitterTestSupport.java | 5 +++-
.../component/twitter/DirectMessageDirectTest.java | 4 +--
.../twitter/DirectMessagePollingTest.java | 4 +--
.../twitter/DirectMessageProducerTest.java | 4 ++-
.../twitter/SearchByExchangeDirectTest.java | 4 ++-
.../component/twitter/UriConfigurationTest.java | 26 +++++++++--------
.../component/twitter/UserProducerInOnlyTest.java | 4 ++-
.../component/twitter/UserProducerInOutTest.java | 4 ++-
...witterSearchComponentVerifierExtensionTest.java | 23 ++++++++-------
.../search/TwitterSearchComponentVerifierTest.java | 23 ++++++++-------
14 files changed, 102 insertions(+), 76 deletions(-)
diff --git a/components/camel-twitter/pom.xml b/components/camel-twitter/pom.xml
index d4df314..4f5618a 100644
--- a/components/camel-twitter/pom.xml
+++ b/components/camel-twitter/pom.xml
@@ -49,12 +49,12 @@
<!-- test dependencies -->
<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>
@@ -62,6 +62,11 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierExtensionTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierExtensionTest.java
index 5294ae2..cd97b148 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierExtensionTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierExtensionTest.java
@@ -20,8 +20,9 @@ import java.util.Map;
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public abstract class AbstractComponentVerifierExtensionTest extends
CamelTwitterTestSupport {
@@ -34,13 +35,13 @@ public abstract class
AbstractComponentVerifierExtensionTest extends CamelTwitte
@Test
public void testConnectivity() {
- Component component = context().getComponent(getComponentScheme());
+ Component component = context.getComponent(getComponentScheme());
ComponentVerifierExtension verifier =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
Map<String, Object> parameters = getParameters();
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
}
@Test
@@ -53,11 +54,11 @@ public abstract class
AbstractComponentVerifierExtensionTest extends CamelTwitte
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
-
Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION,
result.getErrors().get(0).getCode());
- Assert.assertEquals(401,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
- Assert.assertEquals(32,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(1, result.getErrors().size());
+
assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION,
result.getErrors().get(0).getCode());
+ assertEquals(401,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
+ assertEquals(32,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
}
@Test
@@ -70,12 +71,12 @@ public abstract class
AbstractComponentVerifierExtensionTest extends CamelTwitte
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
-
Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION,
result.getErrors().get(0).getCode());
- Assert.assertEquals(401,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
- Assert.assertEquals(89,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
- Assert.assertEquals(1,
result.getErrors().get(0).getParameterKeys().size());
- Assert.assertEquals("accessToken",
result.getErrors().get(0).getParameterKeys().iterator().next());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(1, result.getErrors().size());
+
assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION,
result.getErrors().get(0).getCode());
+ assertEquals(401,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
+ assertEquals(89,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
+ assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
+ assertEquals("accessToken",
result.getErrors().get(0).getParameterKeys().iterator().next());
}
}
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierTest.java
index b937d74..579c884 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierTest.java
@@ -19,8 +19,9 @@ package org.apache.camel.component.twitter;
import java.util.Map;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public abstract class AbstractComponentVerifierTest extends
CamelTwitterTestSupport {
@@ -39,7 +40,7 @@ public abstract class AbstractComponentVerifierTest extends
CamelTwitterTestSupp
Map<String, Object> parameters = getParameters();
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
}
@Test
@@ -52,11 +53,11 @@ public abstract class AbstractComponentVerifierTest extends
CamelTwitterTestSupp
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
-
Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION,
result.getErrors().get(0).getCode());
- Assert.assertEquals(401,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
- Assert.assertEquals(32,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(1, result.getErrors().size());
+
assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION,
result.getErrors().get(0).getCode());
+ assertEquals(401,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
+ assertEquals(32,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
}
@Test
@@ -69,12 +70,12 @@ public abstract class AbstractComponentVerifierTest extends
CamelTwitterTestSupp
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
-
Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION,
result.getErrors().get(0).getCode());
- Assert.assertEquals(401,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
- Assert.assertEquals(89,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
- Assert.assertEquals(1,
result.getErrors().get(0).getParameterKeys().size());
- Assert.assertEquals("accessToken",
result.getErrors().get(0).getParameterKeys().iterator().next());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(1, result.getErrors().size());
+
assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION,
result.getErrors().get(0).getCode());
+ assertEquals(401,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
+ assertEquals(89,
result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
+ assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
+ assertEquals("accessToken",
result.getErrors().get(0).getParameterKeys().iterator().next());
}
}
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterConsumerTestSupport.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterConsumerTestSupport.java
index cf557b8..8d07eb1 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterConsumerTestSupport.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterConsumerTestSupport.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
public abstract class CamelTwitterConsumerTestSupport extends
CamelTwitterTestSupport {
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterTestSupport.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterTestSupport.java
index f40cfd8..47b4f62 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterTestSupport.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterTestSupport.java
@@ -23,11 +23,14 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CamelTwitterTestSupport extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
protected String consumerKey;
protected String consumerSecret;
protected String accessToken;
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageDirectTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageDirectTest.java
index 89d33de..6b8bb66d 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageDirectTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageDirectTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.twitter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
public class DirectMessageDirectTest extends CamelTwitterConsumerTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
/* Uncomment when you need a test direct message
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessagePollingTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessagePollingTest.java
index f5f49f4..6ffafe3 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessagePollingTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessagePollingTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.twitter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
*/
public class DirectMessagePollingTest extends CamelTwitterConsumerTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
/* Uncomment when you need a test direct message
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java
index c19c5d4..5c9017b 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Tests posting a twitter update with the default In Message Exchange Pattern
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java
index 080dc05..7431cea 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java
@@ -25,7 +25,9 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
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 org.junit.jupiter.api.Assertions.assertTrue;
/**
*
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
index a891f61..8f02df9 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
@@ -23,10 +23,12 @@ import
org.apache.camel.component.twitter.directmessage.TwitterDirectMessageEndp
import org.apache.camel.component.twitter.search.TwitterSearchEndpoint;
import org.apache.camel.component.twitter.timeline.TwitterTimelineEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class UriConfigurationTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class UriConfigurationTest {
private CamelContext context = new DefaultCamelContext();
private CamelTwitterTestSupport support = new CamelTwitterTestSupport();
@@ -34,7 +36,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testBasicAuthentication() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-search:foo?" +
support.getUriTokens());
- assertTrue("Endpoint not a TwitterSearchEndpoint: " + endpoint,
endpoint instanceof TwitterSearchEndpoint);
+ assertTrue(endpoint instanceof TwitterSearchEndpoint, "Endpoint not a
TwitterSearchEndpoint: " + endpoint);
TwitterSearchEndpoint twitterEndpoint = (TwitterSearchEndpoint)
endpoint;
assertTrue(!twitterEndpoint.getProperties().getConsumerKey().isEmpty());
@@ -46,7 +48,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testPageSetting() throws Exception {
Endpoint endpoint =
context.getEndpoint("twitter-search:foo?count=50&numberOfPages=2");
- assertTrue("Endpoint not a TwitterSearchEndpoint: " + endpoint,
endpoint instanceof TwitterSearchEndpoint);
+ assertTrue(endpoint instanceof TwitterSearchEndpoint, "Endpoint not a
TwitterSearchEndpoint: " + endpoint);
TwitterSearchEndpoint twitterEndpoint = (TwitterSearchEndpoint)
endpoint;
assertEquals(new Integer(50),
twitterEndpoint.getProperties().getCount());
@@ -56,7 +58,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testHttpProxySetting() throws Exception {
Endpoint endpoint =
context.getEndpoint("twitter-search:foo?httpProxyHost=example.com&httpProxyPort=3338&httpProxyUser=test&httpProxyPassword=pwd");
- assertTrue("Endpoint not a TwitterSearchEndpoint: " + endpoint,
endpoint instanceof TwitterSearchEndpoint);
+ assertTrue(endpoint instanceof TwitterSearchEndpoint, "Endpoint not a
TwitterSearchEndpoint: " + endpoint);
TwitterSearchEndpoint twitterEndpoint = (TwitterSearchEndpoint)
endpoint;
assertEquals("example.com",
twitterEndpoint.getProperties().getHttpProxyHost());
@@ -68,31 +70,31 @@ public class UriConfigurationTest extends Assert {
@Test
public void testDirectMessageEndpoint() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-directmessage:foo");
- assertTrue("Endpoint not a TwitterDirectMessageEndpoint: " + endpoint,
endpoint instanceof TwitterDirectMessageEndpoint);
+ assertTrue(endpoint instanceof TwitterDirectMessageEndpoint, "Endpoint
not a TwitterDirectMessageEndpoint: " + endpoint);
}
@Test
public void testSearchEndpoint() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-search:foo");
- assertTrue("Endpoint not a TwitterSearchEndpoint: " + endpoint,
endpoint instanceof TwitterSearchEndpoint);
+ assertTrue(endpoint instanceof TwitterSearchEndpoint, "Endpoint not a
TwitterSearchEndpoint: " + endpoint);
}
@Test
public void testTimelineEndpoint() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-timeline:home");
- assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint,
endpoint instanceof TwitterTimelineEndpoint);
+ assertTrue(endpoint instanceof TwitterTimelineEndpoint, "Endpoint not
a TwitterTimelineEndpoint: " + endpoint);
TwitterTimelineEndpoint timelineEndpoint =
(TwitterTimelineEndpoint)endpoint;
assertEquals(TimelineType.HOME, timelineEndpoint.getTimelineType());
endpoint = context.getEndpoint("twitter-timeline:mentions");
- assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint,
endpoint instanceof TwitterTimelineEndpoint);
+ assertTrue(endpoint instanceof TwitterTimelineEndpoint, "Endpoint not
a TwitterTimelineEndpoint: " + endpoint);
timelineEndpoint = (TwitterTimelineEndpoint)endpoint;
assertEquals(TimelineType.MENTIONS,
timelineEndpoint.getTimelineType());
endpoint = context.getEndpoint("twitter-timeline:retweetsofme");
- assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint,
endpoint instanceof TwitterTimelineEndpoint);
+ assertTrue(endpoint instanceof TwitterTimelineEndpoint, "Endpoint not
a TwitterTimelineEndpoint: " + endpoint);
timelineEndpoint = (TwitterTimelineEndpoint)endpoint;
assertEquals(TimelineType.RETWEETSOFME,
timelineEndpoint.getTimelineType());
endpoint = context.getEndpoint("twitter-timeline:user");
- assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint,
endpoint instanceof TwitterTimelineEndpoint);
+ assertTrue(endpoint instanceof TwitterTimelineEndpoint, "Endpoint not
a TwitterTimelineEndpoint: " + endpoint);
timelineEndpoint = (TwitterTimelineEndpoint)endpoint;
assertEquals(TimelineType.USER, timelineEndpoint.getTimelineType());
}
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java
index 4ec68b2..7b4bace 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Tests posting a twitter update with the default In Message Exchange Pattern
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
index dc52b27..6416d60 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
@@ -24,12 +24,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import twitter4j.Status;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Tests posting a twitter update and getting the status update id from the
Twitter API response
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierExtensionTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierExtensionTest.java
index 2890762..65f3a88 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierExtensionTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierExtensionTest.java
@@ -23,8 +23,11 @@ import java.util.List;
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
import
org.apache.camel.component.twitter.AbstractComponentVerifierExtensionTest;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TwitterSearchComponentVerifierExtensionTest extends
AbstractComponentVerifierExtensionTest {
@Override
@@ -41,8 +44,8 @@ public class TwitterSearchComponentVerifierExtensionTest
extends AbstractCompone
// Parameters validation
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS,
Collections.emptyMap());
-
Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- Assert.assertEquals(5, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(5, result.getErrors().size());
List<String> expected = new LinkedList<>();
expected.add("keywords");
@@ -55,18 +58,18 @@ public class TwitterSearchComponentVerifierExtensionTest
extends AbstractCompone
expected.removeAll(error.getParameterKeys());
}
- Assert.assertTrue("Missing expected params: " +
expected.toString(), expected.isEmpty());
+ assertTrue(expected.isEmpty(), "Missing expected params: " +
expected.toString());
}
{
// Connectivity validation
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY,
Collections.emptyMap());
-
Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
-
Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION,
result.getErrors().get(0).getCode());
-
Assert.assertNotNull(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE));
-
Assert.assertTrue(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE)
instanceof IllegalArgumentException);
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(1, result.getErrors().size());
+
assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION,
result.getErrors().get(0).getCode());
+
assertNotNull(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE));
+
assertTrue(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE)
instanceof IllegalArgumentException);
}
}
}
diff --git
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierTest.java
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierTest.java
index 6cb9946..ab6c9fe 100644
---
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierTest.java
+++
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierTest.java
@@ -23,8 +23,11 @@ import java.util.List;
import org.apache.camel.component.extension.ComponentVerifierExtension;
import org.apache.camel.component.twitter.AbstractComponentVerifierTest;
import org.apache.camel.component.twitter.AbstractTwitterComponent;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TwitterSearchComponentVerifierTest extends
AbstractComponentVerifierTest {
@Override
@@ -41,8 +44,8 @@ public class TwitterSearchComponentVerifierTest extends
AbstractComponentVerifie
// Parameters validation
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS,
Collections.emptyMap());
-
Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- Assert.assertEquals(5, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(5, result.getErrors().size());
List<String> expected = new LinkedList<>();
expected.add("keywords");
@@ -55,18 +58,18 @@ public class TwitterSearchComponentVerifierTest extends
AbstractComponentVerifie
expected.removeAll(error.getParameterKeys());
}
- Assert.assertTrue("Missing expected params: " +
expected.toString(), expected.isEmpty());
+ assertTrue(expected.isEmpty(), "Missing expected params: " +
expected.toString());
}
{
// Connectivity validation
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY,
Collections.emptyMap());
-
Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
-
Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION,
result.getErrors().get(0).getCode());
-
Assert.assertNotNull(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE));
-
Assert.assertTrue(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE)
instanceof IllegalArgumentException);
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(1, result.getErrors().size());
+
assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION,
result.getErrors().get(0).getCode());
+
assertNotNull(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE));
+
assertTrue(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE)
instanceof IllegalArgumentException);
}
}
}
