Author: solomax
Date: Mon Aug 22 02:57:23 2016
New Revision: 1757100
URL: http://svn.apache.org/viewvc?rev=1757100&view=rev
Log:
[OPENMEETINGS-1138] tests should be fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1757100&r1=1757099&r2=1757100&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
Mon Aug 22 02:57:23 2016
@@ -211,6 +211,7 @@ public class AppointmentLogic {
a.getRoom().setComment(appointmentDescription);
a.getRoom().setName(appointmentName);
a.getRoom().setType(Room.Type.get(roomType));
+ a.getRoom().setAppointment(true);
}
a.setOwner(userDao.get(userId));
a.setPasswordProtected(isPasswordProtected);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java?rev=1757100&r1=1757099&r2=1757100&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
Mon Aug 22 02:57:23 2016
@@ -34,8 +34,8 @@ public class AbstractWicketTester extend
@Override
public void setUp() throws Exception {
super.setUp();
- tester = getWicketTester();
- assertNotNull("Web session should not be null", WebSession.get());
+ tester = getWicketTester();
+ assertNotNull("Web session should not be null",
WebSession.get());
}
public void login(String login, String password) {
@@ -49,6 +49,9 @@ public class AbstractWicketTester extend
@After
public void tearDown() {
- tester.destroy();
+ if (tester != null) {
+ //can be null in case exception on initialization
+ tester.destroy();
+ }
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1757100&r1=1757099&r2=1757100&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
Mon Aug 22 02:57:23 2016
@@ -211,6 +211,7 @@ public class AppointmentLogic {
a.getRoom().setComment(appointmentDescription);
a.getRoom().setName(appointmentName);
a.getRoom().setType(Room.Type.get(roomType));
+ a.getRoom().setAppointment(true);
}
a.setOwner(userDao.get(userId));
a.setPasswordProtected(isPasswordProtected);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java?rev=1757100&r1=1757099&r2=1757100&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
Mon Aug 22 02:57:23 2016
@@ -34,8 +34,8 @@ public class AbstractWicketTester extend
@Override
public void setUp() throws Exception {
super.setUp();
- tester = getWicketTester();
- assertNotNull("Web session should not be null", WebSession.get());
+ tester = getWicketTester();
+ assertNotNull("Web session should not be null",
WebSession.get());
}
public void login(String login, String password) {
@@ -49,6 +49,9 @@ public class AbstractWicketTester extend
@After
public void tearDown() {
- tester.destroy();
+ if (tester != null) {
+ //can be null in case exception on initialization
+ tester.destroy();
+ }
}
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1757100&r1=1757099&r2=1757100&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
Mon Aug 22 02:57:23 2016
@@ -211,6 +211,7 @@ public class AppointmentLogic {
a.getRoom().setComment(appointmentDescription);
a.getRoom().setName(appointmentName);
a.getRoom().setType(Room.Type.get(roomType));
+ a.getRoom().setAppointment(true);
}
a.setOwner(userDao.get(userId));
a.setPasswordProtected(isPasswordProtected);
Modified:
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java?rev=1757100&r1=1757099&r2=1757100&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
Mon Aug 22 02:57:23 2016
@@ -34,8 +34,8 @@ public class AbstractWicketTester extend
@Override
public void setUp() throws Exception {
super.setUp();
- tester = getWicketTester();
- assertNotNull("Web session should not be null", WebSession.get());
+ tester = getWicketTester();
+ assertNotNull("Web session should not be null",
WebSession.get());
}
public void login(String login, String password) {
@@ -49,6 +49,9 @@ public class AbstractWicketTester extend
@After
public void tearDown() {
- tester.destroy();
+ if (tester != null) {
+ //can be null in case exception on initialization
+ tester.destroy();
+ }
}
}
