#32 add sieve3 step to basekbNowFlow

paulhoule · Oct 10, 2013 · 0d96e1a · 0d96e1a
1 parent 5d9c37b
commit 0d96e1a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git 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 @@
               </list>
             </constructor-arg>
         </bean>
+        <bean class="com.ontology2.haruhi.flows.JobStep">
+            <constructor-arg>
+              <list>
+                <value>'run'</value>
+                <value>'sieve3'</value>
+                <value>pos[2]+pos[1]+'/accepted/'</value>
+                <value>pos[2]+pos[1]+'/sieved/'</value>
+              </list>
+            </constructor-arg>
+        </bean>
       </list>
     </constructor-arg>
   </bean>

diff --git 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<String> flowArgs=Lists.newArrayList("s3n://freebase-dumps/","1942-12-07-00-00","s3n://basekb-now/");
         List<FlowStep> 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<String> 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++));
+        }
     }
 }