[drat] branch gsoc18 updated: - remove unused methods and cleanup

[mattmann]

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

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


The following commit(s) were added to refs/heads/gsoc18 by this push:
     new 2620d43  - remove unused methods and cleanup
2620d43 is described below

commit 2620d43227f053a7c8e34154f0f982714dc4a70b
Author: Chris Mattmann <chris.a.mattm...@jpl.nasa.gov>
AuthorDate: Sun Aug 5 16:09:09 2018 -0700

    - remove unused methods and cleanup
---
 .../src/main/java/backend/ProcessDratWrapper.java    | 12 ------------
 .../test/java/backend/TestProcessDratWrapper.java    | 20 --------------------
 2 files changed, 32 deletions(-)

diff --git a/proteus/src/main/java/backend/ProcessDratWrapper.java 
b/proteus/src/main/java/backend/ProcessDratWrapper.java
index 7ccdf40..5d60571 100644
--- a/proteus/src/main/java/backend/ProcessDratWrapper.java
+++ b/proteus/src/main/java/backend/ProcessDratWrapper.java
@@ -363,18 +363,6 @@ public class ProcessDratWrapper extends GenericProcess
     return false;
   }
   
-  @VisibleForTesting
-  @Deprecated
-  protected List<WorkflowInstance> filterPartitioners(List<WorkflowInstance> 
instances){
-    return filterInstances(instances, PARTITION_AND_MAP_TASK_ID); 
-  }
-
-  @VisibleForTesting
-  @Deprecated
-  protected List<WorkflowInstance> filterMappers(List<WorkflowInstance> 
instances){
-     return this.filterInstances(instances, MAPPER_TASK_ID);
-  }
-  
   @VisibleForTesting 
   protected List<WorkflowInstance> filterInstances(List<WorkflowInstance> 
instances, String taskId){
     List<WorkflowInstance> insts = new ArrayList<>();
diff --git a/proteus/src/test/java/backend/TestProcessDratWrapper.java 
b/proteus/src/test/java/backend/TestProcessDratWrapper.java
index f41a138..c816512 100644
--- a/proteus/src/test/java/backend/TestProcessDratWrapper.java
+++ b/proteus/src/test/java/backend/TestProcessDratWrapper.java
@@ -76,26 +76,6 @@ public class TestProcessDratWrapper extends TestCase {
     assertNotNull(partitioners);
     assertEquals(2, partitioners.size());    
   }
-
-  public void testFilterPartitioners(){
-    ProcessDratWrapper wrapper = ProcessDratWrapper.getInstance();
-    assertNotNull(wrapper);
-    String cmdLines =  "Instance: [id=d3aed64f-6e7c-11e7-af03-cb83c51de744, 
status=FINISHED, currentTask=urn:drat:MimePartitioner, workflow=Dynamic 
Workflow-6fc5fc4c-d27a-47f6-905c-2f2e99fa92e9,wallClockTime=0.13265,currentTaskWallClockTime=0.0]\n"
 + 
-                            "Instance: 
[id=d3aed64f-6e7c-11e7-af03-cb83c51de744, status=PGE EXEC, 
currentTask=urn:drat:MimePartitioner, workflow=Dynamic 
Workflow-6fc5fc4c-d27a-47f6-905c-2f2e99fa92e9,wallClockTime=0.13265,currentTaskWallClockTime=0.0]\n"
 + 
-                            "Instance: 
[id=d3aed64f-6e7c-11e7-af03-cb83c51de744, status=PGE EXEC, 
currentTask=urn:drat:RatCodeAudit, workflow=Dynamic 
Workflow-6fc5fc4c-d27a-47f6-905c-2f2e99fa92e9,wallClockTime=0.13265,currentTaskWallClockTime=0.0]";
-    
-    List<WorkflowItem> items = null;
-    items = wrapper.parseWorkflows(cmdLines);
-    assertNotNull(items);
-    List<WorkflowInstance> insts = new 
ArrayList<WorkflowInstance>(items.size());
-    for(WorkflowItem wi: items) {
-      insts.add(wi.toInstance());
-    }    
-    List<WorkflowInstance> partitioners = null;
-    partitioners = wrapper.filterPartitioners(insts);
-    assertNotNull(partitioners);
-    assertEquals(2, partitioners.size());    
-  }
   
   public void testFilterMappers(){
     ProcessDratWrapper wrapper = ProcessDratWrapper.getInstance();