[jboss-cvs] JBossAS SVN: r97224 - in projects/snowdrop/trunk/documentation/samples/sportsclub: sportsclub-hibernate-dao and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: lvlcek at redhat.com
Date: 2009-12-01 07:36:58 -0500 (Tue, 01 Dec 2009)
New Revision: 97224

Added:
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/TestHibernateReservationRepository.java
Modified:
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/pom.xml
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateReservationRepository.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java
Log:
Added tests for ReservationRepository

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java	2009-12-01 12:22:35 UTC (rev 97223)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java	2009-12-01 12:36:58 UTC (rev 97224)
@@ -24,7 +24,8 @@
 
     /**
      * Return all reservations before given date.
-     * This means all reservations whose toDate.before(date) is true.    
+     * This means all reservations whose toDate.before(date) is true.
+     * It checks the right boundary of the date range interval, i.e. (infinity, date>
      * @param date
      * @return
      */
@@ -32,7 +33,8 @@
 
     /**
      * Return all reservations after given date.
-     * This means all reservations whose fromDate.after(date) is true. 
+     * This means all reservations whose fromDate.after(date) is true.
+     * It checks the left boundary of the date range interval, i.e. <date, infinity)
      * @param date
      * @return
      */

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/pom.xml	2009-12-01 12:22:35 UTC (rev 97223)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/pom.xml	2009-12-01 12:36:58 UTC (rev 97224)
@@ -33,6 +33,7 @@
         <dependency>
             <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
             <artifactId>sportsclub-test-infrastructure</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateReservationRepository.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateReservationRepository.java	2009-12-01 12:22:35 UTC (rev 97223)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateReservationRepository.java	2009-12-01 12:36:58 UTC (rev 97224)
@@ -22,18 +22,18 @@
    {
 
       Criteria cri = getCurrentSession().createCriteria(Reservation.class);
-      cri.add(and(le("fromDate", fromDate), ge("toDate", toDate)));
+      cri.add(and(ge("from", fromDate), le("to", toDate)));
 
       return cri.list();
    }
 
    public List<Reservation> getReservationsBefore(Date date)
    {
-      return getCurrentSession().createCriteria(Reservation.class).add(le("toDate", date)).list();
+      return getCurrentSession().createCriteria(Reservation.class).add(le("to", date)).list();
    }
 
    public List<Reservation> getReservationsAfter(Date date)
    {
-      return getCurrentSession().createCriteria(Reservation.class).add(ge("fromDate", date)).list();
+      return getCurrentSession().createCriteria(Reservation.class).add(ge("from", date)).list();
    }
 }

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java	2009-12-01 12:22:35 UTC (rev 97223)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java	2009-12-01 12:36:58 UTC (rev 97224)
@@ -208,6 +208,7 @@
    private static Date createDate(int year, int month, int day)
    {
       Calendar cal = Calendar.getInstance(Locale.US);
+      cal.clear();
       cal.set(year, month-1, day);
       return cal.getTime();
    }

Added: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/TestHibernateReservationRepository.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/TestHibernateReservationRepository.java	                        (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/TestHibernateReservationRepository.java	2009-12-01 12:36:58 UTC (rev 97224)
@@ -0,0 +1,53 @@
+package org.jboss.snowdrop.samples.stayfit.dao.hibernate;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.ReservationRepository;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Reservation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.Date;
+import java.util.List;
+
+/**
+ */
+ at ContextConfiguration(locations = {"classpath:test-infrastructure.xml", "classpath:dao-context.xml"})
+ at RunWith(SpringJUnit4ClassRunner.class)
+public class TestHibernateReservationRepository
+{
+   @Autowired
+   ReservationRepository reservationRepository;
+
+   @Test
+   @Transactional
+   public void testReservationRepository()
+   {
+
+      Date from = getDate(2009,1,1);
+      Date to = getDate(2009,12,31);
+
+      List<Reservation> reservations = reservationRepository.getReservations(from, to);
+      Assert.assertEquals(3, reservations.size());
+
+      reservations = reservationRepository.getReservationsAfter(getDate(2009,02,01));
+      Assert.assertEquals(2, reservations.size());
+
+      reservations = reservationRepository.getReservationsBefore(getDate(2009,11,30));
+      Assert.assertEquals(2, reservations.size());
+      
+   }
+
+   private Date getDate(int year, int month, int day)
+   {
+      Calendar cal = Calendar.getInstance(Locale.US);
+      cal.clear();
+      cal.set(year, month-1, day);
+      return cal.getTime();
+   }
+}