Add template keys verificaion for check() method.

Author: javadev

src/main/java/com/github/underscore/$.java

@@ -137,23 +137,42 @@ public List<String> check(Map<K, V> value) {
             final String escape = TEMPLATE_SETTINGS.get("escape");
             String result = template;
             final List<String> notFound = new ArrayList<String>();
+            final List<String> valueKeys = new ArrayList<String>();
             for (final Map.Entry<K, V> element : value.entrySet()) {
+                final String key = "" + ((Map.Entry) element).getKey();
                 java.util.regex.Matcher matcher = java.util.regex.Pattern.compile(interpolate.replace(ALL_SYMBOLS,
-                    "\\s*\\Q" + ((Map.Entry) element).getKey() + "\\E\\s*")).matcher(result);
+                    "\\s*\\Q" + key + "\\E\\s*")).matcher(result);
                 boolean isFound = matcher.find();
                 result = matcher.replaceAll(String.valueOf(((Map.Entry) element).getValue()));
                 matcher = java.util.regex.Pattern.compile(escape.replace(ALL_SYMBOLS,
-                    "\\s*\\Q" + ((Map.Entry) element).getKey() + "\\E\\s*")).matcher(result);
+                    "\\s*\\Q" + key + "\\E\\s*")).matcher(result);
                 isFound |= matcher.find();
                 result = matcher.replaceAll(escape(String.valueOf(((Map.Entry) element).getValue())));
                 matcher = java.util.regex.Pattern.compile(evaluate.replace(ALL_SYMBOLS,
-                    "\\s*\\Q" + ((Map.Entry) element).getKey() + "\\E\\s*")).matcher(result);
+                    "\\s*\\Q" + key + "\\E\\s*")).matcher(result);
                 isFound |= matcher.find();
                 result = matcher.replaceAll(String.valueOf(((Map.Entry) element).getValue()));
                 if (!isFound) {
-                    notFound.add("" + ((Map.Entry) element).getKey());
+                    notFound.add(key);
                 }
+                valueKeys.add(key);
             }
+            final List<String> templateVars = new ArrayList<String>();
+            java.util.regex.Matcher matcher = java.util.regex.Pattern.compile(interpolate).matcher(result);
+            while (matcher.find()) {
+                templateVars.add(matcher.group(1).trim());
+            }
+            result = matcher.replaceAll("");
+            matcher = java.util.regex.Pattern.compile(escape).matcher(result);
+            while (matcher.find()) {
+                templateVars.add(matcher.group(1).trim());
+            }
+            result = matcher.replaceAll("");
+            matcher = java.util.regex.Pattern.compile(evaluate).matcher(result);
+            while (matcher.find()) {
+                templateVars.add(matcher.group(1).trim());
+            }
+            notFound.addAll(difference(templateVars, valueKeys));
             return notFound;
         }
     }

src/test/java/com/github/underscore/UtilityTest.java

@@ -266,6 +266,20 @@ public void templateCheck() {
         assertEquals("name2", compiled.check(new LinkedHashMap<String, Object>() { {
             put("name2", "moe"); } }).get(0));
     }
+
+    @Test
+    public void templateCheck2() {
+        Template<Map<String, Object>> compiled = $.template("hello: <%= name %> <%= name2 %>");
+        assertEquals("name2", compiled.check(new LinkedHashMap<String, Object>() { {
+            put("name", "moe"); } }).get(0));
+        Template<Map<String, Object>> compiled2 = $.template("hello: <%- name %> <%- name2 %>");
+        assertEquals("name2", compiled2.check(new LinkedHashMap<String, Object>() { {
+            put("name", "moe"); } }).get(0));
+        Template<Map<String, Object>> compiled3 = $.template("hello: <% name %> <% name2 %>");
+        assertEquals("name2", compiled3.check(new LinkedHashMap<String, Object>() { {
+            put("name", "moe"); } }).get(0));
+    }
+
 /*
 var fortmatted = _.format("hello: {}", "moe");
 => "hello: moe"