[jboss-cvs] JBossAS SVN: r101015 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 16 06:50:26 EST 2010
Author: lvlcek at redhat.com
Date: 2010-02-16 06:50:25 -0500 (Tue, 16 Feb 2010)
New Revision: 101015
Modified:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria/RangeCriteria.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateAccountRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateEquipmentRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateReservationRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateAccountRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateEquipmentRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateReservationRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaEquipmentRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaAccountRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaEquipmentRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaReservationRepository.java
Log:
fixing range queries
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria/RangeCriteria.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria/RangeCriteria.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria/RangeCriteria.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -1,6 +1,8 @@
package org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria;
/**
+ * Is used to narrow down number of rows pulled from
+ * {@link org.jboss.snowdrop.samples.sportsclub.domain.repository.Repository}
*/
public class RangeCriteria
{
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateAccountRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateAccountRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateAccountRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -72,10 +72,7 @@
{
Criteria criteria = convert(accountSearchCriteria);
if (accountSearchCriteria.getRange() != null)
- {
- criteria.setFirstResult(accountSearchCriteria.getRange().getMinIndex());
- criteria.setMaxResults(accountSearchCriteria.getRange().length());
- }
+ criteria = applyRange(criteria, accountSearchCriteria.getRange());
return (List<Account>) criteria.list();
}
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateEquipmentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateEquipmentRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateEquipmentRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -31,10 +31,7 @@
{
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Equipment.class);
if (rangeCriteria.getRange() != null)
- {
- criteria.setFirstResult(rangeCriteria.getRange().getMinIndex());
- criteria.setMaxResults(rangeCriteria.getRange().length());
- }
+ criteria = applyRange(criteria, rangeCriteria.getRange());
return criteria;
}
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -1,12 +1,13 @@
package org.jboss.snowdrop.samples.sportsclub.dao.hibernate;
+import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.criterion.Projections;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.Repository;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.Range;
import java.io.Serializable;
-import java.util.Collection;
import java.util.List;
/**
@@ -62,5 +63,8 @@
return (Integer)getCurrentSession().createCriteria(clazz).setProjection(Projections.count("id")).uniqueResult();
}
-
+ public Criteria applyRange(Criteria criteria, Range range)
+ {
+ return criteria.setFirstResult(range.getMinIndex()).setMaxResults(range.length());
+ }
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateReservationRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateReservationRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -38,10 +38,7 @@
}
if (reservationSearchCriteria.getRange() != null)
- {
- criteria.setFirstResult(reservationSearchCriteria.getRange().getMinIndex());
- criteria.setMaxResults(reservationSearchCriteria.getRange().length());
- }
+ criteria = applyRange(criteria, reservationSearchCriteria.getRange());
if (reservationSearchCriteria.getEquipmentType() != null)
{
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateAccountRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateAccountRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateAccountRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -5,9 +5,7 @@
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.AccountRepository;
-import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.AccountSearchCriteria;
-import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.InvoiceSearchCriteria;
-import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.PersonSearchCriteria;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.*;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,6 +44,15 @@
}
@Test
+ public void testRangeCriteria()
+ {
+ AccountSearchCriteria criteria = new AccountSearchCriteria();
+ criteria.setRange(new Range(1,3));
+ List<Account> accountList = accountRepository.findByCriteria(criteria);
+ Assert.assertEquals(3, accountList.size());
+ }
+
+ @Test
public void testAccountRepositoryWithInvoices()
{
AccountSearchCriteria criteria = new AccountSearchCriteria();
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateEquipmentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateEquipmentRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateEquipmentRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -8,8 +8,13 @@
import org.junit.Test;
import org.junit.Assert;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.EquipmentRepository;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.RangeCriteria;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.Range;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
+import java.util.Collection;
+
/**
* @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
*/
@@ -29,4 +34,13 @@
EquipmentType[] types = equipmentRepository.getEquipmentTypes();
Assert.assertEquals(3,types.length);
}
+
+ @Test
+ public void testRangeCriteria()
+ {
+ RangeCriteria criteria = new RangeCriteria();
+ criteria.setRange(new Range(1,3));
+ Collection<Equipment> equipments = equipmentRepository.findByCriteria(criteria);
+ Assert.assertEquals(3, equipments.size());
+ }
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateReservationRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/TestHibernateReservationRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -1,16 +1,17 @@
package org.jboss.snowdrop.samples.sportsclub.dao.hibernate;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Reservation;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.ReservationRepository;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.Range;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.ReservationSearchCriteria;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Reservation;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
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.*;
@@ -67,6 +68,15 @@
Assert.assertEquals(1, reservationRepository.countByCriteria(criteria).longValue());
}
+ @Test
+ public void testRangeCriteria()
+ {
+ ReservationSearchCriteria criteria = new ReservationSearchCriteria();
+ criteria.setRange(new Range(1,3));
+ List<Reservation> accountList = reservationRepository.getByCriteria(criteria);
+ Assert.assertEquals(3, accountList.size());
+ }
+
private Date getDate(int year, int month, int day)
{
Calendar cal = Calendar.getInstance(Locale.US);
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -31,13 +31,9 @@
public List<Account> findByCriteria(AccountSearchCriteria criteria)
{
Query query = getQuery(criteria, null);
- List<Account> list = query.getResultList();
if (criteria.getRange() != null)
- {
- int max = (criteria.getRange().getMaxIndex() > list.size() ? list.size() : criteria.getRange().getMaxIndex());
- list = list.subList(criteria.getRange().getMinIndex(), max);
- }
- return list;
+ query = applyRange(query, criteria.getRange());
+ return query.getResultList();
}
private Query getQuery(AccountSearchCriteria criteria, String select)
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaEquipmentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaEquipmentRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaEquipmentRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -8,7 +8,6 @@
import javax.persistence.Query;
import java.util.Collection;
-import java.util.List;
/**
* @author Marius Bogoevici
@@ -26,13 +25,9 @@
public Collection<Equipment> findByCriteria(RangeCriteria criteria)
{
- Query q = entityManager.createQuery("FROM " + Equipment.class.getSimpleName());
- List<Equipment> list = q.getResultList();
+ Query query = entityManager.createQuery("FROM " + Equipment.class.getSimpleName());
if (criteria.getRange() != null)
- {
- int max = (criteria.getRange().getMaxIndex() > list.size() ? list.size() : criteria.getRange().getMaxIndex());
- list = list.subList(criteria.getRange().getMinIndex(), max);
- }
- return list;
+ query = applyRange(query, criteria.getRange());
+ return query.getResultList();
}
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -1,14 +1,14 @@
package org.jboss.snowdrop.samples.sportsclub.dao.jpa;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.Repository;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.Range;
+import org.springframework.beans.factory.annotation.Autowired;
import javax.persistence.EntityManager;
+import javax.persistence.Query;
import java.io.Serializable;
-import java.util.Collection;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-
/**
* Abstract repository using JPA EntityManager.
*
@@ -50,4 +50,9 @@
{
return (Long)entityManager.createQuery("SELECT COUNT(c) FROM " + clazz.getSimpleName() + " c").getSingleResult();
}
+
+ public Query applyRange(Query query, Range range)
+ {
+ return query.setFirstResult(range.getMinIndex()).setMaxResults(range.length());
+ }
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -29,13 +29,9 @@
public List<Reservation> getByCriteria(ReservationSearchCriteria criteria)
{
Query query = getQuery(criteria, null);
- List<Reservation> list = query.getResultList();
if (criteria.getRange() != null)
- {
- int max = (criteria.getRange().getMaxIndex() > list.size() ? list.size() : criteria.getRange().getMaxIndex());
- list = list.subList(criteria.getRange().getMinIndex(), max);
- }
- return list;
+ query = applyRange(query, criteria.getRange());
+ return query.getResultList();
}
private Query getQuery(ReservationSearchCriteria criteria, String select)
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaAccountRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaAccountRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaAccountRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -1,19 +1,18 @@
package org.jboss.snowdrop.samples.sportsclub.dao.jpa;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Invoice;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.AccountRepository;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.InvoiceRepository;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.AccountSearchCriteria;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.InvoiceSearchCriteria;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.PersonSearchCriteria;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.Range;
+import org.junit.Assert;
+import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.Test;
-import org.junit.Assert;
-import org.jboss.snowdrop.samples.sportsclub.domain.repository.AccountRepository;
-import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.AccountSearchCriteria;
-import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.PersonSearchCriteria;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.Collection;
import java.util.List;
@@ -49,6 +48,15 @@
}
@Test
+ public void testRangeCriteria()
+ {
+ AccountSearchCriteria criteria = new AccountSearchCriteria();
+ criteria.setRange(new Range(1,3));
+ List<Account> accountList = accountRepository.findByCriteria(criteria);
+ Assert.assertEquals(3, accountList.size());
+ }
+
+ @Test
public void testAccountRepositoryWithInvoices()
{
AccountSearchCriteria criteria = new AccountSearchCriteria();
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaEquipmentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaEquipmentRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaEquipmentRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -7,8 +7,13 @@
import org.junit.Test;
import org.junit.Assert;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.EquipmentRepository;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.RangeCriteria;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.Range;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
+import java.util.Collection;
+
/**
* @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
*/
@@ -27,4 +32,13 @@
EquipmentType[] types = equipmentRepository.getEquipmentTypes();
Assert.assertEquals(3,types.length);
}
+
+ @Test
+ public void testRangeCriteria()
+ {
+ RangeCriteria criteria = new RangeCriteria();
+ criteria.setRange(new Range(1,3));
+ Collection<Equipment> equipments = equipmentRepository.findByCriteria(criteria);
+ Assert.assertEquals(3, equipments.size());
+ }
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaReservationRepository.java 2010-02-16 11:24:32 UTC (rev 101014)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/test/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/TestJpaReservationRepository.java 2010-02-16 11:50:25 UTC (rev 101015)
@@ -5,6 +5,7 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.ReservationRepository;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.ReservationSearchCriteria;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.Range;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Reservation;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
import org.junit.runner.RunWith;
@@ -68,6 +69,15 @@
Assert.assertEquals(1, reservationRepository.countByCriteria(criteria).longValue());
}
+ @Test
+ public void testRangeCriteria()
+ {
+ ReservationSearchCriteria criteria = new ReservationSearchCriteria();
+ criteria.setRange(new Range(1,3));
+ List<Reservation> accountList = reservationRepository.getByCriteria(criteria);
+ Assert.assertEquals(3, accountList.size());
+ }
+
private Date getDate(int year, int month, int day)
{
Calendar cal = Calendar.getInstance(Locale.US);
More information about the jboss-cvs-commits
mailing list