diff --git a/haruhi/src/main/resources/com/ontology2/haruhi/shell/applicationContext.xml b/haruhi/src/main/resources/com/ontology2/haruhi/shell/applicationContext.xml index c6c7062..2eddf08 100644 --- a/haruhi/src/main/resources/com/ontology2/haruhi/shell/applicationContext.xml +++ b/haruhi/src/main/resources/com/ontology2/haruhi/shell/applicationContext.xml @@ -71,6 +71,16 @@ + + + + 'run' + 'sieve3' + pos[2]+pos[1]+'/accepted/' + pos[2]+pos[1]+'/sieved/' + + + diff --git a/haruhi/src/test/java/com/ontology2/haruhi/flows/TestFlowBeans.java b/haruhi/src/test/java/com/ontology2/haruhi/flows/TestFlowBeans.java index 8477666..56a7c6c 100644 --- a/haruhi/src/test/java/com/ontology2/haruhi/flows/TestFlowBeans.java +++ b/haruhi/src/test/java/com/ontology2/haruhi/flows/TestFlowBeans.java @@ -26,7 +26,7 @@ public class TestFlowBeans { List flowArgs=Lists.newArrayList("s3n://freebase-dumps/","1942-12-07-00-00","s3n://basekb-now/"); List steps=basekbNowFlow.generateSteps(flowArgs); assertNotNull(steps); - assertEquals(2,steps.size()); + assertEquals(3,steps.size()); { assertTrue(steps.get(0) instanceof SpringStep); @@ -55,5 +55,19 @@ public class TestFlowBeans { assertEquals("/preprocessed/1942-12-07-00-00/",args.get(i++)); assertEquals("s3n://basekb-now/1942-12-07-00-00/",args.get(i++)); } + + { + assertTrue(steps.get(2) instanceof SpringStep); + SpringStep step2=(SpringStep) steps.get(2); + List args=step2.getStepArgs(flowArgs); + + assertEquals(4,args.size()); + + int i=0; + assertEquals("run",args.get(i++)); + assertEquals("sieve3",args.get(i++)); + assertEquals("s3n://basekb-now/1942-12-07-00-00/accepted/",args.get(i++)); + assertEquals("s3n://basekb-now/1942-12-07-00-00/sieved/",args.get(i++)); + } } }