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 d966694ee5591d8deeff656bec1bc446ed6a9950 Author: Guillaume Nodet <[email protected]> AuthorDate: Thu Jun 11 09:50:34 2020 +0200 [CAMEL-11807] Upgrade camel-zendesk to junit5 --- components/camel-zendesk/pom.xml | 2 +- .../zendesk/AbstractZendeskTestSupport.java | 10 +-- .../zendesk/ZendeskTicketIntegrationTest.java | 82 ++++++++++++---------- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/components/camel-zendesk/pom.xml b/components/camel-zendesk/pom.xml index 776c01d..4aa2afb 100644 --- a/components/camel-zendesk/pom.xml +++ b/components/camel-zendesk/pom.xml @@ -54,7 +54,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> diff --git a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java index c628847..4335ff8 100644 --- a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java +++ b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java @@ -22,7 +22,8 @@ import java.util.Properties; import org.apache.camel.CamelContext; 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; /** * A base class for Zendesk integration tests. @@ -33,6 +34,7 @@ import org.apache.camel.test.junit4.CamelTestSupport; * routes from the skeleton code into one of the subclass of this class. * </p> */ +@TestInstance(TestInstance.Lifecycle.PER_CLASS) public class AbstractZendeskTestSupport extends CamelTestSupport { public static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties"; public static final String SYSPROP_ZENDESK_SERVER_URL = "zendesk.serverUrl"; @@ -85,12 +87,6 @@ public class AbstractZendeskTestSupport 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) { return (T) template.requestBodyAndHeaders(endpointUri, body, headers); diff --git a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIntegrationTest.java b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIntegrationTest.java index 790a527..ad1f175 100644 --- a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIntegrationTest.java +++ b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIntegrationTest.java @@ -22,13 +22,17 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.zendesk.internal.ZendeskApiMethod; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.zendesk.client.v2.model.Comment; import org.zendesk.client.v2.model.Ticket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + /** * The integration tests for ticket related Zendesk API. */ @@ -39,7 +43,7 @@ public class ZendeskTicketIntegrationTest extends AbstractZendeskTestSupport { public void testGetTickets() throws Exception { final Iterable<?> result = requestBody("direct://GETTICKETS", null); - assertNotNull("getTickets result", result); + assertNotNull(result, "getTickets result"); int count = 0; for (Object ticket : result) { LOG.info(ticket.toString()); @@ -56,14 +60,14 @@ public class ZendeskTicketIntegrationTest extends AbstractZendeskTestSupport { Ticket input = new Ticket(); input.setSubject(ticketSubject); input.setDescription(ticketDescription); - Assert.assertNull(input.getId()); - Assert.assertNull(input.getCreatedAt()); + assertNull(input.getId()); + assertNull(input.getCreatedAt()); Ticket answer = requestBody("direct://CREATETICKET", input); - Assert.assertNotNull(answer.getId()); - Assert.assertNotNull(answer.getCreatedAt()); - Assert.assertEquals(answer.getCreatedAt(), answer.getUpdatedAt()); - Assert.assertEquals(ticketSubject, answer.getSubject()); - Assert.assertEquals(ticketDescription, answer.getDescription()); + assertNotNull(answer.getId()); + assertNotNull(answer.getCreatedAt()); + assertEquals(answer.getCreatedAt(), answer.getUpdatedAt()); + assertEquals(ticketSubject, answer.getSubject()); + assertEquals(ticketDescription, answer.getDescription()); // update ticket description Thread.sleep(3000); @@ -72,59 +76,59 @@ public class ZendeskTicketIntegrationTest extends AbstractZendeskTestSupport { input.setId(answer.getId()); input.setSubject(ticketSubjectUpdated); answer = requestBody("direct://UPDATETICKET", input); - Assert.assertNotEquals(answer.getCreatedAt(), answer.getUpdatedAt()); - Assert.assertEquals(ticketSubjectUpdated, answer.getSubject()); - Assert.assertEquals(ticketDescription, answer.getDescription()); + assertNotEquals(answer.getCreatedAt(), answer.getUpdatedAt()); + assertEquals(ticketSubjectUpdated, answer.getSubject()); + assertEquals(ticketDescription, answer.getDescription()); // get ticket and compare Ticket answer2 = requestBody("direct://GETTICKET", answer.getId()); - Assert.assertEquals(answer.getSubject(), answer2.getSubject()); - Assert.assertEquals(answer.getDescription(), answer2.getDescription()); - Assert.assertEquals(answer.getId(), answer2.getId()); - Assert.assertEquals(answer.getCreatedAt(), answer2.getCreatedAt()); - Assert.assertEquals(answer.getUpdatedAt(), answer2.getUpdatedAt()); + assertEquals(answer.getSubject(), answer2.getSubject()); + assertEquals(answer.getDescription(), answer2.getDescription()); + assertEquals(answer.getId(), answer2.getId()); + assertEquals(answer.getCreatedAt(), answer2.getCreatedAt()); + assertEquals(answer.getUpdatedAt(), answer2.getUpdatedAt()); // add a comment to the ticket String commentBody = "This is a comment from camel-zendesk."; final Map<String, Object> headers = new HashMap<>(); - Assert.assertEquals("ticketId", ZendeskApiMethod.CREATECOMMENT.getArgNames().get(0)); - Assert.assertEquals(long.class, ZendeskApiMethod.CREATECOMMENT.getArgTypes().get(0)); + assertEquals("ticketId", ZendeskApiMethod.CREATECOMMENT.getArgNames().get(0)); + assertEquals(long.class, ZendeskApiMethod.CREATECOMMENT.getArgTypes().get(0)); headers.put("CamelZendesk.ticketId", answer.getId()); Comment comment = new Comment(); comment.setBody(commentBody); - Assert.assertNull(comment.getId()); - Assert.assertNull(comment.getCreatedAt()); - Assert.assertEquals("comment", ZendeskApiMethod.CREATECOMMENT.getArgNames().get(1)); - Assert.assertEquals(Comment.class, ZendeskApiMethod.CREATECOMMENT.getArgTypes().get(1)); + assertNull(comment.getId()); + assertNull(comment.getCreatedAt()); + assertEquals("comment", ZendeskApiMethod.CREATECOMMENT.getArgNames().get(1)); + assertEquals(Comment.class, ZendeskApiMethod.CREATECOMMENT.getArgTypes().get(1)); headers.put("CamelZendesk.comment", comment); requestBodyAndHeaders("direct://CREATECOMMENT", null, headers); Iterable iterable = requestBody("direct://GETTICKETCOMMENTS", answer.getId()); Iterator iterator = iterable.iterator(); Comment comment1 = (Comment)iterator.next(); - Assert.assertEquals(ticketDescription, comment1.getBody()); - Assert.assertNotNull(comment1.getId()); - Assert.assertNotNull(comment1.getCreatedAt()); + assertEquals(ticketDescription, comment1.getBody()); + assertNotNull(comment1.getId()); + assertNotNull(comment1.getCreatedAt()); Comment comment2 = (Comment)iterator.next(); - Assert.assertEquals(commentBody, comment2.getBody()); - Assert.assertNotNull(comment2.getId()); - Assert.assertNotNull(comment2.getCreatedAt()); + assertEquals(commentBody, comment2.getBody()); + assertNotNull(comment2.getId()); + assertNotNull(comment2.getCreatedAt()); // delete ticket requestBody("direct://DELETETICKET", answer.getId()); Ticket mustBeDeleted = requestBody("direct://GETTICKET", answer.getId()); - Assert.assertNull(mustBeDeleted); + assertNull(mustBeDeleted); } @Test public void testInBodyParams() { - Assert.assertEquals("ticket", ZendeskApiMethod.CREATETICKET.getArgNames().get(0)); - Assert.assertEquals(Ticket.class, ZendeskApiMethod.CREATETICKET.getArgTypes().get(0)); - Assert.assertEquals("ticket", ZendeskApiMethod.UPDATETICKET.getArgNames().get(0)); - Assert.assertEquals(Ticket.class, ZendeskApiMethod.UPDATETICKET.getArgTypes().get(0)); - Assert.assertEquals("id", ZendeskApiMethod.GETTICKET.getArgNames().get(0)); - Assert.assertEquals(long.class, ZendeskApiMethod.GETTICKET.getArgTypes().get(0)); - Assert.assertEquals("id", ZendeskApiMethod.GETTICKETCOMMENTS.getArgNames().get(0)); - Assert.assertEquals(long.class, ZendeskApiMethod.GETTICKETCOMMENTS.getArgTypes().get(0)); + assertEquals("ticket", ZendeskApiMethod.CREATETICKET.getArgNames().get(0)); + assertEquals(Ticket.class, ZendeskApiMethod.CREATETICKET.getArgTypes().get(0)); + assertEquals("ticket", ZendeskApiMethod.UPDATETICKET.getArgNames().get(0)); + assertEquals(Ticket.class, ZendeskApiMethod.UPDATETICKET.getArgTypes().get(0)); + assertEquals("id", ZendeskApiMethod.GETTICKET.getArgNames().get(0)); + assertEquals(long.class, ZendeskApiMethod.GETTICKET.getArgTypes().get(0)); + assertEquals("id", ZendeskApiMethod.GETTICKETCOMMENTS.getArgNames().get(0)); + assertEquals(long.class, ZendeskApiMethod.GETTICKETCOMMENTS.getArgTypes().get(0)); } @Override
