Menu
▾
▴
[Drawbridge-developers] SF.net SVN: drawbridge:[57] trunk/drawbridge/src
|
From: <bla...@us...> - 2008-11-16 00:06:15
|
Revision: 57
http://drawbridge.svn.sourceforge.net/drawbridge/?rev=57&view=rev
Author: blamonica
Date: 2008-11-16 00:06:11 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
Fixed unit test for QuartzDrawbridgeScheduleLoaderTest and also added unit test to JobDaoTest to test the getAllActive() method. Fixed random compilation errors as a result of an incomplete checkin from Adam ;).
Modified Paths:
--------------
trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/sched/ExecuteQueryJob.java
trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobControllerTest.java
trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobSubmitControllerTest.java
trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/DeleteJobSubmitControllerTest.java
trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/ManagesJobControllerTest.java
trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/RunJobControllerTest.java
trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/RunJobSubmitControllerTest.java
trunk/drawbridge/src/test/net/sf/drawbridge/dao/JobDaoTest.java
trunk/drawbridge/src/test/net/sf/drawbridge/sched/QuartzDrawbridgeScheduleLoaderTest.java
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobSubmitController.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobSubmitController.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import net.sf.drawbridge.vo.Job;
+import net.sf.drawbridge.vo.JobType;
import net.sf.drawbridge.vo.RunAsAccount;
import net.sf.drawbridge.vo.Status;
import net.sf.drawbridge.vo.StatusMessage;
@@ -75,6 +76,7 @@
job=new Job(null,
name,
account,
+ JobType.QUERY, //TODO: read JobType from JSP
request.getParameter("query"),
user, Calendar.getInstance(),
null, null,
@@ -101,6 +103,7 @@
job=new Job(new Long(jobIdStr),
name,
account,
+ JobType.QUERY, // TODO: Read JobType from JSP
request.getParameter("query"),
user, Calendar.getInstance(),
null, null,
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/sched/ExecuteQueryJob.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/sched/ExecuteQueryJob.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/sched/ExecuteQueryJob.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -96,7 +96,7 @@
String handlerParams = job.getHandlerParams();
List<QueryParam> params = Collections.emptyList();
try {
- List<Map<String, Object>> results = executer.executeQueryJob(driver, db, runAs, query, params);
+ List<Map<String, Object>> results = executer.executeJob(driver, db, runAs, query, params);
handler.handleQuery(results, propConverter.convertToProperties(handlerParams));
ctx.setResult(Boolean.TRUE);
} catch (Exception e) {
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobControllerTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobControllerTest.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobControllerTest.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -26,6 +26,7 @@
import net.sf.drawbridge.vo.Database;
import net.sf.drawbridge.vo.Driver;
import net.sf.drawbridge.vo.Job;
+import net.sf.drawbridge.vo.JobType;
import net.sf.drawbridge.vo.RunAsAccount;
import org.jmock.Mock;
@@ -54,7 +55,7 @@
List<String> handlerList=new ArrayList<String>();
handlerList.add("TestResultHandler");
- Job job=new Job(1L,"name",runAsAccount,"query",null,null,null,null,null,null,true,null,params);
+ Job job=new Job(1L,"name",runAsAccount, JobType.QUERY, "query",null,null,null,null,null,null,true,null,params);
mockDrawbridgeService.expects(atLeastOnce()).method("getJob").with(eq(new Long(1))).will(returnValue(job));
mockDrawbridgeService.expects(once()).method("listRunAsAccounts").will(returnValue(runAsList));
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobSubmitControllerTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobSubmitControllerTest.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobSubmitControllerTest.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -26,6 +26,7 @@
import net.sf.drawbridge.vo.Database;
import net.sf.drawbridge.vo.Driver;
import net.sf.drawbridge.vo.Job;
+import net.sf.drawbridge.vo.JobType;
import net.sf.drawbridge.vo.RunAsAccount;
import net.sf.drawbridge.vo.Status;
import net.sf.drawbridge.vo.StatusMessage;
@@ -54,7 +55,7 @@
}
public void testShouldAddJobAndReturnSuccessMessage() throws Exception{
- Job job=new Job(null,"name",account,"query",null,null,null,null,null,null,true,"handler",params);
+ Job job=new Job(null,"name",account, JobType.QUERY,"query",null,null,null,null,null,null,true,"handler",params);
mockDrawbridgeService.expects(once()).method("addJob").with(new JobConstraint(job));
mockDrawbridgeService.expects(once()).method("getRunAsAccount").with(eq(1)).will(returnValue(account));
mockDrawbridgeService.expects(once()).method("getUser").with(eq(new Integer(-1))).will(returnValue(user));
@@ -79,7 +80,7 @@
}
public void testShouldEditJobAndReturnSuccessMessage() throws Exception{
- Job job=new Job(1L,"name",account,"query",null,null,null,null,null,null,true,"handler",params);
+ Job job=new Job(1L,"name",account, JobType.QUERY,"query",null,null,null,null,null,null,true,"handler",params);
mockDrawbridgeService.expects(once()).method("updateJob").with(new JobConstraint(job));
mockDrawbridgeService.expects(once()).method("getRunAsAccount").with(eq(1)).will(returnValue(account));
mockDrawbridgeService.expects(once()).method("getUser").with(eq(new Integer(-1))).will(returnValue(user));
@@ -106,7 +107,7 @@
@SuppressWarnings("unchecked")
public void testShouldAddJobAndReturnFailureMessageOnException() throws Exception{
- Job job=new Job(null,"name",account,"query",null,null,null,null,null,null,true,null,params);
+ Job job=new Job(null,"name",account, JobType.QUERY,"query",null,null,null,null,null,null,true,null,params);
RuntimeException ex=new RuntimeException("The Spanish Inquisition");
mockDrawbridgeService.expects(once()).method("addJob").with(new JobConstraint(job)).will(throwException(ex));
mockDrawbridgeService.expects(once()).method("getRunAsAccount").with(eq(1)).will(returnValue(account));
@@ -139,7 +140,7 @@
@SuppressWarnings("unchecked")
public void testShouldEditJobAndReturnFailureMessageOnException() throws Exception{
- Job job=new Job(1L,"name",account,"query",null,null,null,null,null,null,true,"handler",params);
+ Job job=new Job(1L,"name",account, JobType.QUERY,"query",null,null,null,null,null,null,true,"handler",params);
RuntimeException ex=new RuntimeException("The Spanish Inquisition");
mockDrawbridgeService.expects(once()).method("updateJob").with(new JobConstraint(job)).will(throwException(ex));
mockDrawbridgeService.expects(once()).method("getRunAsAccount").with(eq(1)).will(returnValue(account));
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/DeleteJobSubmitControllerTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/DeleteJobSubmitControllerTest.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/DeleteJobSubmitControllerTest.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -25,6 +25,7 @@
import net.sf.drawbridge.domain.DrawbridgeService;
import net.sf.drawbridge.vo.Database;
import net.sf.drawbridge.vo.Job;
+import net.sf.drawbridge.vo.JobType;
import net.sf.drawbridge.vo.RunAsAccount;
import net.sf.drawbridge.vo.Status;
import net.sf.drawbridge.vo.StatusMessage;
@@ -50,7 +51,7 @@
User user = new User(2, "acresse", "Adam", "Cresse", true);
Database db = new Database(new Integer(1), "name", "jdbcUrl", null);
RunAsAccount runAsAccount = new RunAsAccount(2,"userName","password",db);
- Job job=new Job(1L,"name",runAsAccount,"query",user,null,null,null,null,null,true,"handler",params);
+ Job job=new Job(1L,"name",runAsAccount, JobType.QUERY,"query",user,null,null,null,null,null,true,"handler",params);
mockDrawbridgeService.expects(once()).method("getJob").with(eq(new Long(1))).will(returnValue(job));
mockDrawbridgeService.expects(once()).method("deleteJob").with(eq(new Long(1)));
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/ManagesJobControllerTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/ManagesJobControllerTest.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/ManagesJobControllerTest.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -25,6 +25,7 @@
import net.sf.drawbridge.domain.DrawbridgeService;
import net.sf.drawbridge.vo.Database;
import net.sf.drawbridge.vo.Job;
+import net.sf.drawbridge.vo.JobType;
import net.sf.drawbridge.vo.RunAsAccount;
import org.jmock.Mock;
@@ -47,7 +48,7 @@
List<Job> jobList=new ArrayList<Job>();
Database db = new Database(1,"name", "jdbcUrl", null);
RunAsAccount runAsAccount = new RunAsAccount(1,"userName","password",db);
- jobList.add(new Job(1L,"name",runAsAccount,"query",null,null,null,null,null,null,true,"handler",params));
+ jobList.add(new Job(1L,"name",runAsAccount, JobType.QUERY,"query",null,null,null,null,null,null,true,"handler",params));
List<RunAsAccount> runAsList=new ArrayList<RunAsAccount>();
runAsList.add(runAsAccount);
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/RunJobControllerTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/RunJobControllerTest.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/RunJobControllerTest.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -27,6 +27,7 @@
import net.sf.drawbridge.vo.Database;
import net.sf.drawbridge.vo.Driver;
import net.sf.drawbridge.vo.Job;
+import net.sf.drawbridge.vo.JobType;
import net.sf.drawbridge.vo.QueryParam;
import net.sf.drawbridge.vo.RunAsAccount;
@@ -50,7 +51,7 @@
Driver driver = new Driver(4,"name","class");
Database database=new Database(3,"name","url",driver);
RunAsAccount runAsAccount = new RunAsAccount(2,"userName","password",database);
- Job job = new Job(1L,"name",runAsAccount,"query",null,null,null,null,null,null,true,"handler",params);
+ Job job = new Job(1L,"name",runAsAccount, JobType.QUERY,"query",null,null,null,null,null,null,true,"handler",params);
List<QueryParam> queryParams=new ArrayList<QueryParam>();
queryParams.add(new QueryParam(Types.VARCHAR,"name","value"));
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/RunJobSubmitControllerTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/RunJobSubmitControllerTest.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/RunJobSubmitControllerTest.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -27,6 +27,7 @@
import net.sf.drawbridge.domain.DrawbridgeService;
import net.sf.drawbridge.exec.handler.ResultHandler;
import net.sf.drawbridge.vo.Job;
+import net.sf.drawbridge.vo.JobType;
import net.sf.drawbridge.vo.QueryParam;
import net.sf.drawbridge.vo.RunAsAccount;
@@ -53,7 +54,7 @@
public void testShouldReturnViewWithResults() throws Exception{
RunAsAccount account = new RunAsAccount(2, "username", "password", null);
- Job job = new Job(1L,"name",account,"query",null,null,null,null,null,null,true,"handler",paramsStr);
+ Job job = new Job(1L,"name",account, JobType.QUERY,"query",null,null,null,null,null,null,true,"handler",paramsStr);
List<QueryParam> queryParams=new ArrayList<QueryParam>();
queryParams.add(new QueryParam(Types.VARCHAR,"name","value"));
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/dao/JobDaoTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/dao/JobDaoTest.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/dao/JobDaoTest.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import net.sf.drawbridge.test.TestBeanFactory;
import net.sf.drawbridge.vo.Job;
+import net.sf.drawbridge.vo.JobType;
import net.sf.drawbridge.vo.RunAsAccount;
import net.sf.drawbridge.vo.User;
@@ -86,7 +87,7 @@
try {
User submitter = userDao.get(0);
RunAsAccount account = runAsAccountDao.get(0);
- Job job = new Job(null, "A new job", account, "select count(*) from dual", submitter, Calendar.getInstance(), null, null, null, null, true, "handler", params);
+ Job job = new Job(null, "A new job", account, JobType.QUERY, "select count(*) from dual", submitter, Calendar.getInstance(), null, null, null, null, true, "handler", params);
target.create(job);
assertNotNull("id is still null", job.getId());
} finally {
@@ -152,4 +153,17 @@
txManager.rollback(tx);
}
}
+
+ public void testShouldRetriveAllActiveJobs() throws Exception {
+ TransactionStatus tx = txManager.getTransaction(new DefaultTransactionDefinition());
+ try {
+ List<Job> jobs = target.getAllActive();
+ assertTrue(jobs.size() > 0);
+ for (Job job : jobs) {
+ assertTrue("job " + job.getId() + " is not active, but should be.", job.isActive());
+ }
+ } finally {
+ txManager.rollback(tx);
+ }
+ }
}
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/sched/QuartzDrawbridgeScheduleLoaderTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/sched/QuartzDrawbridgeScheduleLoaderTest.java 2008-11-15 03:27:12 UTC (rev 56)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/sched/QuartzDrawbridgeScheduleLoaderTest.java 2008-11-16 00:06:11 UTC (rev 57)
@@ -56,21 +56,14 @@
public void testShouldScheduleActiveJobs() throws Exception{
List<Job> jobs = getJobs(true);
- mockJobDao.expects(once()).method("getAll").will(returnValue(jobs));
+ mockJobDao.expects(once()).method("getAllActive").will(returnValue(jobs));
mockScheduler.expects(once()).method("scheduleJob");
target.loadSchedule();
}
- public void testShouldNotScheduleInActiveJobs() throws Exception{
- List<Job> jobs = getJobs(false);
- mockJobDao.expects(once()).method("getAll").will(returnValue(jobs));
- mockScheduler.expects(never()).method("scheduleJob");
- target.loadSchedule();
- }
-
public void testShouldLogErrorIfExceptionThrownWhileSchedulingJob() throws Exception {
List<Job> jobs = getJobs(true);
- mockJobDao.expects(once()).method("getAll").will(returnValue(jobs));
+ mockJobDao.expects(once()).method("getAllActive").will(returnValue(jobs));
mockScheduler.expects(once()).method("scheduleJob").will(throwException(new SchedulerException("The Spanish Inquisition!!")));
try {
target.loadSchedule();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
