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
commit 9a76fa52bb4a6000d272f35df2a4b8d21d45d695 Author: Maxim Solodovnik <[email protected]> AuthorDate: Mon Jul 14 13:53:04 2025 +0700 [OPENMEETINGS-2797] Sonar should be more happy --- .../db/dao/calendar/AppointmentDao.java | 8 +-- .../apache/openmeetings/cli/OmHelpFormatter.java | 8 +-- .../openmeetings/mediaserver/BaseMockedTest.java | 4 +- .../mediaserver/TestRecordingFlowMocked.java | 2 +- .../mediaserver/TestRoomFlowMocked.java | 2 +- .../mediaserver/TestSetupFlowMocked.java | 2 +- .../service/calendar/AppointmentLogic.java | 2 +- .../service/calendar/caldav/IcalUtils.java | 2 +- .../apache/openmeetings/util/CalendarPatterns.java | 3 +- .../apache/openmeetings/util/crypt/TestSCrypt.java | 2 +- .../openmeetings/invitiation/TestInvitation.java | 2 +- .../org/apache/openmeetings/ldap/TestLdap.java | 12 ++-- .../apache/openmeetings/userdata/TestLogin.java | 10 ++-- .../openmeetings/web/AbstractOmServerTest.java | 34 +++++------ .../openmeetings/web/AbstractWicketTesterTest.java | 8 +-- .../org/apache/openmeetings/web/TestCalendar.java | 4 +- .../org/apache/openmeetings/web/TestMainAreas.java | 68 +++++++++++----------- .../org/apache/openmeetings/web/TestMainMenu.java | 2 +- .../openmeetings/web/app/TestWebSession.java | 8 +-- .../web/backup/AbstractTestImport.java | 6 +- .../org/apache/openmeetings/web/cli/TestAdmin.java | 20 +++---- .../apache/openmeetings/web/cli/TestPatcher.java | 4 +- .../openmeetings/web/pages/auth/TestLoginUI.java | 12 ++-- .../web/pages/install/TestInstall.java | 20 +++---- .../service/mail/template/TestEmailTemplate.java | 2 +- .../mail/template/subject/TestSubjTemplate.java | 2 +- .../openmeetings/ws/AbstractWebServiceTest.java | 6 +- .../apache/openmeetings/ws/TestErrorService.java | 6 +- .../apache/openmeetings/ws/TestGroupService.java | 6 +- .../apache/openmeetings/ws/TestUserService.java | 10 ++-- 30 files changed, 138 insertions(+), 139 deletions(-) diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java index fa67ae42b..4dbcfcfcb 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.db.dao.calendar; import static java.util.UUID.randomUUID; +import static org.apache.commons.lang3.Strings.CS; import static org.apache.openmeetings.db.util.DaoHelper.only; import static org.apache.openmeetings.db.util.DaoHelper.UNSUPPORTED; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_ROOM_CAPACITY; @@ -36,7 +37,6 @@ import jakarta.persistence.PersistenceContext; import jakarta.persistence.Query; import jakarta.persistence.TypedQuery; -import org.apache.commons.lang3.StringUtils; import org.apache.openmeetings.db.dao.IDataProviderDao; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.room.RoomDao; @@ -123,9 +123,9 @@ public class AppointmentDao implements IDataProviderDao<Appointment>{ if (sendmails) { // update meeting members boolean sendMail = a0 == null - || !StringUtils.equals(a0.getTitle(), a.getTitle()) - || !StringUtils.equals(a0.getDescription(), a.getDescription()) - || !StringUtils.equals(a0.getLocation(), a.getLocation()) + || !CS.equals(a0.getTitle(), a.getTitle()) + || !CS.equals(a0.getDescription(), a.getDescription()) + || !CS.equals(a0.getLocation(), a.getLocation()) || !a0.getStart().getTime().equals(a.getStart()) || !a0.getEnd().getTime().equals(a.getEnd()); List<MeetingMember> mmList = a.getMeetingMembers(); diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java index 3b68f05b6..ab3066fd5 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java @@ -83,7 +83,7 @@ public class OmHelpFormatter extends HelpFormatter { if (o.hasArg()) { String argName = o.getArgName(); - if (argName != null && argName.length() == 0) { + if (argName != null && argName.isEmpty()) { // if the option has a blank argname optBuf.append(' '); } else { @@ -179,19 +179,19 @@ public class OmHelpFormatter extends HelpFormatter { public void printHelp(PrintWriter pw, int width, String cmdLineSyntax, String header, Options options, int leftPad, int descPad, String footer, boolean autoUsage) { - if ((cmdLineSyntax == null) || (cmdLineSyntax.length() == 0)) { + if ((cmdLineSyntax == null) || (cmdLineSyntax.isEmpty())) { throw new IllegalArgumentException("cmdLineSyntax not provided"); } printUsage(pw, width, cmdLineSyntax, options); - if ((header != null) && (header.trim().length() > 0)) { + if ((header != null) && !header.trim().isEmpty()) { printWrapped(pw, width, header); } printOptions(pw, width, options, leftPad, descPad); - if ((footer != null) && (footer.trim().length() > 0)) { + if ((footer != null) && !footer.trim().isEmpty()) { printWrapped(pw, width, footer); } } diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java index 0c1dd10bf..08782b340 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java @@ -69,7 +69,7 @@ import org.slf4j.LoggerFactory; import com.github.openjson.JSONObject; @ExtendWith(MockitoExtension.class) -public class BaseMockedTest { +class BaseMockedTest { private static final Logger log = LoggerFactory.getLogger(BaseMockedTest.class); @Mock protected RomManager romManager; @@ -91,7 +91,7 @@ public class BaseMockedTest { protected KurentoHandler handler; @BeforeEach - public void baseSetup() { + void baseSetup() { Mockito.reset(); lenient().doReturn(kServerManager).when(client).getServerManager(); lenient().doReturn(new TransactionImpl(romManager)).when(client).beginTransaction(); diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java index 44813898c..652fe1f15 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java @@ -69,7 +69,7 @@ class TestRecordingFlowMocked extends BaseMockedTest { private String streamDescUID; @BeforeEach - public void setup() { + void setup() { User u = new User(); u.setId(USER_ID); u.setFirstname("firstname"); diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java index ccaeb5405..7a919306e 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java @@ -60,7 +60,7 @@ class TestRoomFlowMocked extends BaseMockedTest { private IApplication app; @BeforeEach - public void setup() { + void setup() { lenient().doReturn(mock(MediaPipeline.class)).when(client).createMediaPipeline(any(Transaction.class)); User u = new User(); u.setId(USER_ID); diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java index ef6490c20..851e04eef 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java @@ -43,7 +43,7 @@ class TestSetupFlowMocked extends BaseMockedTest { } @BeforeEach - public void setup() { + void setup() { doReturn(true).when(handler).isConnected(); } diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java index b4f220c44..2e5db5303 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java @@ -75,7 +75,7 @@ public class AppointmentLogic { // ---------------------------------------------------------------------------------------------- public void doScheduledMeetingReminder() { String baseUrl = getBaseUrl(); - if (baseUrl == null || baseUrl.length() < 1) { + if (baseUrl == null || baseUrl.isEmpty()) { log.error("Error retrieving baseUrl for application"); return; } diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java index 1b47d3ec0..395fb685b 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java @@ -386,7 +386,7 @@ public class IcalUtils { String uid = appointment.getIcalId(); Uid ui; - if (uid == null || uid.length() < 1) { + if (uid == null || uid.isEmpty()) { UUID uuid = randomUUID(); appointment.setIcalId(uuid.toString()); ui = new Uid(uuid.toString()); diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java index 1f2101234..f45b51381 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java @@ -153,8 +153,7 @@ public class CalendarPatterns { public static Date parseDateWithHour(String dateString) { try { - if (dateString == null || dateString.length() == 0 - || "null".equals(dateString)) { + if (dateString == null || dateString.isEmpty() || "null".equals(dateString)) { return null; } return dateFormat__ddMMyyyyHHmmss.parse(dateString); diff --git a/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/TestSCrypt.java b/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/TestSCrypt.java index 84cc4d266..f94d01849 100644 --- a/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/TestSCrypt.java +++ b/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/TestSCrypt.java @@ -30,7 +30,7 @@ class TestSCrypt extends AbstractCryptTest { private static final String SHA_HASH = "1000:3C2Sm1yw8NoyEBg8KaJfJMye9GaM8uKDNfUNyPWSbwNI2amKAK10KIrPOQeOV7uLkGCT1Fl5gabBRGjLRSBzi7S8LgaVetiEuCL0d8oVPYT1xtgrmEzx/dIyd7hVaGbol388FVW2Ei7ZxIce8DIOtKmMfrxqoNEZa+ERRAzBGLE=:lbveBdEopW7QuU2jcgv4UeuA1m0eDwfIz+KjWgciF/8TWdLi7utCiy+wm3X2pp0WRffqKEs+wwBh6iJbF2WNPIH06YaB68Q1h34wpxjBdziqAbUiGt2nZiPdKghNNX5j4L0Jp1gGRWpXOrg7V1NqYV6pLmwa+SipQs7MJGCCf+HAcwYW3HNIcp2Rbu9IzH7/t7oJo+FCgL4i1rYVHxrbHhAZCA9hr+dKM6u3S/Ef+EsZfSxCOX2BIRkoqHF4ZlLpwCIf6gmq3m7jenAjz [...] @BeforeAll - public static void setup() { + static void setup() { crypt = new SCryptImplementation(); } 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 3c6732038..f927579b5 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 @@ -54,7 +54,7 @@ class TestInvitation extends AbstractWicketTesterTest { private Invitation create(Valid valid, boolean createApp) { LocalDateTime base = LocalDateTime.now().plusDays(1).withHour(12).withMinute(0).withSecond(0); - User us = userDao.getByLogin(adminUsername, User.Type.USER, null); + User us = userDao.getByLogin(ADMIN_USERNAME, User.Type.USER, null); Date from = getDate(base, "GMT"); Date to = getDate(base.plusHours(2), "GMT"); diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java index db6121117..2b3869ca1 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java @@ -103,7 +103,7 @@ public class TestLdap extends AbstractWicketTesterTest { private LdapConfigDao ldapDao; @BeforeAll - public static void prepare() { + static void prepare() { loadLdapConf("om_ldap.cfg", PROPS); Transport t = classLdapServer.getTransports()[0]; PROPS.put(CONFIGKEY_LDAP_HOST, t.getAddress()); @@ -132,7 +132,7 @@ public class TestLdap extends AbstractWicketTesterTest { } @BeforeEach - public void clean() throws FileNotFoundException, IOException { + void clean() throws FileNotFoundException, IOException { if (CFG_MAP.isEmpty()) { createSbnd(); } @@ -149,10 +149,10 @@ public class TestLdap extends AbstractWicketTesterTest { @Test void testSbndSessionLogin() throws OmException { LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND); - assertTrue(WebSession.get().signIn(USER1, userpass, User.Type.LDAP, cfg.getId()), "Login should be successful"); + assertTrue(WebSession.get().signIn(USER1, USER_PASS, User.Type.LDAP, cfg.getId()), "Login should be successful"); //do login second time WebSession.get().invalidateNow(); - assertTrue(WebSession.get().signIn(USER1, userpass, User.Type.LDAP, cfg.getId()), "Login should be successful"); + assertTrue(WebSession.get().signIn(USER1, USER_PASS, User.Type.LDAP, cfg.getId()), "Login should be successful"); //check DB assertEquals(1, userDao.count(USER1), "There should be exactly one user after multiple logins"); } @@ -160,7 +160,7 @@ public class TestLdap extends AbstractWicketTesterTest { @Test void testPhoto1() throws OmException { LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND); - assertTrue(WebSession.get().signIn(USER2, userpass, User.Type.LDAP, cfg.getId()), "Login should be successful"); + assertTrue(WebSession.get().signIn(USER2, USER_PASS, User.Type.LDAP, cfg.getId()), "Login should be successful"); User u = userDao.getByLogin(USER2, User.Type.LDAP, cfg.getId()); assertNotNull(u); assertEquals("profile.png", u.getPictureUri()); @@ -169,7 +169,7 @@ public class TestLdap extends AbstractWicketTesterTest { @Test void testPhoto2() throws OmException { LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND); - assertTrue(WebSession.get().signIn(USER3, userpass, User.Type.LDAP, cfg.getId()), "Login should be successful"); + assertTrue(WebSession.get().signIn(USER3, USER_PASS, User.Type.LDAP, cfg.getId()), "Login should be successful"); User u = userDao.getByLogin(USER3, User.Type.LDAP, cfg.getId()); assertNotNull(u); assertEquals("user.jpg", u.getPictureUri()); 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 3a080f80a..7b612aeb1 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 @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; class TestLogin extends AbstractOmServerTest { @Test void testTestLogin() throws OmException { - User us = userDao.login(adminUsername, userpass); + User us = userDao.login(ADMIN_USERNAME, USER_PASS); assertNotNull(us, "User is unable to login"); } @@ -39,8 +39,8 @@ class TestLogin extends AbstractOmServerTest { User u = getUser(randomUUID().toString()); u.setLogin(" AB" + u.getLogin() + " "); u.getAddress().setEmail(" CD_" + u.getAddress().getEmail() + " "); - u.updatePassword(userpass); - u.addGroup(groupDao.get(group)); + u.updatePassword(USER_PASS); + u.addGroup(groupDao.get(GROUP)); return userDao.update(u, null); } @@ -48,7 +48,7 @@ class TestLogin extends AbstractOmServerTest { void testMixedCaseLogin() throws Exception { final String login = prepareUser().getLogin(); - User us = userDao.login(login.toUpperCase(Locale.ROOT), userpass); + User us = userDao.login(login.toUpperCase(Locale.ROOT), USER_PASS); assertNotNull(us, "Uppercase User is unable to login"); } @@ -56,7 +56,7 @@ class TestLogin extends AbstractOmServerTest { void testMixedCaseEmail() throws Exception { final String email = prepareUser().getAddress().getEmail(); - User us = userDao.login(email.toUpperCase(Locale.ROOT), userpass); + User us = userDao.login(email.toUpperCase(Locale.ROOT), USER_PASS); assertNotNull(us, "Uppercase Email is unable to login"); } } diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java index 155fa6ef0..3ebd4cb77 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java @@ -57,17 +57,17 @@ import jakarta.inject.Inject; @RegularTest public abstract class AbstractOmServerTest { private static final Logger log = LoggerFactory.getLogger(AbstractOmServerTest.class); - private static final String timeZone = "Europe/Berlin"; + private static final String TIME_ZONE = "Europe/Berlin"; public static final int ONE_HOUR = 60 * 60 * 1000; - public static final String adminUsername = "admin"; - public static final String regularUsername = "user"; - public static final String soapUsername = "soap"; - protected static final String groupAdminUsername = "groupAdmin"; - public static final String userpass = "Q!w2e3r4t5"; - public static final String group = "smoketest"; - public static final String email = "[email protected]"; + public static final String ADMIN_USERNAME = "admin"; + public static final String REGULAR_USERNAME = "user"; + public static final String SOAP_USERNAME = "soap"; + protected static final String GROUP_ADMIN_USERNAME = "groupAdmin"; + public static final String USER_PASS = "Q!w2e3r4t5"; + public static final String GROUP = "smoketest"; + public static final String EMAIL = "[email protected]"; public static final String UNIT_TEST_ARAB_EXT_TYPE = "النُّجُومُ الخَمْسَةِ"; - public static final Random rnd = new Random(); + public static final Random RND = new Random(); @Inject protected AppointmentDao appointmentDao; @@ -234,24 +234,24 @@ public abstract class AbstractOmServerTest { private static void makeDefaultScheme(ImportInitvalues importInitvalues) throws Exception { InstallationConfig cfg = new InstallationConfig(); - cfg.setUsername(adminUsername); - cfg.setPassword(userpass); - cfg.setEmail(email); - cfg.setGroup(group); - cfg.setTimeZone(timeZone); + cfg.setUsername(ADMIN_USERNAME); + cfg.setPassword(USER_PASS); + cfg.setEmail(EMAIL); + cfg.setGroup(GROUP); + cfg.setTimeZone(TIME_ZONE); importInitvalues.loadAll(cfg, false); // regular user - importInitvalues.createSystemUser(getUser(randomUUID().toString()), group, regularUsername, userpass, false, null); + importInitvalues.createSystemUser(getUser(randomUUID().toString()), GROUP, REGULAR_USERNAME, USER_PASS, false, null); // soap user - importInitvalues.createSystemUser(getUser(randomUUID().toString()), group, soapUsername, userpass, false, u -> { + importInitvalues.createSystemUser(getUser(randomUUID().toString()), GROUP, SOAP_USERNAME, USER_PASS, false, u -> { u.getRights().remove(User.Right.ROOM); u.getRights().remove(User.Right.DASHBOARD); u.getRights().add(User.Right.SOAP); }); // group admin - importInitvalues.createSystemUser(getUser(randomUUID().toString()), group, groupAdminUsername, userpass, true, null); + importInitvalues.createSystemUser(getUser(randomUUID().toString()), GROUP, GROUP_ADMIN_USERNAME, USER_PASS, true, null); } public User getContact(String uuid, Long ownerId) { diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractWicketTesterTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractWicketTesterTest.java index 53e358747..eec76eb66 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractWicketTesterTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractWicketTesterTest.java @@ -82,7 +82,7 @@ public abstract class AbstractWicketTesterTest extends AbstractOmServerTest { tester = getWicketTester(app); assertNotNull(WebSession.get(), "Web session should not be null"); Locale[] locales = Locale.getAvailableLocales(); - Locale l = locales[rnd.nextInt(locales.length)]; + Locale l = locales[RND.nextInt(locales.length)]; log.info("{} Locale is selected", l); tester.getSession().setLocale(l); } @@ -93,12 +93,12 @@ public abstract class AbstractWicketTesterTest extends AbstractOmServerTest { if (login != null && password != null) { s.signIn(login, password, Type.USER, null); } else { - s.signIn(adminUsername, userpass, Type.USER, null); + s.signIn(ADMIN_USERNAME, USER_PASS, Type.USER, null); } } catch (OmException e) { fail(e.getMessage()); } - assertTrue(s.isSignedIn(), "Web session is not signed in for user: " + (login != null ? login : adminUsername)); + assertTrue(s.isSignedIn(), "Web session is not signed in for user: " + (login != null ? login : ADMIN_USERNAME)); } public AbstractAjaxBehavior getButtonBehavior(String path, int idx) { @@ -111,7 +111,7 @@ public abstract class AbstractWicketTesterTest extends AbstractOmServerTest { } protected void testArea(String user, Consumer<MainPage> consumer) throws OmException { - assertTrue(((WebSession)tester.getSession()).signIn(user, userpass, User.Type.USER, null)); + assertTrue(((WebSession)tester.getSession()).signIn(user, USER_PASS, User.Type.USER, null)); MainPage page = tester.startPage(MainPage.class); tester.assertRenderedPage(MainPage.class); tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(1)); 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 9145c2e5d..0c6ee2a38 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 @@ -45,7 +45,7 @@ class TestCalendar extends AbstractWicketTesterTest { @Test void testEventCreate() throws OmException { - testArea(regularUsername, p -> { + testArea(REGULAR_USERNAME, p -> { Navbar menu = (Navbar)p.get(PATH_MENU); assertNotNull(menu); tester.executeBehavior((AbstractAjaxBehavior)menu.get("container:collapse:navLeftListEnclosure:navLeftList:0:component:dropdown-menu:buttons:1:button").getBehaviorById(0)); @@ -54,7 +54,7 @@ class TestCalendar extends AbstractWicketTesterTest { CalendarPanel cal = (CalendarPanel)p.get(PATH_CHILD); tester.executeAllTimerBehaviors(cal); - User u = userDao.getByLogin(regularUsername, User.Type.USER, null); + User u = userDao.getByLogin(REGULAR_USERNAME, User.Type.USER, null); //test create month tester.getRequest().setParameter("allDay", String.valueOf(false)); tester.getRequest().setParameter("startDate", LocalDateTime.of(2017, 11, 13, 13, 13).atOffset(UTC).format(ISO_OFFSET_DATE_TIME)); 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 2a2498c02..1060089c3 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 @@ -77,7 +77,7 @@ class TestMainAreas extends AbstractWicketTesterTest { @Test void testDashboard() throws OmException { - testArea(regularUsername, p -> { + testArea(REGULAR_USERNAME, p -> { tester.assertComponent(PATH_CHILD, OmDashboardPanel.class); }); } @@ -118,157 +118,157 @@ class TestMainAreas extends AbstractWicketTesterTest { @Test void testCalendar() throws OmException { - checkArea(AreaKeys.USER, TYPE_CALENDAR, CalendarPanel.class, regularUsername); + checkArea(AreaKeys.USER, TYPE_CALENDAR, CalendarPanel.class, REGULAR_USERNAME); } @Test void testRecordings() throws OmException { - checkArea(AreaKeys.USER, TYPE_RECORDINGS, RecordingsPanel.class, regularUsername); + checkArea(AreaKeys.USER, TYPE_RECORDINGS, RecordingsPanel.class, REGULAR_USERNAME); } @Test void testRoomsPublic() throws OmException { - checkArea(AreaKeys.ROOMS, TYPE_PUBLIC, RoomsSelectorPanel.class, regularUsername); + checkArea(AreaKeys.ROOMS, TYPE_PUBLIC, RoomsSelectorPanel.class, REGULAR_USERNAME); } @Test void testRoomsGroup() throws OmException { - checkArea(AreaKeys.ROOMS, TYPE_GROUP, RoomsSelectorPanel.class, regularUsername); + checkArea(AreaKeys.ROOMS, TYPE_GROUP, RoomsSelectorPanel.class, REGULAR_USERNAME); } @Test void testRoomsMy() throws OmException { - checkArea(AreaKeys.ROOMS, TYPE_MY, RoomsSelectorPanel.class, regularUsername); + checkArea(AreaKeys.ROOMS, TYPE_MY, RoomsSelectorPanel.class, REGULAR_USERNAME); } @Test void testProfileMessages() throws OmException { - checkArea(AreaKeys.PROFILE, TYPE_MESSAGES, MessagesContactsPanel.class, regularUsername); + checkArea(AreaKeys.PROFILE, TYPE_MESSAGES, MessagesContactsPanel.class, REGULAR_USERNAME); } @Test void testProfileEdit() throws OmException { - checkArea(AreaKeys.PROFILE, TYPE_EDIT, EditProfilePanel.class, regularUsername); + checkArea(AreaKeys.PROFILE, TYPE_EDIT, EditProfilePanel.class, REGULAR_USERNAME); } @Test void testNonExistent() throws OmException { - checkArea(AreaKeys.PROFILE, "bla", OmDashboardPanel.class, regularUsername); + checkArea(AreaKeys.PROFILE, "bla", OmDashboardPanel.class, REGULAR_USERNAME); } @Test void testAdminUsers() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_USER, UsersPanel.class, adminUsername, groupAdminUsername); + checkArea(AreaKeys.ADMIN, TYPE_USER, UsersPanel.class, ADMIN_USERNAME, GROUP_ADMIN_USERNAME); } @Test void testAdminUsers1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_USER, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_USER, REGULAR_USERNAME); } @Test void testAdminConnections() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_CONNECTION, ConnectionsPanel.class, adminUsername); + checkArea(AreaKeys.ADMIN, TYPE_CONNECTION, ConnectionsPanel.class, ADMIN_USERNAME); } @Test void testAdminConnections1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_CONNECTION, groupAdminUsername, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_CONNECTION, GROUP_ADMIN_USERNAME, REGULAR_USERNAME); } @Test void testAdminGroups() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_GROUP, GroupsPanel.class, adminUsername, groupAdminUsername); + checkArea(AreaKeys.ADMIN, TYPE_GROUP, GroupsPanel.class, ADMIN_USERNAME, GROUP_ADMIN_USERNAME); } @Test void testAdminGroups1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_GROUP, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_GROUP, REGULAR_USERNAME); } @Test void testAdminRooms() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_ROOM, RoomsPanel.class, adminUsername, groupAdminUsername); + checkArea(AreaKeys.ADMIN, TYPE_ROOM, RoomsPanel.class, ADMIN_USERNAME, GROUP_ADMIN_USERNAME); } @Test void testAdminRooms1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_ROOM, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_ROOM, REGULAR_USERNAME); } @Test void testAdminConfigs() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_CONFIG, ConfigsPanel.class, adminUsername); + checkArea(AreaKeys.ADMIN, TYPE_CONFIG, ConfigsPanel.class, ADMIN_USERNAME); } @Test void testAdminConfigs1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_CONFIG, groupAdminUsername, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_CONFIG, GROUP_ADMIN_USERNAME, REGULAR_USERNAME); } @Test void testAdminLang() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_LANG, LangPanel.class, adminUsername); + checkArea(AreaKeys.ADMIN, TYPE_LANG, LangPanel.class, ADMIN_USERNAME); } @Test void testAdminLang1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_LANG, groupAdminUsername, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_LANG, GROUP_ADMIN_USERNAME, REGULAR_USERNAME); } @Test void testAdminLdap() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_LDAP, LdapsPanel.class, adminUsername); + checkArea(AreaKeys.ADMIN, TYPE_LDAP, LdapsPanel.class, ADMIN_USERNAME); } @Test void testAdminLdap1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_LDAP, groupAdminUsername, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_LDAP, GROUP_ADMIN_USERNAME, REGULAR_USERNAME); } @Test void testAdminOauth() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_OAUTH2, OAuthPanel.class, adminUsername); + checkArea(AreaKeys.ADMIN, TYPE_OAUTH2, OAuthPanel.class, ADMIN_USERNAME); } @Test void testAdminOauth1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_OAUTH2, groupAdminUsername, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_OAUTH2, GROUP_ADMIN_USERNAME, REGULAR_USERNAME); } @Test void testAdminBackup() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_BACKUP, BackupPanel.class, adminUsername); + checkArea(AreaKeys.ADMIN, TYPE_BACKUP, BackupPanel.class, ADMIN_USERNAME); } @Test void testAdminBackup1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_BACKUP, groupAdminUsername, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_BACKUP, GROUP_ADMIN_USERNAME, REGULAR_USERNAME); } @Test void testAdminEmail() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_EMAIL, EmailPanel.class, adminUsername); + checkArea(AreaKeys.ADMIN, TYPE_EMAIL, EmailPanel.class, ADMIN_USERNAME); } @Test void testAdminEmail1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_EMAIL, groupAdminUsername, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_EMAIL, GROUP_ADMIN_USERNAME, REGULAR_USERNAME); } @Test void testAdminExtras() throws OmException { - checkArea(AreaKeys.ADMIN, TYPE_EXTRA, ExtraPanel.class, adminUsername, groupAdminUsername); + checkArea(AreaKeys.ADMIN, TYPE_EXTRA, ExtraPanel.class, ADMIN_USERNAME, GROUP_ADMIN_USERNAME); } @Test void testAdminExtras1() throws OmException { - checkUnauthArea(AreaKeys.ADMIN, TYPE_EXTRA, regularUsername); + checkUnauthArea(AreaKeys.ADMIN, TYPE_EXTRA, REGULAR_USERNAME); } @Test void testAdminBad() throws OmException { - checkArea(AreaKeys.ADMIN, "BAD", OmDashboardPanel.class, adminUsername); + checkArea(AreaKeys.ADMIN, "BAD", OmDashboardPanel.class, ADMIN_USERNAME); } private void testRoom(Long id) throws OmException { @@ -276,7 +276,7 @@ class TestMainAreas extends AbstractWicketTesterTest { RoomPanel rp = (RoomPanel)p.get(PATH_CHILD); tester.executeBehavior((AbstractAjaxBehavior)rp.get("roomContainer").getBehaviorById(0)); //room enter tester.assertComponent(PATH_CHILD + ":roomContainer:wb-area:whiteboard", AbstractWbPanel.class); - }, regularUsername); + }, REGULAR_USERNAME); } @Test @@ -293,7 +293,7 @@ class TestMainAreas extends AbstractWicketTesterTest { @Test void testRoomBad() throws OmException { - checkArea(AreaKeys.ROOM, "BAD", OmDashboardPanel.class, adminUsername); + checkArea(AreaKeys.ROOM, "BAD", OmDashboardPanel.class, ADMIN_USERNAME); } @Test 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 a73ff1054..5800c2c8b 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 @@ -48,7 +48,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar; class TestMainMenu extends AbstractWicketTesterTest { private void checkMenuItem(int menuIdx, Integer subMenuIdx, Class<? extends BasePanel> clazz) throws OmException { - testArea(adminUsername, p -> { + testArea(ADMIN_USERNAME, p -> { Navbar menu = (Navbar)p.get(PATH_MENU); assertNotNull(menu); String path = "container:collapse:navLeftListEnclosure:navLeftList:" + menuIdx; 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 24f5af187..3ef5fd27e 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 @@ -34,15 +34,15 @@ class TestWebSession extends AbstractWicketTesterTest { assertFalse(ws.isSignedIn(), "Should not be signed in"); try { - ws.signIn(adminUsername, "", User.Type.CONTACT, null); + ws.signIn(ADMIN_USERNAME, "", User.Type.CONTACT, null); fail("Exception should be thrown"); } catch(OmException exc) { assertTrue(true, "Expected exception"); } - assertFalse(ws.signIn(adminUsername, "", User.Type.USER, null)); - assertTrue(ws.signIn(adminUsername, userpass, User.Type.USER, null)); + assertFalse(ws.signIn(ADMIN_USERNAME, "", User.Type.USER, null)); + assertTrue(ws.signIn(ADMIN_USERNAME, USER_PASS, User.Type.USER, null)); try { - ws.signIn(adminUsername, userpass, User.Type.LDAP, null); + ws.signIn(ADMIN_USERNAME, USER_PASS, User.Type.LDAP, null); fail("Exception should be thrown"); } catch(OmException exc) { assertTrue(true, "Expected exception"); diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/AbstractTestImport.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/AbstractTestImport.java index 9b23cb45b..3237a1328 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/AbstractTestImport.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/AbstractTestImport.java @@ -35,19 +35,19 @@ import org.junit.jupiter.api.BeforeEach; import jakarta.inject.Inject; -public class AbstractTestImport extends AbstractOmServerTest { +class AbstractTestImport extends AbstractOmServerTest { private String cryptClass = null; @Inject protected BackupImport backupImport; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { // Crypt class need to be preserved here to avoid overriding by backup import cryptClass = getCryptClassName(); } @AfterEach - public void tearDown() { + void tearDown() { Configuration cfg = cfgDao.get(CONFIG_CRYPT); assertNotNull(cfg, "Not null config should be returned"); cfg.setValue(cryptClass); diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/cli/TestAdmin.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/cli/TestAdmin.java index 5e6acdd85..d6f399247 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/cli/TestAdmin.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/cli/TestAdmin.java @@ -19,11 +19,11 @@ package org.apache.openmeetings.web.cli; import static org.apache.commons.io.FileUtils.deleteQuietly; -import static org.apache.openmeetings.web.AbstractOmServerTest.adminUsername; -import static org.apache.openmeetings.web.AbstractOmServerTest.email; -import static org.apache.openmeetings.web.AbstractOmServerTest.group; +import static org.apache.openmeetings.web.AbstractOmServerTest.ADMIN_USERNAME; +import static org.apache.openmeetings.web.AbstractOmServerTest.EMAIL; +import static org.apache.openmeetings.web.AbstractOmServerTest.GROUP; import static org.apache.openmeetings.web.AbstractOmServerTest.setOmHome; -import static org.apache.openmeetings.web.AbstractOmServerTest.userpass; +import static org.apache.openmeetings.web.AbstractOmServerTest.USER_PASS; import static org.apache.openmeetings.cli.Admin.OM_HOME; import static org.apache.openmeetings.db.util.ApplicationHelper.destroyApplication; import static org.apache.openmeetings.web.pages.install.TestInstall.resetH2Home; @@ -56,7 +56,7 @@ class TestAdmin { private File tempFolder; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { setOmHome(); tempFolder = Files.createTempDirectory("omtempdb").toFile(); System.setProperty("user.dir", tempFolder.getCanonicalPath()); @@ -66,7 +66,7 @@ class TestAdmin { } @AfterEach - public void tearDown() throws Exception { + void tearDown() throws Exception { resetH2Home(); System.getProperties().remove(OM_HOME); WebApplication app = (WebApplication)Application.get(getWicketApplicationName()); @@ -115,10 +115,10 @@ class TestAdmin { private static void performInstall(Admin admin, String... args) throws Exception { List<String> params = new ArrayList<>(List.of("-i" , "-tz", "Europe/Berlin" - , "-email", email - , "-group", group - , "-user", adminUsername - , "--password", userpass)); + , "-email", EMAIL + , "-group", GROUP + , "-user", ADMIN_USERNAME + , "--password", USER_PASS)); for (String a : args) { params.add(a); } diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/cli/TestPatcher.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/cli/TestPatcher.java index d2f67459d..5c0065c7f 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/cli/TestPatcher.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/cli/TestPatcher.java @@ -47,7 +47,7 @@ class TestPatcher { private static final String PASS = "mypass"; @BeforeAll - public static void setUp() { + static void setUp() { setOmHome(); } @@ -66,7 +66,7 @@ class TestPatcher { } @AfterAll - public static void cleanup() throws IOException { + static void cleanup() throws IOException { Files.copy(OmFileHelper.getPersistence(DbType.H2), OmFileHelper.getPersistence()); } } diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java index 23e0b149e..ec6411083 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java @@ -67,7 +67,7 @@ class TestLoginUI extends AbstractWicketTesterTest { tester.startPage(MainPage.class); tester.assertRenderedPage(SignInPage.class); - checkLogin(adminUsername, userpass); + checkLogin(ADMIN_USERNAME, USER_PASS); } @Test @@ -160,8 +160,8 @@ class TestLoginUI extends AbstractWicketTesterTest { formTester.setValue("email", getEmail(uid)); formTester.setValue("firstName", "first" + uid); formTester.setValue("lastName", "last" + uid); - formTester.setValue("password", userpass); - formTester.setValue("confirmPassword", userpass); + formTester.setValue("password", USER_PASS); + formTester.setValue("confirmPassword", USER_PASS); formTester.setValue("captcha:captchaText", getCaptcha("register:form:captcha:captcha")); formTester.submit("submit"); checkErrors(0); @@ -171,7 +171,7 @@ class TestLoginUI extends AbstractWicketTesterTest { } private void performForget(String uid) throws ReflectiveOperationException, SecurityException { - int type = rnd.nextInt(2); + int type = RND.nextInt(2); FormTester forgetTester = showForget(); forgetTester.select("type", type); forgetTester.setValue("name", type == 0 ? getEmail(uid) : getLogin(uid)); @@ -194,7 +194,7 @@ class TestLoginUI extends AbstractWicketTesterTest { tester.startPage(SignInPage.class); tester.assertRenderedPage(SignInPage.class); - String uid = String.valueOf(Math.abs(rnd.nextLong())); // number uid is used to prevent password validation errors + String uid = String.valueOf(Math.abs(RND.nextLong())); // number uid is used to prevent password validation errors performRegister(uid, "warn.notverified"); // activate @@ -209,7 +209,7 @@ class TestLoginUI extends AbstractWicketTesterTest { assertNotNull(u); assertNull(u.getActivatehash()); assertTrue(u.getRights().contains(User.Right.LOGIN)); - checkLogin(getEmail(uid), userpass); + checkLogin(getEmail(uid), USER_PASS); // logout Locale loc = tester.getSession().getLocale(); diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java index 1dc7dddf5..86c8e97ce 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java @@ -19,11 +19,11 @@ package org.apache.openmeetings.web.pages.install; import static org.apache.commons.io.FileUtils.deleteQuietly; -import static org.apache.openmeetings.web.AbstractOmServerTest.adminUsername; -import static org.apache.openmeetings.web.AbstractOmServerTest.email; -import static org.apache.openmeetings.web.AbstractOmServerTest.group; +import static org.apache.openmeetings.web.AbstractOmServerTest.ADMIN_USERNAME; +import static org.apache.openmeetings.web.AbstractOmServerTest.EMAIL; +import static org.apache.openmeetings.web.AbstractOmServerTest.GROUP; import static org.apache.openmeetings.web.AbstractOmServerTest.setOmHome; -import static org.apache.openmeetings.web.AbstractOmServerTest.userpass; +import static org.apache.openmeetings.web.AbstractOmServerTest.USER_PASS; import static org.apache.openmeetings.web.AbstractWicketTesterTest.checkErrors; import static org.apache.openmeetings.web.AbstractWicketTesterTest.countErrors; import static org.apache.openmeetings.web.AbstractWicketTesterTest.getWicketTester; @@ -91,7 +91,7 @@ public class TestInstall { } @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { log.info("Going to perform setup for TestInstall"); setOmHome(); setWicketApplicationName(DEFAULT_APP_NAME); @@ -113,7 +113,7 @@ public class TestInstall { } @AfterEach - public void tearDown() throws Exception { + void tearDown() throws Exception { log.info("Going to perform clean-up for TestInstall"); AbstractWicketTesterTest.destroy(tester); log.info("WicketTester is destroyed"); @@ -146,12 +146,12 @@ public class TestInstall { wizardTester.submit(next); //user step checkErrors(tester, 0); wizardTester = tester.newFormTester(FORM_PATH); - wizardTester.setValue("view:username", adminUsername); - wizardTester.setValue("view:password", userpass); - wizardTester.setValue("view:email", email); + wizardTester.setValue("view:username", ADMIN_USERNAME); + wizardTester.setValue("view:password", USER_PASS); + wizardTester.setValue("view:email", EMAIL); String[] tzIds = TimeZone.getAvailableIDs(); wizardTester.select("view:timeZone", rnd.nextInt(tzIds.length)); - wizardTester.setValue("view:group", group); + wizardTester.setValue("view:group", GROUP); wizardTester.submit(next); //cfg+smtp step checkErrors(tester, 0); wizardTester = tester.newFormTester(FORM_PATH); diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/service/mail/template/TestEmailTemplate.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/service/mail/template/TestEmailTemplate.java index 591176318..654aa26a9 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/service/mail/template/TestEmailTemplate.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/service/mail/template/TestEmailTemplate.java @@ -48,7 +48,7 @@ class TestEmailTemplate extends AbstractWicketTesterTest { private static User templateUser() { User u = new User(); - u.setLanguageId(rnd.nextInt(40)); + u.setLanguageId(RND.nextInt(40)); return u; } diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/service/mail/template/subject/TestSubjTemplate.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/service/mail/template/subject/TestSubjTemplate.java index 2bfb744fc..44c9edc75 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/service/mail/template/subject/TestSubjTemplate.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/service/mail/template/subject/TestSubjTemplate.java @@ -68,7 +68,7 @@ class TestSubjTemplate extends AbstractWicketTesterTest { Group g = new Group(); g.setName("Template test"); for (User u : users) { - TimeZone tz = TimeZone.getTimeZone(ids[rnd.nextInt(ids.length)]); + TimeZone tz = TimeZone.getTimeZone(ids[RND.nextInt(ids.length)]); checkTemplate(CreatedAppointmentTemplate.get(u, a, tz, u.getLogin())); checkTemplate(CanceledAppointmentTemplate.get(u, a, tz, u.getLogin())); checkTemplate(UpdatedAppointmentTemplate.get(u, a, tz, u.getLogin())); diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java index df4f6c595..83d957483 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java @@ -21,8 +21,8 @@ package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static org.apache.openmeetings.web.AbstractOmServerTest.createPass; import static org.apache.openmeetings.web.AbstractOmServerTest.ensureSchema; -import static org.apache.openmeetings.web.AbstractOmServerTest.soapUsername; -import static org.apache.openmeetings.web.AbstractOmServerTest.userpass; +import static org.apache.openmeetings.web.AbstractOmServerTest.SOAP_USERNAME; +import static org.apache.openmeetings.web.AbstractOmServerTest.USER_PASS; import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -83,7 +83,7 @@ public abstract class AbstractWebServiceTest { } public static ServiceResult login() { - return login(soapUsername, userpass); + return login(SOAP_USERNAME, USER_PASS); } public static ServiceResult loginNoCheck(String user, String pass) { diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestErrorService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestErrorService.java index 7927a887b..9c9af080e 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestErrorService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestErrorService.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; -import static org.apache.openmeetings.web.AbstractOmServerTest.rnd; +import static org.apache.openmeetings.web.AbstractOmServerTest.RND; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -38,7 +38,7 @@ class TestErrorService extends AbstractWebServiceTest { void getTestBadKey() { Locale[] locales = Locale.getAvailableLocales(); ServiceResult sr = getClient(getErrorUrl()) - .path(String.format("/%s/%s", randomUUID().toString(), LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L))) + .path(String.format("/%s/%s", randomUUID().toString(), LabelDao.getLanguage(locales[RND.nextInt(locales.length)], 1L))) .get(ServiceResult.class); assertNotNull(sr, "Valid Result should be returned"); assertEquals(ServiceResult.Type.SUCCESS.name(), sr.getType(), "SUCCESS result should be returned"); @@ -48,7 +48,7 @@ class TestErrorService extends AbstractWebServiceTest { void getTest() { Locale[] locales = Locale.getAvailableLocales(); ServiceResult sr = getClient(getErrorUrl()) - .path(String.format("/%s/%s", "error.unknown", LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L))) + .path(String.format("/%s/%s", "error.unknown", LabelDao.getLanguage(locales[RND.nextInt(locales.length)], 1L))) .get(ServiceResult.class); assertNotNull(sr, "Valid Result should be returned"); assertEquals(ServiceResult.Type.SUCCESS.name(), sr.getType(), "SUCCESS result should be returned"); diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestGroupService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestGroupService.java index 337557e26..84e134cc6 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestGroupService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestGroupService.java @@ -18,8 +18,8 @@ */ package org.apache.openmeetings.ws; -import static org.apache.openmeetings.web.AbstractOmServerTest.adminUsername; -import static org.apache.openmeetings.web.AbstractOmServerTest.userpass; +import static org.apache.openmeetings.web.AbstractOmServerTest.ADMIN_USERNAME; +import static org.apache.openmeetings.web.AbstractOmServerTest.USER_PASS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -72,7 +72,7 @@ class TestGroupService extends AbstractWebServiceTest { @Test void addRemoveTest() { - ServiceResult r = login(adminUsername, userpass); + ServiceResult r = login(ADMIN_USERNAME, USER_PASS); Long groupId = createGroup(r.getMessage(), "Test Group"); //delete group created { diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestUserService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestUserService.java index 0cffd87c1..3473340aa 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestUserService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestUserService.java @@ -20,10 +20,10 @@ package org.apache.openmeetings.ws; import static java.util.UUID.randomUUID; import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; -import static org.apache.openmeetings.web.AbstractOmServerTest.adminUsername; +import static org.apache.openmeetings.web.AbstractOmServerTest.ADMIN_USERNAME; import static org.apache.openmeetings.web.AbstractOmServerTest.createPass; -import static org.apache.openmeetings.web.AbstractOmServerTest.rnd; -import static org.apache.openmeetings.web.AbstractOmServerTest.userpass; +import static org.apache.openmeetings.web.AbstractOmServerTest.RND; +import static org.apache.openmeetings.web.AbstractOmServerTest.USER_PASS; import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -121,7 +121,7 @@ class TestUserService extends AbstractWebServiceTest { void hashTest() throws OmException { ensureApplication(-1L); // to ensure WebSession is attached WebSession ws = WebSession.get(); - assertTrue(ws.signIn(adminUsername, userpass, User.Type.USER, null)); + assertTrue(ws.signIn(ADMIN_USERNAME, USER_PASS, User.Type.USER, null)); Long userId0 = WebSession.getUserId(); Long userId1 = getAndcheckHash(userId0); Long userId2 = getAndcheckHash(userId0); @@ -130,7 +130,7 @@ class TestUserService extends AbstractWebServiceTest { private UserDTO doAddUser(String uuid, String extId) { String[] tzList = TimeZone.getAvailableIDs(); - String tz = TimeZone.getTimeZone(tzList[rnd.nextInt(tzList.length)]).getID(); + String tz = TimeZone.getTimeZone(tzList[RND.nextInt(tzList.length)]).getID(); ServiceResult r = login(); UserDTO u = new UserDTO(); u.setType(null); // check auto-set
