Revision: 4500
Author: seba.wagner
Date: Mon Oct 31 08:22:28 2011
Log: Update issue 1561
add new test file for Scheduler Testing in Reminder calculations
Update issue -1
used TypedQuery instead of Query
http://code.google.com/p/openmeetings/source/detail?r=4500
Added:
/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
Modified:
/trunk/singlewebapp/.classpath
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
=======================================
--- /dev/null
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
Mon Oct 31 08:22:28 2011
@@ -0,0 +1,33 @@
+package org.openmeetings.test.calendar;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openmeetings.app.data.calendar.management.AppointmentLogic;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class TestAppointmentSchedulerTask extends
AbstractOpenmeetingsSpringTest {
+
+ private static final Logger log =
Red5LoggerFactory.getLogger(TestAppointmentSchedulerTask.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ @Autowired
+ private AppointmentLogic appointmentLogic;
+
+ @Test
+ public void doIt() {
+ log.debug("- 1 MeetingReminderJob.execute");
+ log.warn("- 2 MeetingReminderJob.execute");
+ try {
+ appointmentLogic.doScheduledMeetingReminder();
+
+ assertTrue(true);
+ } catch (Exception err){
+ log.error("execute",err);
+ }
+ }
+
+}
=======================================
--- /trunk/singlewebapp/.classpath Mon Oct 31 07:41:24 2011
+++ /trunk/singlewebapp/.classpath Mon Oct 31 08:22:28 2011
@@ -69,7 +69,7 @@
<classpathentry kind="lib" path="lib/openjpa2/commons-lang-2.4.jar"/>
<classpathentry kind="lib" path="lib/openjpa2/dom4j-1.6.1.jar"/>
<classpathentry kind="lib"
path="lib/openjpa2/geronimo-jms_1.1_spec-1.1.1.jar"/>
- <classpathentry kind="lib"
path="lib/openjpa2/geronimo-jpa_2.0_spec-1.1.jar"/>
+ <classpathentry kind="lib"
path="lib/openjpa2/geronimo-jpa_2.0_spec-1.1.jar"
sourcepath="C:/Users/swagner/.m2/repository/org/apache/geronimo/specs/geronimo-jpa_2.0_spec/1.1/geronimo-jpa_2.0_spec-1.1-sources.jar"/>
<classpathentry kind="lib"
path="lib/openjpa2/geronimo-jta_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib"
path="lib/openjpa2/geronimo-validation_1.0_spec-1.1.jar"/>
<classpathentry kind="lib" path="lib/openjpa2/openjpa-2.1.0.jar"/>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
Sun Oct 30 07:27:20 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
Mon Oct 31 08:22:28 2011
@@ -8,7 +8,6 @@
import java.util.TimeZone;
import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
@@ -79,6 +78,7 @@
query.setParameter("deleted", "true");
query.setParameter("room_id", room_id);
+ @SuppressWarnings("unchecked")
List<Appointment> appoint = query.getResultList();
if (appoint.size() > 0) {
@@ -141,7 +141,7 @@
String hql = "select a from Appointment a "
+ "WHERE a.deleted <> :deleted ";
- Query query = em.createQuery(hql);
+ TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
query.setParameter("deleted", "true");
List<Appointment> appointList = query.getResultList();
@@ -287,7 +287,8 @@
String hql = "select a from Appointment a "
+ "WHERE a.room.rooms_id = :roomId ";
- Query query = em.createQuery(hql);
+
+ TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
query.setParameter("roomId", roomId);
List<Appointment> ll = query.getResultList();
@@ -697,12 +698,6 @@
Date starttime, Date endtime) {
try {
- /*
- * String hql = "select a from Appointment a " +
- * "WHERE a.deleted != :deleted "+ "AND a.userId = :userId
"+
- * "AND a.starttime BETWEEN :starttime AND :endtime";
- */
-
starttime.setHours(0);
endtime.setHours(23);
@@ -753,7 +748,7 @@
+ "WHERE a.deleted <> :deleted "
+ "AND a.appointmentCategory.categoryId =
:categoryId";
- Query query = em.createQuery(hql);
+ TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
query.setParameter("deleted", "true");
query.setParameter("categoryId", categoryId);
@@ -816,7 +811,7 @@
+ "WHERE a.deleted <> :deleted "
+ "AND a.appointmentName LIKE
:appointmentName";
- Query query = em.createQuery(hql);
+ TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
query.setParameter("deleted", "true");
query.setParameter("appointmentName", name);
@@ -858,12 +853,11 @@
Timestamp startStamp = new Timestamp(startDate.getTime());
Timestamp stopStamp = new Timestamp(endDate.getTime());
- System.out.println("StartTime : " + startDate);
- System.out.println("EndTime : " + endDate);
-
- EntityTransaction tx = null;
+ log.debug("StartTime : " + startDate);
+ log.debug("EndTime : " + endDate);
+
try {
- Query query = em.createQuery(hql);
+ TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
query.setParameter("mm_deleted", true);
query.setParameter("app_deleted", "true");
@@ -877,7 +871,6 @@
} catch (Exception e) {
log.error("Error in getTodaysAppoitmentsbyRangeAndMember :
"
+ e.getMessage());
- tx.rollback();
return null;
}
}
@@ -891,8 +884,6 @@
public List<Appointment> getTodaysReminderAppointmentsForAllUsers() {
try {
- // log.debug("getTodaysAppoitmentsForAllUsers");
-
String hql = "SELECT app from MeetingMember mm "
+ "JOIN mm.appointment as app "
+ "WHERE mm.deleted <> :mm_deleted "
@@ -914,10 +905,7 @@
Timestamp startStamp = new
Timestamp(startCal.getTime().getTime());
Timestamp stopStamp = new
Timestamp(endCal.getTime().getTime());
- // System.out.println("StartTime : " + startDate);
- // System.out.println("EndTime : " + endDate);
-
- Query query = em.createQuery(hql);
+ TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
query.setParameter("mm_deleted", true);
query.setParameter("app_deleted", "true");
@@ -939,14 +927,12 @@
public Appointment getAppointmentByRoomId(Long user_id, Long rooms_id) {
try {
- // log.debug("getAppointmentByRoomId");
-
String hql = "select a from Appointment a "
+ "WHERE a.deleted <> :deleted "
+ "AND a.userId.user_id = :user_id "
+ "AND a.room.rooms_id = :rooms_id ";
- Query query = em.createQuery(hql);
+ TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
query.setParameter("deleted", "true");
query.setParameter("user_id", user_id);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
