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 0164787 [OPENMEETINGS-2044] more tests are moved to junit5
0164787 is described below
commit 0164787f96079a24e890c3e194b28381ad89b9f3
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Apr 19 18:06:01 2019 +0700
[OPENMEETINGS-2044] more tests are moved to junit5
---
.../apache/openmeetings/user/TestMailSending.java | 4 +--
.../org/apache/openmeetings/cli/TestAdmin.java | 10 +++---
.../org/apache/openmeetings/config/TestConfig.java | 8 ++---
.../openmeetings/core/file/TestFileProcessor.java | 10 +++---
.../apache/openmeetings/db/dao/TestRoomDao.java | 33 +++++++++----------
.../apache/openmeetings/domain/TestAddGroup.java | 10 +++---
.../domain/TestUserGroupAggregation.java | 10 +++---
.../openmeetings/invitiation/TestInvitation.java | 2 +-
.../service/mail/template/TestEmailTemplate.java | 7 ++--
.../mail/template/subject/TestSubjTemplate.java | 18 +++++-----
.../openmeetings/service/quartz/TestJob.java | 2 +-
.../apache/openmeetings/smoke/TestSmokeBasic.java | 4 +--
.../org/apache/openmeetings/test/HeavyTests.java | 23 -------------
.../test/selenium/AbstractTestDefaults.java | 8 ++---
.../openmeetings/test/selenium/SeleniumTests.java | 23 -------------
.../openmeetings/test/selenium/TestSignUp.java | 2 +-
.../apache/openmeetings/user/TestUserContact.java | 38 +++++++++++-----------
.../apache/openmeetings/user/TestUserCount.java | 12 +++----
.../apache/openmeetings/user/TestUserGroup.java | 32 +++++++++---------
.../org/apache/openmeetings/userdata/TestAuth.java | 2 +-
.../apache/openmeetings/userdata/TestLogin.java | 6 ++--
.../apache/openmeetings/util/TestStoredFile.java | 8 ++---
.../org/apache/openmeetings/web/TestCalendar.java | 12 +++----
.../org/apache/openmeetings/web/TestMainAreas.java | 8 ++---
.../org/apache/openmeetings/web/TestMainMenu.java | 7 ++--
.../web/app/TestOmAuthenticationStrategy.java | 12 +++----
.../web/app/TestUserManagerMocked.java | 12 +++----
.../openmeetings/web/app/TestWebSession.java | 14 ++++----
28 files changed, 146 insertions(+), 191 deletions(-)
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/user/TestMailSending.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/user/TestMailSending.java
index e0e159c..f4b7c30 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/user/TestMailSending.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/user/TestMailSending.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.user;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.mail.Message;
import javax.mail.Transport;
@@ -26,7 +26,7 @@ import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import org.apache.openmeetings.core.mail.MailHandler;
-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/cli/TestAdmin.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
index 6724a73..088027e 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
@@ -31,7 +31,8 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplic
import static
org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete;
import static
org.apache.openmeetings.web.pages.install.TestInstall.resetDerbyHome;
import static
org.apache.openmeetings.web.pages.install.TestInstall.setDerbyHome;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.IOException;
@@ -42,10 +43,9 @@ import java.util.UUID;
import org.apache.wicket.Application;
import org.apache.wicket.protocol.http.WebApplication;
-import org.junit.Assert;
-import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestAdmin {
private File tempFolder;
@@ -76,7 +76,7 @@ public class TestAdmin {
new Admin().process(args);
fail();
} catch (ExitException ee) {
- Assert.assertTrue(true);
+ assertTrue(true);
}
}
@@ -93,7 +93,7 @@ public class TestAdmin {
@Test
public void testUsage() throws Exception {
new Admin().process("-h");
- Assert.assertTrue(true);
+ assertTrue(true);
}
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java
index 04c7e1f..69eb0ac 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java
@@ -19,14 +19,14 @@
package org.apache.openmeetings.config;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SERVER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.List;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.entity.basic.Configuration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +57,7 @@ public class TestConfig extends AbstractJUnitDefaults {
}
}
- assertEquals(list.size(), 6);
+ assertEquals(6, list.size());
} catch (Exception err) {
log.error("[getConfigs]", err);
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java
index 69af09d..460ee17 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java
@@ -21,8 +21,8 @@ package org.apache.openmeetings.core.file;
import static java.util.UUID.randomUUID;
import static org.apache.openmeetings.util.OmFileHelper.FILE_NAME_FMT;
import static
org.apache.openmeetings.util.OmFileHelper.getDefaultProfilePicture;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -33,7 +33,7 @@ import org.apache.openmeetings.db.dto.file.FileItemDTO;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.util.process.ProcessResultList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TestFileProcessor extends AbstractJUnitDefaults {
@@ -51,8 +51,8 @@ public class TestFileProcessor extends AbstractJUnitDefaults {
.setType(BaseFileItem.Type.Recording).get();
try (InputStream is = new
FileInputStream(getDefaultProfilePicture())) {
ProcessResultList result =
processor.processFile(f, is);
- assertFalse("Conversion should be successful",
result.hasError());
- assertEquals("Type should be image",
BaseFileItem.Type.Image, f.getType());
+ assertFalse(result.hasError(), "Conversion
should be successful");
+ assertEquals(BaseFileItem.Type.Image,
f.getType(), "Type should be image");
}
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java
index a3b84ec..981945f 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.db.dao;
-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.util.HashSet;
import java.util.Set;
@@ -31,8 +31,7 @@ import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.user.User;
-import org.junit.Assert;
-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;
@@ -45,37 +44,37 @@ public class TestRoomDao extends AbstractJUnitDefaults {
@Test
public void testMicStatusHidden() throws Exception {
Room r = roomDao.get(1);
- assertNotNull("Room must exist", r);
- assertTrue("Default interview room should have mic status
hidden", r.isHidden(RoomElement.MicrophoneStatus));
+ assertNotNull(r, "Room must exist");
+ assertTrue(r.isHidden(RoomElement.MicrophoneStatus), "Default
interview room should have mic status hidden");
r = roomDao.get(5);
- assertNotNull("Room must exist", r);
- assertTrue("Default presentation room should have mic status
hidden", r.isHidden(RoomElement.MicrophoneStatus));
+ assertNotNull(r, "Room must exist");
+ assertTrue(r.isHidden(RoomElement.MicrophoneStatus), "Default
presentation room should have mic status hidden");
r = roomDao.get(6);
- assertNotNull("Room must exist", r);
- assertFalse("Default Mic room should have mic status visible",
r.isHidden(RoomElement.MicrophoneStatus));
+ assertNotNull(r, "Room must exist");
+ assertFalse(r.isHidden(RoomElement.MicrophoneStatus), "Default
Mic room should have mic status visible");
User u = createUser(); //creating new User here
r = roomDao.getUserRoom(u.getId(), Room.Type.presentation,
"bla");
- assertNotNull("Room must exist", r);
+ assertNotNull(r, "Room must exist");
boolean hidden = r.isHidden(RoomElement.MicrophoneStatus);
if (!hidden && log.isDebugEnabled()) {
log.debug("Invalid personal room found -> User: {},
Room: {} ... deleted ? {}", u, r, r.isDeleted());
}
- Assert.assertEquals("User presentation room should be created",
Room.Type.presentation, r.getType());
- assertTrue("User presentation room should have mic status
hidden", hidden);
+ assertEquals(Room.Type.presentation, r.getType(), "User
presentation room should be created");
+ assertTrue(hidden, "User presentation room should have mic
status hidden");
}
@Test
public void testPublicRooms() {
for (Room.Type type : Room.Type.values()) {
for (Room r : roomDao.getPublicRooms(type)) {
- assertEquals(String.format("Room type should be
%s", type), type, r.getType());
+ assertEquals(type, r.getType(), "Room type
should be " + type);
}
}
Set<Room.Type> types = new HashSet<>();
for (Room r : roomDao.getPublicRooms()) {
types.add(r.getType());
}
- assertEquals("All room types should be listed",
Room.Type.values().length, types.size());
+ assertEquals(Room.Type.values().length, types.size(), "All room
types should be listed");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java
index 749ab45..737d0a4 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java
@@ -18,13 +18,13 @@
*/
package org.apache.openmeetings.domain;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
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;
@@ -36,12 +36,12 @@ public class TestAddGroup extends AbstractJUnitDefaults {
Group o = new Group();
o.setName("default");
o = groupDao.update(o, null);
- assertNotNull("Id of group created should not be null",
o.getId());
+ assertNotNull(o.getId(), "Id of group created should not be
null");
User us = userDao.get(1L);
- assertNotNull("User should exist", us);
+ assertNotNull(us, "User should exist");
- assertNotNull("Group User list should exist",
us.getGroupUsers());
+ assertNotNull(us.getGroupUsers(), "Group User list should
exist");
us.getGroupUsers().add(new GroupUser(o, us));
us = userDao.update(us, null);
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java
index 6f9d0ac..41fec3e 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java
@@ -18,13 +18,13 @@
*/
package org.apache.openmeetings.domain;
-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.entity.user.GroupUser;
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;
@@ -35,8 +35,8 @@ public class TestUserGroupAggregation extends
AbstractJUnitDefaults {
public void testitNow() {
User u = userDao.get(1L);
- assertNotNull("Group list for default user must not be null",
u.getGroupUsers());
- assertTrue("Default user must belong to at least one group",
u.getGroupUsers().size() > 0);
+ assertNotNull(u.getGroupUsers(), "Group list for default user
must not be null");
+ assertTrue(u.getGroupUsers().size() > 0, "Default user must
belong to at least one group");
for (GroupUser orgUserObj : u.getGroupUsers()) {
log.error("testitNow: group Id: '" +
orgUserObj.getGroup().getId() + "'; name: '" + orgUserObj.getGroup().getName()
+ "'");
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
index b9c1f99..d06908d 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
@@ -29,7 +29,7 @@ import
org.apache.openmeetings.db.entity.room.Invitation.MessageType;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.service.room.InvitationManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TestInvitation extends AbstractWicketTester {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
index 302cd76..9006739 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
@@ -18,16 +18,17 @@
*/
package org.apache.openmeetings.service.mail.template;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.wicket.util.string.Strings;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEmailTemplate extends AbstractWicketTester {
private static void checkTemplate(String eml) {
- Assert.assertFalse("Body should be not empty",
Strings.isEmpty(eml));
+ assertFalse(Strings.isEmpty(eml), "Body should be not empty");
}
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
index 28b70a1..7f90b00 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.service.mail.template.subject;
-import static org.junit.Assert.assertFalse;
-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.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;
import java.util.ArrayList;
import java.util.List;
@@ -34,13 +34,13 @@ import
org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.wicket.util.string.Strings;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestSubjTemplate extends AbstractWicketTester {
private static void checkTemplate(SubjectEmailTemplate t) {
- assertNotNull("Template should be created", t);
- assertFalse("Subject should be not empty",
Strings.isEmpty(t.getSubject()));
- assertFalse("Body should be not empty",
Strings.isEmpty(t.getEmail()));
+ assertNotNull(t, "Template should be created");
+ assertFalse(Strings.isEmpty(t.getSubject()), "Subject should be
not empty");
+ assertFalse(Strings.isEmpty(t.getEmail()), "Body should be not
empty");
}
@Test
@@ -71,7 +71,7 @@ public class TestSubjTemplate extends AbstractWicketTester {
cons.accept(t);
fail("RuntimeException is expected");
} catch (RuntimeException ex) {
- assertTrue("Expected", true);
+ assertTrue(true, "Expected");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
index 0782e21..ef08ecb 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
@@ -25,7 +25,7 @@ import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.service.quartz.scheduler.CleanupJob;
import org.apache.openmeetings.service.quartz.scheduler.ReminderJob;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TestJob extends AbstractWicketTester {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java
index a612af0..46065a8 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.smoke;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.openmeetings.AbstractJUnitDefaults;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestSmokeBasic extends AbstractJUnitDefaults {
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/HeavyTests.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/HeavyTests.java
deleted file mode 100644
index ccd81dc..0000000
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/HeavyTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.test;
-
-public @interface HeavyTests {
-
-}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
index 6504e52..8fe3c35 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
@@ -22,9 +22,9 @@ import java.util.List;
import org.apache.openmeetings.AbstractSpringTest;
import org.apache.openmeetings.db.dao.label.LabelDao;
-import org.junit.After;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
import org.openqa.selenium.Keys;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
@@ -32,7 +32,7 @@ import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.firefox.FirefoxOptions;
import org.openqa.selenium.firefox.FirefoxProfile;
-@Category(SeleniumTests.class)
+@Tag("org.apache.openmeetings.test.selenium.SeleniumTests")
public abstract class AbstractTestDefaults extends AbstractSpringTest {
public WebDriver driver = null;
@@ -218,7 +218,7 @@ public abstract class AbstractTestDefaults extends
AbstractSpringTest {
throw new Exception("Timeout during installation");
}
- @After
+ @AfterEach
public void tearDown() {
if (getDoTearDownAfterTest()) {
driver.close();
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumTests.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumTests.java
deleted file mode 100644
index 5272d26..0000000
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.test.selenium;
-
-public @interface SeleniumTests {
-
-}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java
index 0716d81..cd7d2e0 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.test.selenium;
import java.util.Date;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openqa.selenium.Alert;
import org.openqa.selenium.WebElement;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java
index 3c4f4d2..5241871 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java
@@ -20,23 +20,23 @@ package org.apache.openmeetings.user;
import static java.util.UUID.randomUUID;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestUserContact extends AbstractWicketTester {
@Test
public void testGetUser() {
- assertNull("Null should be returned in case User does not
exist", userDao.get(Long.MAX_VALUE));
+ assertNull(userDao.get(Long.MAX_VALUE), "Null should be
returned in case User does not exist");
}
@Test
@@ -45,19 +45,19 @@ public class TestUserContact extends AbstractWicketTester {
User u = getUser(uuid);
u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
u = userDao.update(u, null);
- assertTrue("Password should be set as expected",
userDao.verifyPassword(u.getId(), createPass()));
+ assertTrue(userDao.verifyPassword(u.getId(), createPass()),
"Password should be set as expected");
User u1 = userDao.get(u.getId());
- assertNotNull("Just created user should not be null", u1);
- assertNotNull("Just created user should have non null
org-users", u1.getGroupUsers());
- assertFalse("Just created user should have not empty
org-users", u1.getGroupUsers().isEmpty());
+ assertNotNull(u1, "Just created user should not be null");
+ assertNotNull(u1.getGroupUsers(), "Just created user should
have non null org-users");
+ assertFalse(u1.getGroupUsers().isEmpty(), "Just created user
should have not empty org-users");
}
@Test
public void testCreateUser() throws Exception {
String uuid = randomUUID().toString();
User u = createUser(uuid);
- assertTrue("Password should be set as expected",
userDao.verifyPassword(u.getId(), createPass()));
+ assertTrue(userDao.verifyPassword(u.getId(), createPass()),
"Password should be set as expected");
}
@Test
@@ -65,23 +65,23 @@ public class TestUserContact extends AbstractWicketTester {
login(null, null);
List<User> users = userDao.getAllUsers();
- assertNotNull("User list should not be null ", users);
- assertFalse("User list should not be empty ", users.isEmpty());
+ assertNotNull(users, "User list should not be null ");
+ assertFalse(users.isEmpty(), "User list should not be empty ");
User contact = createUserContact(getUserId());
String email = contact.getAddress().getEmail();
List<User> l = userDao.get(email, false, 0, 9999);
// check that contact is visible for admin
- assertNotNull("Contact list should not be null for admin ", l);
- assertFalse("Contact list should not be empty for admin ",
l.isEmpty());
+ assertNotNull(l, "Contact list should not be null for admin ");
+ assertFalse(l.isEmpty(), "Contact list should not be empty for
admin ");
// check that contact is visible for owner
l = userDao.get(email, 0, 9999, null, true, getUserId());
- assertTrue("Contact list should not be empty for owner ",
!l.isEmpty());
+ assertFalse(l.isEmpty(), "Contact list should not be empty for
owner ");
//delete contact
userDao.delete(contact, getUserId());
l = userDao.get(email, false, 0, 9999);
- assertTrue("Contact list should be empty after deletion",
l.isEmpty());
+ assertTrue(l.isEmpty(), "Contact list should be empty after
deletion");
User u = createUser();
User u1 = createUser();
@@ -89,10 +89,10 @@ public class TestUserContact extends AbstractWicketTester {
email = contact.getAddress().getEmail();
// check that contact is not visible for user that is not owner
of this contact
l = userDao.get(email, 0, 9999, null, true, u1.getId());
- assertTrue("Contact list should be empty for another user",
l.isEmpty());
+ assertTrue(l.isEmpty(), "Contact list should be empty for
another user");
//delete contact
userDao.delete(contact, u.getId());
l = userDao.get(email, false, 0, 9999);
- assertTrue("Contact list should be empty after deletion",
l.isEmpty());
+ assertTrue(l.isEmpty(), "Contact list should be empty after
deletion");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java
index db32a41..4685fab 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java
@@ -19,35 +19,35 @@
package org.apache.openmeetings.user;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestUserCount extends AbstractWicketTester {
@Test
public void testCountSearchUsers() throws Exception {
User u = createUser();
- assertTrue("Account of search users should be one",
userDao.count(u.getFirstname()) == 1);
+ assertTrue(userDao.count(u.getFirstname()) == 1, "Account of
search users should be one");
}
@Test
public void testCountFilteredUsers() throws Exception {
User u = createUser();
User contact = createUserContact(u.getId());
- assertTrue("Account of filtered user should be one",
userDao.count(contact.getFirstname(), true, u.getId()) == 1);
+ assertTrue(userDao.count(contact.getFirstname(), true,
u.getId()) == 1, "Account of filtered user should be one");
}
@Test
public void testCountUnfilteredUsers() throws Exception {
User u = createUser();
createUserContact(u.getId());
- assertTrue("Account of unfiltered should be more then one",
userDao.count("firstname", false, getUserId()) > 1);
+ assertTrue(userDao.count("firstname", false, getUserId()) > 1,
"Account of unfiltered should be more then one");
}
@Test
public void testCountAllUsers() {
- assertTrue("Account of users should be positive",
userDao.count() > 0);
+ assertTrue(userDao.count() > 0, "Account of users should be
positive");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
index e5dacf2..321ac44 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
@@ -19,9 +19,10 @@
package org.apache.openmeetings.user;
import static java.util.UUID.randomUUID;
-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.util.List;
@@ -30,10 +31,9 @@ import org.apache.openmeetings.db.dao.user.GroupUserDao;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.test.HeavyTests;
import org.apache.openmeetings.util.OmException;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TestUserGroup extends AbstractJUnitDefaults {
@@ -56,10 +56,10 @@ public class TestUserGroup extends AbstractJUnitDefaults {
User u = getValidUser();
Long groupId = u.getGroupUsers().get(0).getGroup().getId();
List<GroupUser> ul = groupUserDao.get(groupId, 0, 9999);
- assertTrue("Default Group should contain at least 1 user: " +
ul.size(), ul.size() > 0);
+ assertTrue(ul.size() > 0, "Default Group should contain at
least 1 user: " + ul.size());
GroupUser ou = groupUserDao.getByGroupAndUser(groupId,
u.getId());
- assertNotNull("Unable to find [group, user] pair - [" + groupId
+ "," + u.getId() + "]", ou);
+ assertNotNull(ou, "Unable to find [group, user] pair - [" +
groupId + "," + u.getId() + "]");
}
@Test
@@ -67,10 +67,10 @@ public class TestUserGroup extends AbstractJUnitDefaults {
Group g = new Group();
g.setName(GROUP_NAME);
Long groupId = groupDao.update(g, null).getId(); //inserted by
not checked
- assertNotNull("New Group have valid id", groupId);
+ assertNotNull(groupId, "New Group have valid id");
List<GroupUser> ul = groupUserDao.get(groupId, 0, 9999);
- assertTrue("New Group should contain NO users: " + ul.size(),
ul.size() == 0);
+ assertEquals(0, ul.size(), "New Group should contain NO users:
" + ul.size());
}
@Test
@@ -78,13 +78,13 @@ public class TestUserGroup extends AbstractJUnitDefaults {
String uuid = randomUUID().toString();
User u = getUser(uuid);
u = userDao.update(u, null);
- assertNotNull("User successfully created", u.getId());
+ assertNotNull(u.getId(), "User successfully created");
checkEmptyGroup("dao.get()", userDao.get(u.getId()));
try {
checkEmptyGroup("dao.login()",
userDao.login(u.getAddress().getEmail(), createPass()));
fail("User with no Group is unable to login");
} catch (OmException e) {
- assertTrue("Expected Om Exception",
"error.nogroup".equals(e.getKey()));
+ assertEquals("error.nogroup", e.getKey(), "Expected Om
Exception");
}
checkEmptyGroup("dao.getByLogin(user)",
userDao.getByLogin(u.getLogin(), u.getType(), u.getDomainId()));
}
@@ -100,13 +100,13 @@ public class TestUserGroup extends AbstractJUnitDefaults {
}
private static void checkEmptyGroup(String prefix, User u) {
- assertNotNull(prefix + ":: Created user should be available",
u);
- assertNotNull(prefix + ":: List<GroupUser> for newly created
user should not be null", u.getGroupUsers());
- assertTrue(prefix + ":: List<GroupUser> for newly created user
should be empty", u.getGroupUsers().isEmpty());
+ assertNotNull(u, prefix + ":: Created user should be
available");
+ assertNotNull(u.getGroupUsers(), prefix + ":: List<GroupUser>
for newly created user should not be null");
+ assertTrue(u.getGroupUsers().isEmpty(), prefix + "::
List<GroupUser> for newly created user should be empty");
}
@Test
- @Category(HeavyTests.class)
+ @Tag("org.apache.openmeetings.test.HeavyTests")
public void add10kUsers() throws Exception {
List<Group> groups = groupDao.get(GROUP_NAME, 0, 1, null);
Group g = null;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
index 0155624..2a603bb 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
@@ -22,7 +22,7 @@ import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.util.crypt.CryptProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TestAuth extends AbstractJUnitDefaults {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java
index a849033..f87fb63 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java
@@ -18,18 +18,18 @@
*/
package org.apache.openmeetings.userdata;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.OmException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestLogin extends AbstractJUnitDefaults {
@Test
public void testTestLogin() throws OmException {
User us = userDao.login(adminUsername, userpass);
- assertNotNull("User is unable to login", us);
+ assertNotNull(us, "User is unable to login");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
index 3ac217a..d04de7a 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
@@ -19,14 +19,14 @@
package org.apache.openmeetings.util;
import static
org.apache.openmeetings.util.OmFileHelper.getDefaultProfilePicture;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.openmeetings.AbstractJUnitDefaults;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestStoredFile extends AbstractJUnitDefaults {
@Test
@@ -34,8 +34,8 @@ public class TestStoredFile extends AbstractJUnitDefaults {
File f = getDefaultProfilePicture();
for (String ext : new String[] {null, "txt", "jpg"}) {
StoredFile sf = new StoredFile("test image", ext, f);
- assertTrue("Type should be detected as image",
sf.isImage());
- assertTrue("Type should be detected as image",
sf.isAsIs());
+ assertTrue(sf.isImage(), "Type should be detected as
image");
+ assertTrue(sf.isAsIs(), "Type should be detected as
image");
}
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
index a872329..387ee69 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
@@ -19,7 +19,8 @@
package org.apache.openmeetings.web;
import static java.util.UUID.randomUUID;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.time.LocalDateTime;
import java.util.List;
@@ -31,8 +32,7 @@ import org.apache.openmeetings.util.OmException;
import org.apache.openmeetings.web.user.calendar.CalendarPanel;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.util.tester.FormTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
import com.googlecode.wicket.jquery.ui.widget.dialog.ButtonAjaxBehavior;
@@ -46,7 +46,7 @@ public class TestCalendar extends AbstractWicketTester {
public void testEventCreate() throws OmException {
testArea(regularUsername, p -> {
Menu menu = (Menu)p.get(PATH_MENU);
- Assert.assertNotNull(menu);
+ assertNotNull(menu);
tester.getRequest().setParameter("hash",
menu.getItemList().get(0).getItems().get(1).getId());
tester.executeBehavior((AbstractAjaxBehavior)menu.getBehaviorById(0));
@@ -69,8 +69,8 @@ public class TestCalendar extends AbstractWicketTester {
tester.executeBehavior(save);
List<Appointment> appts =
appointmentDao.searchByTitle(u.getId(), title);
- assertEquals("Appointment should be created", 1,
appts.size());
- assertEquals("Appointment should be created", title,
appts.get(0).getTitle());
+ assertEquals(1, appts.size(), "Appointment should be
created");
+ assertEquals(title, appts.get(0).getTitle(),
"Appointment should be created");
});
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
index 758a590..107bf55 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
@@ -34,8 +34,8 @@ import static
org.apache.openmeetings.web.util.OmUrlFragment.TYPE_PUBLIC;
import static org.apache.openmeetings.web.util.OmUrlFragment.TYPE_RECORDINGS;
import static org.apache.openmeetings.web.util.OmUrlFragment.TYPE_ROOM;
import static org.apache.openmeetings.web.util.OmUrlFragment.TYPE_USER;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.function.Consumer;
@@ -66,7 +66,7 @@ import
org.apache.openmeetings.web.user.rooms.RoomsSelectorPanel;
import org.apache.openmeetings.web.util.OmUrlFragment.AreaKeys;
import org.apache.wicket.authorization.UnauthorizedInstantiationException;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -109,7 +109,7 @@ public class TestMainAreas extends AbstractWicketTester {
tester.executeBehavior((AbstractAjaxBehavior)p.getBehaviorById(1));
fail("Not authorized");
} catch (UnauthorizedInstantiationException e) {
- assertTrue("Exception is expected",
true);
+ assertTrue(true, "Exception is
expected");
}
});
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
index 34f181b..eb8a222 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.web;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.util.OmException;
import org.apache.openmeetings.web.admin.backup.BackupPanel;
@@ -36,8 +38,7 @@ import
org.apache.openmeetings.web.user.dashboard.OmDashboardPanel;
import org.apache.openmeetings.web.user.record.RecordingsPanel;
import org.apache.openmeetings.web.user.rooms.RoomsSelectorPanel;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.googlecode.wicket.jquery.ui.widget.menu.Menu;
@@ -45,7 +46,7 @@ public class TestMainMenu extends AbstractWicketTester {
private void checkMenuItem(int idx1, int idx2, Class<? extends
BasePanel> clazz) throws OmException {
testArea(adminUsername, p -> {
Menu menu = (Menu)p.get(PATH_MENU);
- Assert.assertNotNull(menu);
+ assertNotNull(menu);
tester.getRequest().setParameter("hash",
menu.getItemList().get(idx1).getItems().get(idx2).getId());
tester.executeBehavior((AbstractAjaxBehavior)menu.getBehaviorById(0));
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
index 826a3e5..0a85e92 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
@@ -18,26 +18,26 @@
*/
package org.apache.openmeetings.web.app;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import javax.servlet.http.Cookie;
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestOmAuthenticationStrategy extends AbstractWicketTester {
@Test
public void test() {
OmAuthenticationStrategy s = new OmAuthenticationStrategy();
s.save(null, null, User.Type.oauth, null);
- assertNull("Wasn't saved, should not be loaded", s.load());
+ assertNull(s.load(), "Wasn't saved, should not be loaded");
s.save("aa", "bb", User.Type.contact, null);
copyCookies();
- assertNotNull("Should be loaded", s.load());
+ assertNotNull(s.load(), "Should be loaded");
assertEquals(0, s.decode(null).length);
assertEquals(4, s.decode("1").length);
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
index 4f9127a..6f91e93 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.web.app;
-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 static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
@@ -39,7 +39,7 @@ import org.apache.openmeetings.db.manager.IClientManager;
import org.apache.openmeetings.service.mail.EmailManager;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.SCryptImplementation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
@@ -77,8 +77,8 @@ public class TestUserManagerMocked {
.addMapping(OAuthUser.PARAM_LOGIN,
"preferred_username")
.addMapping(OAuthUser.PARAM_EMAIL, "email"));
User u = userManager.loginOAuth(user, 1);
- assertNotNull("Valid user should be created", u);
- assertEquals("User should have valid login", "openmeetings",
u.getLogin());
- assertEquals("User should have valid email",
"[email protected]", u.getAddress().getEmail());
+ assertNotNull(u, "Valid user should be created");
+ assertEquals("openmeetings", u.getLogin(), "User should have
valid login");
+ assertEquals("[email protected]",
u.getAddress().getEmail(), "User should have valid email");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java
index 04000c0..8677dcf 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java
@@ -18,26 +18,26 @@
*/
package org.apache.openmeetings.web.app;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.OmException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestWebSession extends AbstractWicketTester {
@Test
public void testLogin() throws OmException {
WebSession ws = WebSession.get();
- assertFalse("Should not be signed in", ws.isSignedIn());
+ assertFalse(ws.isSignedIn(), "Should not be signed in");
try {
ws.signIn(adminUsername, "", User.Type.contact, null);
fail("Exception should be thrown");
} catch(OmException exc) {
- assertTrue("Expected exception", true);
+ assertTrue(true, "Expected exception");
}
assertFalse(ws.signIn(adminUsername, "", User.Type.user, null));
assertTrue(ws.signIn(adminUsername, userpass, User.Type.user,
null));
@@ -45,7 +45,7 @@ public class TestWebSession extends AbstractWicketTester {
ws.signIn(adminUsername, userpass, User.Type.ldap,
null);
fail("Exception should be thrown");
} catch(OmException exc) {
- assertTrue("Expected exception", true);
+ assertTrue(true, "Expected exception");
}
}
}
