unit test, adhoc command for adhoc executions

Author: jtobard

core/src/main/java/com/dtolabs/rundeck/core/execution/ExecutionReference.java

@@ -11,10 +11,12 @@ public interface ExecutionReference {
     String getOptions();
     JobReference getJob();
     Date getDateStarted();
+    Date getDateCompleted();
     String getStatus();
     String getSucceededNodeList();
     String getFailedNodeList();
     String getTargetNodes();
+    String getAdhocCommand();
 
 
 }

rundeckapp/grails-app/services/rundeck/services/JobStateService.groovy

@@ -235,8 +235,8 @@ class JobStateService implements AuthorizingJobService {
                     project: se.project)
         }
         new ExecutionReferenceImpl(id:exec.id, options: exec.argString, filter: exec.filter, job: jobRef,
-                dateStarted: exec.dateStarted, status: exec.status, succeededNodeList: exec.succeededNodeList, 
-                failedNodeList: exec.failedNodeList)
+                dateStarted: exec.dateStarted, status: exec.status, succeededNodeList: exec.succeededNodeList,
+                dateCompleted:exec.dateCompleted, failedNodeList: exec.failedNodeList)
 
     }
 
@@ -359,9 +359,13 @@ class JobStateService implements AuthorizingJobService {
                 jobRef = new JobReferenceImpl(id: se.extid, jobName: se.jobName, groupPath: se.groupPath,
                         project: se.project)
             }
-            ExecutionReferenceImpl execRef = new ExecutionReferenceImpl(id:exec.id, options: exec.argString, filter: exec.filter, job: jobRef,
-                    dateStarted: exec.dateStarted, status: exec.status, succeededNodeList: exec.succeededNodeList,
+            ExecutionReferenceImpl execRef = new ExecutionReferenceImpl(id:exec.id, options: exec.argString,
+                    filter: exec.filter, job: jobRef, dateStarted: exec.dateStarted, dateCompleted:exec.dateCompleted,
+                    status: exec.status, succeededNodeList: exec.succeededNodeList,
                     failedNodeList: exec.failedNodeList)
+            if(!se && exec.workflow && exec.workflow.commands && exec.workflow.commands[0]){
+                execRef.adhocCommand = exec.workflow.commands[0].summarize()
+            }
             idList.push(execRef)
         }
         return [result:idList, total:idList.size()]

rundeckapp/grails-app/services/rundeck/services/execution/ExecutionReferenceImpl.groovy

@@ -10,10 +10,12 @@ class ExecutionReferenceImpl implements ExecutionReference {
     String id
     JobReferenceImpl job
     Date dateStarted
+    Date dateCompleted
     String status
     String succeededNodeList
     String failedNodeList
     String targetNodes
+    String adhocCommand
 
     @Override
     String toString() {

rundeckapp/test/unit/rundeck/services/JobStateServiceSpec.groovy

@@ -16,6 +16,8 @@
 
 package rundeck.services
 
+import com.dtolabs.rundeck.app.support.ExecutionQuery
+import com.dtolabs.rundeck.core.authorization.AuthContext
 import com.dtolabs.rundeck.core.authorization.SubjectAuthContext
 import com.dtolabs.rundeck.core.dispatcher.ExecutionState
 import com.dtolabs.rundeck.core.execution.ExecutionNotFound
@@ -495,7 +497,36 @@ class JobStateServiceSpec extends Specification {
     }
 
 
-
+    def "queryExecutions simple params"() {
+        setup:
+        def auth = Mock(AuthContext)
+        service.frameworkService = Mock(FrameworkService)
+        def mockExec = Mock(Execution)
+        when:
+        def result = service.queryExecutions(auth, filter)
+        then:
+        result
+        result.total == expTotal
+        1 * service.frameworkService.queryExecutions(_, 0, 0) >> {ExecutionQuery query,offset,max ->
+            if(query.adhoc){
+                return [result: [mockExec], total: 1]
+            }
+            if(query.jobIdListFilter){
+                return [result: [mockExec,mockExec], total: 2]
+            }
+            [result: [], total: 0]
+        }
+        1 * service.frameworkService.filterAuthorizedProjectExecutionsAll(_, _, [AuthConstants.ACTION_READ]) >>
+                {authcontext, inputArr, actions ->
+            return inputArr
+        }
+        where:
+        filter      | expTotal
+        [:]                     | 0
+        [adhoc:true]            | 1
+        [jobonly:true]          | 0
+        [jobIdListFilter:'1,2'] | 2
+    }
 
 
     def setTestExecutions(projectName, jobUuid){