Repository: openmeetings Updated Branches: refs/heads/master 67686134b -> d3f60892c
[OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d3f60892 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d3f60892 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d3f60892 Branch: refs/heads/master Commit: d3f60892ccaf13510dfb578c708daf21415c15ab Parents: 6768613 Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 9 11:12:01 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 9 11:12:01 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/config/TestConfig.java | 9 ++---- .../apache/openmeetings/db/dao/TestRoomDao.java | 34 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d3f60892/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java ---------------------------------------------------------------------- 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 ffcc28e..dfb15c3 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 @@ -26,24 +26,19 @@ import static org.junit.Assert.assertNull; import java.util.List; import org.apache.openmeetings.AbstractJUnitDefaults; -import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.entity.basic.Configuration; import org.junit.Test; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; public class TestConfig extends AbstractJUnitDefaults { private static final Logger log = Red5LoggerFactory.getLogger(TestConfig.class, getWebAppRootKey()); - @Autowired - private ConfigurationDao configurationDao; - @Test public void getConfigKey() { System.err.println("THIS"); - Configuration smtp_server = configurationDao.get(CONFIG_SMTP_SERVER); + Configuration smtp_server = cfgDao.get(CONFIG_SMTP_SERVER); System.err.println("smtp_server " + smtp_server.getUser()); @@ -54,7 +49,7 @@ public class TestConfig extends AbstractJUnitDefaults { public void getConfigs() { try { - List<Configuration> list = configurationDao.get(4, 6); + List<Configuration> list = cfgDao.get(4, 6); for (Configuration conf : list) { log.error("conf.getKey() " + conf.getKey()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d3f60892/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..75237ca --- /dev/null +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java @@ -0,0 +1,34 @@ +package org.apache.openmeetings.db.dao; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import org.apache.openmeetings.AbstractJUnitDefaults; +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.Test; +import org.springframework.beans.factory.annotation.Autowired; + + +public class TestRoomDao extends AbstractJUnitDefaults { + @Autowired + protected RoomDao roomDao; + + @Test + public void testMicStatusHidden() { + Room r = roomDao.get(1); + assertTrue("Default interview room should have mic status hidden", r.isHidden(RoomElement.MicrophoneStatus)); + r = roomDao.get(5); + assertTrue("Default presentation room should have mic status hidden", r.isHidden(RoomElement.MicrophoneStatus)); + r = roomDao.get(6); + assertFalse("Default Mic room should have mic status visible", r.isHidden(RoomElement.MicrophoneStatus)); + + User u = userDao.getByLogin(adminUsername, User.Type.user, null); + assertNotNull("Admin user should exist", u); + r = roomDao.getUserRoom(u.getId(), Room.Type.presentation, "bla"); + assertTrue("User presentation room should have mic status hidden", r.isHidden(RoomElement.MicrophoneStatus)); + } +}
