This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 54aeece [OPENMEETINGS-2044] webservice tests are moved to junit5
54aeece is described below
commit 54aeece273ad347ddc1d7f20b3bece8578ff6675
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Apr 19 00:13:23 2019 +0700
[OPENMEETINGS-2044] webservice tests are moved to junit5
---
.../openmeetings/webservice/TestErrorService.java | 34 ++++++++---------
.../openmeetings/webservice/TestFileService.java | 17 ++++-----
.../openmeetings/webservice/TestGroupService.java | 32 ++++++++--------
.../openmeetings/webservice/TestInfoService.java | 12 +++---
.../webservice/TestRecordingService.java | 14 +++----
.../openmeetings/webservice/TestRoomService.java | 26 ++++++-------
.../openmeetings/webservice/TestUserService.java | 44 +++++++++++-----------
.../openmeetings/webservice/TestWebConverters.java | 26 +++++++------
8 files changed, 103 insertions(+), 102 deletions(-)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java
index 3ded0b9..ca4ee51 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java
@@ -20,8 +20,8 @@ package org.apache.openmeetings.webservice;
import static java.util.UUID.randomUUID;
import static org.apache.openmeetings.AbstractJUnitDefaults.rnd;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Locale;
@@ -29,7 +29,7 @@ import javax.ws.rs.core.Response;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestErrorService extends AbstractWebServiceTest {
public static final String ERROR_SERVICE_MOUNT = "error";
@@ -40,8 +40,8 @@ public class TestErrorService extends AbstractWebServiceTest {
ServiceResult sr = getClient(getErrorUrl())
.path(String.format("/%s/%s",
randomUUID().toString(),
LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L)))
.get(ServiceResult.class);
- assertNotNull("Valid Result should be returned", sr);
- assertEquals("SUCCESS result should be returned",
ServiceResult.Type.SUCCESS.name(), sr.getType());
+ assertNotNull(sr, "Valid Result should be returned");
+ assertEquals(ServiceResult.Type.SUCCESS.name(), sr.getType(),
"SUCCESS result should be returned");
}
@Test
@@ -50,8 +50,8 @@ public class TestErrorService extends AbstractWebServiceTest {
ServiceResult sr = getClient(getErrorUrl())
.path(String.format("/%s/%s", "error.unknown",
LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L)))
.get(ServiceResult.class);
- assertNotNull("Valid Result should be returned", sr);
- assertEquals("SUCCESS result should be returned",
ServiceResult.Type.SUCCESS.name(), sr.getType());
+ assertNotNull(sr, "Valid Result should be returned");
+ assertEquals(ServiceResult.Type.SUCCESS.name(), sr.getType(),
"SUCCESS result should be returned");
}
@Test
@@ -60,16 +60,16 @@ public class TestErrorService extends
AbstractWebServiceTest {
Response resp = getClient(getErrorUrl())
.path("/report")
.post("");
- assertNotNull("Not null Response should be returned", resp);
- assertEquals("SUCCESS result should be returned",
Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus());
+ assertNotNull(resp, "Not null Response should be returned");
+ assertEquals(Response.Status.NO_CONTENT.getStatusCode(),
resp.getStatus(), "SUCCESS result should be returned");
// report with message
resp = getClient(getErrorUrl())
.path("/report")
.query("message", "Dummy test")
.post("");
- assertNotNull("Not null Response should be returned", resp);
- assertEquals("SUCCESS result should be returned",
Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus());
+ assertNotNull(resp, "Not null Response should be returned");
+ assertEquals(Response.Status.NO_CONTENT.getStatusCode(),
resp.getStatus(), "SUCCESS result should be returned");
// report with invalid sid and message
resp = getClient(getErrorUrl())
@@ -77,8 +77,8 @@ public class TestErrorService extends AbstractWebServiceTest {
.query("message", "Dummy test")
.query("sid", "n/a")
.post("");
- assertNotNull("Not null Response should be returned", resp);
- assertEquals("SUCCESS result should be returned",
Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus());
+ assertNotNull(resp, "Not null Response should be returned");
+ assertEquals(Response.Status.NO_CONTENT.getStatusCode(),
resp.getStatus(), "SUCCESS result should be returned");
// report with valid sid and no message
ServiceResult r = login();
@@ -86,8 +86,8 @@ public class TestErrorService extends AbstractWebServiceTest {
.path("/report")
.query("sid", r.getMessage())
.post("");
- assertNotNull("Not null Response should be returned", resp);
- assertEquals("SUCCESS result should be returned",
Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus());
+ assertNotNull(resp, "Not null Response should be returned");
+ assertEquals(Response.Status.NO_CONTENT.getStatusCode(),
resp.getStatus(), "SUCCESS result should be returned");
// report with valid sid and message
resp = getClient(getErrorUrl())
@@ -95,8 +95,8 @@ public class TestErrorService extends AbstractWebServiceTest {
.query("sid", r.getMessage())
.query("message", "Dummy test")
.post("");
- assertNotNull("Not null Response should be returned", resp);
- assertEquals("SUCCESS result should be returned",
Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus());
+ assertNotNull(resp, "Not null Response should be returned");
+ assertEquals(Response.Status.NO_CONTENT.getStatusCode(),
resp.getStatus(), "SUCCESS result should be returned");
}
protected static String getErrorUrl() {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
index 51da43b..abb2277 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.webservice;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.awt.Graphics;
import java.awt.image.BufferedImage;
@@ -32,14 +32,13 @@ import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.file.FileExplorerObject;
import org.apache.openmeetings.db.dto.file.FileItemDTO;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
-import org.apache.openmeetings.test.NonJenkinsTests;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
public class TestFileService extends AbstractWebServiceTest {
@Test
- @Category(NonJenkinsTests.class)
+ @Tag("org.apache.openmeetings.test.NonJenkinsTests")
public void addFileTest() throws IOException {
File img = null;
try {
@@ -51,9 +50,9 @@ public class TestFileService extends AbstractWebServiceTest {
g.drawString("Hello World!!!", 10, 20);
ImageIO.write(image, "jpg", img);
CallResult<FileItemDTO> cr = createVerifiedFile(img,
"test.txt", BaseFileItem.Type.Presentation);
- assertEquals("Type should be Image",
BaseFileItem.Type.Image, cr.getObj().getType());
- assertEquals("Width should be determined", width,
cr.getObj().getWidth());
- assertEquals("Height should be Image", height,
cr.getObj().getHeight());
+ assertEquals(BaseFileItem.Type.Image,
cr.getObj().getType(), "Type should be Image");
+ assertEquals(width, cr.getObj().getWidth(), "Width
should be determined");
+ assertEquals(height, cr.getObj().getHeight(), "Height
should be Image");
} finally {
if (img != null && img.exists()) {
img.delete();
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
index 0669295..cbb7789 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
@@ -20,9 +20,9 @@ package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.AbstractJUnitDefaults.adminUsername;
import static org.apache.openmeetings.AbstractJUnitDefaults.userpass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Collection;
@@ -32,7 +32,7 @@ import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.basic.ServiceResult.Type;
import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.dto.user.GroupDTO;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestGroupService extends AbstractWebServiceTest {
public static final String GROUP_SERVICE_MOUNT = "group";
@@ -43,8 +43,8 @@ public class TestGroupService extends AbstractWebServiceTest {
Collection<? extends GroupDTO> groups = getClient(getGroupUrl())
.path("/")
.query("sid",
r.getMessage()).getCollection(GroupDTO.class);
- assertNotNull("Collection should be not null", groups);
- assertFalse("Collection should be not empty", groups.isEmpty());
+ assertNotNull(groups, "Collection should be not null");
+ assertFalse(groups.isEmpty(), "Collection should be not empty");
}
@Test
@@ -53,17 +53,17 @@ public class TestGroupService extends
AbstractWebServiceTest {
Response resp = getClient(getGroupUrl())
.path("/")
.query("sid", r.getMessage()).put("");
- assertEquals("Call should NOT be successful",
Response.Status.METHOD_NOT_ALLOWED.getStatusCode(), resp.getStatus());
+
assertEquals(Response.Status.METHOD_NOT_ALLOWED.getStatusCode(),
resp.getStatus(), "Call should NOT be successful");
}
private static Long createGroup(String sid, String name) {
Response resp = getClient(getGroupUrl())
.path("/")
.query("sid", sid).query("name", name).post("");
- assertNotNull("Valid ServiceResult should be returned", resp);
- assertEquals("Call should be successful",
Response.Status.OK.getStatusCode(), resp.getStatus());
+ assertNotNull(resp, "Valid ServiceResult should be returned");
+ assertEquals(Response.Status.OK.getStatusCode(),
resp.getStatus(), "Call should be successful");
ServiceResult r1 = resp.readEntity(ServiceResult.class);
- assertEquals("OM Call should be successful", r1.getType(),
Type.SUCCESS.name());
+ assertEquals(Type.SUCCESS.name(), r1.getType(), "OM Call should
be successful");
return Long.valueOf(r1.getMessage());
}
@@ -76,10 +76,10 @@ public class TestGroupService extends
AbstractWebServiceTest {
Response resp = getClient(getGroupUrl())
.path("/" + groupId)
.query("sid", r.getMessage()).delete();
- assertNotNull("Valid ServiceResult should be returned",
resp);
- assertEquals("Call should be successful",
Response.Status.OK.getStatusCode(), resp.getStatus());
+ assertNotNull(resp, "Valid ServiceResult should be
returned");
+ assertEquals(Response.Status.OK.getStatusCode(),
resp.getStatus(), "Call should be successful");
ServiceResult r1 = resp.readEntity(ServiceResult.class);
- assertEquals("OM Call should be successful",
r1.getType(), Type.SUCCESS.name());
+ assertEquals(Type.SUCCESS.name(), r1.getType(), "OM
Call should be successful");
}
}
@@ -95,10 +95,10 @@ public class TestGroupService extends
AbstractWebServiceTest {
Response resp = getClient(getGroupUrl())
.path(String.format("/%s/rooms/add/%s",
groupId, room.getObj().getId()))
.query("sid", sr.getMessage()).query("name",
"Test Group").post("");
- assertNotNull("Valid ServiceResult should be returned", resp);
- assertEquals("Call should be successful",
Response.Status.OK.getStatusCode(), resp.getStatus());
+ assertNotNull(resp, "Valid ServiceResult should be returned");
+ assertEquals(Response.Status.OK.getStatusCode(),
resp.getStatus(), "Call should be successful");
ServiceResult sr1 = resp.readEntity(ServiceResult.class);
- assertEquals("OM Call should be successful", sr1.getType(),
Type.SUCCESS.name());
+ assertEquals(Type.SUCCESS.name(), sr1.getType(), "OM Call
should be successful");
}
protected static String getGroupUrl() {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
index 51fe409..c80d2bc 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.webservice;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.openmeetings.db.dto.basic.Info;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestInfoService extends AbstractWebServiceTest {
private static final String INFO_SERVICE_MOUNT = "info";
@@ -29,10 +29,10 @@ public class TestInfoService extends AbstractWebServiceTest
{
@Test
public void infoTest() {
Info info =
getClient(getInfoUrl()).path("/version").get(Info.class);
- assertNotNull("Valid info should be returned", info);
- assertNotNull("Valid BuildDate should be returned",
info.getBuildDate());
- assertNotNull("Valid Revision should be returned",
info.getRevision());
- assertNotNull("Valid Version should be returned",
info.getVersion());
+ assertNotNull(info, "Valid info should be returned");
+ assertNotNull(info.getBuildDate(), "Valid BuildDate should be
returned");
+ assertNotNull(info.getRevision(), "Valid Revision should be
returned");
+ assertNotNull(info.getVersion(), "Valid Version should be
returned");
}
protected static String getInfoUrl() {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java
index f235442..9affb5b 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java
@@ -20,9 +20,9 @@ package org.apache.openmeetings.webservice;
import static java.util.UUID.randomUUID;
import static org.apache.openmeetings.AbstractJUnitDefaults.getUser;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+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 java.util.Collection;
@@ -31,7 +31,7 @@ import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.record.RecordingDTO;
import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.user.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestRecordingService extends AbstractWebServiceTest {
public static final String RECORD_SERVICE_MOUNT = "record";
@@ -56,8 +56,8 @@ public class TestRecordingService extends
AbstractWebServiceTest {
ServiceResult sr = login();
Collection<? extends RecordingDTO> recs =
getClient(getRecordUrl()).path("/" + UNIT_TEST_EXT_TYPE).query("sid",
sr.getMessage())
.getCollection(RecordingDTO.class);
- assertNotNull("Valid collection should be returned", recs);
- assertFalse("Collection of the recordings should not be empty",
recs.isEmpty());
+ assertNotNull(recs, "Valid collection should be returned");
+ assertFalse(recs.isEmpty(), "Collection of the recordings
should not be empty");
boolean found = false;
for (RecordingDTO rdo : recs) {
if (r.getId().equals(rdo.getId())) {
@@ -66,7 +66,7 @@ public class TestRecordingService extends
AbstractWebServiceTest {
break;
}
}
- assertTrue("Just created recording was not found by the
service", found);
+ assertTrue(found, "Just created recording was not found by the
service");
}
protected static String getRecordUrl() {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
index 601c4b9..4d7272e 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
@@ -20,10 +20,10 @@ package org.apache.openmeetings.webservice;
import static java.util.UUID.randomUUID;
import static
org.apache.openmeetings.util.OmFileHelper.getDefaultProfilePicture;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.List;
@@ -38,7 +38,7 @@ import org.apache.openmeetings.db.dto.room.RoomFileDTO;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.room.Room;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestRoomService extends AbstractWebServiceTest {
private static final long CAPACITY = 666L;
@@ -59,14 +59,14 @@ public class TestRoomService extends AbstractWebServiceTest
{
.query("sid", sr.getMessage())
.query("room", r.toString())
.get(RoomDTO.class);
- assertNotNull("Valid room should be returned", room);
- assertNotNull("Room ID should be not empty", room.getId());
+ assertNotNull(room, "Valid room should be returned");
+ assertNotNull(room.getId(), "Room ID should be not empty");
RoomDTO room1 =
getClient(getRoomUrl()).path(String.format("/%s/%s/%s", Room.Type.presentation,
UNIT_TEST_EXT_TYPE, extId))
.query("sid", sr.getMessage())
.get(RoomDTO.class);
- assertNotNull("Valid room should be returned", room1);
- assertEquals("Same Room should be returned", room.getId(),
room1.getId());
+ assertNotNull(room1, "Valid room should be returned");
+ assertEquals(room.getId(), room1.getId(), "Same Room should be
returned");
}
@Test
@@ -115,7 +115,7 @@ public class TestRoomService extends AbstractWebServiceTest
{
r.getFiles().add(rf);
CallResult<RoomDTO> res = createAndValidate(r);
- assertTrue("No room files should be added",
res.getObj().getFiles().isEmpty());
+ assertTrue(res.getObj().getFiles().isEmpty(), "No room files
should be added");
}
@Test
@@ -137,13 +137,13 @@ public class TestRoomService extends
AbstractWebServiceTest {
r.getFiles().add(rf);
CallResult<RoomDTO> res = createAndValidate(fileCall.getSid(),
r);
- assertFalse("Room files should NOT be empty",
res.getObj().getFiles().isEmpty());
+ assertFalse(res.getObj().getFiles().isEmpty(), "Room files
should NOT be empty");
}
@Test
public void testHash() {
List<Room> rooms = getBean(RoomDao.class).get(0, 100);
- assertFalse("Room list should not be empty", rooms.isEmpty());
+ assertFalse(rooms.isEmpty(), "Room list should not be empty");
ServiceResult sr = login();
ServiceResult res = getClient(getRoomUrl())
@@ -163,6 +163,6 @@ public class TestRoomService extends AbstractWebServiceTest
{
.setValidTo("2018-04-20
02:25:12")
.toString())
.post("", ServiceResult.class);
- assertEquals("Login should be successful", Type.SUCCESS.name(),
res.getType());
+ assertEquals(Type.SUCCESS.name(), res.getType(), "Login should
be successful");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
index aacce56..5d46f92 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
@@ -25,11 +25,11 @@ import static
org.apache.openmeetings.AbstractJUnitDefaults.createPass;
import static org.apache.openmeetings.AbstractJUnitDefaults.rnd;
import static org.apache.openmeetings.AbstractJUnitDefaults.userpass;
import static
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Collection;
import java.util.Locale;
@@ -49,7 +49,7 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.OmException;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.util.string.StringValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestUserService extends AbstractWebServiceTest {
private static final String DUMMY_PICTURE_URL =
"https://openmeetings.apache.org/images/logo.png";;
@@ -57,14 +57,14 @@ public class TestUserService extends AbstractWebServiceTest
{
@Test
public void invalidLoginTest() {
ServiceResult r = loginNoCheck("invalid-user", "bad pass");
- assertNotNull("Valid ServiceResult should be returned", r);
- assertEquals("Login should NOT be successful",
Type.ERROR.name(), r.getType());
+ assertNotNull(r, "Valid ServiceResult should be returned");
+ assertEquals(Type.ERROR.name(), r.getType(), "Login should NOT
be successful");
}
@Test
public void loginTest() {
ServiceResult r = login();
- assertNotNull("Valid ServiceResult should be returned", r);
+ assertNotNull(r, "Valid ServiceResult should be returned");
}
private static ServiceResult getHash(String sid, boolean expectError) {
@@ -84,12 +84,12 @@ public class TestUserService extends AbstractWebServiceTest
{
.query("sid", sid)
.form(new Form().param("user",
user.toString()).param("options", options.toString())))
{
- assertNotNull("Valid ServiceResult should be returned",
resp);
+ assertNotNull(resp, "Valid ServiceResult should be
returned");
if (expectError) {
- assertEquals("Call should NOT be successful",
Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), resp.getStatus());
+
assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
resp.getStatus(), "Call should NOT be successful");
return null;
} else {
- assertEquals("Call should be successful",
Response.Status.OK.getStatusCode(), resp.getStatus());
+
assertEquals(Response.Status.OK.getStatusCode(), resp.getStatus(), "Call should
be successful");
return resp.readEntity(ServiceResult.class);
}
}
@@ -104,19 +104,19 @@ public class TestUserService extends
AbstractWebServiceTest {
public void hashTest() throws OmException {
ServiceResult r = login();
ServiceResult r1 = getHash(r.getMessage(), false);
- assertEquals("OM Call should be successful",
Type.SUCCESS.name(), r1.getType());
+ assertEquals(Type.SUCCESS.name(), r1.getType(), "OM Call should
be successful");
ensureApplication(-1L); // to ensure WebSession is attached
WebSession ws = WebSession.get();
assertTrue(ws.signIn(adminUsername, userpass, User.Type.user,
null));
Long userId0 = WebSession.getUserId();
ws.checkHashes(StringValue.valueOf(r1.getMessage()),
StringValue.valueOf(""));
- assertTrue("Login via secure hash should be successful",
ws.isSignedIn());
+ assertTrue(ws.isSignedIn(), "Login via secure hash should be
successful");
Long userId1 = WebSession.getUserId();
assertNotEquals(userId0, userId1);
User u = getBean(UserDao.class).get(userId1);
- assertNotNull("User should be created successfuly", u);
- assertEquals("Picture URL should be preserved",
DUMMY_PICTURE_URL, u.getPictureUri());
+ assertNotNull(u, "User should be created successfuly");
+ assertEquals(DUMMY_PICTURE_URL, u.getPictureUri(), "Picture URL
should be preserved");
}
@Test
@@ -141,10 +141,10 @@ public class TestUserService extends
AbstractWebServiceTest {
.query("sid", r.getMessage())
.type(APPLICATION_FORM_URLENCODED)
.post(new Form().param("user",
u.toString()).param("confirm", "" + false), UserDTO.class);
- assertNotNull("Valid UserDTO should be returned", user);
- assertNotNull("Id should not be NULL", user.getId());
- assertEquals("OM Call should be successful", u.getLogin(),
user.getLogin());
- assertEquals("OM Call should be successful", tz,
user.getTimeZoneId());
+ assertNotNull(user, "Valid UserDTO should be returned");
+ assertNotNull(user.getId(), "Id should not be NULL");
+ assertEquals(u.getLogin(), user.getLogin(), "OM Call should be
successful");
+ assertEquals(tz, user.getTimeZoneId(), "OM Call should be
successful");
}
@Test
@@ -153,7 +153,7 @@ public class TestUserService extends AbstractWebServiceTest
{
Collection<? extends UserDTO> users = getClient(getUserUrl())
.path("/")
.query("sid",
r.getMessage()).getCollection(UserDTO.class);
- assertNotNull("Collection should be not null", users);
- assertFalse("Collection should be not empty", users.isEmpty());
+ assertNotNull(users, "Collection should be not null");
+ assertFalse(users.isEmpty(), "Collection should be not empty");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java
index 5bd544a..acc77b2 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.webservice;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.time.LocalDate;
import java.time.ZoneId;
@@ -29,33 +29,35 @@ import java.util.Date;
import org.apache.openmeetings.db.dto.user.UserDTO;
import org.apache.openmeetings.webservice.util.CalendarParamConverter;
import org.apache.openmeetings.webservice.util.DateParamConverter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.github.openjson.JSONObject;
public class TestWebConverters {
@Test
public void testDateConverter() {
- assertEquals("Null date should be parsed", null,
DateParamConverter.get(null));
- assertEquals("Date should be parsed"
- , Date.from(LocalDate.of(2017, 01,
15).atStartOfDay(ZoneId.systemDefault()).toInstant())
- , DateParamConverter.get("2017-01-15"));
- assertEquals("Date should be parsed"
- , Date.from(ZonedDateTime.of(2017, 01, 20, 20,
30, 03, 0, ZoneId.of("Europe/Moscow")).toInstant())
- ,
DateParamConverter.get("2017-01-20T20:30:03+0300"));
+ assertEquals(null, DateParamConverter.get(null), "Null date
should be parsed");
+ assertEquals(
+ Date.from(LocalDate.of(2017, 01,
15).atStartOfDay(ZoneId.systemDefault()).toInstant())
+ , DateParamConverter.get("2017-01-15")
+ , "Date should be parsed");
+ assertEquals(
+ Date.from(ZonedDateTime.of(2017, 01, 20, 20,
30, 03, 0, ZoneId.of("Europe/Moscow")).toInstant())
+ ,
DateParamConverter.get("2017-01-20T20:30:03+0300")
+ , "Date should be parsed");
}
@Test
public void testCalendarConverter() {
CalendarParamConverter c = new CalendarParamConverter();
- assertEquals("Null calendar should be parsed", null,
c.fromString(null));
+ assertEquals(null, c.fromString(null), "Null calendar should be
parsed");
Calendar cal = Calendar.getInstance();
cal.setTime(Date.from(LocalDate.of(2017, 01,
15).atStartOfDay(ZoneId.systemDefault()).toInstant()));
- assertEquals("Calendar should be parsed", cal,
c.fromString("2017-01-15"));
+ assertEquals(cal, c.fromString("2017-01-15"), "Calendar should
be parsed");
}
@Test
public void testUserConverter() {
- assertEquals("Null UserDTO should be parsed", null,
UserDTO.get((JSONObject)null));
+ assertEquals(null, UserDTO.get((JSONObject)null), "Null UserDTO
should be parsed");
}
}
![https://openmeetings.apache.org/images/logo.png"](https://openmeetings.apache.org/images/logo.png"){kind=link}