Merge pull request #112 from SeqWare/feature/SEQWARE-1751

Update naming in workflow run report, and emit working dir.

Former-commit-id: afa6860

Author: denis-yuen

seqware-ext-testing/src/test/java/net/sourceforge/seqware/pipeline/plugins/WorkflowRunReporterET.java

@@ -55,7 +55,7 @@ public void runWorkflowRunReporter() throws IOException {
         List<String> readLines = FileUtils.readLines(testOutFile);
         Assert.assertTrue("incorrect number of lines", readLines.size() == 2);
         long checksumCRC32 = FileUtils.checksumCRC32(testOutFile);
-        Assert.assertTrue("incorrect output checksum", checksumCRC32 == 3905672450L);
+        Assert.assertTrue("incorrect output checksum", checksumCRC32 == 684521512L);
     }
 
     @Test
@@ -89,7 +89,7 @@ public void runFirstDate() throws IOException {
         List<String> readLines = FileUtils.readLines(testOutFile);
         Assert.assertTrue("incorrect number of lines ", readLines.size() == 7);
         long checksumCRC32 = FileUtils.checksumCRC32(testOutFile);
-        Assert.assertTrue("incorrect output checksum " + checksumCRC32, checksumCRC32 == 2453262749L);
+        Assert.assertTrue("incorrect output checksum " + checksumCRC32, checksumCRC32 == 3712295835L);
     }
 
     @Test
@@ -106,7 +106,7 @@ public void runBothDates() throws IOException {
         List<String> readLines = FileUtils.readLines(testOutFile);
         Assert.assertTrue("incorrect number of lines ", readLines.size() == 4);
         long checksumCRC32 = FileUtils.checksumCRC32(testOutFile);
-        Assert.assertTrue("incorrect output checksum " + checksumCRC32, checksumCRC32 == 1339214791L);
+        Assert.assertTrue("incorrect output checksum " + checksumCRC32, checksumCRC32 == 1475250685L);
     }
 
     @Test
@@ -163,7 +163,7 @@ public void emptyDateRange() throws IOException{
         List<String> readLines = FileUtils.readLines(testOutFile);
         Assert.assertTrue("incorrect number of lines ", readLines.size() == 1);
         long checksumCRC32 = FileUtils.checksumCRC32(testOutFile);
-        Assert.assertTrue("incorrect output checksum " + checksumCRC32, checksumCRC32 == 2324536436L);
+        Assert.assertTrue("incorrect output checksum " + checksumCRC32, checksumCRC32 == 1649363086L);
     }
 
     @Test

seqware-webservice/src/main/java/net/sourceforge/seqware/webservice/resources/queries/WorkflowRunReportResource.java

@@ -155,7 +155,8 @@ public StringBuilder getHeader() {
         builder.append("Workflow Run Status").append("\t");
         builder.append("Workflow Run Create Timestamp").append("\t");
         builder.append("Workflow Run Host").append("\t");
-        builder.append("Workflow Run Status Command").append("\t");
+        builder.append("Workflow Run Working Dir").append("\t");
+        builder.append("Workflow Run Engine ID").append("\t");
         builder.append("Library Sample Names").append("\t");
         builder.append("Library Sample SWIDs").append("\t");
         builder.append("Identity Sample Names").append("\t");
@@ -208,6 +209,7 @@ public String toString(WorkflowRunReportRow wrrr, StringBuilder builder) {
         builder.append(wrrr.getWorkflowRun().getStatus()).append("\t");
         builder.append(wrrr.getWorkflowRun().getCreateTimestamp().toString()).append("\t");
         builder.append(wrrr.getWorkflowRun().getHost()).append("\t");
+        builder.append(wrrr.getWorkflowRun().getCurrentWorkingDir()).append("\t");
         builder.append(wrrr.getWorkflowRun().getStatusCmd()).append("\t");
 
         parseSamples(builder, wrrr.getLibrarySamples());