Cleanup commented out code and expected test results

jasmith-hs · jasmith-hs · commit 3aff6ac4e92e · 2023-06-12T14:18:33.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/util/EagerContextWatcher.java b/src/main/java/com/hubspot/jinjava/util/EagerContextWatcher.java
@@ -209,12 +209,7 @@ private static Map<String, Object> getBasicSpeculativeBindings(
             .peek(
               entry -> ((OneTimeReconstructible) entry.getValue()).setReconstructed(true)
             )
-            .collect(
-              Collectors.toMap(
-                Entry::getKey,
-                entry -> entry.getValue() //((OneTimeReconstructible) entry.getValue()).getOriginalValue()
-              )
-            )
+            .collect(Collectors.toMap(Entry::getKey, Entry::getValue))
         );
     }
     return eagerExecutionResult
@@ -245,10 +240,7 @@ private static Map<String, Object> getBasicSpeculativeBindings(
             ) {
               throw new CannotReconstructValueException(entry.getKey());
             }
-            return new AbstractMap.SimpleImmutableEntry<>(
-              entry.getKey(),
-              contextValue //((DeferredValue) contextValue).getOriginalValue()
-            );
+            return new AbstractMap.SimpleImmutableEntry<>(entry.getKey(), contextValue);
           }
           return null;
         }
@@ -262,15 +254,7 @@ private static Map<String, Object> getBasicSpeculativeBindings(
             ((DeferredValue) entry.getValue()).getOriginalValue() == null
           )
       )
-      .collect(
-        Collectors.toMap(
-          Entry::getKey,
-          entry -> entry.getValue()
-          //            entry.getValue() instanceof DeferredValue
-          //              ? ((DeferredValue) entry.getValue()).getOriginalValue()
-          //              : entry.getValue()
-        )
-      );
+      .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
   }
 
   private static Map<String, Object> getAllSpeculativeBindings(
@@ -383,9 +367,6 @@ private static Object getOriginalValue(
     boolean isFullyResolved
   ) {
     if (eagerChildContextConfig.takeNewValue || isFullyResolved) {
-      if (e.getValue() instanceof DeferredValue) {
-        //        return ((DeferredValue) e.getValue()).getOriginalValue();
-      }
       return e.getValue();
     }
 
@@ -395,7 +376,7 @@ private static Object getOriginalValue(
         .get(e.getKey())
         .equals(getObjectOrHashCode(((DeferredValue) e.getValue()).getOriginalValue()))
     ) {
-      return e.getValue(); //((DeferredValue) e.getValue()).getOriginalValue();
+      return e.getValue();
     }
 
     // This is necessary if a state-changing function, such as .update()
diff --git a/src/test/java/com/hubspot/jinjava/EagerTest.java b/src/test/java/com/hubspot/jinjava/EagerTest.java
@@ -1367,8 +1367,17 @@ public void itAllowsDeferredLazyReferenceToGetOverriddenSecondPass() {
   }
 
   @Test
-  public void itE() {
-    interpreter.getContext().put("request", DeferredValue.instance());
-    expectedTemplateInterpreter.assertExpectedOutput("e");
+  public void itCommitsVariablesFromDoTagWhenPartiallyResolved() {
+    expectedTemplateInterpreter.assertExpectedOutput(
+      "commits-variables-from-do-tag-when-partially-resolved"
+    );
+  }
+
+  @Test
+  public void itCommitsVariablesFromDoTagWhenPartiallyResolvedSecondPass() {
+    interpreter.getContext().put("deferred", "resolved");
+    expectedTemplateInterpreter.assertExpectedNonEagerOutput(
+      "commits-variables-from-do-tag-when-partially-resolved.expected"
+    );
   }
 }
diff --git a/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.expected.expected.jinja b/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.expected.expected.jinja
@@ -0,0 +1,2 @@
+L1: ['a']
+L2: ['b', 'resolved']
diff --git a/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.expected.jinja b/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.expected.jinja
@@ -0,0 +1,7 @@
+{% do %}
+
+
+{% set list2 = ['b'] %}{% do list2.append(deferred) %}
+{% enddo %}
+L1: ['a']
+L2: {{ list2 }}
diff --git a/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.jinja b/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.jinja
@@ -4,4 +4,4 @@
 {% do list2.append(deferred) %}
 {% enddo %}
 L1: {{ list1 }}
-L2: {{ list2 }}
+L2: {{ list2 }}
diff --git a/src/test/resources/eager/e.expected.jinja b/src/test/resources/eager/e.expected.jinja
