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 182380a75ddc7fdb90ca2815ffad02cb1886dd39 Author: Guillaume Nodet <[email protected]> AuthorDate: Thu Jun 11 09:41:36 2020 +0200 [CAMEL-11807] Upgrade camel-twilio to junit5 --- components/camel-twilio/pom.xml | 2 +- .../component/twilio/AbstractTwilioTestSupport.java | 10 +++------- .../component/twilio/AccountIntegrationTest.java | 21 ++++++++++++--------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml index cccfc95..37ff8e0 100644 --- a/components/camel-twilio/pom.xml +++ b/components/camel-twilio/pom.xml @@ -73,7 +73,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java index 70cb0d1..7334a04 100644 --- a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java +++ b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java @@ -24,11 +24,13 @@ import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.TestInstance; /** * Abstract base class for Twilio Integration tests generated by Camel API component maven plugin. */ +@TestInstance(TestInstance.Lifecycle.PER_CLASS) public class AbstractTwilioTestSupport extends CamelTestSupport { private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties"; @@ -60,12 +62,6 @@ public class AbstractTwilioTestSupport extends CamelTestSupport { return context; } - @Override - public boolean isCreateCamelContextPerClass() { - // only create the context once for this class - return true; - } - @SuppressWarnings("unchecked") protected <T> T requestBodyAndHeaders(String endpointUri, Object body, Map<String, Object> headers) throws CamelExecutionException { diff --git a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AccountIntegrationTest.java b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AccountIntegrationTest.java index c190962..bad5009 100644 --- a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AccountIntegrationTest.java +++ b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AccountIntegrationTest.java @@ -24,10 +24,13 @@ import com.twilio.rest.api.v2010.Account; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.twilio.internal.AccountApiMethod; import org.apache.camel.component.twilio.internal.TwilioApiCollection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * Test class for {@link com.twilio.rest.api.v2010.Account} APIs. */ @@ -40,8 +43,8 @@ public class AccountIntegrationTest extends AbstractTwilioTestSupport { public void testFetcher() throws Exception { final Account result = requestBody("direct://FETCHER", null); - assertNotNull("fetcher result not null", result); - assertNotNull("fetcher result sid not null", result.getSid()); + assertNotNull(result, "fetcher result not null"); + assertNotNull(result.getSid(), "fetcher result sid not null"); LOG.debug("fetcher: " + result); } @@ -50,8 +53,8 @@ public class AccountIntegrationTest extends AbstractTwilioTestSupport { final Account result = requestBodyAndHeaders("direct://FETCHER", null, headers("CamelTwilioPathSid", ((TwilioComponent) context().getComponent("twilio")).getAccountSid())); - assertNotNull("fetcher result not null", result); - assertNotNull("fetcher result sid not null", result.getSid()); + assertNotNull(result, "fetcher result not null"); + assertNotNull(result.getSid(), "fetcher result sid not null"); LOG.debug("fetcher: " + result); } @@ -59,9 +62,9 @@ public class AccountIntegrationTest extends AbstractTwilioTestSupport { public void testReader() throws Exception { final ResourceSet<Account> result = requestBody("direct://READER", null); - assertNotNull("reader result not null", result); + assertNotNull(result, "reader result not null"); result.forEach(account -> { - assertNotNull("reader result account not null", account); + assertNotNull(account, "reader result account not null"); LOG.debug("reader: " + account); }); } @@ -71,9 +74,9 @@ public class AccountIntegrationTest extends AbstractTwilioTestSupport { final ResourceSet<Account> result = requestBodyAndHeaders("direct://READER", null, headers("CamelTwilioStatus", "active")); - assertNotNull("reader result not null", result); + assertNotNull(result, "reader result not null"); result.forEach(account -> { - assertEquals("reader result account active", Account.Status.ACTIVE, account.getStatus()); + assertEquals(Account.Status.ACTIVE, account.getStatus(), "reader result account active"); LOG.debug("reader: " + account); }); }
