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 7b925591a6f8015a07cc915ca9ce4767468109ff Author: Guillaume Nodet <[email protected]> AuthorDate: Thu Jun 11 08:39:58 2020 +0200 [CAMEL-11807] Upgrade camel-google-mail to junit5 --- components/camel-google-mail/pom.xml | 2 +- .../component/google/mail/AbstractGoogleMailTestSupport.java | 10 +++------- .../camel/component/google/mail/GmailConfigurationTest.java | 5 ++++- .../component/google/mail/GmailUsersIntegrationTest.java | 8 +++++--- .../google/mail/GmailUsersLabelsIntegrationTest.java | 7 +++++-- .../mail/GmailUsersMessagesConsumerIntegrationTest.java | 4 +++- .../google/mail/GmailUsersMessagesIntegrationTest.java | 10 +++++++--- .../google/mail/GmailUsersThreadsIntegrationTest.java | 7 +++++-- .../google/mail/GoogleMailComponentVerifierExtensionTest.java | 11 ++++++----- .../mail/stream/AbstractGoogleMailStreamTestSupport.java | 9 +++------ .../GoogleMailStreamComponentVerifierExtensionTest.java | 11 ++++++----- .../mail/stream/GoogleMailStreamConsumerIntegrationTest.java | 2 +- 12 files changed, 49 insertions(+), 37 deletions(-) diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml index 60512be..8c58696 100644 --- a/components/camel-google-mail/pom.xml +++ b/components/camel-google-mail/pom.xml @@ -104,7 +104,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-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java index a7f371c..b76e1b4 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java @@ -24,12 +24,14 @@ 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 GoogleMail Integration tests generated by Camel API * component maven plugin. */ +@TestInstance(TestInstance.Lifecycle.PER_CLASS) public class AbstractGoogleMailTestSupport extends CamelTestSupport { // userid of the currently authenticated user @@ -65,12 +67,6 @@ public class AbstractGoogleMailTestSupport 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 { return (T) template().requestBodyAndHeaders(endpointUri, body, headers); diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailConfigurationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailConfigurationTest.java index 4a00e0b..47b8d22 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailConfigurationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailConfigurationTest.java @@ -21,10 +21,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.mail.internal.GmailUsersMessagesApiMethod; import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; import org.apache.camel.impl.DefaultCamelContext; -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 GoogleMailConfiguration}. */ diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java index e54ef01..c4f04a9 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java @@ -19,10 +19,12 @@ package org.apache.camel.component.google.mail; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.mail.internal.GmailUsersApiMethod; import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -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.assertNotNull; + /** * Test class for {@link com.google.api.services.gmail.Gmail$Users} APIs. */ @@ -36,8 +38,8 @@ public class GmailUsersIntegrationTest extends AbstractGoogleMailTestSupport { // using String message body for single parameter "userId" final com.google.api.services.gmail.model.Profile result = requestBody("direct://GETPROFILE", CURRENT_USERID); - assertNotNull("getProfile result", result); - assertNotNull("Should be email address associated with current account", result.getEmailAddress()); + assertNotNull(result, "getProfile result"); + assertNotNull(result.getEmailAddress(), "Should be email address associated with current account"); LOG.debug("getProfile: " + result); } diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java index 03c3f20..fba54b1 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java @@ -23,10 +23,13 @@ import com.google.api.services.gmail.model.Label; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.mail.internal.GmailUsersLabelsApiMethod; import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Test class for {@link com.google.api.services.gmail.Gmail$Users$Labels} APIs. */ @@ -52,7 +55,7 @@ public class GmailUsersLabelsIntegrationTest extends AbstractGoogleMailTestSuppo com.google.api.services.gmail.model.Label result = requestBodyAndHeaders("direct://CREATE", null, headers); - assertNotNull("create result", result); + assertNotNull(result, "create result"); labelId = result.getId(); } else { labelId = getTestLabel(labels).getId(); diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesConsumerIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesConsumerIntegrationTest.java index 6b350ae..121e576 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesConsumerIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesConsumerIntegrationTest.java @@ -21,10 +21,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.mail.internal.GmailUsersMessagesApiMethod; import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; 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.junit.jupiter.api.Assertions.assertTrue; + /** * Test class for {@link com.google.api.services.gmail.Gmail$Users$Messages} * APIs. diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java index a027153..1964445 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java @@ -33,10 +33,14 @@ import com.google.api.services.gmail.model.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.mail.internal.GmailUsersMessagesApiMethod; import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Test class for {@link com.google.api.services.gmail.Gmail$Users$Messages} * APIs. @@ -60,7 +64,7 @@ public class GmailUsersMessagesIntegrationTest extends AbstractGoogleMailTestSup headers.put("CamelGoogleMail.content", testEmail); com.google.api.services.gmail.model.Message result = requestBodyAndHeaders("direct://SEND", null, headers); - assertNotNull("send result", result); + assertNotNull(result, "send result"); String testEmailId = result.getId(); // ==== Search for message we just sent ==== @@ -117,7 +121,7 @@ public class GmailUsersMessagesIntegrationTest extends AbstractGoogleMailTestSup } private boolean idInList(String testEmailId, ListMessagesResponse listOfMessages) { - assertNotNull("list result", listOfMessages); + assertNotNull(listOfMessages, "list result"); assertTrue(!listOfMessages.getMessages().isEmpty()); boolean foundMessage = false; for (Message m : listOfMessages.getMessages()) { diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java index 08c59fe..44912c9 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java @@ -31,10 +31,13 @@ import com.google.api.services.gmail.model.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.mail.internal.GmailUsersThreadsApiMethod; import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Test class for {@link com.google.api.services.gmail.Gmail$Users$Threads} * APIs. @@ -86,7 +89,7 @@ public class GmailUsersThreadsIntegrationTest extends AbstractGoogleMailTestSupp // using String message body for single parameter "userId" com.google.api.services.gmail.model.ListThreadsResponse result = requestBodyAndHeaders("direct://LIST", CURRENT_USERID, headers); - assertNotNull("list result", result); + assertNotNull(result, "list result"); assertTrue(result.getThreads().size() > 0); LOG.debug("list: " + result); diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtensionTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtensionTest.java index a17f44a..ba54a32 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtensionTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtensionTest.java @@ -21,9 +21,10 @@ import java.util.Map; import org.apache.camel.Component; import org.apache.camel.component.extension.ComponentVerifierExtension; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Assert; -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 GoogleMailComponentVerifierExtensionTest extends CamelTestSupport { @@ -47,7 +48,7 @@ public class GoogleMailComponentVerifierExtensionTest extends CamelTestSupport { parameters.put("applicationName", "test"); ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters); - Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); + assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); } @Test @@ -62,7 +63,7 @@ public class GoogleMailComponentVerifierExtensionTest extends CamelTestSupport { parameters.put("applicationName", "test"); ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters); - Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); + assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); } } diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/AbstractGoogleMailStreamTestSupport.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/AbstractGoogleMailStreamTestSupport.java index e38c1f8..d0bf1b5 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/AbstractGoogleMailStreamTestSupport.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/AbstractGoogleMailStreamTestSupport.java @@ -23,12 +23,14 @@ 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; /** * Abstract base class for GoogleMail Integration tests generated by Camel API * component maven plugin. */ +@TestInstance(TestInstance.Lifecycle.PER_CLASS) public class AbstractGoogleMailStreamTestSupport extends CamelTestSupport { // userid of the currently authenticated user @@ -64,9 +66,4 @@ public class AbstractGoogleMailStreamTestSupport extends CamelTestSupport { return context; } - @Override - public boolean isCreateCamelContextPerClass() { - // only create the context once for this class - return true; - } } diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtensionTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtensionTest.java index 0076035..9d8221f 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtensionTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtensionTest.java @@ -21,9 +21,10 @@ import java.util.Map; import org.apache.camel.Component; import org.apache.camel.component.extension.ComponentVerifierExtension; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Assert; -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 GoogleMailStreamComponentVerifierExtensionTest extends CamelTestSupport { @@ -47,7 +48,7 @@ public class GoogleMailStreamComponentVerifierExtensionTest extends CamelTestSup parameters.put("applicationName", "test"); ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters); - Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); + assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); } @Test @@ -62,7 +63,7 @@ public class GoogleMailStreamComponentVerifierExtensionTest extends CamelTestSup parameters.put("applicationName", "test"); ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters); - Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); + assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); } } diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumerIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumerIntegrationTest.java index c1af59e..bb2f16c 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumerIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumerIntegrationTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.google.mail.stream; 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 GoogleMailStreamConsumerIntegrationTest extends AbstractGoogleMailStreamTestSupport {
