refactor a bit and add a main method for easier benchmarking

spullara · spullara · commit 2c56bac25e4f · 2012-03-04T15:23:27.000-08:00
diff --git a/compiler/src/main/java/com/github/mustachejava/codes/DefaultCode.java b/compiler/src/main/java/com/github/mustachejava/codes/DefaultCode.java
@@ -79,24 +79,7 @@ public Object get(String name, Object[] scopes) {
       return scopes[scopes.length - 1];
     }
     if (wrapper == null) {
-      wrapper = oh.find(name, scopes);
-      if (wrapper == null) {
-        notfound = true;
-        if (debug) {
-          // Ugly but generally not interesting
-          if (!(this instanceof PartialCode)) {
-            StringBuilder sb = new StringBuilder("Failed to find: ");
-            sb.append(name).append(" in");
-            for (Object scope : scopes) {
-              if (scope != null) {
-                sb.append(" ").append(scope.getClass().getSimpleName());
-              }
-            }
-            logger.warning(sb.toString());
-          }
-        }
-        return null;
-      }
+      if (getWrapper(name, scopes)) return null;
     }
     try {
       return oh.coerce(wrapper.call(scopes));
@@ -106,6 +89,28 @@ public Object get(String name, Object[] scopes) {
     }
   }
 
+  private boolean getWrapper(String name, Object[] scopes) {
+    wrapper = oh.find(name, scopes);
+    if (wrapper == null) {
+      notfound = true;
+      if (debug) {
+        // Ugly but generally not interesting
+        if (!(this instanceof PartialCode)) {
+          StringBuilder sb = new StringBuilder("Failed to find: ");
+          sb.append(name).append(" in");
+          for (Object scope : scopes) {
+            if (scope != null) {
+              sb.append(" ").append(scope.getClass().getSimpleName());
+            }
+          }
+          logger.warning(sb.toString());
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+
   @Override
   public Writer execute(Writer writer, Object scope) {
     return execute(writer, new Object[] { scope });
diff --git a/compiler/src/test/java/com/github/mustachejavabenchmarks/BenchmarkTest.java b/compiler/src/test/java/com/github/mustachejavabenchmarks/BenchmarkTest.java
@@ -1,16 +1,15 @@
 package com.github.mustachejavabenchmarks;
 
+import com.github.mustachejava.*;
+import com.google.common.io.CharStreams;
+import junit.framework.TestCase;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.util.concurrent.Executors;
 
-import com.github.mustachejava.*;
-import com.google.common.io.CharStreams;
-
-import junit.framework.TestCase;
-
 /**
  * Compare compilation with interpreter.
  * <p/>
@@ -102,4 +101,13 @@ private StringWriter complextest(Mustache m, Object complexObject) throws Mustac
     return sw;
   }
 
+  public static void main(String[] args) throws Exception {
+    BenchmarkTest benchmarkTest = new BenchmarkTest();
+    benchmarkTest.setUp();
+    benchmarkTest.testComplex();
+    benchmarkTest.testParallelComplex();
+    benchmarkTest.testParallelComplexNoExecutor();
+    System.exit(0);
+  }
+  
 }
diff --git a/indy/src/test/java/com/github/mustachejava/BenchmarkTest.java b/indy/src/test/java/com/github/mustachejava/BenchmarkTest.java
@@ -1,16 +1,15 @@
 package com.github.mustachejava;
 
+import com.github.mustachejava.indy.IndyObjectHandler;
+import com.google.common.io.CharStreams;
+import junit.framework.TestCase;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.util.concurrent.Executors;
 
-import com.google.common.io.CharStreams;
-
-import com.github.mustachejava.indy.IndyObjectHandler;
-import junit.framework.TestCase;
-
 /**
  * Compare compilation with interpreter.
  * <p/>
@@ -108,4 +107,12 @@ private StringWriter complextest(Mustache m, Object complexObject) throws Mustac
     return sw;
   }
 
+  public static void main(String[] args) throws Exception {
+    BenchmarkTest benchmarkTest = new BenchmarkTest();
+    benchmarkTest.setUp();
+    benchmarkTest.testComplex();
+    benchmarkTest.testParallelComplex();
+    benchmarkTest.testParallelComplexNoExecutor();
+    System.exit(0);
+  }
 }
