|
From: <yo...@us...> - 2009-11-06 16:36:20
|
Revision: 257
http://treebase.svn.sourceforge.net/treebase/?rev=257&view=rev
Author: youjun
Date: 2009-11-06 16:36:12 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
typo-proof, add a test on SubmissionDAOTest
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/SubmissionDAOTest.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -184,12 +184,12 @@
return (Submission) q.uniqueResult();
}
- public Collection<Submission> findByCreateDateRange(Date from, Date util) {
+ public Collection<Submission> findByCreateDateRange(Date from, Date until) {
Query q = getSession().createQuery(
- "from Submission as sub where sub.createDate between :begin and :end");
+ "from Submission where createdate between :begin and :end");
q.setDate("begin", from);
- q.setDate("end", util);
+ q.setDate("end", until);
return q.list();
}
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -71,5 +71,5 @@
Collection<Submission> findByPublishedState();
Collection<Submission> findByInProgressState();
- Collection<Submission> findByCreateDateRange(Date from, Date util);
+ Collection<Submission> findByCreateDateRange(Date from, Date until);
}
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -41,7 +41,7 @@
Collection<Submission> findPublishedSubmissions();
- Collection<Submission> findSubmissionByCreateDateRange(Date from, Date util);
+ Collection<Submission> findSubmissionByCreateDateRange(Date from, Date until);
/**
* Create a submission, which associates with a new study. A submitter is required.
*
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -929,10 +929,10 @@
}
- public Collection<Submission> findSubmissionByCreateDateRange(Date from, Date util) {
+ public Collection<Submission> findSubmissionByCreateDateRange(Date from, Date until) {
- return getSubmissionHome().findByCreateDateRange(from, util);
+ return getSubmissionHome().findByCreateDateRange(from, until);
}
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/SubmissionDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/SubmissionDAOTest.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/SubmissionDAOTest.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -1,6 +1,8 @@
package org.cipres.treebase.dao.study;
import java.util.Collection;
+import java.util.Date;
+import java.util.GregorianCalendar;
import org.cipres.treebase.dao.AbstractDAOTest;
import org.cipres.treebase.domain.matrix.Matrix;
@@ -166,6 +168,23 @@
}
}
+ public void testFindByCreateDateRange() {
+ String testName = "testFindByCreateDateRange";
+ if (logger.isInfoEnabled()) {
+ logger.info("\n\t\tRunning Test: " + testName);
+ }
+
+ Date from = (new GregorianCalendar(2006,1,1)).getTime();
+ Date until = (new GregorianCalendar(2007,1,1)).getTime();
+
+ Collection<Submission> s = getFixture().findByCreateDateRange(from, until);
+ assertTrue(s.size() > 0);
+ if (logger.isInfoEnabled()) {
+ logger.info("\n\t\tRunning Test: found " + s.size());
+ }
+ }
+
+
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|