[drat] branch master updated: Fix test/process and logic errors in filterMappers and isRunning.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mattmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drat.git


The following commit(s) were added to refs/heads/master by this push:
     new a2c0da3  Fix test/process and logic errors in filterMappers and isRunning.
a2c0da3 is described below

commit a2c0da3652b3344a8cc9015ee95bdc04dff6292d
Author: Chris Mattmann <ch...@jpl.nasa.gov>
AuthorDate: Tue Jun 19 09:03:42 2018 -0700

    Fix test/process and logic errors in filterMappers and isRunning.
---
 proteus/src/main/java/backend/ProcessDratWrapper.java  | 10 +++++-----
 proteus/src/main/java/backend/WorkflowItem.java        | 18 ++++++++++++++++++
 .../src/test/java/backend/TestProcessDratWrapper.java  | 17 +++++++++++++----
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/proteus/src/main/java/backend/ProcessDratWrapper.java b/proteus/src/main/java/backend/ProcessDratWrapper.java
index 1601370..8d0a27e 100644
--- a/proteus/src/main/java/backend/ProcessDratWrapper.java
+++ b/proteus/src/main/java/backend/ProcessDratWrapper.java
@@ -74,8 +74,8 @@ public class ProcessDratWrapper extends GenericProcess
   private static final String STATUS_IDLE = "idle";
 
   private static final String MAPPER_TASK = "RatCodeAudit";
-  
-  private static final String MAPPER_TASK_ID = "urn:drat:MimePartitioner";
+  private static final String REDUCE_TASK = "RatAggregator";
+  private static final String MAPPER_TASK_ID = "urn:drat:RatCodeAudit";
   private static final String REDUCE_TASK_ID = "urn:drat:RatAggregator";
   private static final String[] WIPE_TYPES = { "RatLog", "GenericFile",
       "RatAggregateLog" };
@@ -364,11 +364,11 @@ public class ProcessDratWrapper extends GenericProcess
       List<WorkflowInstance> mappers = new ArrayList<>();
       if(instances!=null && instances.size()>0){
           for(WorkflowInstance instance:instances){
-              if(instance.getCurrentTask().equals(MAPPER_TASK)){
-                  LOG.info("Adding mapper: [" + instance.getCurrentTask() + "]");
+              if(instance.getCurrentTask().getTaskId().equals(MAPPER_TASK_ID)){
+                  LOG.info("Adding mapper: [" + instance.getCurrentTask().getTaskId() + "]");
                   mappers.add(instance);
               }else{
-                  LOG.info("Filtering task: [" + instance.getCurrentTask() + "]");
+                  LOG.info("Filtering task: [" + instance.getCurrentTask().getTaskId() + "]");
               }
           }
       }
diff --git a/proteus/src/main/java/backend/WorkflowItem.java b/proteus/src/main/java/backend/WorkflowItem.java
index 24eb65c..2a63e33 100644
--- a/proteus/src/main/java/backend/WorkflowItem.java
+++ b/proteus/src/main/java/backend/WorkflowItem.java
@@ -17,6 +17,10 @@
 
 package backend;
 
+import org.apache.oodt.cas.workflow.structs.Workflow;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowTask;
+
 public class WorkflowItem {
 
   private String id;
@@ -167,5 +171,19 @@ public class WorkflowItem {
         + wallClockTime + ", currentTaskWallClock=" + currentTaskWallClock
         + "]";
   }
+  
+  public WorkflowInstance toInstance() {
+    WorkflowInstance i = new WorkflowInstance();
+    i.setId(this.id);
+    i.setStatus(this.status);
+    i.setCurrentTaskId(this.currentTask);
+    WorkflowTask task = new WorkflowTask();
+    task.setTaskId(this.currentTask);
+    Workflow w = new Workflow();
+    w.getTasks().add(task);
+    w.setName(this.workflowName);
+    i.setWorkflow(w);;
+    return i;
+  }
 
 }
diff --git a/proteus/src/test/java/backend/TestProcessDratWrapper.java b/proteus/src/test/java/backend/TestProcessDratWrapper.java
index 95b8a1e..dbe768d 100644
--- a/proteus/src/test/java/backend/TestProcessDratWrapper.java
+++ b/proteus/src/test/java/backend/TestProcessDratWrapper.java
@@ -17,8 +17,9 @@
 
 package backend;
 
+import java.util.ArrayList;
 import java.util.List;
-
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
 import backend.ProcessDratWrapper;
 import junit.framework.TestCase;
 
@@ -47,7 +48,11 @@ public class TestProcessDratWrapper extends TestCase {
     List<WorkflowItem> items = null;
     items = wrapper.parseWorkflows(cmdLines);
     assertNotNull(items);
-    assertTrue(wrapper.stillRunning(items)); 
+    List<WorkflowInstance> insts = new ArrayList<WorkflowInstance>(items.size());
+    for(WorkflowItem wi: items) {
+      insts.add(wi.toInstance());
+    }
+    assertTrue(wrapper.stillRunning(insts)); 
   }
   
   public void testFilterMappers(){
@@ -60,8 +65,12 @@ public class TestProcessDratWrapper extends TestCase {
     List<WorkflowItem> items = null;
     items = wrapper.parseWorkflows(cmdLines);
     assertNotNull(items);
-    List<WorkflowItem> mappers = null;
-    mappers = wrapper.filterMappers(items);
+    List<WorkflowInstance> insts = new ArrayList<WorkflowInstance>(items.size());
+    for(WorkflowItem wi: items) {
+      insts.add(wi.toInstance());
+    }    
+    List<WorkflowInstance> mappers = null;
+    mappers = wrapper.filterMappers(insts);
     assertNotNull(mappers);
     assertEquals(1, mappers.size());    
   }