Author: sebawagner
Date: Sat Oct 12 20:29:15 2013
New Revision: 1531589
URL: http://svn.apache.org/r1531589
Log:
OPENMEETINGS-816 Change Abstract classes to have only one place for spring
context definition
Added:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
- copied, changed from r1529278,
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java
Removed:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
Copied:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
(from r1529278,
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?p2=openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java&p1=openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java&r1=1529278&r2=1531589&rev=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
Sat Oct 12 20:29:15 2013
@@ -20,7 +20,6 @@ package org.apache.openmeetings.test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.Date;
@@ -32,22 +31,14 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
-import org.apache.openmeetings.util.OmFileHelper;
import org.junit.Before;
-import org.junit.runner.RunWith;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@TestExecutionListeners({})
-@ContextConfiguration(locations={"classpath:openmeetings-applicationContext.xml"},
inheritLocations = true)
-public abstract class AbstractOpenmeetingsSpringTest extends
AbstractJUnit4SpringContextTests {
- private static final Logger log =
Red5LoggerFactory.getLogger(AbstractOpenmeetingsSpringTest.class);
+
+public abstract class AbstractJUnitDefaults extends AbstractSpringTest {
+
+ private static final Logger log =
Red5LoggerFactory.getLogger(AbstractJUnitDefaults.class);
protected static final String username = "swagner";
protected static final String userpass = "qweqwe";
@@ -68,7 +59,7 @@ public abstract class AbstractOpenmeetin
@Before
public void setUp() throws Exception {
- setOmHome();
+ super.setUp();
if (userDao.count() < 1) {
makeDefaultScheme();
log.info("Default scheme created successfully");
@@ -123,14 +114,6 @@ public abstract class AbstractOpenmeetin
return u;
}
- protected void setOmHome() {
- String webappsDir = System.getProperty("om.home", ".");
- OmFileHelper.setOmHome(webappsDir);
- if (!OmFileHelper.getOmHome().exists() ||
!OmFileHelper.getOmHome().isDirectory()) {
- fail("Invalid directory is specified as OM HOME: " +
webappsDir);
- }
- }
-
private void makeDefaultScheme() throws Exception {
InstallationConfig cfg = new InstallationConfig();
cfg.username = username;
Added:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java?rev=1531589&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java
(added)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java
Sat Oct 12 20:29:15 2013
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+import static org.junit.Assert.fail;
+
+import org.apache.openmeetings.util.OmFileHelper;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@TestExecutionListeners({})
+@ContextConfiguration(locations={"classpath:openmeetings-applicationContext.xml"},
inheritLocations = true)
+public abstract class AbstractSpringTest extends
AbstractJUnit4SpringContextTests {
+
+ @Before
+ public void setUp() throws Exception {
+ setOmHome();
+ }
+
+ protected void setOmHome() {
+ String webappsDir = System.getProperty("om.home", ".");
+ OmFileHelper.setOmHome(webappsDir);
+ if (!OmFileHelper.getOmHome().exists() ||
!OmFileHelper.getOmHome().isDirectory()) {
+ fail("Invalid directory is specified as OM HOME: " +
webappsDir);
+ }
+ }
+}
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
Sat Oct 12 20:29:15 2013
@@ -26,7 +26,7 @@ import org.apache.openmeetings.web.app.W
import org.apache.wicket.util.tester.WicketTester;
import org.junit.After;
-public class AbstractWicketTester extends AbstractOpenmeetingsSpringTest {
+public class AbstractWicketTester extends AbstractJUnitDefaults {
protected WicketTester tester;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
Sat Oct 12 20:29:15 2013
@@ -33,13 +33,13 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.room.RoomOrganisationDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestOldBackups extends AbstractOpenmeetingsSpringTest {
+public class TestOldBackups extends AbstractJUnitDefaults {
private static final Logger log =
Red5LoggerFactory.getLogger(TestOldBackups.class, webAppRootKey);
@Autowired
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
Sat Oct 12 20:29:15 2013
@@ -26,12 +26,12 @@ import java.util.Calendar;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestAppointmentAddAppointment extends
AbstractOpenmeetingsSpringTest {
+public class TestAppointmentAddAppointment extends AbstractJUnitDefaults {
private static final Logger log =
Red5LoggerFactory.getLogger(TestAppointmentAddAppointment.class, webAppRootKey);
@Autowired
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
Sat Oct 12 20:29:15 2013
@@ -21,14 +21,14 @@ package org.apache.openmeetings.test.cal
import static org.junit.Assert.assertTrue;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestAppointmentSchedulerTask extends
AbstractOpenmeetingsSpringTest {
+public class TestAppointmentSchedulerTask extends AbstractJUnitDefaults {
private static final Logger log =
Red5LoggerFactory.getLogger(TestAppointmentSchedulerTask.class,
OpenmeetingsVariables.webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
Sat Oct 12 20:29:15 2013
@@ -29,13 +29,13 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDatabaseStructureAppointment extends
AbstractOpenmeetingsSpringTest {
+public class TestDatabaseStructureAppointment extends AbstractJUnitDefaults {
private static final Logger log =
Logger.getLogger(TestDatabaseStructureAppointment.class);
@Autowired
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
Sat Oct 12 20:29:15 2013
@@ -26,11 +26,11 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDatabaseStructureAppointmentReminderTyp extends
AbstractOpenmeetingsSpringTest {
+public class TestDatabaseStructureAppointmentReminderTyp extends
AbstractJUnitDefaults {
private static final Logger log = Logger
.getLogger(TestDatabaseStructureAppointmentReminderTyp.class);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java
Sat Oct 12 20:29:15 2013
@@ -23,11 +23,11 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDatabaseStructureCategory extends
AbstractOpenmeetingsSpringTest {
+public class TestDatabaseStructureCategory extends AbstractJUnitDefaults {
@Autowired
private AppointmentCategoryDao appointmentCategoryDaoImpl;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
Sat Oct 12 20:29:15 2013
@@ -24,11 +24,11 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDatabaseStructureGetAppointmentByRange extends
AbstractOpenmeetingsSpringTest {
+public class TestDatabaseStructureGetAppointmentByRange extends
AbstractJUnitDefaults {
private static final Logger log =
Logger.getLogger(TestDatabaseStructureGetAppointmentByRange.class);
@Autowired
private AppointmentDao appointmentDao;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
Sat Oct 12 20:29:15 2013
@@ -20,11 +20,11 @@ package org.apache.openmeetings.test.cal
import org.apache.log4j.Logger;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDatabaseStructureGetUserStart extends
AbstractOpenmeetingsSpringTest {
+public class TestDatabaseStructureGetUserStart extends AbstractJUnitDefaults {
private static final Logger log =
Logger.getLogger(TestDatabaseStructureGetUserStart.class);
@Autowired
private UserDao usersDao;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java
Sat Oct 12 20:29:15 2013
@@ -20,12 +20,12 @@ package org.apache.openmeetings.test.cal
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDatabaseStructureMeetingMember extends
AbstractOpenmeetingsSpringTest {
+public class TestDatabaseStructureMeetingMember extends AbstractJUnitDefaults {
@Autowired
private MeetingMemberDao meetingMemberDao;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
Sat Oct 12 20:29:15 2013
@@ -22,12 +22,12 @@ import org.apache.log4j.Logger;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDatabaseStructureUsersSearch extends
AbstractOpenmeetingsSpringTest {
+public class TestDatabaseStructureUsersSearch extends AbstractJUnitDefaults {
@Autowired
private UserManager userManager;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
Sat Oct 12 20:29:15 2013
@@ -25,12 +25,12 @@ import java.util.GregorianCalendar;
import org.apache.log4j.Logger;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TestGetAppointment extends
-AbstractOpenmeetingsSpringTest {
+AbstractJUnitDefaults {
private static final Logger log =
Logger.getLogger(TestGetAppointment.class);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
Sat Oct 12 20:29:15 2013
@@ -61,7 +61,7 @@ import net.fortuna.ical4j.model.property
import net.fortuna.ical4j.util.UidGenerator;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.mail.ByteArrayDataSource;
import org.apache.openmeetings.util.mail.IcalHandler;
@@ -71,7 +71,7 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestSendIcalMessage extends AbstractOpenmeetingsSpringTest {
+public class TestSendIcalMessage extends AbstractJUnitDefaults {
private static final Logger log = Red5LoggerFactory.getLogger(
TestAppointmentSchedulerTask.class,
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
Sat Oct 12 20:29:15 2013
@@ -25,14 +25,14 @@ import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.test.calendar.TestAppointmentAddAppointment;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestConfig extends AbstractOpenmeetingsSpringTest {
+public class TestConfig extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestAppointmentAddAppointment.class);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
Sat Oct 12 20:29:15 2013
@@ -22,11 +22,11 @@ import org.apache.log4j.Logger;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestAddGroup extends AbstractOpenmeetingsSpringTest {
+public class TestAddGroup extends AbstractJUnitDefaults {
@Autowired
private OrganisationManager organisationManager;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
Sat Oct 12 20:29:15 2013
@@ -25,11 +25,11 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestUserGroupAggregation extends AbstractOpenmeetingsSpringTest {
+public class TestUserGroupAggregation extends AbstractJUnitDefaults {
@Autowired
private OrganisationManager organisationManager;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
Sat Oct 12 20:29:15 2013
@@ -25,13 +25,13 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.InvitationService;
import org.apache.openmeetings.remote.MainService;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestInvitation extends AbstractOpenmeetingsSpringTest {
+public class TestInvitation extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestInvitation.class);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
Sat Oct 12 20:29:15 2013
@@ -34,7 +34,7 @@ import org.apache.openmeetings.db.dao.la
import org.apache.openmeetings.db.entity.label.FieldLanguage;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.label.Fieldvalues;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.LangExport;
import org.apache.openmeetings.util.OmFileHelper;
import org.dom4j.Document;
@@ -64,7 +64,7 @@ import org.springframework.beans.factory
* @author sebawagner
*
*/
-public class FillLabels extends AbstractOpenmeetingsSpringTest {
+public class FillLabels extends AbstractJUnitDefaults {
private final String basePath = "languages/";
private final String masterLangFile = "english.xml";
private final String[] excludeFiles = { "errorvalues.xml",
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
Sat Oct 12 20:29:15 2013
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTru
import org.apache.openmeetings.db.dao.label.FieldValueDao;
import org.apache.openmeetings.db.entity.label.Fieldvalues;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +31,7 @@ import org.springframework.beans.factory
* @author sebawagner
*
*/
-public class TestGetFieldValues extends AbstractOpenmeetingsSpringTest {
+public class TestGetFieldValues extends AbstractJUnitDefaults {
@Autowired
private FieldValueDao fieldValueDao;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java
Sat Oct 12 20:29:15 2013
@@ -20,12 +20,12 @@ package org.apache.openmeetings.test.lib
import org.apache.log4j.Logger;
import org.apache.openmeetings.documents.LibraryWmlLoader;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestFileParser extends AbstractOpenmeetingsSpringTest {
+public class TestFileParser extends AbstractJUnitDefaults {
private static final Logger log =
Logger.getLogger(TestFileParser.class);
@Autowired
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java
Sat Oct 12 20:29:15 2013
@@ -26,11 +26,11 @@ import java.util.List;
import org.apache.openmeetings.db.dao.basic.NavigationDao;
import org.apache.openmeetings.db.entity.basic.Naviglobal;
import org.apache.openmeetings.db.entity.basic.Navimain;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestNavi extends AbstractOpenmeetingsSpringTest {
+public class TestNavi extends AbstractJUnitDefaults {
@Autowired
private NavigationDao navimanagement;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestClientListManager.java
Sat Oct 12 20:29:15 2013
@@ -23,11 +23,11 @@ import static org.junit.Assert.assertNot
import java.util.Random;
import org.apache.openmeetings.db.dao.server.ISessionManager;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestClientListManager extends AbstractOpenmeetingsSpringTest {
+public class TestClientListManager extends AbstractJUnitDefaults {
@Autowired
private ISessionManager sessionManager;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
Sat Oct 12 20:29:15 2013
@@ -20,13 +20,13 @@ package org.apache.openmeetings.test.pol
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.entity.room.PollType;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import static org.junit.Assert.*;
-public class TestPollManagement extends AbstractOpenmeetingsSpringTest {
+public class TestPollManagement extends AbstractJUnitDefaults {
@Autowired
private PollDao pollManager;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
Sat Oct 12 20:29:15 2013
@@ -21,24 +21,17 @@ package org.apache.openmeetings.test.sel
import java.util.List;
import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
+import org.apache.openmeetings.test.AbstractSpringTest;
import org.junit.After;
import org.junit.Before;
-import org.junit.runner.RunWith;
import org.openqa.selenium.Keys;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.firefox.FirefoxProfile;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@TestExecutionListeners({})
-@ContextConfiguration(locations={"classpath:openmeetings-applicationContext.xml"},
inheritLocations = true)
-public abstract class AbstractTestDefaults extends
AbstractJUnit4SpringContextTests {
+
+public abstract class AbstractTestDefaults extends AbstractSpringTest {
@Autowired
private FieldLanguagesValuesDao fieldLanguagesValuesDao;
@@ -100,7 +93,8 @@ public abstract class AbstractTestDefaul
}
@Before
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
FirefoxProfile profile = new FirefoxProfile();
profile.setPreference("intl.accept_languages", getLocale());
driver = new FirefoxDriver(profile);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
Sat Oct 12 20:29:15 2013
@@ -26,14 +26,14 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDbSession extends AbstractOpenmeetingsSpringTest {
+public class TestDbSession extends AbstractJUnitDefaults {
protected static final Logger log = Red5LoggerFactory.getLogger(
TestDbSession.class,
OpenmeetingsVariables.webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
Sat Oct 12 20:29:15 2013
@@ -26,14 +26,14 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestDbSessionGetRoomIds extends AbstractOpenmeetingsSpringTest {
+public class TestDbSessionGetRoomIds extends AbstractJUnitDefaults {
protected static final Logger log = Red5LoggerFactory.getLogger(
TestDbSessionGetRoomIds.class,
OpenmeetingsVariables.webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
Sat Oct 12 20:29:15 2013
@@ -28,7 +28,7 @@ import java.util.Random;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.session.store.HashMapStore;
import org.apache.openmeetings.session.store.IClientPersistenceStore;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.junit.Test;
@@ -36,7 +36,7 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestHashMapSession extends AbstractOpenmeetingsSpringTest {
+public class TestHashMapSession extends AbstractJUnitDefaults {
protected static final Logger log = Red5LoggerFactory.getLogger(
TestHashMapSession.class,
OpenmeetingsVariables.webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
Sat Oct 12 20:29:15 2013
@@ -21,11 +21,11 @@ package org.apache.openmeetings.test.smo
import static org.junit.Assert.assertNotNull;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestSmokeBasic extends AbstractOpenmeetingsSpringTest {
+public class TestSmokeBasic extends AbstractJUnitDefaults {
@Autowired
private UserManager userManager;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
Sat Oct 12 20:29:15 2013
@@ -22,11 +22,11 @@ import static org.junit.Assert.assertTru
import org.apache.openmeetings.db.dao.user.StateDao;
import org.apache.openmeetings.db.entity.user.State;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestStateToLower extends AbstractOpenmeetingsSpringTest {
+public class TestStateToLower extends AbstractJUnitDefaults {
@Autowired
private StateDao stateDao;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
Sat Oct 12 20:29:15 2013
@@ -29,11 +29,11 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestUserOrganisation extends AbstractOpenmeetingsSpringTest {
+public class TestUserOrganisation extends AbstractJUnitDefaults {
@Autowired
private OrganisationManager orgManagement;
@Autowired
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
Sat Oct 12 20:29:15 2013
@@ -20,12 +20,12 @@ package org.apache.openmeetings.test.use
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.remote.MainService;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestAuth extends AbstractOpenmeetingsSpringTest {
+public class TestAuth extends AbstractJUnitDefaults {
@Autowired
private MainService mService;
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java?rev=1531589&r1=1531588&r2=1531589&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
Sat Oct 12 20:29:15 2013
@@ -24,11 +24,11 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.MainService;
-import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestLogin extends AbstractOpenmeetingsSpringTest {
+public class TestLogin extends AbstractJUnitDefaults {
@Autowired
private MainService mService;
