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 67b03118004c43536c2e10f0f5b529c0664eb8b5
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jun 22 15:13:09 2020 +0200
[CAMEL-11807] Upgrade camel-box to junit5
---
components/camel-box/camel-box-component/pom.xml | 2 +-
.../component/box/AbstractBoxTestSupport.java | 10 +--
.../BoxCollaborationsManagerIntegrationTest.java | 33 +++++----
.../box/BoxCommentsManagerIntegrationTest.java | 45 ++++++------
.../box/BoxEventLogsManagerIntegrationTest.java | 10 +--
.../box/BoxEventsManagerIntegrationTest.java | 9 ++-
.../box/BoxFilesManagerIntegrationTest.java | 80 ++++++++++++----------
.../box/BoxFoldersManagerIntegrationTest.java | 59 ++++++++--------
.../box/BoxGroupsManagerIntegrationTest.java | 38 +++++-----
.../box/BoxSearchManagerIntegrationTest.java | 8 ++-
.../box/BoxTasksManagerIntegrationTest.java | 47 +++++++------
.../box/BoxUsersManagerIntegrationTest.java | 65 +++++++++---------
12 files changed, 215 insertions(+), 191 deletions(-)
diff --git a/components/camel-box/camel-box-component/pom.xml
b/components/camel-box/camel-box-component/pom.xml
index 07e3b3c..a1bb8c3 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -102,7 +102,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-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
index 74f3760..671067a 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
@@ -26,11 +26,13 @@ import com.box.sdk.BoxFolder;
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 Box Integration tests generated by Camel API
component maven plugin.
*/
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class AbstractBoxTestSupport extends CamelTestSupport {
private static final String TEST_OPTIONS_PROPERTIES =
"/test-options.properties";
@@ -74,12 +76,6 @@ public class AbstractBoxTestSupport 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-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
index bdce999..1c2bff9 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
@@ -30,13 +30,16 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxCollaborationsManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import
org.apache.camel.component.box.internal.BoxCollaborationsManagerApiMethod;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+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 BoxCollaborationsManager} APIs.
@@ -68,11 +71,11 @@ public class BoxCollaborationsManagerIntegrationTest
extends AbstractBoxTestSupp
final com.box.sdk.BoxCollaboration result =
requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATIONBYEMAIL",
testFolder.getID(), headers);
- assertNotNull("addFolderCollaboration result", result);
+ assertNotNull(result, "addFolderCollaboration result");
LOG.debug("addFolderCollaboration: " + result);
}
- @Ignore //creation of app users could be used only with JWT
authentication, which is not possible in this time
+ @Disabled //creation of app users could be used only with JWT
authentication, which is not possible in this time
@Test
public void testAddFolderCollaboration() throws Exception {
// delete collaborator created by setupTest
@@ -94,7 +97,7 @@ public class BoxCollaborationsManagerIntegrationTest extends
AbstractBoxTestSupp
final com.box.sdk.BoxCollaboration result =
requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATION",
testFolder.getID(), headers);
- assertNotNull("addFolderCollaboration result", result);
+ assertNotNull(result, "addFolderCollaboration result");
LOG.debug("addFolderCollaboration: " + result);
} catch (BoxAPIException e) {
throw new RuntimeException(
@@ -112,7 +115,7 @@ public class BoxCollaborationsManagerIntegrationTest
extends AbstractBoxTestSupp
final com.box.sdk.BoxCollaboration.Info result =
requestBody("direct://GETCOLLABORATIONINFO",
testCollaboration.getID());
- assertNotNull("getCollaborationInfo result", result);
+ assertNotNull(result, "getCollaborationInfo result");
LOG.debug("getCollaborationInfo: " + result);
}
@@ -122,7 +125,7 @@ public class BoxCollaborationsManagerIntegrationTest
extends AbstractBoxTestSupp
@SuppressWarnings("rawtypes")
final java.util.Collection result =
requestBody("direct://GETFOLDERCOLLABORATIONS", testFolder.getID());
- assertNotNull("getFolderCollaborations result", result);
+ assertNotNull(result, "getFolderCollaborations result");
LOG.debug("getFolderCollaborations: " + result);
}
@@ -131,7 +134,7 @@ public class BoxCollaborationsManagerIntegrationTest
extends AbstractBoxTestSupp
public void testGetPendingCollaborations() throws Exception {
final java.util.Collection result =
requestBody("direct://GETPENDINGCOLLABORATIONS", null);
- assertNotNull("getPendingCollaborations result", result);
+ assertNotNull(result, "getPendingCollaborations result");
LOG.debug("getPendingCollaborations: " + result);
}
@@ -149,9 +152,9 @@ public class BoxCollaborationsManagerIntegrationTest
extends AbstractBoxTestSupp
final com.box.sdk.BoxCollaboration result =
requestBodyAndHeaders("direct://UPDATECOLLABORATIONINFO", null,
headers);
- assertNotNull("updateCollaborationInfo result", result);
- assertNotNull("updateCollaborationInfo info", result.getInfo());
- assertEquals("updateCollaborationInfo info",
BoxCollaboration.Role.PREVIEWER, result.getInfo().getRole());
+ assertNotNull(result, "updateCollaborationInfo result");
+ assertNotNull(result.getInfo(), "updateCollaborationInfo info");
+ assertEquals(BoxCollaboration.Role.PREVIEWER,
result.getInfo().getRole(), "updateCollaborationInfo info");
LOG.debug("updateCollaborationInfo: " + result);
}
@@ -189,13 +192,13 @@ public class BoxCollaborationsManagerIntegrationTest
extends AbstractBoxTestSupp
};
}
- @Before
+ @BeforeEach
public void setupTest() throws Exception {
createTestFolder();
createTestCollaborator();
}
- @After
+ @AfterEach
public void teardownTest() {
deleteTestCollaborator();
deleteTestFolder();
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
index 67e8942..fba4935 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
@@ -29,12 +29,16 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxCommentsManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxCommentsManagerApiMethod;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+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;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test class for
* {@link BoxCommentsManager} APIs.
@@ -60,11 +64,10 @@ public class BoxCommentsManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxFile result =
requestBodyAndHeaders("direct://ADDFILECOMMENT", null, headers);
- assertNotNull("addFileComment result", result);
- assertNotNull("addFileComment comments", result.getComments());
- assertTrue("changeCommentMessage comments size",
result.getComments().size() > 0);
- assertEquals("changeCommentMessage comment message",
CAMEL_TEST_FILE_COMMENT,
- result.getComments().get(0).getMessage());
+ assertNotNull(result, "addFileComment result");
+ assertNotNull(result.getComments(), "addFileComment comments");
+ assertTrue(result.getComments().size() > 0, "changeCommentMessage
comments size");
+ assertEquals(CAMEL_TEST_FILE_COMMENT,
result.getComments().get(0).getMessage(), "changeCommentMessage comment
message");
LOG.debug("addFileComment: " + result);
}
@@ -81,9 +84,9 @@ public class BoxCommentsManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxComment result =
requestBodyAndHeaders("direct://CHANGECOMMENTMESSAGE", null, headers);
- assertNotNull("changeCommentMessage result", result);
- assertNotNull("changeCommentMessage message",
result.getInfo().getMessage());
- assertEquals("changeCommentMessage message",
CAMEL_TEST_FILE_CHANGED_COMMENT, result.getInfo().getMessage());
+ assertNotNull(result, "changeCommentMessage result");
+ assertNotNull(result.getInfo().getMessage(), "changeCommentMessage
message");
+ assertEquals(CAMEL_TEST_FILE_CHANGED_COMMENT,
result.getInfo().getMessage(), "changeCommentMessage message");
LOG.debug("changeCommentMessage: " + result);
}
@@ -95,8 +98,8 @@ public class BoxCommentsManagerIntegrationTest extends
AbstractBoxTestSupport {
requestBody("direct://DELETECOMMENT", commentInfo.getID());
List<BoxComment.Info> comments = testFile.getComments();
- assertNotNull("deleteComment comments", comments);
- assertEquals("deleteComment comments empty", 0, comments.size());
+ assertNotNull(comments, "deleteComment comments");
+ assertEquals(0, comments.size(), "deleteComment comments empty");
}
@Test
@@ -107,8 +110,8 @@ public class BoxCommentsManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter "commentId"
final com.box.sdk.BoxComment.Info result =
requestBody("direct://GETCOMMENTINFO", commentInfo.getID());
- assertNotNull("getCommentInfo result", result);
- assertEquals("getCommentInfo message", CAMEL_TEST_FILE_COMMENT,
result.getMessage());
+ assertNotNull(result, "getCommentInfo result");
+ assertEquals(CAMEL_TEST_FILE_COMMENT, result.getMessage(),
"getCommentInfo message");
LOG.debug("getCommentInfo: " + result);
}
@@ -120,8 +123,8 @@ public class BoxCommentsManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.List result = requestBody("direct://GETFILECOMMENTS",
testFile.getID());
- assertNotNull("getFileComments result", result);
- assertEquals("getFileComments size", 1, result.size());
+ assertNotNull(result, "getFileComments result");
+ assertEquals(1, result.size(), "getFileComments size");
LOG.debug("getFileComments: " + result);
}
@@ -138,8 +141,8 @@ public class BoxCommentsManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxComment result =
requestBodyAndHeaders("direct://REPLYTOCOMMENT", null, headers);
- assertNotNull("replyToComment result", result);
- assertEquals("replyToComment result", CAMEL_TEST_FILE_REPLY_COMMENT,
result.getInfo().getMessage());
+ assertNotNull(result, "replyToComment result");
+ assertEquals(CAMEL_TEST_FILE_REPLY_COMMENT,
result.getInfo().getMessage(), "replyToComment result");
LOG.debug("replyToComment: " + result);
}
@@ -169,12 +172,12 @@ public class BoxCommentsManagerIntegrationTest extends
AbstractBoxTestSupport {
};
}
- @Before
+ @BeforeEach
public void setupTest() throws Exception {
createTestFile();
}
- @After
+ @AfterEach
public void teardownTest() {
deleteTestFile();
}
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIntegrationTest.java
index fcee034..18cf0c7 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIntegrationTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxEventLogsManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxEventLogsManagerApiMethod;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+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 BoxEventLogsManager} APIs.
@@ -40,7 +42,7 @@ public class BoxEventLogsManagerIntegrationTest extends
AbstractBoxTestSupport {
.getApiName(BoxEventLogsManagerApiMethod.class).getName();
private static final long ONE_MINUTE_OF_MILLISECONDS = 1000 * 60;
- @Ignore // Requires enterprise admin account to test
+ @Disabled // Requires enterprise admin account to test
@Test
public void testGetEnterpriseEvents() throws Exception {
Date before = new Date();
@@ -60,7 +62,7 @@ public class BoxEventLogsManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.List result =
requestBodyAndHeaders("direct://GETENTERPRISEEVENTS", null, headers);
- assertNotNull("getEnterpriseEvents result", result);
+ assertNotNull(result, "getEnterpriseEvents result");
LOG.debug("getEnterpriseEvents: " + result);
}
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
index cd05555..577979a 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
@@ -29,10 +29,13 @@ import org.apache.camel.component.box.api.BoxEventsManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxEventsManagerApiMethod;
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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Test class for {@link BoxEventsManager}
* APIs. TODO Move the file to src/test/java, populate parameter values, and
@@ -63,8 +66,8 @@ public class BoxEventsManagerIntegrationTest extends
AbstractBoxTestSupport {
mockEndpoint.assertIsSatisfied();
final List<Exchange> exchanges = mockEndpoint.getExchanges();
- assertNotNull("poll result", exchanges);
- assertFalse("poll result", exchanges.isEmpty());
+ assertNotNull(exchanges, "poll result");
+ assertFalse(exchanges.isEmpty(), "poll result");
LOG.debug("poll result: " + exchanges);
}
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
index a1b4e13..ac2e092 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
@@ -35,13 +35,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxFilesManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxFilesManagerApiMethod;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* Test class for {@link BoxFilesManager}
* APIs.
@@ -75,8 +81,8 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://COPYFILE", null, headers);
- assertNotNull("copyFile result", result);
- assertEquals("copyFile name", CAMEL_TEST_COPY_FILE_NAME,
result.getInfo().getName());
+ assertNotNull(result, "copyFile result");
+ assertEquals(CAMEL_TEST_COPY_FILE_NAME,
result.getInfo().getName(), "copyFile name");
LOG.debug("copyFile: " + result);
} finally {
if (result != null) {
@@ -100,8 +106,8 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.Metadata result =
requestBodyAndHeaders("direct://CREATEFILEMETADATA", null, headers);
- assertNotNull("createFileMetadata result", result);
- assertEquals("createFileMetadata result", "bar", result.get("/foo"));
+ assertNotNull(result, "createFileMetadata result");
+ assertEquals("bar", result.get("/foo"), "createFileMetadata result");
LOG.debug("createFileMetadata: " + result);
}
@@ -119,7 +125,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxSharedLink result =
requestBodyAndHeaders("direct://CREATEFILESHAREDLINK", null, headers);
- assertNotNull("createFileSharedLink result", result);
+ assertNotNull(result, "createFileSharedLink result");
LOG.debug("createFileSharedLink: " + result);
}
@@ -132,7 +138,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
Iterable<BoxItem.Info> it = rootFolder.search("^" + CAMEL_TEST_FILE +
"$");
int searchResults = sizeOfIterable(it);
boolean exists = searchResults > 0 ? true : false;
- assertEquals("deleteFile exists", false, exists);
+ assertFalse(exists, "deleteFile exists");
LOG.debug("deleteFile: exists? " + exists);
}
@@ -156,7 +162,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
}
- @Ignore // Requires premium user account to test.
+ @Disabled // Requires premium user account to test.
@Test
public void testDeleteFileVersion() throws Exception {
testFile.uploadVersion(getClass().getResourceAsStream(CAMEL_TEST_FILE));
@@ -169,7 +175,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
requestBodyAndHeaders("direct://DELETEFILEVERSION", null, headers);
boolean onlyOneVersion = testFile.getVersions().size() == 1;
- assertTrue("deleteFileVersion version deleted", onlyOneVersion);
+ assertTrue(onlyOneVersion, "deleteFileVersion version deleted");
}
@Test
@@ -189,11 +195,11 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final java.io.OutputStream result =
requestBodyAndHeaders("direct://DOWNLOADFILE", null, headers);
- assertNotNull("downloadFile result", result);
+ assertNotNull(result, "downloadFile result");
LOG.debug("downloadFile: " + result);
}
- @Ignore // Requires premium user account to test
+ @Disabled // Requires premium user account to test
@Test
public void testDownloadPreviousFileVersion() throws Exception {
final Map<String, Object> headers = new HashMap<>();
@@ -210,7 +216,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final java.io.OutputStream result =
requestBodyAndHeaders("direct://DOWNLOADPREVIOUSFILEVERSION", null,
headers);
- assertNotNull("downloadPreviousFileVersion result", result);
+ assertNotNull(result, "downloadPreviousFileVersion result");
LOG.debug("downloadPreviousFileVersion: " + result);
}
@@ -219,7 +225,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter "fileId"
final java.net.URL result = requestBody("direct://GETDOWNLOADURL",
testFile.getID());
- assertNotNull("getDownloadURL result", result);
+ assertNotNull(result, "getDownloadURL result");
LOG.debug("getDownloadURL: " + result);
}
@@ -233,7 +239,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxFile.Info result =
requestBodyAndHeaders("direct://GETFILEINFO", null, headers);
- assertNotNull("getFileInfo result", result);
+ assertNotNull(result, "getFileInfo result");
LOG.debug("getFileInfo: " + result);
}
@@ -249,7 +255,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.Metadata result =
requestBodyAndHeaders("direct://GETFILEMETADATA", null, headers);
- assertNotNull("getFileMetadata result", result);
+ assertNotNull(result, "getFileMetadata result");
LOG.debug("getFileMetadata: " + result);
}
@@ -258,7 +264,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter "fileId"
final java.net.URL result = requestBody("direct://GETFILEPREVIEWLINK",
testFile.getID());
- assertNotNull("getFilePreviewLink result", result);
+ assertNotNull(result, "getFilePreviewLink result");
LOG.debug("getFilePreviewLink: " + result);
}
@@ -280,7 +286,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final byte[] result =
requestBodyAndHeaders("direct://GETFILETHUMBNAIL", null, headers);
- assertNotNull("getFileThumbnail result", result);
+ assertNotNull(result, "getFileThumbnail result");
LOG.debug("getFileThumbnail: " + result);
}
@@ -290,7 +296,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.Collection result =
requestBody("direct://GETFILEVERSIONS", testFile.getID());
- assertNotNull("getFileVersions result", result);
+ assertNotNull(result, "getFileVersions result");
LOG.debug("getFileVersions: " + result);
}
@@ -309,8 +315,8 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://MOVEFILE", null, headers);
- assertNotNull("moveFile result", result);
- assertEquals("moveFile name", CAMEL_TEST_MOVE_FILE_NAME,
result.getInfo().getName());
+ assertNotNull(result, "moveFile result");
+ assertEquals(CAMEL_TEST_MOVE_FILE_NAME,
result.getInfo().getName(), "moveFile name");
LOG.debug("moveFile: " + result);
} finally {
if (result != null) {
@@ -319,7 +325,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
}
}
- @Ignore // Requires premium user account to test
+ @Disabled // Requires premium user account to test
@Test
public void testPromoteFileVersion() throws Exception {
testFile.uploadVersion(getClass().getResourceAsStream(CAMEL_TEST_FILE));
@@ -332,7 +338,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxFileVersion result =
requestBodyAndHeaders("direct://PROMOTEFILEVERSION", null, headers);
- assertNotNull("promoteFileVersion result", result);
+ assertNotNull(result, "promoteFileVersion result");
LOG.debug("promoteFileVersion: " + result);
}
@@ -350,8 +356,8 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://RENAMEFILE", null,
headers);
- assertNotNull("renameFile result", result);
- assertEquals("renameFile name", CAMEL_TEST_RENAME_FILE_NAME,
result.getInfo().getName());
+ assertNotNull(result, "renameFile result");
+ assertEquals(CAMEL_TEST_RENAME_FILE_NAME,
result.getInfo().getName(), "renameFile name");
LOG.debug("renameFile: " + result);
} finally {
if (result != null) {
@@ -373,8 +379,8 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxFile result =
requestBodyAndHeaders("direct://UPDATEFILEINFO", null, headers);
- assertNotNull("updateFileInfo result", result);
- assertEquals("updateFileInfo info", CAMEL_TEST_FILE_DESCRIPTION,
result.getInfo().getDescription());
+ assertNotNull(result, "updateFileInfo result");
+ assertEquals(CAMEL_TEST_FILE_DESCRIPTION,
result.getInfo().getDescription(), "updateFileInfo info");
LOG.debug("updateFileInfo: " + result);
}
@@ -394,8 +400,8 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.Metadata result =
requestBodyAndHeaders("direct://UPDATEFILEMETADATA", null, headers);
- assertNotNull("updateFileMetadata result", result);
- assertNotNull("updateFileMetadata property foo", result.get("/foo"));
+ assertNotNull(result, "updateFileMetadata result");
+ assertNotNull(result.get("/foo"), "updateFileMetadata property foo");
assertEquals("bar", metadata.get("/foo"));
LOG.debug("updateFileMetadata: " + result);
}
@@ -416,7 +422,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://UPLOADFILE", null,
headers);
- assertNotNull("uploadFile result", result);
+ assertNotNull(result, "uploadFile result");
LOG.debug("uploadFile: " + result);
} finally {
if (result != null) {
@@ -443,9 +449,9 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
headers.put("CamelBox.listener", null);
result = requestBodyAndHeaders("direct://UPLOADFILE", null,
headers);
- assertNotNull("uploadFile result", result);
+ assertNotNull(result, "uploadFile result");
result = requestBodyAndHeaders("direct://UPLOADFILEOVERWRITE",
null, headers);
- assertNotNull("uploadFile overwrite result", result);
+ assertNotNull(result, "uploadFile overwrite result");
LOG.debug("uploadFile: " + result);
} finally {
if (result != null) {
@@ -476,7 +482,7 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://UPLOADNEWFILEVERSION",
null, headers);
- assertNotNull("uploadNewFileVersion result", result);
+ assertNotNull(result, "uploadNewFileVersion result");
LOG.debug("uploadNewFileVersion: " + result);
} finally {
if (result != null) {
@@ -563,12 +569,12 @@ public class BoxFilesManagerIntegrationTest extends
AbstractBoxTestSupport {
};
}
- @Before
+ @BeforeEach
public void setupTest() throws Exception {
createTestFile();
}
- @After
+ @AfterEach
public void teardownTest() {
deleteTestFile();
}
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
index 2cb03bc..dbff8f0 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
@@ -28,12 +28,16 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxFoldersManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxFoldersManagerApiMethod;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Test class for {@link BoxFoldersManager}
* APIs.
@@ -66,8 +70,8 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
testFolder = requestBodyAndHeaders("direct://CREATEFOLDER", null,
headers);
- assertNotNull("createFolder result", testFolder);
- assertEquals("createFolder folder name", CAMEL_TEST_FOLDER,
testFolder.getInfo().getName());
+ assertNotNull(testFolder, "createFolder result");
+ assertEquals(CAMEL_TEST_FOLDER, testFolder.getInfo().getName(),
"createFolder folder name");
LOG.debug("createFolder: " + testFolder);
}
@@ -85,8 +89,8 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
testFolder = requestBodyAndHeaders("direct://CREATEFOLDER", null,
headers);
- assertNotNull("createFolder result", testFolder);
- assertEquals("createFolder folder name", CAMEL_TEST_FOLDER,
testFolder.getInfo().getName());
+ assertNotNull(testFolder, "createFolder result");
+ assertEquals(CAMEL_TEST_FOLDER, testFolder.getInfo().getName(),
"createFolder folder name");
LOG.debug("createFolder: " + testFolder);
}
@@ -98,9 +102,7 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
BoxFolder rootFolder = BoxFolder.getRootFolder(getConnection());
Iterable<BoxItem.Info> it = rootFolder.search("^" + CAMEL_TEST_FOLDER
+ "$");
int searchResults = sizeOfIterable(it);
- boolean exists = searchResults > 0 ? true : false;
- assertEquals("deleteFolder exists", false, exists);
- LOG.debug("deleteFolder: exists? " + exists);
+ assertFalse(searchResults > 0, "deleteFolder exists");
}
@Test
@@ -115,8 +117,8 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
// parameter type is String
headers.put("CamelBox.newName", CAMEL_TEST_COPY_FOLDER);
result = requestBodyAndHeaders("direct://COPYFOLDER", null,
headers);
- assertNotNull("copyFolder result", result);
- assertEquals("copyFolder folder name", CAMEL_TEST_COPY_FOLDER,
result.getInfo().getName());
+ assertNotNull(result, "copyFolder result");
+ assertEquals(CAMEL_TEST_COPY_FOLDER, result.getInfo().getName(),
"copyFolder folder name");
LOG.debug("copyFolder: " + result);
} finally {
if (result != null) {
@@ -143,7 +145,7 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxSharedLink result =
requestBodyAndHeaders("direct://CREATEFOLDERSHAREDLINK", null,
headers);
- assertNotNull("createFolderSharedLink result", result);
+ assertNotNull(result, "createFolderSharedLink result");
LOG.debug("createFolderSharedLink: " + result);
}
@@ -152,8 +154,8 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String[] message body for single parameter "path"
final com.box.sdk.BoxFolder result = requestBody("direct://GETFOLDER",
new String[] {CAMEL_TEST_FOLDER});
- assertNotNull("getFolder result", result);
- assertEquals("getFolder folder id", testFolder.getID(),
result.getID());
+ assertNotNull(result, "getFolder result");
+ assertEquals(testFolder.getID(), result.getID(), "getFolder folder
id");
LOG.debug("getFolder: " + result);
}
@@ -167,9 +169,9 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxFolder.Info result =
requestBodyAndHeaders("direct://GETFOLDERINFO", null, headers);
- assertNotNull("getFolderInfo result", result);
- assertNotNull("getFolderInfo result.getName()", result.getName());
- assertEquals("getFolderInfo info name", CAMEL_TEST_FOLDER,
result.getName());
+ assertNotNull(result, "getFolderInfo result");
+ assertNotNull(result.getName(), "getFolderInfo result.getName()");
+ assertEquals(CAMEL_TEST_FOLDER, result.getName(), "getFolderInfo info
name");
LOG.debug("getFolderInfo: " + result);
}
@@ -188,7 +190,7 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.Collection result =
requestBodyAndHeaders("direct://GETFOLDERITEMS", null, headers);
- assertNotNull("getFolderItems result", result);
+ assertNotNull(result, "getFolderItems result");
LOG.debug("getFolderItems: " + result);
}
@@ -196,7 +198,7 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
public void testGetRootFolder() throws Exception {
final com.box.sdk.BoxFolder result =
requestBody("direct://GETROOTFOLDER", null);
- assertNotNull("getRootFolder result", result);
+ assertNotNull(result, "getRootFolder result");
LOG.debug("getRootFolder: " + result);
}
@@ -212,8 +214,8 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxFolder result =
requestBodyAndHeaders("direct://MOVEFOLDER", null, headers);
- assertNotNull("moveFolder result", result);
- assertEquals("moveFolder folder name", CAMEL_TEST_MOVE_FOLDER,
result.getInfo().getName());
+ assertNotNull(result, "moveFolder result");
+ assertEquals(CAMEL_TEST_MOVE_FOLDER, result.getInfo().getName(),
"moveFolder folder name");
LOG.debug("moveFolder: " + result);
}
@@ -227,8 +229,8 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxFolder result =
requestBodyAndHeaders("direct://RENAMEFOLDER", null, headers);
- assertNotNull("renameFolder result", result);
- assertEquals("moveFolder folder name", CAMEL_TEST_RENAME_FOLDER,
result.getInfo().getName());
+ assertNotNull(result, "renameFolder result");
+ assertEquals(CAMEL_TEST_RENAME_FOLDER, result.getInfo().getName(),
"moveFolder folder name");
LOG.debug("renameFolder: " + result);
}
@@ -245,9 +247,8 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxFolder result =
requestBodyAndHeaders("direct://UPDATEFOLDERINFO", null, headers);
- assertNotNull("updateInfo result", result);
- assertEquals("update folder info description",
CAMEL_TEST_FOLDER_DESCRIPTION,
- result.getInfo().getDescription());
+ assertNotNull(result, "updateInfo result");
+ assertEquals(CAMEL_TEST_FOLDER_DESCRIPTION,
result.getInfo().getDescription(), "update folder info description");
LOG.debug("updateInfo: " + result);
}
@@ -292,12 +293,12 @@ public class BoxFoldersManagerIntegrationTest extends
AbstractBoxTestSupport {
};
}
- @Before
+ @BeforeEach
public void setupTest() throws Exception {
createTestFolder();
}
- @After
+ @AfterEach
public void teardownTest() {
deleteTestFolder();
}
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIntegrationTest.java
index f4ef71e..c6a3781 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIntegrationTest.java
@@ -28,12 +28,16 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxGroupsManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxGroupsManagerApiMethod;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Test class for {@link BoxGroupsManager} APIs.
*/
@@ -62,7 +66,7 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxGroupMembership result =
requestBodyAndHeaders("direct://ADDGROUPMEMBERSHIP", null,
headers);
- assertNotNull("addGroupMembership result", result);
+ assertNotNull(result, "addGroupMembership result");
LOG.debug("addGroupMembership: " + result);
}
@@ -73,7 +77,7 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
try {
// using String message body for single parameter "name"
result = requestBody("direct://CREATEGROUP",
CAMEL_TEST_CREATE_GROUP_NAME);
- assertNotNull("createGroup result", result);
+ assertNotNull(result, "createGroup result");
assertEquals(CAMEL_TEST_CREATE_GROUP_NAME,
result.getInfo().getName());
LOG.debug("createGroup: " + result);
} finally {
@@ -95,9 +99,7 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
Iterable<BoxGroup.Info> it = BoxGroup.getAllGroups(getConnection());
int searchResults = sizeOfIterable(it);
- boolean exists = searchResults > 0 ? true : false;
- assertEquals("deleteGroup exists", false, exists);
- LOG.debug("deleteGroup: exists? " + exists);
+ assertFalse(searchResults > 0, "deleteGroup exists");
}
@Test
@@ -108,15 +110,15 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
requestBody("direct://DELETEGROUPMEMBERSHIP", info.getID());
Collection<BoxGroupMembership.Info> memberships =
testGroup.getMemberships();
- assertNotNull("deleteGroupMemberships memberships", memberships);
- assertEquals("deleteGroupMemberships memberships exists", 0,
memberships.size());
+ assertNotNull(memberships, "deleteGroupMemberships memberships");
+ assertEquals(0, memberships.size(), "deleteGroupMemberships
memberships exists");
}
@Test
public void testGetAllGroups() throws Exception {
@SuppressWarnings("rawtypes") final java.util.Collection result =
requestBody("direct://GETALLGROUPS", null);
- assertNotNull("getAllGroups result", result);
+ assertNotNull(result, "getAllGroups result");
LOG.debug("getAllGroups: " + result);
}
@@ -125,7 +127,7 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter "groupId"
final com.box.sdk.BoxGroup.Info result =
requestBody("direct://GETGROUPINFO", testGroup.getID());
- assertNotNull("getGroupInfo result", result);
+ assertNotNull(result, "getGroupInfo result");
LOG.debug("getGroupInfo: " + result);
}
@@ -141,7 +143,7 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
// parameter type is com.box.sdk.BoxGroup.Info
headers.put("CamelBox.groupInfo", info);
final com.box.sdk.BoxGroup result =
requestBodyAndHeaders("direct://UPDATEGROUPINFO", null, headers);
- assertNotNull("updateGroupInfo result", result);
+ assertNotNull(result, "updateGroupInfo result");
LOG.debug("updateGroupInfo: " + result);
} finally {
info = testGroup.getInfo();
@@ -157,7 +159,7 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter "groupMembershipId"
final com.box.sdk.BoxGroupMembership.Info result =
requestBody("direct://GETGROUPMEMBERSHIPINFO", info.getID());
- assertNotNull("getGroupMembershipInfo result", result);
+ assertNotNull(result, "getGroupMembershipInfo result");
LOG.debug("getGroupMembershipInfo: " + result);
}
@@ -166,7 +168,7 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter "groupId"
@SuppressWarnings("rawtypes") final java.util.Collection result =
requestBody("direct://GETGROUPMEMBERSHIPS", testGroup.getID());
- assertNotNull("getGroupMemberships result", result);
+ assertNotNull(result, "getGroupMemberships result");
LOG.debug("getGroupMemberships: " + result);
}
@@ -184,7 +186,7 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxGroupMembership result =
requestBodyAndHeaders("direct://UPDATEGROUPMEMBERSHIPINFO", null,
headers);
- assertNotNull("updateGroupMembershipInfo result", result);
+ assertNotNull(result, "updateGroupMembershipInfo result");
LOG.debug("updateGroupMembershipInfo: " + result);
}
@@ -229,13 +231,13 @@ public class BoxGroupsManagerIntegrationTest extends
AbstractBoxTestSupport {
};
}
- @Before
+ @BeforeEach
public void setupTest() throws Exception {
createTestGroup();
createTestUser();
}
- @After
+ @AfterEach
public void teardownTest() {
deleteTestGroup();
deleteTestUser();
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
index b249cd8..5204363 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
@@ -23,10 +23,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxSearchManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxSearchManagerApiMethod;
-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 BoxSearchManager}
* APIs.
@@ -45,7 +47,7 @@ public class BoxSearchManagerIntegrationTest extends
AbstractBoxTestSupport {
*
* To test search of real data, change query string from '*' to real name
of file.
*/
- @Test(expected = Test.None.class /* no exception expected */)
+ @Test
public void testSearchFolder() {
final Map<String, Object> headers = new HashMap<>();
// parameter type is String
@@ -56,7 +58,7 @@ public class BoxSearchManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.Collection result =
requestBodyAndHeaders("direct://SEARCHFOLDER", null, headers);
- assertNotNull("searchFolder result", result);
+ assertNotNull(result, "searchFolder result");
LOG.debug("searchFolder: " + result);
}
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
index 64b5bdb..9235b72 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
@@ -33,13 +33,16 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxTasksManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxTasksManagerApiMethod;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+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;
+
/**
* Test class for {@link BoxTasksManager}
* APIs.
@@ -56,7 +59,8 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
private BoxTask testTask;
- @Ignore //needs
https://community.box.com/t5/custom/page/page-id/BoxViewTicketDetail?ticket_id=1895413
to be solved
+ @Disabled
+ //needs
https://community.box.com/t5/custom/page/page-id/BoxViewTicketDetail?ticket_id=1895413
to be solved
@Test
public void testAddAssignmentToTask() throws Exception {
com.box.sdk.BoxTask result = null;
@@ -69,7 +73,7 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://ADDASSIGNMENTTOTASK", null,
headers);
- assertNotNull("addAssignmentToTask result", result);
+ assertNotNull(result, "addAssignmentToTask result");
LOG.debug("addAssignmentToTask: " + result);
}
@@ -92,7 +96,7 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://ADDFILETASK", null,
headers);
- assertNotNull("addFileTask result", result);
+ assertNotNull(result, "addFileTask result");
LOG.debug("addFileTask: " + result);
} finally {
if (result != null) {
@@ -110,11 +114,10 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
requestBody("direct://DELETETASK", testTask.getID());
List<BoxTask.Info> tasks = testFile.getTasks();
- boolean exists = tasks.size() != 0;
- assertEquals("deleteTask task still exists.", false, exists);
+ assertFalse(tasks.size() != 0, "deleteTask task still exists.");
}
- @Ignore // Receiving "not found" exception from Box API
+ @Disabled // Receiving "not found" exception from Box API
@Test
public void testDeleteTaskAssignment() throws Exception {
BoxTaskAssignment.Info info = testTask.addAssignment(getCurrentUser());
@@ -123,8 +126,7 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
requestBody("direct://DELETETASKASSIGNMENT", info.getID());
List<BoxTaskAssignment.Info> assignments = testTask.getAssignments();
- boolean exists = assignments.size() != 0;
- assertEquals("deleteTaskAssignment assignment still exists.", false,
exists);
+ assertFalse(assignments.size() != 0, "deleteTaskAssignment assignment
still exists.");
}
@Test
@@ -133,11 +135,11 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.List result = requestBody("direct://GETFILETASKS",
testFile.getID());
- assertNotNull("getFileTasks result", result);
+ assertNotNull(result, "getFileTasks result");
LOG.debug("getFileTasks: " + result);
}
- @Ignore
+ @Disabled
@Test
public void testGetTaskAssignmentInfo() throws Exception {
BoxTaskAssignment.Info info = testTask.addAssignment(getCurrentUser());
@@ -147,7 +149,7 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter
"taskAssignmentId"
result = requestBody("direct://GETTASKASSIGNMENTINFO",
info.getID());
- assertNotNull("getTaskAssignmentInfo result", result);
+ assertNotNull(result, "getTaskAssignmentInfo result");
LOG.debug("getTaskAssignmentInfo: " + result);
} finally {
if (result != null) {
@@ -159,7 +161,8 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
}
}
- @Ignore //needs
https://community.box.com/t5/custom/page/page-id/BoxViewTicketDetail?ticket_id=1895413
to be solved
+ @Disabled
+ //needs
https://community.box.com/t5/custom/page/page-id/BoxViewTicketDetail?ticket_id=1895413
to be solved
@Test
public void testGetTaskAssignments() throws Exception {
// using String message body for single parameter "taskId"
@@ -176,7 +179,7 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.List result =
requestBody("direct://GETTASKASSIGNMENTS", testTask.getID());
- assertNotNull("getTaskAssignments result", result);
+ assertNotNull(result, "getTaskAssignments result");
LOG.debug("getTaskAssignments: " + result);
}
@@ -185,11 +188,11 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter "taskId"
final com.box.sdk.BoxTask.Info result =
requestBody("direct://GETTASKINFO", testTask.getID());
- assertNotNull("getTaskInfo result", result);
+ assertNotNull(result, "getTaskInfo result");
LOG.debug("getTaskInfo: " + result);
}
- @Ignore // No way to change BoxTask.Info parameters
+ @Disabled // No way to change BoxTask.Info parameters
@Test
public void testUpdateTaskInfo() throws Exception {
BoxTask.Info info = testTask.getInfo();
@@ -202,7 +205,7 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
final com.box.sdk.BoxTask result =
requestBodyAndHeaders("direct://UPDATETASKINFO", null, headers);
- assertNotNull("updateTaskInfo result", result);
+ assertNotNull(result, "updateTaskInfo result");
LOG.debug("updateTaskInfo: " + result);
}
@@ -243,13 +246,13 @@ public class BoxTasksManagerIntegrationTest extends
AbstractBoxTestSupport {
};
}
- @Before
+ @BeforeEach
public void setupTest() throws Exception {
createTestFile();
createTestTask();
}
- @After
+ @AfterEach
public void teardownTest() {
deleteTestTask();
deleteTestFile();
diff --git
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
index 82727f4..3e1e99e 100644
---
a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
+++
b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
@@ -29,14 +29,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxUsersManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxUsersManagerApiMethod;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
/**
* Test class for {@link BoxUsersManager}
* APIs.
@@ -56,7 +61,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
private BoxUser testUser;
- @Ignore
+ @Disabled
@Test
public void testAddUserEmailAlias() throws Exception {
com.box.sdk.EmailAlias result = null;
@@ -67,7 +72,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
// parameter type is String
headers.put("CamelBox.email", CAMEL_TEST_USER_EMAIL_ALIAS);
result = requestBodyAndHeaders("direct://ADDUSEREMAILALIAS", null,
headers);
- assertNotNull("addUserEmailAlias result", result);
+ assertNotNull(result, "addUserEmailAlias result");
LOG.debug("addUserEmailAlias: " + result);
} finally {
if (result != null) {
@@ -82,7 +87,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
@Test
public void testCreateAppUser() throws Exception {
//This test makes sense only with JWT authentication. With standard
(OAuth) it will always fail.
- Assume.assumeTrue("Test has to be executed with standard
authentication.", jwtAuthentoication);
+ assumeTrue(jwtAuthentoication, "Test has to be executed with standard
authentication.");
com.box.sdk.BoxUser result = null;
@@ -98,7 +103,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://CREATEAPPUSER", null,
headers);
- assertNotNull("createAppUser result", result);
+ assertNotNull(result, "createAppUser result");
LOG.debug("createAppUser: " + result);
} finally {
if (result != null) {
@@ -113,14 +118,14 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
@Test
public void testCreateEnterpriseUser() throws Exception {
//This test makes sense only with standard (OAuth) authentication,
with JWT it will always fail with return code 403
- Assume.assumeFalse("Test has to be executed with standard
authentication.", jwtAuthentoication);
+ assumeFalse(jwtAuthentoication, "Test has to be executed with standard
authentication.");
String enterpriseUser1Login =
(String)options.get(CAMEL_TEST_ENTERPRISE_USER_LOGIN_KEY);
if (enterpriseUser1Login != null &&
"".equals(enterpriseUser1Login.trim())) {
enterpriseUser1Login = null;
}
- assertNotNull("Email for enterprise user has to be defined in
test-options.properties for this test to succeed.", enterpriseUser1Login);
+ assertNotNull(enterpriseUser1Login, "Email for enterprise user has to
be defined in test-options.properties for this test to succeed.");
com.box.sdk.BoxUser result = null;
@@ -138,7 +143,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
result = requestBodyAndHeaders("direct://CREATEENTERPRISEUSER",
null, headers);
- assertNotNull("createEnterpriseUser result", result);
+ assertNotNull(result, "createEnterpriseUser result");
LOG.debug("createEnterpriseUser: " + result);
} finally {
if (result != null) {
@@ -153,7 +158,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
@Test
public void testDeleteUser() throws Exception {
//This test makes sense only with JWT authentication. With standard
(OAuth) it will always fail.
- Assume.assumeTrue("Test has to be executed with standard
authentication.", jwtAuthentoication);
+ assumeTrue(jwtAuthentoication, "Test has to be executed with standard
authentication.");
BoxUser.Info info = BoxUser.createAppUser(getConnection(),
CAMEL_TEST_CREATE_APP_USER_NAME);
@@ -169,12 +174,10 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
Iterable<BoxUser.Info> it =
BoxUser.getAllEnterpriseUsers(getConnection(), CAMEL_TEST_CREATE_APP_USER_NAME);
int searchResults = sizeOfIterable(it);
- boolean exists = searchResults > 0 ? true : false;
- assertEquals("deleteUser exists", false, exists);
- LOG.debug("deleteUser: exists? " + exists);
+ assertFalse(searchResults > 0, "deleteUser exists");
}
- @Ignore
+ @Disabled
@Test
public void testDeleteUserEmailAlias() throws Exception {
EmailAlias emailAlias = null;
@@ -193,8 +196,8 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
requestBodyAndHeaders("direct://DELETEUSEREMAILALIAS", null, headers);
- assertNotNull("deleteUserEmailAlias email aliases",
testUser.getEmailAliases());
- assertEquals("deleteUserEmailAlias email aliases", 0,
testUser.getEmailAliases().size());
+ assertNotNull(testUser.getEmailAliases(), "deleteUserEmailAlias email
aliases");
+ assertEquals(0, testUser.getEmailAliases().size(),
"deleteUserEmailAlias email aliases");
}
@Test
@@ -208,7 +211,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.List result =
requestBodyAndHeaders("direct://GETALLENTERPRISEOREXTERNALUSERS", null,
headers);
- assertNotNull("getAllEnterpriseOrExternalUsers result", result);
+ assertNotNull(result, "getAllEnterpriseOrExternalUsers result");
LOG.debug("getAllEnterpriseOrExternalUsers: " + result);
}
@@ -216,7 +219,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
public void testGetCurrentUser() throws Exception {
final com.box.sdk.BoxUser result =
requestBody("direct://GETCURRENTUSER", testUser.getID());
- assertNotNull("getCurrentUser result", result);
+ assertNotNull(result, "getCurrentUser result");
LOG.debug("getCurrentUser: " + result);
}
@@ -226,7 +229,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
@SuppressWarnings("rawtypes")
final java.util.Collection result =
requestBody("direct://GETUSEREMAILALIAS", testUser.getID());
- assertNotNull("getUserEmailAlias result", result);
+ assertNotNull(result, "getUserEmailAlias result");
LOG.debug("getUserEmailAlias: " + result);
}
@@ -235,14 +238,14 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
// using String message body for single parameter "userId"
final com.box.sdk.BoxUser.Info result =
requestBody("direct://GETUSERINFO", testUser.getID());
- assertNotNull("getUserInfo result", result);
+ assertNotNull(result, "getUserInfo result");
LOG.debug("getUserInfo: " + result);
}
@Test
public void testUpdateUserInfo() throws Exception {
//This test makes sense only with standard (OAuth) authentication,
with JWT it will always fail with return code 403
- Assume.assumeFalse("Test has to be executed with standard
authentication.", jwtAuthentoication);
+ assumeFalse(jwtAuthentoication, "Test has to be executed with standard
authentication.");
BoxUser.Info info = testUser.getInfo();
info.setJobTitle(CAMEL_TEST_USER_JOB_TITLE);
@@ -254,7 +257,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
// parameter type is com.box.sdk.BoxUser.Info
headers.put("CamelBox.info", info);
final com.box.sdk.BoxUser result =
requestBodyAndHeaders("direct://UPDATEUSERINFO", null, headers);
- assertNotNull("updateUserInfo result", result);
+ assertNotNull(result, "updateUserInfo result");
LOG.debug("updateUserInfo: " + result);
} finally {
info = testUser.getInfo();
@@ -267,7 +270,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
@Test
public void testmMoveFolderToUser() throws Exception {
//This test makes sense only with standard (OAuth) authentication,
with JWT it will always fail with return code 403
- Assume.assumeFalse("Test has to be executed with standard
authentication.", jwtAuthentoication);
+ assumeFalse(jwtAuthentoication, "Test has to be executed with standard
authentication.");
String enterpriseUser1Login =
(String)options.get(CAMEL_TEST_ENTERPRISE_USER_LOGIN_KEY);
String enterpriseUser2Login =
(String)options.get(CAMEL_TEST_ENTERPRISE_USER2_LOGIN_KEY);
@@ -278,8 +281,8 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
enterpriseUser2Login = null;
}
- assertNotNull("Email for enterprise user has to be defined in
test-options.properties for this test to succeed.", enterpriseUser1Login);
- assertNotNull("Email for enterprise user2 has to be defined in
test-options.properties for this test to succeed.", enterpriseUser2Login);
+ assertNotNull(enterpriseUser1Login, "Email for enterprise user has to
be defined in test-options.properties for this test to succeed.");
+ assertNotNull(enterpriseUser2Login, "Email for enterprise user2 has to
be defined in test-options.properties for this test to succeed.");
BoxUser.Info user1 = null;
BoxUser.Info user2 = null;
@@ -295,7 +298,7 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
headers.put("CamelBox.sourceUserId", user2.getID());
final com.box.sdk.BoxFolder.Info result =
requestBodyAndHeaders("direct://MOVEFOLDERTOUSER", null, headers);
- assertNotNull("moveFolderToUser result", result);
+ assertNotNull(result, "moveFolderToUser result");
} finally {
if (user1 != null) {
try {
@@ -353,12 +356,12 @@ public class BoxUsersManagerIntegrationTest extends
AbstractBoxTestSupport {
};
}
- @Before
+ @BeforeEach
public void setupTest() throws Exception {
createTestUser();
}
- @After
+ @AfterEach
public void teardownTest() {
deleteTestUser();
}
