force lazy vs eager conf switch is go after freebaseDownloader smoke …

…test; if that succeeds, we launch instance 99.6; too bad there is no more freecode to announce it at
paulhoule · Jun 24, 2014 · 4ea43ed · 4ea43ed
1 parent dbf6d3e
commit 4ea43ed
Show file tree

Hide file tree

Showing 6 changed files with 195 additions and 145 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/centipede/src/main/java/com/ontology2/centipede/shell/CentipedeShell.java b/centipede/src/main/java/com/ontology2/centipede/shell/CentipedeShell.java
@@ -68,12 +68,9 @@ ApplicationContext createApplicationContext(CentipedeShellOptions centipedeOptio
         if(centipedeOptions.eager && centipedeOptions.lazy)
             throw new MisconfigurationException("Cannot force eager and lazy load at same time");
 
-        Boolean forcedMode=false;
-//        Boolean forcedMode =
-//                centipedeOptions.lazy ? true :
-//                        (centipedeOptions.eager ? false : null);
-
-        forcedMode = (forcedMode==null) ? isLazyByDefault() : forcedMode;
+        Boolean forcedMode =
+                centipedeOptions.lazy ? Boolean.TRUE :
+                        (centipedeOptions.eager ? Boolean.FALSE : isLazyByDefault());
 
         return (forcedMode==null) ? newContext(contextPath) :
                 newContext(contextPath,forcedMode);

diff --git a/centipede/src/test/java/com/ontology2/centipede/shell/InfovoreShell.java b/centipede/src/test/java/com/ontology2/centipede/shell/InfovoreShell.java
@@ -35,11 +35,7 @@ public List<String> getApplicationContextPath() {
         return that;
     }
 
-    public static void main(String[] args) {
+    static void main(String[] args) {
         new InfovoreShell().run(args);
-
-
     }
-
-
 }
diff --git a/centipede/src/test/java/com/ontology2/centipede/shell/NeitherLazyNorEagerShell.java b/centipede/src/test/java/com/ontology2/centipede/shell/NeitherLazyNorEagerShell.java
@@ -0,0 +1,12 @@
+package com.ontology2.centipede.shell;
+
+public class NeitherLazyNorEagerShell extends InfovoreShell {
+    @Override
+    protected Boolean isLazyByDefault() {
+        return null;
+    }
+
+    static void main(String[] arguments) {
+        new NeitherLazyNorEagerShell().run(arguments);
+    }
+}
diff --git a/centipede/src/test/java/com/ontology2/centipede/shell/ObjectThatCountsClassInstances.java b/centipede/src/test/java/com/ontology2/centipede/shell/ObjectThatCountsClassInstances.java
@@ -25,5 +25,6 @@ public static int getCreated() {
 
     public static void reset() {
         instanceCount.set(0);
+        totalCreated.set(0);
     }
 }
diff --git a/centipede/src/test/java/com/ontology2/centipede/shell/TestInfovoreShell.java b/centipede/src/test/java/com/ontology2/centipede/shell/TestInfovoreShell.java
@@ -6,6 +6,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.theories.suppliers.TestedOn;
 
 public class TestInfovoreShell {
 
@@ -62,4 +63,38 @@ public void alternateLaunchCode() throws IOException {
         assertEquals("777-656-005",ShellTestApp.getLaunchCode());
     }
 
+    @Test
+    public void evaluationIsLazyByDefault() {
+        String[] arguments = {"-applicationContext","classpath:com/ontology2/centipede/shell/objectCountingContext.xml","run","shellTest"};
+        InfovoreShell.main(arguments);
+        assertEquals(0,ObjectThatCountsClassInstances.getCreated());
+    }
+
+    @Test
+    public void evaluationCanBeForcedEager() {
+        String[] arguments = {"-applicationContext","classpath:com/ontology2/centipede/shell/objectCountingContext.xml","-eager","run","shellTest"};
+        InfovoreShell.main(arguments);
+        assertEquals(2,ObjectThatCountsClassInstances.getCreated());
+    }
+
+    @Test
+    public void defaultEvaluationBehaviorCanBeExposed() {
+        String[] arguments = {"-applicationContext","classpath:com/ontology2/centipede/shell/objectCountingContext.xml","run","shellTest"};
+        NeitherLazyNorEagerShell.main(arguments);
+        assertEquals(1,ObjectThatCountsClassInstances.getCreated());
+    }
+
+    @Test
+    public void defaultEvaluationBehaviorCanBeForcedLazy() {
+        String[] arguments = {"-applicationContext","classpath:com/ontology2/centipede/shell/objectCountingContext.xml","-lazy","run","shellTest"};
+        NeitherLazyNorEagerShell.main(arguments);
+        assertEquals(0,ObjectThatCountsClassInstances.getCreated());
+    }
+
+    @Test
+    public void defaultEvaluationBehaviorCanBeForcedEager() {
+        String[] arguments = {"-applicationContext","classpath:com/ontology2/centipede/shell/objectCountingContext.xml","-eager","run","shellTest"};
+        NeitherLazyNorEagerShell.main(arguments);
+        assertEquals(2,ObjectThatCountsClassInstances.getCreated());
+    }
 }