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
commit 35f9f911a5975ea03faca8000ef9f312a15cf028 Merge: abce383 69a9ca7 Author: Chris Mattmann <[email protected]> AuthorDate: Sun Aug 5 16:05:11 2018 -0700 cleanup. .gitignore | 7 + distribution/pom.xml | 13 + distribution/src/main/assembly/assembly.xml | 1 + pom.xml | 2 +- .../src/main/java/backend/ProcessDratWrapper.java | 2 +- .../test/java/backend/TestProcessDratWrapper.java | 20 + webapps/pom.xml | 1 + webapps/proteus-new/pom.xml | 93 + .../src/main/webapp/META-INF/context.xml | 4 + .../proteus-new/src/main/webapp/WEB-INF/web.xml | 44 + .../src/main/webapp/resources/babel.config.js | 14 + .../src/main/webapp/resources/package-lock.json | 13925 +++++++++++++++++++ .../src/main/webapp/resources/package.json | 57 + .../src/main/webapp/resources/public/favicon.ico | Bin 0 -> 1150 bytes .../src/main/webapp/resources/public/index.html | 24 + .../src/main/webapp/resources/public/logo.png | Bin 0 -> 102270 bytes .../src/main/webapp/resources/src/App.vue | 273 + .../resources/src/components/auditsummarycomp.vue | 258 + .../resources/src/components/barchartcomp.vue | 170 + .../resources/src/components/bublechartcomp.vue | 185 + .../resources/src/components/controll_bar.vue | 123 + .../resources/src/components/filelistcomp.vue | 104 + .../resources/src/components/licencepiecomp.vue | 170 + .../webapp/resources/src/components/piechart.vue | 126 + .../resources/src/components/progresscomp.vue | 93 + .../resources/src/components/projectstable.vue | 404 + .../resources/src/components/statisticscomp.vue | 111 + .../resources/src/components/topmimepiecomp.vue | 178 + .../src/main/webapp/resources/src/logo.png | Bin 0 -> 102270 bytes .../src/main/webapp/resources/src/main.js | 47 + .../src/main/webapp/resources/src/store/store.js | 56 + .../src/main/webapp/resources/vue.config.js | 3 + .../src/main/webapp/resources/webpack.config.js | 47 + 33 files changed, 16553 insertions(+), 2 deletions(-) diff --cc proteus/src/main/java/backend/ProcessDratWrapper.java index 06e1ff8,a068685..7ccdf40 --- a/proteus/src/main/java/backend/ProcessDratWrapper.java +++ b/proteus/src/main/java/backend/ProcessDratWrapper.java @@@ -388,9 -378,24 +388,9 @@@ public class ProcessDratWrapper extend } } } - return partitioners; - } - - @VisibleForTesting - protected List<WorkflowInstance> filterMappers(List<WorkflowInstance> instances){ - List<WorkflowInstance> mappers = new ArrayList<>(); - if(instances!=null && instances.size()>0){ - for(WorkflowInstance instance:instances){ - 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().getTaskId() + "]"); - } - } - } - return mappers; - } + return insts; - } ++ } + @VisibleForTesting protected boolean isRunning(String status) { diff --cc proteus/src/test/java/backend/TestProcessDratWrapper.java index c816512,181837d..f41a138 --- a/proteus/src/test/java/backend/TestProcessDratWrapper.java +++ b/proteus/src/test/java/backend/TestProcessDratWrapper.java @@@ -54,28 -52,28 +54,48 @@@ public class TestProcessDratWrapper ext for(WorkflowItem wi: items) { insts.add(wi.toInstance()); } - assertTrue(wrapper.stillRunning(insts)); + assertTrue(wrapper.taskStillRunning(insts, PARTITION_AND_MAP_TASK_ID, MAPPER_TASK_ID)); + } + + 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.filterInstances(insts, PARTITION_AND_MAP_TASK_ID); + 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();
