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 8a9ec2be9ebed1fa65d16661eb5c90684f8bbae0 Author: Maxim Solodovnik <[email protected]> AuthorDate: Thu May 26 09:46:19 2022 +0700 [OPENMEETINGS-2520] sonar should be more happy --- .../openmeetings/backup/TestImportConfig.java | 2 + .../apache/openmeetings/backup/TestImportRoom.java | 10 +++- .../calendar/TestDatabaseStructureAppointment.java | 58 +++++++++------------- .../TestDatabaseStructureGetUserStart.java | 37 -------------- .../TestDatabaseStructureMeetingMember.java | 30 ----------- .../org/apache/openmeetings/cli/TestAdmin.java | 5 +- .../apache/openmeetings/backup/config/configs.xml | 2 +- .../apache/openmeetings/backup/roomgrp/rooms.xml | 45 +---------------- 8 files changed, 41 insertions(+), 148 deletions(-) diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportConfig.java b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportConfig.java index de3c7b3dd..cedb67562 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportConfig.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportConfig.java @@ -23,6 +23,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_OAUTH; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REPLY_TO_ORGANIZER; +import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SERVER; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; @@ -65,5 +66,6 @@ class TestImportConfig extends AbstractTestImport { void importConfigs() throws Exception { File configs = new File(getClass().getClassLoader().getResource(BACKUP_ROOT + "config/configs.xml").toURI()); backupImport.importConfigs(configs.getParentFile()); + assertEquals("ml.abracadabra.com", cfgDao.get(CONFIG_SMTP_SERVER).getValue(), "SMTP server should be updated"); } } diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportRoom.java b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportRoom.java index e96f0f68e..3561ebda6 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportRoom.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportRoom.java @@ -20,10 +20,12 @@ package org.apache.openmeetings.backup; import static org.apache.openmeetings.backup.TestImport.BACKUP_ROOT; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import org.apache.openmeetings.db.dao.room.RoomDao; +import org.apache.openmeetings.db.entity.room.Room; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -41,8 +43,12 @@ class TestImportRoom extends AbstractTestImport { @Test void importRoomGroups() throws Exception { - //TODO need to check it somehow - File rooms = new File(getClass().getClassLoader().getResource(BACKUP_ROOT + "room/rooms.xml").toURI()); + File rooms = new File(getClass().getClassLoader().getResource(BACKUP_ROOT + "roomgrp/rooms.xml").toURI()); + backupImport.importRooms(rooms.getParentFile()); backupImport.importRoomGroups(rooms.getParentFile()); + + Room r = roomDao.get("testWgrps"); + assertNotNull(r, "Room should be imported"); + assertEquals(1, r.getGroups().size(), "Room should belongs to 1 group"); } } diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java index 21371c2d2..85a615328 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java @@ -18,52 +18,42 @@ */ package org.apache.openmeetings.calendar; -import java.text.SimpleDateFormat; -import java.util.Calendar; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; -import java.util.Iterator; import java.util.List; +import java.util.TimeZone; import org.apache.openmeetings.AbstractOmServerTest; import org.apache.openmeetings.db.entity.calendar.Appointment; +import org.apache.openmeetings.util.CalendarHelper; import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; class TestDatabaseStructureAppointment extends AbstractOmServerTest { - private static final Logger log = LoggerFactory.getLogger(TestDatabaseStructureAppointment.class); + private static String getTzId() { + return TimeZone.getDefault().getID(); + } - @Test - void testAddingGroup() { - try { - Calendar cal = Calendar.getInstance(); - cal.set(2008, 9, 2); - cal.get(Calendar.DAY_OF_MONTH); - cal.getTime(); + private static Date getDate(int hour, int minute) { + return CalendarHelper.getDate(LocalDateTime.of(2008, 8, 17, 12, 28), getTzId()); + } - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - Date date = format.parse("2008-17-08"); - Date date2 = format.parse("2008-18-08"); + private void createAppointment(int startHour, int startMinute, int endHour, int endMinute) { + Appointment a = getAppointment(getDate(startHour, startMinute), getDate(endHour, endMinute)); + appointmentDao.update(a, a.getOwner().getId()); + } - List<Appointment> listAppoints = appointmentDao.getInRange(1L, date, date2); - // List<Appointment> listAppoints = appointmentDao.searchAppointmentsByName("%"); - // appointmentDao.getNextAppointmentById(1L); - // appointmentDao.addAppointment("mezo", 1L, "Pforzheim", "zweiter", Calendar.getInstance().getTime(), - // date, null, true, null, null, 1L,1L); - // appointmentDao.addAppointment("testap", "erster Test",Calendar.getInstance().getTime(), - // Calendar.getInstance().getTime(), true, false, false, false, new Long(1), 1L); - log.debug("Anzahl: " + listAppoints.size()); + @Test + void testAddingGroup() throws Exception { + Date date = CalendarHelper.getDate(LocalDate.of(2008, 8, 17), getTzId()); + Date date2 = CalendarHelper.getDate(LocalDate.of(2008, 8, 18), getTzId()); - for (Appointment appoints : listAppoints) { - log.debug("Termin: " + appoints.getTitle() + " startDate: " + appoints.getStart() + " endDate: " + appoints.getEnd()); - log.debug("MeetingMembers: " + appoints.getMeetingMembers().size()); - } + createAppointment(12, 28, 23, 15); + createAppointment(1, 1, 3, 52); - for (Iterator<Appointment> iter = listAppoints.iterator(); iter.hasNext();) { - log.debug("" + iter.next()); - } - } catch (Exception err) { - log.error("[testAddingGroup]", err); - } + List<Appointment> listAppoints = appointmentDao.getInRange(1L, date, date2); + assertEquals(2, listAppoints.size(), "Exactly 2 appointments should retrieved"); } } diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java deleted file mode 100644 index a40d9a8de..000000000 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java +++ /dev/null @@ -1,37 +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.calendar; - -import org.apache.openmeetings.AbstractOmServerTest; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -class TestDatabaseStructureGetUserStart extends AbstractOmServerTest { - private static final Logger log = LoggerFactory.getLogger(TestDatabaseStructureGetUserStart.class); - - @Test - void testAddingGroup() { - try { - userDao.get(1L); - } catch (Exception err) { - log.error("[testAddingGroup]", err); - } - } -} diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java deleted file mode 100644 index b29ffdbc5..000000000 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java +++ /dev/null @@ -1,30 +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.calendar; - -import org.apache.openmeetings.AbstractOmServerTest; -import org.junit.jupiter.api.Test; - -class TestDatabaseStructureMeetingMember extends AbstractOmServerTest { - - @Test - void testUpdateMeetingMember(){ - //TODO add test - } -} 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 73be7321d..ff1ea1ff4 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 @@ -131,7 +131,10 @@ class TestAdmin { //backup a.process("-b"); //backup to file - a.process("-b", Files.createTempFile("omtempbackup", null).toFile().getCanonicalPath()); + File backup = Files.createTempFile("omtempbackup", null).toFile(); + a.process("-b", backup.getCanonicalPath()); + assertTrue(backup.exists(), "backup Should be created"); + assertTrue(Files.size(backup.toPath()) > 0, "backup shouldn't be empty"); } @Test diff --git a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/configs.xml b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/configs.xml index a1e5f240f..d2a98a861 100644 --- a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/configs.xml +++ b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/configs.xml @@ -68,7 +68,7 @@ see http://openmeetings.apache.org/Upgrade.html for Details <config> <id><![CDATA[6]]></id> <key><![CDATA[smtp_server]]></key> - <value><![CDATA[ml.unipro.ru]]></value> + <value><![CDATA[ml.abracadabra.com]]></value> <created class="java.util.Date"><![CDATA[1502426201387]]></created> <comment><![CDATA[this is the smtp server to send messages]]></comment> <deleted><![CDATA[false]]></deleted> diff --git a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/roomgrp/rooms.xml b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/roomgrp/rooms.xml index 08cdd780d..869b1e94e 100644 --- a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/roomgrp/rooms.xml +++ b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/roomgrp/rooms.xml @@ -25,50 +25,9 @@ see http://openmeetings.apache.org/Upgrade.html for Details ############################################### --><root> <rooms> - <room> - <rooms_id><![CDATA[1]]></rooms_id> - <name><![CDATA[public Interview Room]]></name> - <roomtypeId><![CDATA[4]]></roomtypeId> - <deleted><![CDATA[false]]></deleted> - <ispublic><![CDATA[true]]></ispublic> - <numberOfPartizipants><![CDATA[2]]></numberOfPartizipants> - <appointment><![CDATA[false]]></appointment> - <isDemoRoom><![CDATA[false]]></isDemoRoom> - <isModeratedRoom><![CDATA[false]]></isModeratedRoom> - <allowUserQuestions><![CDATA[true]]></allowUserQuestions> - <isAudioOnly><![CDATA[false]]></isAudioOnly> - <allowFontStyles><![CDATA[true]]></allowFontStyles> - <isClosed><![CDATA[false]]></isClosed> - <waitForRecording><![CDATA[false]]></waitForRecording> - <allowRecording><![CDATA[true]]></allowRecording> - <chatModerated><![CDATA[false]]></chatModerated> - <chatOpened><![CDATA[false]]></chatOpened> - <filesOpened><![CDATA[false]]></filesOpened> - <autoVideoSelect><![CDATA[false]]></autoVideoSelect> - <room_moderators class="org.apache.openjpa.util.java$util$ArrayList$proxy"> - <room_moderator> - <is_supermoderator><![CDATA[false]]></is_supermoderator> - <user_id><![CDATA[1725]]></user_id> - </room_moderator> - <room_moderator> - <is_supermoderator><![CDATA[false]]></is_supermoderator> - <user_id><![CDATA[1]]></user_id> - </room_moderator> - </room_moderators> - <sipEnabled><![CDATA[false]]></sipEnabled> - <hide_element class="org.apache.openjpa.util.java$util$HashSet$proxy"> - <roomElement><![CDATA[TopBar]]></roomElement> - <roomElement><![CDATA[ActionMenu]]></roomElement> - <roomElement><![CDATA[PollMenu]]></roomElement> - <roomElement><![CDATA[ScreenSharing]]></roomElement> - <roomElement><![CDATA[MicrophoneStatus]]></roomElement> - <roomElement><![CDATA[UserCount]]></roomElement> - <roomElement><![CDATA[FILES]]></roomElement> - </hide_element> - </room> <room> <rooms_id><![CDATA[666]]></rooms_id> - <name><![CDATA[public Interview Room]]></name> + <name><![CDATA[public Devil's Room]]></name> <roomtypeId><![CDATA[4]]></roomtypeId> <deleted><![CDATA[false]]></deleted> <ispublic><![CDATA[true]]></ispublic> @@ -86,7 +45,7 @@ see http://openmeetings.apache.org/Upgrade.html for Details <chatOpened><![CDATA[false]]></chatOpened> <filesOpened><![CDATA[false]]></filesOpened> <autoVideoSelect><![CDATA[false]]></autoVideoSelect> - <tag><![CDATA[test_w_grps]]></tag> + <tag><![CDATA[testWgrps]]></tag> <room_moderators class="org.apache.openjpa.util.java$util$ArrayList$proxy"> <room_moderator> <is_supermoderator><![CDATA[false]]></is_supermoderator>
