add a git submodule with mustache specs #112

Author: jknack

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "handlebars/src/test/resources/mustache"]
+	path = handlebars/src/test/resources/mustache
+	url = https://github.com/mustache/spec.git

handlebars/src/test/java/com/github/jknack/handlebars/HelpersTest.java

@@ -23,14 +23,11 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.junit.runners.Parameterized.Parameters;
+import mustache.specs.Spec;
+import mustache.specs.SpecTest;
 
-import com.github.jknack.handlebars.Handlebars;
-import com.github.jknack.handlebars.Helper;
-import com.github.jknack.handlebars.Options;
+import org.junit.runners.Parameterized.Parameters;
 
-import specs.Spec;
-import specs.SpecTest;
 
 public class HelpersTest extends SpecTest {
 
@@ -108,7 +105,7 @@ public CharSequence apply(final String text,
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
+  public static Collection<Object[]> data() throws IOException {
     return data(HelpersTest.class, "helpers.yml");
   }
 }

handlebars/src/test/java/com/github/jknack/handlebars/custom/CustomObjectTest.java

@@ -17,12 +17,14 @@
  */
 package com.github.jknack.handlebars.custom;
 
+import java.io.IOException;
 import java.util.Collection;
 
+import mustache.specs.Spec;
+import mustache.specs.SpecTest;
+
 import org.junit.runners.Parameterized.Parameters;
 
-import specs.Spec;
-import specs.SpecTest;
 
 public class CustomObjectTest extends SpecTest {
 
@@ -31,7 +33,7 @@ public CustomObjectTest(final Spec spec) {
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
+  public static Collection<Object[]> data() throws IOException {
     return data(CustomObjectTest.class, "customObjects.yml");
   }
 

handlebars/src/test/java/com/github/jknack/handlebars/io/ClasspathLocatorTest.java

@@ -27,7 +27,6 @@
 import org.junit.Test;
 
 import com.github.jknack.handlebars.TemplateLoader;
-import com.github.jknack.handlebars.io.ClassTemplateLoader;
 
 /**
  * Unit test for {@link ClassTemplateLoader}.
@@ -48,15 +47,15 @@ public void locate() throws IOException {
   public void subFolder() throws IOException {
     TemplateLoader locator = new ClassTemplateLoader();
     locator.setSuffix(".yml");
-    Reader reader = locator.load(URI.create("specs/comments"));
+    Reader reader = locator.load(URI.create("mustache/specs/comments"));
     assertNotNull(reader);
   }
 
   @Test
   public void subFolderwithDashAtBeginning() throws IOException {
     TemplateLoader locator = new ClassTemplateLoader();
     locator.setSuffix(".yml");
-    Reader reader = locator.load(URI.create("/specs/comments"));
+    Reader reader = locator.load(URI.create("/mustache/specs/comments"));
     assertNotNull(reader);
   }
 
@@ -68,14 +67,14 @@ public void failLocate() throws IOException {
 
   @Test
   public void setBasePath() throws IOException {
-    TemplateLoader locator = new ClassTemplateLoader("/specs", ".yml");
+    TemplateLoader locator = new ClassTemplateLoader("/mustache/specs", ".yml");
     Reader reader = locator.load(URI.create("comments"));
     assertNotNull(reader);
   }
 
   @Test
   public void setBasePathWithDashDash() throws IOException {
-    TemplateLoader locator = new ClassTemplateLoader("/specs/", ".yml");
+    TemplateLoader locator = new ClassTemplateLoader("/mustache/specs/", ".yml");
     Reader reader = locator.load(URI.create("comments"));
     assertNotNull(reader);
   }

handlebars/src/test/java/com/github/jknack/handlebars/io/FileLocatorTest.java

@@ -28,8 +28,6 @@
 import org.junit.Test;
 
 import com.github.jknack.handlebars.TemplateLoader;
-import com.github.jknack.handlebars.io.ClassTemplateLoader;
-import com.github.jknack.handlebars.io.FileTemplateLoader;
 
 /**
  * Unit test for {@link ClassTemplateLoader}.
@@ -51,15 +49,15 @@ public void locate() throws IOException {
   public void subFolder() throws IOException {
     TemplateLoader locator =
         new FileTemplateLoader(new File("src/test/resources"), ".yml");
-    Reader reader = locator.load(URI.create("specs/comments"));
+    Reader reader = locator.load(URI.create("mustache/specs/comments"));
     assertNotNull(reader);
   }
 
   @Test
   public void subFolderwithDashAtBeginning() throws IOException {
     TemplateLoader locator =
         new FileTemplateLoader(new File("src/test/resources"), ".yml");
-    Reader reader = locator.load(URI.create("/specs/comments"));
+    Reader reader = locator.load(URI.create("mustache/specs/comments"));
     assertNotNull(reader);
   }
 
@@ -73,15 +71,15 @@ public void failLocate() throws IOException {
   @Test
   public void setBasePath() throws IOException {
     TemplateLoader locator =
-        new FileTemplateLoader(new File("src/test/resources/specs"), ".yml");
+        new FileTemplateLoader(new File("src/test/resources/mustache/specs"), ".yml");
     Reader reader = locator.load(URI.create("comments"));
     assertNotNull(reader);
   }
 
   @Test
   public void setBasePathWithDash() throws IOException {
     TemplateLoader locator =
-        new FileTemplateLoader(new File("src/test/resources/specs/"), ".yml");
+        new FileTemplateLoader(new File("src/test/resources/mustache/specs/"), ".yml");
     Reader reader = locator.load(URI.create("comments"));
     assertNotNull(reader);
   }

handlebars/src/test/java/hbs/js/package.java handlebars/src/test/java/hbs/js/package-info.java

@@ -1,4 +1,5 @@
 /**
  * Handlebars.js Spec Tests
  * See https://github.com/wycats/handlebars.js/blob/master/spec/qunit_spec.js
- */
+ */
+package hbs.js;

handlebars/src/test/java/specs/CommentsTest.java handlebars/src/test/java/mustache/specs/CommentsTest.java

@@ -15,8 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
+import java.io.IOException;
 import java.util.Collection;
 
 import org.junit.runners.Parameterized.Parameters;
@@ -28,7 +29,7 @@ public CommentsTest(final Spec spec) {
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
+  public static Collection<Object[]> data() throws IOException {
     return data("comments.yml");
   }
 }

handlebars/src/test/java/specs/DelimitersTest.java handlebars/src/test/java/mustache/specs/DelimitersTest.java

@@ -15,8 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
+import java.io.IOException;
 import java.util.Collection;
 
 import org.junit.runners.Parameterized.Parameters;
@@ -28,7 +29,7 @@ public DelimitersTest(final Spec spec) {
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
+  public static Collection<Object[]> data() throws IOException {
     return data("delimiters.yml");
   }
 

handlebars/src/test/java/specs/InterpolationTest.java handlebars/src/test/java/mustache/specs/InterpolationTest.java

@@ -15,8 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
+import java.io.IOException;
 import java.util.Collection;
 
 import org.junit.runners.Parameterized.Parameters;
@@ -28,7 +29,7 @@ public InterpolationTest(final Spec spec) {
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
+  public static Collection<Object[]> data() throws IOException {
     return data("interpolation.yml");
   }
 }

handlebars/src/test/java/specs/InvertedTest.java handlebars/src/test/java/mustache/specs/InvertedTest.java

@@ -15,8 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
+import java.io.IOException;
 import java.util.Collection;
 
 import org.junit.runners.Parameterized.Parameters;
@@ -28,7 +29,7 @@ public InvertedTest(final Spec spec) {
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
+  public static Collection<Object[]> data() throws IOException {
     return data("inverted.yml");
   }
 }

handlebars/src/test/java/specs/LambdasTest.java handlebars/src/test/java/mustache/specs/LambdasTest.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -144,7 +144,7 @@ public Object apply(final Object scope, final Template template)
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
-    return data("lambdas.yml");
+  public static Collection<Object[]> data() throws IOException {
+    return data("~lambdas.yml");
   }
 }

handlebars/src/test/java/specs/PartialsTest.java handlebars/src/test/java/mustache/specs/PartialsTest.java

@@ -15,8 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -61,7 +62,7 @@ protected Handlebars configure(final Handlebars handlebars) {
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
+  public static Collection<Object[]> data() throws IOException {
     return data("partials.yml");
   }
 }

handlebars/src/test/java/specs/SectionsTest.java handlebars/src/test/java/mustache/specs/SectionsTest.java

@@ -15,8 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
+import java.io.IOException;
 import java.util.Collection;
 
 import org.junit.runners.Parameterized.Parameters;
@@ -28,7 +29,7 @@ public SectionsTest(final Spec spec) {
   }
 
   @Parameters
-  public static Collection<Object[]> data() {
+  public static Collection<Object[]> data() throws IOException {
     return data("sections.yml");
   }
 }

handlebars/src/test/java/specs/SkipTestException.java handlebars/src/test/java/mustache/specs/SkipTestException.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
 import org.junit.internal.AssumptionViolatedException;
 

handlebars/src/test/java/specs/Spec.java handlebars/src/test/java/mustache/specs/Spec.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
 import java.util.Map;
 

handlebars/src/test/java/specs/SpecResourceLocator.java handlebars/src/test/java/mustache/specs/SpecResourceLocator.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
 import java.io.IOException;
 import java.io.Reader;

handlebars/src/test/java/specs/SpecRunner.java handlebars/src/test/java/mustache/specs/SpecRunner.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

handlebars/src/test/java/specs/SpecTest.java handlebars/src/test/java/mustache/specs/SpecTest.java

@@ -15,17 +15,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package specs;
+package mustache.specs;
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.ComparisonFailure;
 import org.junit.Test;
@@ -82,7 +84,7 @@ public void run() throws HandlebarsException, IOException {
     }
   }
 
-  public static Collection<Object[]> data(final String filename) {
+  public static Collection<Object[]> data(final String filename) throws IOException {
     return data(SpecTest.class, filename);
   }
 
@@ -92,25 +94,26 @@ public static String path(final Class<?> loader) {
 
   @SuppressWarnings("unchecked")
   public static Collection<Object[]> data(final Class<?> loader,
-      final String filename) {
+      final String filename) throws IOException {
     Constructor constructor = new Constructor();
     constructor.addTypeDescription(new TypeDescription(Blog.class, "!blog"));
     constructor.addTypeDescription(new TypeDescription(Comment.class,
         "!comment"));
+    constructor.addTypeDescription(new TypeDescription(Map.class,
+        "!code"));
 
     Yaml yaml = new Yaml(constructor);
 
     String location = path(loader) + filename;
-    Map<String, Object> data =
-        (Map<String, Object>) yaml.load(
-            SpecTest.class.getResourceAsStream(location));
+    String input = FileUtils.readFileToString(new File("src/test/resources", location));
+    Map<String, Object> data = (Map<String, Object>) yaml.load(input);
     List<Map<String, Object>> tests =
         (List<Map<String, Object>>) data.get("tests");
     int number = 0;
     Collection<Object[]> dataset = new ArrayList<Object[]>();
     for (Map<String, Object> test : tests) {
       test.put("number", number++);
-      dataset.add(new Object[] {new Spec(test) });
+      dataset.add(new Object[]{new Spec(test) });
     }
     return dataset;
   }
@@ -153,7 +156,7 @@ private void run(final Spec spec) throws IOException {
       assertEquals(expected, output);
       report.append("OUTPUT:");
       report.append(output);
-    } catch(HandlebarsException ex) {
+    } catch (HandlebarsException ex) {
       Handlebars.error(ex.getMessage());
     } catch (ComparisonFailure ex) {
       report.append("FOUND:");