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 a5dd51a [OPENMEETINGS-2044] more tests are moved to junit5
a5dd51a is described below
commit a5dd51afc8b0b8c32a68171d96680c5131250d02
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Apr 19 16:28:52 2019 +0700
[OPENMEETINGS-2044] more tests are moved to junit5
---
.../apache/openmeetings/AbstractJUnitDefaults.java | 14 +++++-----
.../apache/openmeetings/AbstractSpringTest.java | 14 +++-------
.../apache/openmeetings/AbstractWicketTester.java | 19 +++++++-------
.../org/apache/openmeetings/backup/TestBackup.java | 30 ++++++++++++----------
.../calendar/TestAppointmentAddAppointment.java | 22 ++++++++--------
.../calendar/TestAppointmentSchedulerTask.java | 4 +--
.../calendar/TestDatabaseStructureAppointment.java | 2 +-
...TestDatabaseStructureGetAppointmentByRange.java | 16 ++++++------
.../TestDatabaseStructureGetUserStart.java | 2 +-
.../TestDatabaseStructureMeetingMember.java | 4 +--
.../calendar/TestDatabaseStructureUsersSearch.java | 2 +-
.../openmeetings/calendar/TestGetAppointment.java | 12 ++++-----
.../openmeetings/calendar/TestOmCalendar.java | 11 ++++----
.../openmeetings/calendar/TestSendIcalMessage.java | 2 +-
14 files changed, 73 insertions(+), 81 deletions(-)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
index a89d853..875aa53 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
@@ -24,7 +24,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_CONTEXT
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getCryptClassName;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Date;
import java.util.Random;
@@ -90,9 +90,7 @@ public abstract class AbstractJUnitDefaults extends
AbstractSpringTest {
} else {
log.info("Default scheme already created");
}
- if (getCryptClassName() == null) {
- assertNotNull("Crypt class name should not be null",
getCryptClassName());
- }
+ assertNotNull(getCryptClassName(), "Crypt class name should not
be null");
}
public Appointment getAppointment() {
@@ -145,10 +143,10 @@ public abstract class AbstractJUnitDefaults extends
AbstractSpringTest {
}
public static Appointment createAppointment(AppointmentDao
appointmentDao, Appointment ap) {
- assertNotNull("Can't access to appointment dao implimentation",
appointmentDao);
+ assertNotNull(appointmentDao, "Can't access to appointment dao
implimentation");
// add new appointment
ap = appointmentDao.update(ap, null, false);
- assertNotNull("Can't add appointment", ap.getId());
+ assertNotNull(ap.getId(), "Can't add appointment");
return ap;
}
@@ -197,7 +195,7 @@ public abstract class AbstractJUnitDefaults extends
AbstractSpringTest {
public static User createUser(UserDao userDao, User u) {
u = userDao.update(u, null);
- assertNotNull("Can't add user", u);
+ assertNotNull(u, "Can't add user");
return u;
}
@@ -237,7 +235,7 @@ public abstract class AbstractJUnitDefaults extends
AbstractSpringTest {
public User createUserContact(User user, Long ownerId) {
user = userDao.update(user, ownerId);
- assertNotNull("Cann't add user", user);
+ assertNotNull(user, "Cann't add user");
return user;
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java
index 3fddd69..e8fc40a 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java
@@ -18,22 +18,16 @@
*/
package org.apache.openmeetings;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.tomcat.util.scan.Constants;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig;
-@ExtendWith(SpringExtension.class)
-@TestExecutionListeners({})
-@ContextConfiguration(locations={"classpath:applicationContext.xml"},
inheritLocations = true)
-public abstract class AbstractSpringTest extends
AbstractJUnit4SpringContextTests {
+@SpringJUnitWebConfig(locations={"classpath:applicationContext.xml"})
+public abstract class AbstractSpringTest {
@BeforeAll
public static void init() {
setOmHome();
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
index 82a9e99..2d13eb1 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
@@ -21,10 +21,10 @@ package org.apache.openmeetings;
import static
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
import static
org.apache.openmeetings.web.common.OmWebSocketPanel.CONNECTED_MSG;
import static org.apache.wicket.util.string.Strings.escapeMarkup;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.Serializable;
import java.util.List;
@@ -43,7 +43,7 @@ import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.protocol.ws.util.tester.WebSocketTester;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,10 +82,11 @@ public class AbstractWicketTester extends
AbstractJUnitDefaults {
}
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
tester = getWicketTester(app);
- assertNotNull("Web session should not be null",
WebSession.get());
+ assertNotNull(WebSession.get(), "Web session should not be
null");
Locale[] locales = Locale.getAvailableLocales();
tester.getSession().setLocale(locales[rnd.nextInt(locales.length)]);
}
@@ -101,7 +102,7 @@ public class AbstractWicketTester extends
AbstractJUnitDefaults {
} catch (OmException e) {
fail(e.getMessage());
}
- assertTrue("Web session is not signed in for user: " + (login
!= null ? login : adminUsername), s.isSignedIn());
+ assertTrue(s.isSignedIn(), "Web session is not signed in for
user: " + (login != null ? login : adminUsername));
}
public ButtonAjaxBehavior getButtonBehavior(String path, String name) {
@@ -124,7 +125,7 @@ public class AbstractWicketTester extends
AbstractJUnitDefaults {
}
protected void testArea(String user, Consumer<MainPage> consumer)
throws OmException {
-
Assert.assertTrue(((WebSession)tester.getSession()).signIn(user, userpass,
User.Type.user, null));
+ assertTrue(((WebSession)tester.getSession()).signIn(user,
userpass, User.Type.user, null));
MainPage page = tester.startPage(MainPage.class);
tester.assertRenderedPage(MainPage.class);
tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0));
@@ -156,6 +157,6 @@ public class AbstractWicketTester extends
AbstractJUnitDefaults {
log.debug("Error {}", fm);
}
}
- assertEquals(String.format("There should be exactly %s errors",
count), count, errors.size());
+ assertEquals(count, errors.size(), String.format("There should
be exactly %s errors", count));
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
index ca78607..a9c6ba6 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
@@ -24,9 +24,9 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_IMA
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_OFFICE;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_SOX;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getCryptClassName;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.FileInputStream;
@@ -36,8 +36,9 @@ import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
-import org.junit.After;
-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 org.springframework.beans.factory.annotation.Autowired;
@@ -54,21 +55,22 @@ public class TestBackup extends AbstractJUnitDefaults {
private MeetingMemberDao meetingMemberDao;
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
// Crypt class need to be preserved here to avoid overriding by
backup import
cryptClass = getCryptClassName();
}
- @After
+ @AfterEach
public void tearDown() {
Configuration cfg = cfgDao.get(CONFIG_CRYPT);
- assertNotNull("Not null config should be returned", cfg);
+ assertNotNull(cfg, "Not null config should be returned");
cfg.setValue(cryptClass);
cfgDao.update(cfg, null);
for (String key : new String[] {CONFIG_PATH_IMAGEMAGIC,
CONFIG_PATH_FFMPEG, CONFIG_PATH_OFFICE, CONFIG_PATH_SOX}) {
Configuration c = cfgDao.get(key);
- assertNotNull("Not null config should be returned", c);
+ assertNotNull(c, "Not null config should be returned");
c.setValue("");
cfgDao.update(c, null);
}
@@ -99,12 +101,12 @@ public class TestBackup extends AbstractJUnitDefaults {
long newRoomGroupCount =
roomDao.getGroups().size();
long newApptCount = appointmentDao.get().size();
long newMeetingMembersCount =
meetingMemberDao.getMeetingMembers().size();
- assertTrue("Zero groups were imported from " +
name, newGroupCount > groupCount);
- assertTrue("Zero users were imported from " +
name, newUserCount > userCount);
- assertTrue("Zero rooms were imported from " +
name, newRoomCount > roomCount);
- assertTrue("Zero room groups were imported from
" + name, newRoomGroupCount > roomGroupCount);
- assertTrue("Zero appointments were imported
from " + name, newApptCount > apptCount);
- assertTrue("Zero meeting members were imported
from " + name, newMeetingMembersCount > meetingMembersCount);
+ assertTrue(newGroupCount > groupCount, "Zero
groups were imported from " + name);
+ assertTrue(newUserCount > userCount, "Zero
users were imported from " + name);
+ assertTrue(newRoomCount > roomCount, "Zero
rooms were imported from " + name);
+ assertTrue(newRoomGroupCount > roomGroupCount,
"Zero room groups were imported from " + name);
+ assertTrue(newApptCount > apptCount, "Zero
appointments were imported from " + name);
+ assertTrue(newMeetingMembersCount >
meetingMembersCount, "Zero meeting members were imported from " + name);
groupCount = newGroupCount;
userCount = newUserCount;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
index 159d77a..a100782 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
@@ -19,9 +19,9 @@
package org.apache.openmeetings.calendar;
import static java.util.UUID.randomUUID;
-import static org.junit.Assert.assertEquals;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -40,7 +40,7 @@ import
org.apache.openmeetings.service.calendar.AppointmentLogic;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -142,7 +142,7 @@ public class TestAppointmentAddAppointment extends
AbstractWicketTester {
Thread.sleep(3000);
- assertNotNull("Saved appointment should have valid id: " +
a.getId(), a.getId());
+ assertNotNull(a.getId(), "Saved appointment should have valid
id");
}
@Test
@@ -163,18 +163,18 @@ public class TestAppointmentAddAppointment extends
AbstractWicketTester {
a.getMeetingMembers().add(mm);
}
a = appointmentDao.update(a, owner.getId());
- assertNotNull("Saved appointment should have valid id: " +
a.getId(), a.getId());
- assertEquals("Saved appointment should have corect count of
guests: ", 3, a.getMeetingMembers().size());
+ assertNotNull(a.getId(), "Saved appointment should have valid
id");
+ assertEquals(3, a.getMeetingMembers().size(), "Saved
appointment should have corect count of guests");
for (MeetingMember mm : a.getMeetingMembers()) {
- assertNotNull("Saved guest should have valid id: ",
mm.getId());
- assertNotNull("Saved guest should have valid
invitation: ", mm.getInvitation());
- assertNotNull("Saved guest should have invitation with
ID: ", mm.getInvitation().getId());
+ assertNotNull(mm.getId(), "Saved guest should have
valid id");
+ assertNotNull(mm.getInvitation(), "Saved guest should
have valid invitation");
+ assertNotNull(mm.getInvitation().getId(), "Saved guest
should have invitation with ID");
}
WebSession ws = WebSession.get();
Appointment a1 = appointmentDao.get(a.getId());
ws.checkHashes(StringValue.valueOf(""),
StringValue.valueOf(a1.getMeetingMembers().get(0).getInvitation().getHash()));
- assertTrue("Login via secure hash should be successful",
ws.isSignedIn());
+ assertTrue(ws.isSignedIn(), "Login via secure hash should be
successful");
}
private static String createClientObj(String firstname, String
lastname, String email, String jNameTimeZone) {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
index c3932a9..9c9c9d3 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
@@ -21,12 +21,12 @@ package org.apache.openmeetings.calendar;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getBaseUrl;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setBaseUrl;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.service.calendar.AppointmentLogic;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
index 4eae902..11dcbaf 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
index 8ca2afb..6ee31b5 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.calendar;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.Calendar;
@@ -26,7 +26,7 @@ import java.util.Calendar;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,20 +80,20 @@ public class TestDatabaseStructureGetAppointmentByRange
extends AbstractJUnitDef
for (Appointment a : appointmentDao.getInRange(userId,
rangeStart.getTime(), rangeEnd.getTime())) {
int mmCount = a.getMeetingMembers() == null ? 0 :
a.getMeetingMembers().size();
if (a.getId().equals(a1.getId())) {
- assertEquals("Inapropriate MeetingMembers
count", 0, mmCount);
+ assertEquals(0, mmCount, "Inapropriate
MeetingMembers count");
a1found++;
}
if (a.getId().equals(a2.getId())) {
- assertEquals("Inapropriate MeetingMembers
count", 1, mmCount);
+ assertEquals(1, mmCount, "Inapropriate
MeetingMembers count");
a2found++;
}
if (a.getId().equals(a3.getId())) {
- assertEquals("Inapropriate MeetingMembers
count", 2, mmCount);
+ assertEquals(2, mmCount, "Inapropriate
MeetingMembers count");
a3found++;
}
}
- assertEquals("Inappropriate count of appointments without
members found", 1, a1found);
- assertEquals("Inappropriate count of appointments with 1 member
found", 1, a2found);
- assertEquals("Inappropriate count of appointments with 2
members found", 1, a3found);
+ assertEquals(1, a1found, "Inappropriate count of appointments
without members found");
+ assertEquals(1, a2found, "Inappropriate count of appointments
with 1 member found");
+ assertEquals(1, a3found, "Inappropriate count of appointments
with 2 members found");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
index 28e3d72..4dc0b36 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.calendar;
import org.apache.openmeetings.AbstractJUnitDefaults;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
index 53c9959..f962ff7 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
@@ -18,10 +18,8 @@
*/
package org.apache.openmeetings.calendar;
-
import org.apache.openmeetings.AbstractJUnitDefaults;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
public class TestDatabaseStructureMeetingMember extends AbstractJUnitDefaults {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java
index 21f01f9..e2a87e8 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.entity.user.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
index 186242c..2989eef 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.calendar;
-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.Calendar;
import java.util.Date;
@@ -27,7 +27,7 @@ import java.util.Date;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,8 +53,8 @@ public class TestGetAppointment extends AbstractJUnitDefaults
{
a1 = appointmentDao.update(a1, userId);
Appointment a = appointmentDao.get(a1.getId());
- assertNotNull("Failed to get Appointment By id", a);
- assertEquals("Inapropriate MeetingMembers count", 0,
a.getMeetingMembers() == null ? 0 : a.getMeetingMembers().size());
+ assertNotNull(a, "Failed to get Appointment By id");
+ assertEquals(0, a.getMeetingMembers() == null ? 0 :
a.getMeetingMembers().size(), "Inapropriate MeetingMembers count");
}
@Test
@@ -62,7 +62,7 @@ public class TestGetAppointment extends AbstractJUnitDefaults
{
Date start = new Date();
Appointment a =
createAppointment(getAppointment(userDao.get(1L), roomDao.get(5L), start, new
Date(start.getTime() + ONE_HOUR)));
Appointment a1 = appointmentDao.getByRoom(1L, 5L);
- assertNotNull("Created appointment should be found", a1);
+ assertNotNull(a1, "Created appointment should be found");
assertEquals(a.getId(), a1.getId());
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java
index 668308b..ba14bab 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java
@@ -18,14 +18,14 @@
*/
package org.apache.openmeetings.calendar;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.dao.calendar.OmCalendarDao;
import org.apache.openmeetings.db.entity.calendar.OmCalendar;
import org.apache.openmeetings.db.entity.user.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TestOmCalendar extends AbstractJUnitDefaults {
@@ -46,10 +46,9 @@ public class TestOmCalendar extends AbstractJUnitDefaults {
calendar = calendarDao.update(calendar);
- assertTrue("Saved calendar should have valid id: " +
calendar.getId(),
- calendar.getId() != null && calendar.getId() >
0);
+ assertTrue(calendar.getId() != null && calendar.getId() > 0,
"Saved calendar should have valid id: " + calendar.getId());
OmCalendar c = calendarDao.get(calendar.getId());
- assertNotNull("Failed to find Calendar by id", c);
+ assertNotNull(c, "Failed to find Calendar by id");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
index cc027a6..d57b9bc 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
@@ -44,7 +44,7 @@ import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.util.mail.ByteArrayDataSource;
import org.apache.openmeetings.util.mail.IcalHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
