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 f082f20af37c9bcc53ee6e34aeb3adf9002e5cc6 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 13:31:45 2020 +0200 [CAMEL-11807] Upgrade camel-facebook to junit5 --- components/camel-facebook/pom.xml | 6 ++--- .../facebook/CamelFacebookTestSupport.java | 2 +- .../facebook/FacebookComponentConsumerTest.java | 7 ++++-- .../FacebookComponentPageIdProducerTest.java | 2 +- .../facebook/FacebookComponentProducerTest.java | 13 ++++++++--- .../component/facebook/FacebookEndpointTest.java | 2 +- .../component/facebook/TestUserMethodsTest.java | 18 +++++++++------ .../config/FacebookEndpointConfigurationTest.java | 10 +++++---- .../data/FacebookMethodsTypeHelperTest.java | 26 ++++++++++------------ .../facebook/data/FacebookMethodsTypeTest.java | 10 ++++----- .../facebook/data/ReadingBuilderTest.java | 18 +++++++-------- 11 files changed, 64 insertions(+), 50 deletions(-) diff --git a/components/camel-facebook/pom.xml b/components/camel-facebook/pom.xml index 002b42d..cd2c6a2 100644 --- a/components/camel-facebook/pom.xml +++ b/components/camel-facebook/pom.xml @@ -48,12 +48,12 @@ <!-- 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> diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/CamelFacebookTestSupport.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/CamelFacebookTestSupport.java index fb36b4e..656ca22 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/CamelFacebookTestSupport.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/CamelFacebookTestSupport.java @@ -25,7 +25,7 @@ import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.component.facebook.config.FacebookConfiguration; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; public abstract class CamelFacebookTestSupport extends CamelTestSupport { diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java index 6fe838b..3c01562 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java @@ -34,7 +34,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultPollingConsumerPollStrategy; import org.apache.camel.support.ScheduledPollConsumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class FacebookComponentConsumerTest extends CamelFacebookTestSupport { public static final String APACHE_FOUNDATION_PAGE_ID = "6538157161"; @@ -78,7 +81,7 @@ public class FacebookComponentConsumerTest extends CamelFacebookTestSupport { final String rawJSON = mock.getExchanges().get(0).getIn().getHeader(FacebookConstants.RAW_JSON_HEADER, String.class); assertNotNull("Null rawJSON", rawJSON); - assertFalse("Empty rawJSON", rawJSON.isEmpty()); + assertFalse(rawJSON.isEmpty(), "Empty rawJSON"); } @Test diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java index 1fef049..d3d726d 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java @@ -20,7 +20,7 @@ import facebook4j.Post; import facebook4j.ResponseList; 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 FacebookComponentPageIdProducerTest extends CamelFacebookTestSupport { public static final String APACHE_FOUNDATION_PAGE_ID = "6538157161"; diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java index 3a87f9a..1784df4 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java @@ -17,7 +17,11 @@ package org.apache.camel.component.facebook; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import facebook4j.Facebook; import facebook4j.FacebookException; @@ -27,7 +31,10 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.facebook.data.FacebookMethodsType; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class FacebookComponentProducerTest extends CamelFacebookTestSupport { @@ -110,7 +117,7 @@ public class FacebookComponentProducerTest extends CamelFacebookTestSupport { public void testJsonStoreEnabled() throws Exception { final String rawJSON = template().requestBody("direct://testJsonStoreEnabled", new String[]{"me"}, String.class); assertNotNull("NULL rawJSON", rawJSON); - assertFalse("Empty rawJSON", rawJSON.isEmpty()); + assertFalse(rawJSON.isEmpty(), "Empty rawJSON"); } @Override diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookEndpointTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookEndpointTest.java index 997748a..f4b80b7 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookEndpointTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookEndpointTest.java @@ -19,7 +19,7 @@ package org.apache.camel.component.facebook; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test preconfigured Facebook component. diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/TestUserMethodsTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/TestUserMethodsTest.java index e3da350..d7f9ce9 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/TestUserMethodsTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/TestUserMethodsTest.java @@ -23,7 +23,11 @@ import java.util.Map; import facebook4j.TestUser; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test methods in {@link facebook4j.api.TestUserMethods} @@ -41,22 +45,22 @@ public class TestUserMethodsTest extends CamelFacebookTestSupport { // create a test user with exchange properties final TestUser testUser1 = template().requestBody("direct:createTestUser", TEST_USER1, TestUser.class); - assertNotNull("Test User1", testUser1); + assertNotNull(testUser1, "Test User1"); // create a test user with exchange properties final TestUser testUser2 = template().requestBody("direct:createTestUser", TEST_USER2, TestUser.class); - assertNotNull("Test User2", testUser2); + assertNotNull(testUser2, "Test User2"); // make friends, not enemies final Map<String, Object> headers = new HashMap<>(); headers.put("CamelFacebook.testUser2", testUser2); Boolean worked = template().requestBodyAndHeaders("direct:makeFriendTestUser", testUser1, headers, Boolean.class); - assertTrue("Friends not made", worked); + assertTrue(worked, "Friends not made"); // get app test users final List testUsers = template().requestBody("direct:testUsers", null, List.class); - assertNotNull("Test users", testUsers); - assertFalse("Empty test user list", testUsers.isEmpty()); + assertNotNull(testUsers, "Test users"); + assertFalse(testUsers.isEmpty(), "Empty test user list"); // delete test users for (Object user : testUsers) { @@ -64,7 +68,7 @@ public class TestUserMethodsTest extends CamelFacebookTestSupport { if (testUser.equals(testUser1) || testUser.equals(testUser2)) { final String id = testUser.getId(); worked = template().requestBody("direct:deleteTestUser", id, Boolean.class); - assertTrue("Test user not deleted for id " + id, worked); + assertTrue(worked, "Test user not deleted for id " + id); } } } diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/config/FacebookEndpointConfigurationTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/config/FacebookEndpointConfigurationTest.java index 4179f10..bf1df00 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/config/FacebookEndpointConfigurationTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/config/FacebookEndpointConfigurationTest.java @@ -19,8 +19,10 @@ package org.apache.camel.component.facebook.config; import org.apache.camel.BindToRegistry; import org.apache.camel.component.facebook.FacebookComponent; import org.apache.camel.component.facebook.FacebookEndpoint; -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; public class FacebookEndpointConfigurationTest extends CamelTestSupport { @@ -28,8 +30,8 @@ public class FacebookEndpointConfigurationTest extends CamelTestSupport { public void testConfigurationBeanUriParam() throws Exception { FacebookComponent component = new FacebookComponent(context); FacebookEndpoint facebookEndpoint = (FacebookEndpoint) component.createEndpoint("facebook://getFeed?configuration=#configuration"); - assertEquals("Configuration bean wasn't taken into account!", "fakeId", facebookEndpoint.getConfiguration().getOAuthAppId()); - assertEquals("Configuration bean wasn't taken into account!", "fakeSecret", facebookEndpoint.getConfiguration().getOAuthAppSecret()); + assertEquals("fakeId", facebookEndpoint.getConfiguration().getOAuthAppId(), "Configuration bean wasn't taken into account!"); + assertEquals("fakeSecret", facebookEndpoint.getConfiguration().getOAuthAppSecret(), "Configuration bean wasn't taken into account!"); } @BindToRegistry("configuration") diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java index 236fa54..008bac8 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java @@ -24,11 +24,11 @@ import java.util.List; import facebook4j.Facebook; import org.apache.camel.component.facebook.config.FacebookEndpointConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test {@link FacebookMethodsTypeHelper}. @@ -58,14 +58,14 @@ public class FacebookMethodsTypeHelperTest { final String[] argNames = method.getArgNames().toArray(new String[method.getArgNames().size()]); List<FacebookMethodsType> candidates = FacebookMethodsTypeHelper.getCandidateMethods(name, argNames); - assertFalse("No candidate methods for " + name, candidates.isEmpty()); + assertFalse(candidates.isEmpty(), "No candidate methods for " + name); if (!name.equals(shortName) && !"search".equals(name)) { if (searchIncludes.contains(shortName)) { candidates = FacebookMethodsTypeHelper.getCandidateMethods( FacebookMethodsTypeHelper.convertToSearchMethod(shortName), new String[0]); - assertFalse("No candidate search methods for " + shortName, candidates.isEmpty()); + assertFalse(candidates.isEmpty(), "No candidate search methods for " + shortName); } } } @@ -90,8 +90,8 @@ public class FacebookMethodsTypeHelperTest { for (int i = 0; i < nArgs; i++) { types.add((Class<?>) arguments.get(2 * i)); } - assertTrue("Missing parameters for " + method, - types.containsAll(Arrays.asList(method.getParameterTypes()))); + assertTrue(types.containsAll(Arrays.asList(method.getParameterTypes())), + "Missing parameters for " + method); } } } @@ -99,7 +99,7 @@ public class FacebookMethodsTypeHelperTest { @Test public void testAllArguments() throws Exception { - assertFalse("Missing arguments", FacebookMethodsTypeHelper.allArguments().isEmpty()); + assertFalse(FacebookMethodsTypeHelper.allArguments().isEmpty(), "Missing arguments"); } @Test @@ -118,20 +118,18 @@ public class FacebookMethodsTypeHelperTest { // skip lists, since they will be converted in invokeMethod() expectedType = actualType; } - assertEquals("Missing property " + field.getName(), expectedType, actualType); + assertEquals(expectedType, actualType, "Missing property " + field.getName()); } } @Test public void testConvertToGetMethod() throws Exception { - assertEquals("Invalid get method name", - FacebookMethodsType.GET_ACCOUNTS.getName(), FacebookMethodsTypeHelper.convertToGetMethod("accounts")); + assertEquals(FacebookMethodsType.GET_ACCOUNTS.getName(), FacebookMethodsTypeHelper.convertToGetMethod("accounts"), "Invalid get method name"); } @Test public void testConvertToSearchMethod() throws Exception { - assertEquals("Invalid search method name", - FacebookMethodsType.SEARCHPOSTS.getName(), FacebookMethodsTypeHelper.convertToSearchMethod("posts")); + assertEquals(FacebookMethodsType.SEARCHPOSTS.getName(), FacebookMethodsTypeHelper.convertToSearchMethod("posts"), "Invalid search method name"); } } diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java index 20e540b..decf490 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java @@ -19,10 +19,10 @@ package org.apache.camel.component.facebook.data; import java.lang.reflect.Method; import facebook4j.Facebook; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Test that all *Methods methods are mapped in {@link FacebookMethodsType}. @@ -37,8 +37,8 @@ public class FacebookMethodsTypeTest { // check all methods of this *Methods interface for (Method method : clazz.getDeclaredMethods()) { final FacebookMethodsType methodsType = FacebookMethodsType.findMethod(method.getName(), method.getParameterTypes()); - assertNotNull("Expected method mapping not found:" + method.getName(), methodsType); - assertEquals("Methods are not equal", method, methodsType.getMethod()); + assertNotNull(methodsType, "Expected method mapping not found:" + method.getName()); + assertEquals(method, methodsType.getMethod(), "Methods are not equal"); } } } diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/ReadingBuilderTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/ReadingBuilderTest.java index 20a8ccf..a66ee01 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/ReadingBuilderTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/ReadingBuilderTest.java @@ -24,12 +24,12 @@ import java.util.Map; import facebook4j.Reading; import org.apache.camel.component.facebook.FacebookConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Test {@link ReadingBuilder}. @@ -50,14 +50,14 @@ public class ReadingBuilderTest { source.withLocation(); Reading copy = ReadingBuilder.copy(source, false); - assertNotNull("Null copy", copy); - assertEquals("Copy not equal", source.toString(), copy.toString()); + assertNotNull(copy, "Null copy"); + assertEquals(source.toString(), copy.toString(), "Copy not equal"); // skip since and until copy = ReadingBuilder.copy(source, true); assertNotEquals("Copy equal", source.toString(), copy.toString()); - assertFalse("since", copy.toString().contains("since=")); - assertFalse("until", copy.toString().contains("until=")); + assertFalse(copy.toString().contains("since="), "since"); + assertFalse(copy.toString().contains("until="), "until"); } @Test
