Merge pull request #1204 from HubSpot/cleanup-eager-fixtures

Cleanup eager execution test fixtures
HubSpot · Sep 12, 2024 · 3e243de · 3e243de
2 parents 9742adf + f1742bc
commit 3e243de
Show file tree

Hide file tree

Showing 247 changed files with 341 additions and 298 deletions.
diff --git a/src/test/java/com/hubspot/jinjava/EagerTest.java b/src/test/java/com/hubspot/jinjava/EagerTest.java
diff --git a/...to-get-overridden.expected.expected.jinja → ...t-overridden/test.expected.expected.jinja b/...to-get-overridden.expected.expected.jinja → ...t-overridden/test.expected.expected.jinja
diff --git a/...eference-to-get-overridden.expected.jinja → ...nce-to-get-overridden/test.expected.jinja b/...eference-to-get-overridden.expected.jinja → ...nce-to-get-overridden/test.expected.jinja
diff --git a/...ed-lazy-reference-to-get-overridden.jinja → ...zy-reference-to-get-overridden/test.jinja b/...ed-lazy-reference-to-get-overridden.jinja → ...zy-reference-to-get-overridden/test.jinja
diff --git a/...eta-context-var-overriding.expected.jinja → ...ontext-var-overriding/test.expected.jinja b/...eta-context-var-overriding.expected.jinja → ...ontext-var-overriding/test.expected.jinja
diff --git a/.../allows-meta-context-var-overriding.jinja → ...ws-meta-context-var-overriding/test.jinja b/.../allows-meta-context-var-overriding.jinja → ...ws-meta-context-var-overriding/test.jinja
diff --git a/...ation-in-resolved-for-loop.expected.jinja → ...-in-resolved-for-loop/test.expected.jinja b/...ation-in-resolved-for-loop.expected.jinja → ...-in-resolved-for-loop/test.expected.jinja
diff --git a/...s-modification-in-resolved-for-loop.jinja → ...ification-in-resolved-for-loop/test.jinja b/...s-modification-in-resolved-for-loop.jinja → ...ification-in-resolved-for-loop/test.jinja
diff --git a/src/test/resources/eager/allows-variable-sharing-alias-name.jinja b/src/test/resources/eager/allows-variable-sharing-alias-name.jinja
diff --git a/...est/resources/tags/macrotag/filters.jinja → ...variable-sharing-alias-name/filters.jinja b/...est/resources/tags/macrotag/filters.jinja → ...variable-sharing-alias-name/filters.jinja
diff --git a/...ariable-sharing-alias-name.expected.jinja → ...le-sharing-alias-name/test.expected.jinja b/...ariable-sharing-alias-name.expected.jinja → ...le-sharing-alias-name/test.expected.jinja
@@ -1,5 +1,5 @@
 {% do %}\
-{% set current_path = 'filters.jinja' %}\
+{% set current_path = 'eager/allows-variable-sharing-alias-name/filters.jinja' %}\
 {% set __temp_import_alias_854547461__ = {}  %}\
 {% for __ignored__ in [0] %}
 {% set bar = deferred %}\
@@ -8,10 +8,10 @@
 {% set filters = {}  %}\
 {% do __temp_import_alias_854547461__.update({'filters': filters}) %}\
 {% do filters.update(deferred) %}
-{% do __temp_import_alias_854547461__.update({'bar': bar,'foo': 123,'import_resource_path': 'filters.jinja','filters': filters}) %}\
+{% do __temp_import_alias_854547461__.update({'bar': bar,'foo': 123,'import_resource_path': 'eager/allows-variable-sharing-alias-name/filters.jinja','filters': filters}) %}\
 {% endfor %}\
 {% set filters = __temp_import_alias_854547461__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/allows-variable-sharing-alias-name/test.jinja' %}\
 {% enddo %}
 
 {{ filters }}
diff --git a/src/test/resources/eager/allows-variable-sharing-alias-name/test.jinja b/src/test/resources/eager/allows-variable-sharing-alias-name/test.jinja
@@ -0,0 +1,3 @@
+{% import './filters.jinja' as filters %}
+
+{{ filters }}
diff --git a/...artially-resolved.expected.expected.jinja → ...lly-resolved/test.expected.expected.jinja b/...artially-resolved.expected.expected.jinja → ...lly-resolved/test.expected.expected.jinja
diff --git a/...ag-when-partially-resolved.expected.jinja → ...en-partially-resolved/test.expected.jinja b/...ag-when-partially-resolved.expected.jinja → ...en-partially-resolved/test.expected.jinja
diff --git a/...from-do-tag-when-partially-resolved.jinja → ...do-tag-when-partially-resolved/test.jinja b/...from-do-tag-when-partially-resolved.jinja → ...do-tag-when-partially-resolved/test.jinja
diff --git a/...defers-with-multiple-loops.expected.jinja → ...s-with-multiple-loops/test.expected.jinja b/...defers-with-multiple-loops.expected.jinja → ...s-with-multiple-loops/test.expected.jinja
diff --git a/...orrectly-defers-with-multiple-loops.jinja → ...tly-defers-with-multiple-loops/test.jinja b/...orrectly-defers-with-multiple-loops.jinja → ...tly-defers-with-multiple-loops/test.jinja
diff --git a/...deferred-argument.expected.expected.jinja → ...red-argument/test.expected.expected.jinja b/...deferred-argument.expected.expected.jinja → ...red-argument/test.expected.expected.jinja
diff --git a/...tag-with-deferred-argument.expected.jinja → ...ith-deferred-argument/test.expected.jinja b/...tag-with-deferred-argument.expected.jinja → ...ith-deferred-argument/test.expected.jinja
diff --git a/...ers-call-tag-with-deferred-argument.jinja → ...all-tag-with-deferred-argument/test.jinja b/...ers-call-tag-with-deferred-argument.jinja → ...all-tag-with-deferred-argument/test.jinja
diff --git a/...ger/defers-caller.expected.expected.jinja → ...efers-caller/test.expected.expected.jinja b/...ger/defers-caller.expected.expected.jinja → ...efers-caller/test.expected.expected.jinja
diff --git a/...ources/eager/defers-caller.expected.jinja → ...s/eager/defers-caller/test.expected.jinja b/...ources/eager/defers-caller.expected.jinja → ...s/eager/defers-caller/test.expected.jinja
diff --git a/src/test/resources/eager/defers-caller.jinja → .../resources/eager/defers-caller/test.jinja b/src/test/resources/eager/defers-caller.jinja → .../resources/eager/defers-caller/test.jinja
diff --git a/...eferred-set-block.expected.expected.jinja → ...ed-set-block/test.expected.expected.jinja b/...eferred-set-block.expected.expected.jinja → ...ed-set-block/test.expected.expected.jinja
diff --git a/...-within-deferred-set-block.expected.jinja → ...in-deferred-set-block/test.expected.jinja b/...-within-deferred-set-block.expected.jinja → ...in-deferred-set-block/test.expected.jinja
diff --git a/...s-changes-within-deferred-set-block.jinja → ...nges-within-deferred-set-block/test.jinja b/...s-changes-within-deferred-set-block.jinja → ...nges-within-deferred-set-block/test.jinja
diff --git a/...rs-eager-child-scoped-vars.expected.jinja → ...ger-child-scoped-vars/test.expected.jinja b/...rs-eager-child-scoped-vars.expected.jinja → ...ger-child-scoped-vars/test.expected.jinja
diff --git a/...ager/defers-eager-child-scoped-vars.jinja → ...defers-eager-child-scoped-vars/test.jinja b/...ager/defers-eager-child-scoped-vars.jinja → ...defers-eager-child-scoped-vars/test.jinja
diff --git a/...ces/eager/defers-ifchanged.expected.jinja → ...ager/defers-ifchanged/test.expected.jinja b/...ces/eager/defers-ifchanged.expected.jinja → ...ager/defers-ifchanged/test.expected.jinja
diff --git a/...st/resources/eager/defers-ifchanged.jinja → ...sources/eager/defers-ifchanged/test.jinja b/...st/resources/eager/defers-ifchanged.jinja → ...sources/eager/defers-ifchanged/test.jinja
diff --git a/...es/eager/defers-large-loop.expected.jinja → ...ger/defers-large-loop/test.expected.jinja b/...es/eager/defers-large-loop.expected.jinja → ...ger/defers-large-loop/test.expected.jinja
diff --git a/...t/resources/eager/defers-large-loop.jinja → ...ources/eager/defers-large-loop/test.jinja b/...t/resources/eager/defers-large-loop.jinja → ...ources/eager/defers-large-loop/test.jinja
diff --git a/...-meta-context-var.expected.expected.jinja → ...-context-var/test.expected.expected.jinja b/...-meta-context-var.expected.expected.jinja → ...-context-var/test.expected.expected.jinja
diff --git a/...p-setting-meta-context-var.expected.jinja → ...ting-meta-context-var/test.expected.jinja b/...p-setting-meta-context-var.expected.jinja → ...ting-meta-context-var/test.expected.jinja
diff --git a/...efers-loop-setting-meta-context-var.jinja → ...-loop-setting-meta-context-var/test.jinja b/...efers-loop-setting-meta-context-var.jinja → ...-loop-setting-meta-context-var/test.jinja
diff --git a/...ers-macro-for-do-and-print.expected.jinja → ...acro-for-do-and-print/test.expected.jinja b/...ers-macro-for-do-and-print.expected.jinja → ...acro-for-do-and-print/test.expected.jinja
diff --git a/...eager/defers-macro-for-do-and-print.jinja → .../defers-macro-for-do-and-print/test.jinja b/...eager/defers-macro-for-do-and-print.jinja → .../defers-macro-for-do-and-print/test.jinja
diff --git a/...cro-in-expression.expected.expected.jinja → ...n-expression/test.expected.expected.jinja b/...cro-in-expression.expected.expected.jinja → ...n-expression/test.expected.expected.jinja
diff --git a/...defers-macro-in-expression.expected.jinja → ...s-macro-in-expression/test.expected.jinja b/...defers-macro-in-expression.expected.jinja → ...s-macro-in-expression/test.expected.jinja
diff --git a/...es/eager/defers-macro-in-expression.jinja → ...ger/defers-macro-in-expression/test.jinja b/...es/eager/defers-macro-in-expression.jinja → ...ger/defers-macro-in-expression/test.jinja
diff --git a/.../eager/defers-macro-in-for.expected.jinja → ...r/defers-macro-in-for/test.expected.jinja b/.../eager/defers-macro-in-for.expected.jinja → ...r/defers-macro-in-for/test.expected.jinja
diff --git a/...resources/eager/defers-macro-in-for.jinja → ...rces/eager/defers-macro-in-for/test.jinja b/...resources/eager/defers-macro-in-for.jinja → ...rces/eager/defers-macro-in-for/test.jinja
diff --git a/...s/eager/defers-macro-in-if.expected.jinja → ...er/defers-macro-in-if/test.expected.jinja b/...s/eager/defers-macro-in-if.expected.jinja → ...er/defers-macro-in-if/test.expected.jinja
diff --git a/.../resources/eager/defers-macro-in-if.jinja → ...urces/eager/defers-macro-in-if/test.jinja b/.../resources/eager/defers-macro-in-if.jinja → ...urces/eager/defers-macro-in-if/test.jinja
diff --git a/...r/defers-on-immutable-mode.expected.jinja → ...ers-on-immutable-mode/test.expected.jinja b/...r/defers-on-immutable-mode.expected.jinja → ...ers-on-immutable-mode/test.expected.jinja
diff --git a/...rces/eager/defers-on-immutable-mode.jinja → ...eager/defers-on-immutable-mode/test.jinja b/...rces/eager/defers-on-immutable-mode.jinja → ...eager/defers-on-immutable-mode/test.jinja
diff --git a/src/test/resources/eager/does-not-override-import-modification-in-for.jinja b/src/test/resources/eager/does-not-override-import-modification-in-for.jinja
diff --git a/...dification-in-for.expected.expected.jinja → ...ation-in-for/test.expected.expected.jinja b/...dification-in-for.expected.expected.jinja → ...ation-in-for/test.expected.expected.jinja
diff --git a/...import-modification-in-for.expected.jinja → ...t-modification-in-for/test.expected.jinja b/...import-modification-in-for.expected.jinja → ...t-modification-in-for/test.expected.jinja
@@ -1,7 +1,7 @@
 {% set foo = 'start' %}\
 {% for __ignored__ in [0] %}
 {% do %}\
-{% set current_path = 'deferred-modification.jinja' %}\
+{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
 {% set __temp_import_alias_3016318__ = {}  %}\
 {% for __ignored__ in [0] %}\
 {% if deferred %}
@@ -13,14 +13,14 @@
 
 {% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_import_alias_3016318__.update({'foo': foo}) %}
-{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}\
+{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
 {% set bar1 = __temp_import_alias_3016318__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/does-not-override-import-modification-in-for/test.jinja' %}\
 {% enddo %}
 {{ bar1.foo }}
 {% do %}\
-{% set current_path = 'deferred-modification.jinja' %}\
+{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
 {% set __temp_import_alias_3016319__ = {}  %}\
 {% for __ignored__ in [0] %}\
 {% if deferred %}
@@ -32,15 +32,15 @@
 
 {% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_import_alias_3016319__.update({'foo': foo}) %}
-{% do __temp_import_alias_3016319__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\
+{% do __temp_import_alias_3016319__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
 {% set bar2 = __temp_import_alias_3016319__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/does-not-override-import-modification-in-for/test.jinja' %}\
 {% enddo %}
 {{ bar2.foo }}
 
 {% do %}\
-{% set current_path = 'deferred-modification.jinja' %}\
+{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
 {% set __temp_import_alias_3016318__ = {}  %}\
 {% for __ignored__ in [0] %}\
 {% if deferred %}
@@ -52,14 +52,14 @@
 
 {% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_import_alias_3016318__.update({'foo': foo}) %}
-{% do __temp_import_alias_3016318__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\
+{% do __temp_import_alias_3016318__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
 {% set bar1 = __temp_import_alias_3016318__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/does-not-override-import-modification-in-for/test.jinja' %}\
 {% enddo %}
 {{ bar1.foo }}
 {% do %}\
-{% set current_path = 'deferred-modification.jinja' %}\
+{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
 {% set __temp_import_alias_3016319__ = {}  %}\
 {% for __ignored__ in [0] %}\
 {% if deferred %}
@@ -71,10 +71,10 @@
 
 {% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_import_alias_3016319__.update({'foo': foo}) %}
-{% do __temp_import_alias_3016319__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\
+{% do __temp_import_alias_3016319__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
 {% set bar2 = __temp_import_alias_3016319__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/does-not-override-import-modification-in-for/test.jinja' %}\
 {% enddo %}
 {{ bar2.foo }}
 {% endfor %}

diff --git a/src/test/resources/eager/does-not-override-import-modification-in-for/test.jinja b/src/test/resources/eager/does-not-override-import-modification-in-for/test.jinja
@@ -0,0 +1,8 @@
+{% set foo = 'start' %}
+{% for i in range(2) %}
+{% import "../supplements/deferred-modification.jinja" as bar1 %}
+{{ bar1.foo }}
+{% import "../supplements/deferred-modification.jinja" as bar2 %}
+{{ bar2.foo }}
+{% endfor %}
+{{ foo }}
diff --git a/...ot-reconstruct-extra-times.expected.jinja → ...construct-extra-times/test.expected.jinja b/...ot-reconstruct-extra-times.expected.jinja → ...construct-extra-times/test.expected.jinja
diff --git a/...er/does-not-reconstruct-extra-times.jinja → ...es-not-reconstruct-extra-times/test.jinja b/...er/does-not-reconstruct-extra-times.jinja → ...es-not-reconstruct-extra-times/test.jinja
diff --git a/...able-in-set-in-wrong-scope.expected.jinja → ...in-set-in-wrong-scope/test.expected.jinja b/...able-in-set-in-wrong-scope.expected.jinja → ...in-set-in-wrong-scope/test.expected.jinja
diff --git a/...ruct-variable-in-set-in-wrong-scope.jinja → ...variable-in-set-in-wrong-scope/test.jinja b/...ruct-variable-in-set-in-wrong-scope.jinja → ...variable-in-set-in-wrong-scope/test.jinja
diff --git a/...le-in-wrong-scope.expected.expected.jinja → ...-wrong-scope/test.expected.expected.jinja b/...le-in-wrong-scope.expected.expected.jinja → ...-wrong-scope/test.expected.expected.jinja
diff --git a/...ct-variable-in-wrong-scope.expected.jinja → ...riable-in-wrong-scope/test.expected.jinja b/...ct-variable-in-wrong-scope.expected.jinja → ...riable-in-wrong-scope/test.expected.jinja
diff --git a/...reconstruct-variable-in-wrong-scope.jinja → ...struct-variable-in-wrong-scope/test.jinja b/...reconstruct-variable-in-wrong-scope.jinja → ...struct-variable-in-wrong-scope/test.jinja
diff --git a/...rential-defer-for-set-vars.expected.jinja → ...al-defer-for-set-vars/test.expected.jinja b/...rential-defer-for-set-vars.expected.jinja → ...al-defer-for-set-vars/test.expected.jinja
diff --git a/...-not-referential-defer-for-set-vars.jinja → ...referential-defer-for-set-vars/test.jinja b/...-not-referential-defer-for-set-vars.jinja → ...referential-defer-for-set-vars/test.jinja
diff --git a/...ffect-parent-from-eager-if.expected.jinja → ...-parent-from-eager-if/test.expected.jinja b/...ffect-parent-from-eager-if.expected.jinja → ...-parent-from-eager-if/test.expected.jinja
diff --git a/.../doesnt-affect-parent-from-eager-if.jinja → ...nt-affect-parent-from-eager-if/test.jinja b/.../doesnt-affect-parent-from-eager-if.jinja → ...nt-affect-parent-from-eager-if/test.jinja
diff --git a/...-append-in-deferred-if-tag.expected.jinja → ...nd-in-deferred-if-tag/test.expected.jinja b/...-append-in-deferred-if-tag.expected.jinja → ...nd-in-deferred-if-tag/test.expected.jinja
diff --git a/...nt-double-append-in-deferred-if-tag.jinja → ...uble-append-in-deferred-if-tag/test.jinja b/...nt-double-append-in-deferred-if-tag.jinja → ...uble-append-in-deferred-if-tag/test.jinja
diff --git a/...e-append-in-deferred-macro.expected.jinja → ...end-in-deferred-macro/test.expected.jinja b/...e-append-in-deferred-macro.expected.jinja → ...end-in-deferred-macro/test.expected.jinja
diff --git a/...snt-double-append-in-deferred-macro.jinja → ...ouble-append-in-deferred-macro/test.jinja b/...snt-double-append-in-deferred-macro.jinja → ...ouble-append-in-deferred-macro/test.jinja
diff --git a/...ble-append-in-deferred-set.expected.jinja → ...ppend-in-deferred-set/test.expected.jinja b/...ble-append-in-deferred-set.expected.jinja → ...ppend-in-deferred-set/test.expected.jinja
diff --git a/...oesnt-double-append-in-deferred-set.jinja → ...-double-append-in-deferred-set/test.jinja b/...oesnt-double-append-in-deferred-set.jinja → ...-double-append-in-deferred-set/test.jinja
diff --git a/...ager/doesnt-overwrite-elif.expected.jinja → ...doesnt-overwrite-elif/test.expected.jinja b/...ager/doesnt-overwrite-elif.expected.jinja → ...doesnt-overwrite-elif/test.expected.jinja
diff --git a/...sources/eager/doesnt-overwrite-elif.jinja → ...es/eager/doesnt-overwrite-elif/test.jinja b/...sources/eager/doesnt-overwrite-elif.jinja → ...es/eager/doesnt-overwrite-elif/test.jinja
diff --git a/...erly-defers-macro.expected.expected.jinja → ...defers-macro/test.expected.expected.jinja b/...erly-defers-macro.expected.expected.jinja → ...defers-macro/test.expected.expected.jinja
diff --git a/...eager/eagerly-defers-macro.expected.jinja → .../eagerly-defers-macro/test.expected.jinja b/...eager/eagerly-defers-macro.expected.jinja → .../eagerly-defers-macro/test.expected.jinja
diff --git a/...esources/eager/eagerly-defers-macro.jinja → ...ces/eager/eagerly-defers-macro/test.jinja b/...esources/eager/eagerly-defers-macro.jinja → ...ces/eager/eagerly-defers-macro/test.jinja
diff --git a/...s/eager/eagerly-defers-set.expected.jinja → ...er/eagerly-defers-set/test.expected.jinja b/...s/eager/eagerly-defers-set.expected.jinja → ...er/eagerly-defers-set/test.expected.jinja
diff --git a/.../resources/eager/eagerly-defers-set.jinja → ...urces/eager/eagerly-defers-set/test.jinja b/.../resources/eager/eagerly-defers-set.jinja → ...urces/eager/eagerly-defers-set/test.jinja
diff --git a/...er/evaluates-non-eager-set.expected.jinja → ...aluates-non-eager-set/test.expected.jinja b/...er/evaluates-non-eager-set.expected.jinja → ...aluates-non-eager-set/test.expected.jinja
diff --git a/...urces/eager/evaluates-non-eager-set.jinja → .../eager/evaluates-non-eager-set/test.jinja b/...urces/eager/evaluates-non-eager-set.jinja → .../eager/evaluates-non-eager-set/test.jinja
diff --git a/...ources/tags/macrotag/eager/settings.jinja → ...ification-in-aliased-macro/settings.jinja b/...ources/tags/macrotag/eager/settings.jinja → ...ification-in-aliased-macro/settings.jinja
diff --git a/...ls-on-modification-in-aliased-macro.jinja → ...-modification-in-aliased-macro/test.jinja b/...ls-on-modification-in-aliased-macro.jinja → ...-modification-in-aliased-macro/test.jinja
@@ -1,4 +1,4 @@
-{% import 'eager/settings.jinja' as shared %}
+{% import './settings.jinja' as shared %}
 
 {% if deferred %}
 {{ shared.load_settings() }}

diff --git a/...nside-reconstructed-string.expected.jinja → ...-reconstructed-string/test.expected.jinja b/...nside-reconstructed-string.expected.jinja → ...-reconstructed-string/test.expected.jinja
diff --git a/...d-words-inside-reconstructed-string.jinja → ...ds-inside-reconstructed-string/test.jinja b/...d-words-inside-reconstructed-string.jinja → ...ds-inside-reconstructed-string/test.jinja
diff --git a/...rs-filtered-macro.expected.expected.jinja → ...ltered-macro/test.expected.expected.jinja b/...rs-filtered-macro.expected.expected.jinja → ...ltered-macro/test.expected.expected.jinja
diff --git a/...ully-defers-filtered-macro.expected.jinja → ...defers-filtered-macro/test.expected.jinja b/...ully-defers-filtered-macro.expected.jinja → ...defers-filtered-macro/test.expected.jinja
diff --git a/...s/eager/fully-defers-filtered-macro.jinja → ...er/fully-defers-filtered-macro/test.jinja b/...s/eager/fully-defers-filtered-macro.jinja → ...er/fully-defers-filtered-macro/test.jinja
diff --git a/.../eager/handles-auto-escape.expected.jinja → ...r/handles-auto-escape/test.expected.jinja b/.../eager/handles-auto-escape.expected.jinja → ...r/handles-auto-escape/test.expected.jinja
diff --git a/...resources/eager/handles-auto-escape.jinja → ...rces/eager/handles-auto-escape/test.jinja b/...resources/eager/handles-auto-escape.jinja → ...rces/eager/handles-auto-escape/test.jinja
diff --git a/...et-in-deferred-if.expected.expected.jinja → ...-deferred-if/test.expected.expected.jinja b/...et-in-deferred-if.expected.expected.jinja → ...-deferred-if/test.expected.expected.jinja
diff --git a/...s-block-set-in-deferred-if.expected.jinja → ...ck-set-in-deferred-if/test.expected.jinja b/...s-block-set-in-deferred-if.expected.jinja → ...ck-set-in-deferred-if/test.expected.jinja
diff --git a/...er/handles-block-set-in-deferred-if.jinja → ...ndles-block-set-in-deferred-if/test.jinja b/...er/handles-block-set-in-deferred-if.jinja → ...ndles-block-set-in-deferred-if/test.jinja
diff --git a/...ing-name-in-macro.expected.expected.jinja → ...ame-in-macro/test.expected.expected.jinja b/...ing-name-in-macro.expected.expected.jinja → ...ame-in-macro/test.expected.expected.jinja
diff --git a/...les-clashing-name-in-macro.expected.jinja → ...lashing-name-in-macro/test.expected.jinja b/...les-clashing-name-in-macro.expected.jinja → ...lashing-name-in-macro/test.expected.jinja
diff --git a/...ager/handles-clashing-name-in-macro.jinja → ...handles-clashing-name-in-macro/test.jinja b/...ager/handles-clashing-name-in-macro.jinja → ...handles-clashing-name-in-macro/test.jinja
diff --git a/.../eager/handles-complex-raw.expected.jinja → ...r/handles-complex-raw/test.expected.jinja b/.../eager/handles-complex-raw.expected.jinja → ...r/handles-complex-raw/test.expected.jinja
diff --git a/...resources/eager/handles-complex-raw.jinja → ...rces/eager/handles-complex-raw/test.jinja b/...resources/eager/handles-complex-raw.jinja → ...rces/eager/handles-complex-raw/test.jinja
diff --git a/...e-in-deferred-for.expected.expected.jinja → ...deferred-for/test.expected.expected.jinja b/...e-in-deferred-for.expected.expected.jinja → ...deferred-for/test.expected.expected.jinja
diff --git a/...dles-cycle-in-deferred-for.expected.jinja → ...cycle-in-deferred-for/test.expected.jinja b/...dles-cycle-in-deferred-for.expected.jinja → ...cycle-in-deferred-for/test.expected.jinja
diff --git a/...eager/handles-cycle-in-deferred-for.jinja → .../handles-cycle-in-deferred-for/test.jinja b/...eager/handles-cycle-in-deferred-for.jinja → .../handles-cycle-in-deferred-for/test.jinja
diff --git a/...r/handles-cycle-with-quote.expected.jinja → ...dles-cycle-with-quote/test.expected.jinja b/...r/handles-cycle-with-quote.expected.jinja → ...dles-cycle-with-quote/test.expected.jinja
diff --git a/...rces/eager/handles-cycle-with-quote.jinja → ...eager/handles-cycle-with-quote/test.jinja b/...rces/eager/handles-cycle-with-quote.jinja → ...eager/handles-cycle-with-quote/test.jinja
diff --git a/...deferred-cycle-as.expected.expected.jinja → ...red-cycle-as/test.expected.expected.jinja b/...deferred-cycle-as.expected.expected.jinja → ...red-cycle-as/test.expected.expected.jinja
diff --git a/.../handles-deferred-cycle-as.expected.jinja → ...les-deferred-cycle-as/test.expected.jinja b/.../handles-deferred-cycle-as.expected.jinja → ...les-deferred-cycle-as/test.expected.jinja
diff --git a/...ces/eager/handles-deferred-cycle-as.jinja → ...ager/handles-deferred-cycle-as/test.jinja b/...ces/eager/handles-deferred-cycle-as.jinja → ...ager/handles-deferred-cycle-as/test.jinja
diff --git a/...op-var-from-macro.expected.expected.jinja → ...r-from-macro/test.expected.expected.jinja b/...op-var-from-macro.expected.expected.jinja → ...r-from-macro/test.expected.expected.jinja
diff --git a/...ed-for-loop-var-from-macro.expected.jinja → ...r-loop-var-from-macro/test.expected.jinja b/...ed-for-loop-var-from-macro.expected.jinja → ...r-loop-var-from-macro/test.expected.jinja
diff --git a/...es-deferred-for-loop-var-from-macro.jinja → ...ferred-for-loop-var-from-macro/test.jinja b/...es-deferred-for-loop-var-from-macro.jinja → ...ferred-for-loop-var-from-macro/test.jinja
diff --git a/...ed-from-import-as.expected.expected.jinja → ...om-import-as/test.expected.expected.jinja b/...ed-from-import-as.expected.expected.jinja → ...om-import-as/test.expected.expected.jinja
diff --git a/...es-deferred-from-import-as.expected.jinja → ...ferred-from-import-as/test.expected.jinja b/...es-deferred-from-import-as.expected.jinja → ...ferred-from-import-as/test.expected.jinja
diff --git a/...ger/handles-deferred-from-import-as.jinja → ...andles-deferred-from-import-as/test.jinja b/...ger/handles-deferred-from-import-as.jinja → ...andles-deferred-from-import-as/test.jinja
@@ -1,4 +1,4 @@
 {%- set myname = deferred + (3 + 4) -%}
-{%- from "macro-and-set.jinja" import foo as from_foo, bar as from_bar -%}
+{%- from "../supplements/macro-and-set.jinja" import foo as from_foo, bar as from_bar -%}
 from_foo: {{ from_foo() }}
 from_bar: {{ from_bar }}
diff --git a/...erred-import-vars.expected.expected.jinja → ...-import-vars/test.expected.expected.jinja b/...erred-import-vars.expected.expected.jinja → ...-import-vars/test.expected.expected.jinja
diff --git a/...ndles-deferred-import-vars.expected.jinja → ...-deferred-import-vars/test.expected.jinja b/...ndles-deferred-import-vars.expected.jinja → ...-deferred-import-vars/test.expected.jinja
@@ -8,18 +8,18 @@ bar: {{ bar }}
 ---
 {% set myname = deferred + 7 %}\
 {% do %}\
-{% set current_path = 'macro-and-set.jinja' %}\
+{% set current_path = 'eager/supplements/macro-and-set.jinja' %}\
 {% set __temp_import_alias_902286926__ = {}  %}\
 {% for __ignored__ in [0] %}
 {% set bar = myname + 19 %}\
 {% do __temp_import_alias_902286926__.update({'bar': bar}) %}
 Hello {{ myname }}
-{% do __temp_import_alias_902286926__.update({'import_resource_path': 'macro-and-set.jinja'}) %}\
+{% do __temp_import_alias_902286926__.update({'import_resource_path': 'eager/supplements/macro-and-set.jinja'}) %}\
 {% endfor %}\
 {% set simple = __temp_import_alias_902286926__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/handles-deferred-import-vars/test.jinja' %}\
 {% enddo %}\
-simple.foo: {% set deferred_import_resource_path = 'macro-and-set.jinja' %}\
+simple.foo: {% set deferred_import_resource_path = 'eager/supplements/macro-and-set.jinja' %}\
 {% macro simple.foo() %}\
 Hello {{ myname }}\
 {% endmacro %}\

diff --git a/.../eager/handles-deferred-import-vars.jinja → ...r/handles-deferred-import-vars/test.jinja b/.../eager/handles-deferred-import-vars.jinja → ...r/handles-deferred-import-vars/test.jinja
@@ -1,9 +1,9 @@
 {%- set myname = deferred + (1 + 2) -%}
-{%- from "macro-and-set.jinja" import foo, bar -%}
+{%- from "../supplements/macro-and-set.jinja" import foo, bar -%}
 foo: {{ foo() }}
 bar: {{ bar }}
 ---
 {% set myname = deferred + (3 + 4) -%}
-{%- import "macro-and-set.jinja" as simple -%}
+{%- import "../supplements/macro-and-set.jinja" as simple -%}
 simple.foo: {{ simple.foo() }}
 simple.bar: {{ simple.bar }}
diff --git a/.../handles-deferred-in-cycle.expected.jinja → ...les-deferred-in-cycle/test.expected.jinja b/.../handles-deferred-in-cycle.expected.jinja → ...les-deferred-in-cycle/test.expected.jinja
diff --git a/...ces/eager/handles-deferred-in-cycle.jinja → ...ager/handles-deferred-in-cycle/test.jinja b/...ces/eager/handles-deferred-in-cycle.jinja → ...ager/handles-deferred-in-cycle/test.jinja
diff --git a/...dles-deferred-in-ifchanged.expected.jinja → ...deferred-in-ifchanged/test.expected.jinja b/...dles-deferred-in-ifchanged.expected.jinja → ...deferred-in-ifchanged/test.expected.jinja
diff --git a/...eager/handles-deferred-in-ifchanged.jinja → .../handles-deferred-in-ifchanged/test.jinja b/...eager/handles-deferred-in-ifchanged.jinja → .../handles-deferred-in-ifchanged/test.jinja
diff --git a/...rred-in-namespace.expected.expected.jinja → ...in-namespace/test.expected.expected.jinja b/...rred-in-namespace.expected.expected.jinja → ...in-namespace/test.expected.expected.jinja
diff --git a/...dles-deferred-in-namespace.expected.jinja → ...deferred-in-namespace/test.expected.jinja b/...dles-deferred-in-namespace.expected.jinja → ...deferred-in-namespace/test.expected.jinja
diff --git a/...eager/handles-deferred-in-namespace.jinja → .../handles-deferred-in-namespace/test.jinja b/...eager/handles-deferred-in-namespace.jinja → .../handles-deferred-in-namespace/test.jinja
diff --git a/...ication-in-caller.expected.expected.jinja → ...on-in-caller/test.expected.expected.jinja b/...ication-in-caller.expected.expected.jinja → ...on-in-caller/test.expected.expected.jinja
diff --git a/...red-modification-in-caller.expected.jinja → ...odification-in-caller/test.expected.jinja b/...red-modification-in-caller.expected.jinja → ...odification-in-caller/test.expected.jinja
diff --git a/...les-deferred-modification-in-caller.jinja → ...eferred-modification-in-caller/test.jinja b/...les-deferred-modification-in-caller.jinja → ...eferred-modification-in-caller/test.jinja
diff --git a/...es-deferring-loop-variable.expected.jinja → ...ferring-loop-variable/test.expected.jinja b/...es-deferring-loop-variable.expected.jinja → ...ferring-loop-variable/test.expected.jinja
diff --git a/...ger/handles-deferring-loop-variable.jinja → ...andles-deferring-loop-variable/test.jinja b/...ger/handles-deferring-loop-variable.jinja → ...andles-deferring-loop-variable/test.jinja
diff --git a/src/test/resources/eager/handles-double-import-modification.jinja b/src/test/resources/eager/handles-double-import-modification.jinja
diff --git a/...port-modification.expected.expected.jinja → ...modification/test.expected.expected.jinja b/...port-modification.expected.expected.jinja → ...modification/test.expected.expected.jinja
diff --git a/...double-import-modification.expected.jinja → ...e-import-modification/test.expected.jinja b/...double-import-modification.expected.jinja → ...e-import-modification/test.expected.jinja
@@ -1,5 +1,5 @@
 {% do %}\
-{% set current_path = 'deferred-modification.jinja' %}\
+{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
 {% set __temp_import_alias_3016318__ = {}  %}\
 {% for __ignored__ in [0] %}\
 {% if deferred %}
@@ -11,14 +11,14 @@
 
 {% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_import_alias_3016318__.update({'foo': foo}) %}
-{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}\
+{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
 {% set bar1 = __temp_import_alias_3016318__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/handles-double-import-modification/test.jinja' %}\
 {% enddo %}
 ---
 {% do %}\
-{% set current_path = 'deferred-modification.jinja' %}\
+{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
 {% set __temp_import_alias_3016319__ = {}  %}\
 {% for __ignored__ in [0] %}\
 {% if deferred %}
@@ -30,11 +30,11 @@
 
 {% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_import_alias_3016319__.update({'foo': foo}) %}
-{% do __temp_import_alias_3016319__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}\
+{% do __temp_import_alias_3016319__.update({'foo': foo,'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
 {% set bar2 = __temp_import_alias_3016319__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/handles-double-import-modification/test.jinja' %}\
 {% enddo %}
 ---
 {{ bar1.foo }}
-{{ bar2.foo }}
+{{ bar2.foo }}
diff --git a/src/test/resources/eager/handles-double-import-modification/test.jinja b/src/test/resources/eager/handles-double-import-modification/test.jinja
@@ -0,0 +1,6 @@
+{% import "../supplements/deferred-modification.jinja" as bar1 %}
+---
+{% import "../supplements/deferred-modification.jinja" as bar2 %}
+---
+{{ bar1.foo }}
+{{ bar2.foo }}
diff --git a/...handles-eager-print-and-do.expected.jinja → ...es-eager-print-and-do/test.expected.jinja b/...handles-eager-print-and-do.expected.jinja → ...es-eager-print-and-do/test.expected.jinja
diff --git a/...es/eager/handles-eager-print-and-do.jinja → ...ger/handles-eager-print-and-do/test.jinja b/...es/eager/handles-eager-print-and-do.jinja → ...ger/handles-eager-print-and-do/test.jinja
diff --git a/...ence-modification.expected.expected.jinja → ...modification/test.expected.expected.jinja b/...ence-modification.expected.expected.jinja → ...modification/test.expected.expected.jinja
diff --git a/...ope-reference-modification.expected.jinja → ...eference-modification/test.expected.jinja b/...ope-reference-modification.expected.jinja → ...eference-modification/test.expected.jinja
diff --git a/...higher-scope-reference-modification.jinja → ...r-scope-reference-modification/test.jinja b/...higher-scope-reference-modification.jinja → ...r-scope-reference-modification/test.jinja
diff --git a/...dles-import-in-deferred-if.expected.jinja → ...import-in-deferred-if/test.expected.jinja b/...dles-import-in-deferred-if.expected.jinja → ...import-in-deferred-if/test.expected.jinja
@@ -1,21 +1,21 @@
 {% set primary_line_height = 100 %}\
 {% if deferred %}
 {% do %}\
-{% set current_path = '../settag/set-val.jinja' %}\
+{% set current_path = 'eager/supplements/set-val.jinja' %}\
 {% set __temp_import_alias_902286926__ = {}  %}\
 {% for __ignored__ in [0] %}\
 {% set primary_line_height = 42 %}\
 {% do __temp_import_alias_902286926__.update({'primary_line_height': primary_line_height}) %}\
-{% do __temp_import_alias_902286926__.update({'primary_line_height': 42,'import_resource_path': '../settag/set-val.jinja'}) %}\
+{% do __temp_import_alias_902286926__.update({'primary_line_height': 42,'import_resource_path': 'eager/supplements/set-val.jinja'}) %}\
 {% endfor %}\
 {% set simple = __temp_import_alias_902286926__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/handles-import-in-deferred-if/test.jinja' %}\
 {% enddo %}
 {% else %}
 {% do %}\
-{% set current_path = '../settag/set-val.jinja' %}\
+{% set current_path = 'eager/supplements/set-val.jinja' %}\
 {% set primary_line_height = 42 %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/handles-import-in-deferred-if/test.jinja' %}\
 {% enddo %}
 {% endif %}
 simple.primary_line_height (deferred): {{ simple.primary_line_height }}

diff --git a/...eager/handles-import-in-deferred-if.jinja → .../handles-import-in-deferred-if/test.jinja b/...eager/handles-import-in-deferred-if.jinja → .../handles-import-in-deferred-if/test.jinja
@@ -1,9 +1,9 @@
 {% set primary_line_height = 100 %}
 {% set secondary_line_height = 200 %}
 {% if deferred %}
-{% import "../settag/set-val.jinja" as simple %}
+{% import "../supplements/set-val.jinja" as simple %}
 {% else %}
-{% import "../settag/set-val.jinja" %}
+{% import "../supplements/set-val.jinja" %}
 {% endif %}
 simple.primary_line_height (deferred): {{ simple.primary_line_height }}
 primary_line_height (deferred): {{ primary_line_height }}

diff --git a/...s-import-with-macros-in-deferred-if.jinja → ...ort-with-macros-in-deferred-if/test.jinja b/...s-import-with-macros-in-deferred-if.jinja → ...ort-with-macros-in-deferred-if/test.jinja
@@ -1,8 +1,8 @@
 {% set myname = 'person' %}
 {% if deferred %}
-{%- import "macro-and-set.jinja" as simple -%}
+{%- import "../supplements/macro-and-set.jinja" as simple -%}
 {% else %}
-{%- import "macro-and-set.jinja" as simple -%}
+{%- import "../supplements/macro-and-set.jinja" as simple -%}
 {% endif %}
 simple.foo: {{ simple.foo() }}
 simple.bar: {{ simple.bar }}
diff --git a/...-deferred-in-loop.expected.expected.jinja → ...rred-in-loop/test.expected.expected.jinja b/...-deferred-in-loop.expected.expected.jinja → ...rred-in-loop/test.expected.expected.jinja
diff --git a/...r-against-deferred-in-loop.expected.jinja → ...inst-deferred-in-loop/test.expected.jinja b/...r-against-deferred-in-loop.expected.jinja → ...inst-deferred-in-loop/test.expected.jinja
diff --git a/...s-loop-var-against-deferred-in-loop.jinja → ...p-var-against-deferred-in-loop/test.jinja b/...s-loop-var-against-deferred-in-loop.jinja → ...p-var-against-deferred-in-loop/test.jinja
diff --git a/...s-non-deferred-import-vars.expected.jinja → ...-deferred-import-vars/test.expected.jinja b/...s-non-deferred-import-vars.expected.jinja → ...-deferred-import-vars/test.expected.jinja
diff --git a/...er/handles-non-deferred-import-vars.jinja → ...ndles-non-deferred-import-vars/test.jinja b/...er/handles-non-deferred-import-vars.jinja → ...ndles-non-deferred-import-vars/test.jinja
@@ -1,9 +1,9 @@
 {%- set myname = (1 + 2) -%}
-{%- from "macro-and-set.jinja" import foo, bar -%}
+{%- from "../supplements/macro-and-set.jinja" import foo, bar -%}
 foo: {{ foo() }}
 bar: {{ bar }}
 ---
 {% set myname = (3 + 4) -%}
-{%- import "macro-and-set.jinja" as simple -%}
+{%- import "../supplements/macro-and-set.jinja" as simple -%}
 simple.foo: {{ simple.foo() }}
 simple.bar: {{ simple.bar }}
diff --git a/...ndles-non-deferring-cycles.expected.jinja → ...-non-deferring-cycles/test.expected.jinja b/...ndles-non-deferring-cycles.expected.jinja → ...-non-deferring-cycles/test.expected.jinja
diff --git a/.../eager/handles-non-deferring-cycles.jinja → ...r/handles-non-deferring-cycles/test.jinja b/.../eager/handles-non-deferring-cycles.jinja → ...r/handles-non-deferring-cycles/test.jinja
diff --git a/...cation-when-source-is-lost.expected.jinja → ...n-when-source-is-lost/test.expected.jinja b/...cation-when-source-is-lost.expected.jinja → ...n-when-source-is-lost/test.expected.jinja
diff --git a/...ce-modification-when-source-is-lost.jinja → ...dification-when-source-is-lost/test.jinja b/...ce-modification-when-source-is-lost.jinja → ...dification-when-source-is-lost/test.jinja
diff --git a/src/test/resources/eager/handles-same-name-import-var.expected.expected.jinja b/src/test/resources/eager/handles-same-name-import-var.expected.expected.jinja
diff --git a/src/test/resources/eager/handles-same-name-import-var/set-var-and-deferred.jinja b/src/test/resources/eager/handles-same-name-import-var/set-var-and-deferred.jinja
@@ -0,0 +1,6 @@
+{% if deferred %}
+{% do %}{% set path = 'eager/handles-same-name-import-var/set-var-and-deferred.jinja' %}{% set value = null %}{% set my_var = {} %}{% set my_var = {'foo': 'bar'} %}{% set my_var = {'my_var': my_var} %}
+{% set value = deferred %}{% do my_var.update({"value": value}) %}
+{% do my_var.update({'import_resource_path': 'eager/handles-same-name-import-var/set-var-and-deferred.jinja','value': value}) %}{% set path = '' %}{% enddo %}
+{{ my_var }}
+{% endif %}
diff --git a/src/test/resources/eager/handles-same-name-import-var/test.expected.expected.jinja b/src/test/resources/eager/handles-same-name-import-var/test.expected.expected.jinja
@@ -0,0 +1 @@
+[fn:map_entry('import_resource_path', 'eager/handles-same-name-import-var/set-var-and-deferred.jinja'), fn:map_entry('my_var', {'my_var': {'foo': 'bar'} , 'value': 'resolved', 'import_resource_path': 'eager/handles-same-name-import-var/set-var-and-deferred.jinja'} ), fn:map_entry('path', ''), fn:map_entry('value', 'resolved')]
diff --git a/...ndles-same-name-import-var.expected.jinja → ...-same-name-import-var/test.expected.jinja b/...ndles-same-name-import-var.expected.jinja → ...-same-name-import-var/test.expected.jinja
@@ -1,6 +1,6 @@
 {% if deferred %}
 {% do %}\
-{% set current_path = '../settag/set-var-and-deferred.jinja' %}\
+{% set current_path = 'eager/handles-same-name-import-var/set-var-and-deferred.jinja' %}\
 {% set __temp_import_alias_1059697132__ = {}  %}\
 {% for __ignored__ in [0] %}\
 {% if deferred %}
@@ -9,7 +9,7 @@
 {% do __temp_import_alias_1059697132__.update({'path': path}) %}\
 {% set my_var = {'my_var': {'foo': 'bar'} }  %}\
 {% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}\
-{% set path = '../settag/set-var-and-deferred.jinja' %}\
+{% set path = 'eager/handles-same-name-import-var/set-var-and-deferred.jinja' %}\
 {% do __temp_import_alias_1059697132__.update({'path': path}) %}\
 {% set value = null %}\
 {% do __temp_import_alias_1059697132__.update({'value': value}) %}\
@@ -24,16 +24,16 @@
 {% set my_var = {'my_var': {'foo': 'bar'} }  %}\
 {% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}\
 {% do my_var.update({'value': value}) %}
-{% do my_var.update({'import_resource_path': '../settag/set-var-and-deferred.jinja', 'value': value}) %}\
+{% do my_var.update({'import_resource_path': 'eager/handles-same-name-import-var/set-var-and-deferred.jinja', 'value': value}) %}\
 {% set path = '' %}\
 {% do __temp_import_alias_1059697132__.update({'path': path}) %}\
 {% enddo %}
 {{ my_var }}
 {% endif %}
-{% do __temp_import_alias_1059697132__.update({'path': path,'import_resource_path': '../settag/set-var-and-deferred.jinja','value': value}) %}\
+{% do __temp_import_alias_1059697132__.update({'path': path,'import_resource_path': 'eager/handles-same-name-import-var/set-var-and-deferred.jinja','value': value}) %}\
 {% endfor %}\
 {% set my_var = __temp_import_alias_1059697132__ %}\
-{% set current_path = '' %}\
+{% set current_path = 'eager/handles-same-name-import-var/test.jinja' %}\
 {% enddo %}
 {{ filter:dictsort.filter(my_var, ____int3rpr3t3r____, false, 'key') }}
 {% endif %}
diff --git a/.../eager/handles-same-name-import-var.jinja → ...r/handles-same-name-import-var/test.jinja b/.../eager/handles-same-name-import-var.jinja → ...r/handles-same-name-import-var/test.jinja
@@ -1,4 +1,4 @@
 {% if deferred %}
-{% import '../settag/set-var-and-deferred.jinja' as my_var %}
+{% import './set-var-and-deferred.jinja' as my_var %}
 {{ my_var|dictsort(false, 'key') }}
 {% endif %}
diff --git a/...es-set-and-modified-in-for.expected.jinja → ...t-and-modified-in-for/test.expected.jinja b/...es-set-and-modified-in-for.expected.jinja → ...t-and-modified-in-for/test.expected.jinja
diff --git a/...ger/handles-set-and-modified-in-for.jinja → ...andles-set-and-modified-in-for/test.jinja b/...ger/handles-set-and-modified-in-for.jinja → ...andles-set-and-modified-in-for/test.jinja
diff --git a/...s/eager/handles-set-in-for.expected.jinja → ...er/handles-set-in-for/test.expected.jinja b/...s/eager/handles-set-in-for.expected.jinja → ...er/handles-set-in-for/test.expected.jinja
diff --git a/.../resources/eager/handles-set-in-for.jinja → ...urces/eager/handles-set-in-for/test.jinja b/.../resources/eager/handles-set-in-for.jinja → ...urces/eager/handles-set-in-for/test.jinja
diff --git a/...handles-set-in-inner-scope.expected.jinja → ...es-set-in-inner-scope/test.expected.jinja b/...handles-set-in-inner-scope.expected.jinja → ...es-set-in-inner-scope/test.expected.jinja
diff --git a/...es/eager/handles-set-in-inner-scope.jinja → ...ger/handles-set-in-inner-scope/test.jinja b/...es/eager/handles-set-in-inner-scope.jinja → ...ger/handles-set-in-inner-scope/test.jinja
diff --git a/...es-unknown-function-errors.expected.jinja → ...known-function-errors/test.expected.jinja b/...es-unknown-function-errors.expected.jinja → ...known-function-errors/test.expected.jinja
diff --git a/...ger/handles-unknown-function-errors.jinja → ...andles-unknown-function-errors/test.jinja b/...ger/handles-unknown-function-errors.jinja → ...andles-unknown-function-errors/test.jinja
diff --git a/...es-value-modified-in-macro.expected.jinja → ...lue-modified-in-macro/test.expected.jinja b/...es-value-modified-in-macro.expected.jinja → ...lue-modified-in-macro/test.expected.jinja
diff --git a/...ger/handles-value-modified-in-macro.jinja → ...andles-value-modified-in-macro/test.jinja b/...ger/handles-value-modified-in-macro.jinja → ...andles-value-modified-in-macro/test.jinja
diff --git a/.../has-proper-line-stripping.expected.jinja → ...proper-line-stripping/test.expected.jinja b/.../has-proper-line-stripping.expected.jinja → ...proper-line-stripping/test.expected.jinja
diff --git a/...ces/eager/has-proper-line-stripping.jinja → ...ager/has-proper-line-stripping/test.jinja b/...ces/eager/has-proper-line-stripping.jinja → ...ager/has-proper-line-stripping/test.jinja
diff --git a/...ications-in-scope.expected.expected.jinja → ...ons-in-scope/test.expected.expected.jinja b/...ications-in-scope.expected.expected.jinja → ...ons-in-scope/test.expected.expected.jinja
diff --git a/...cro-modifications-in-scope.expected.jinja → ...odifications-in-scope/test.expected.jinja b/...cro-modifications-in-scope.expected.jinja → ...odifications-in-scope/test.expected.jinja
diff --git a/.../keeps-macro-modifications-in-scope.jinja → ...s-macro-modifications-in-scope/test.jinja b/.../keeps-macro-modifications-in-scope.jinja → ...s-macro-modifications-in-scope/test.jinja
diff --git a/...-max-macro-recursion-depth.expected.jinja → ...macro-recursion-depth/test.expected.jinja b/...-max-macro-recursion-depth.expected.jinja → ...macro-recursion-depth/test.expected.jinja
diff --git a/...ger/keeps-max-macro-recursion-depth.jinja → ...eeps-max-macro-recursion-depth/test.jinja b/...ger/keeps-max-macro-recursion-depth.jinja → ...eeps-max-macro-recursion-depth/test.jinja
diff --git a/...e-isolation-from-for-loops.expected.jinja → ...lation-from-for-loops/test.expected.jinja b/...e-isolation-from-for-loops.expected.jinja → ...lation-from-for-loops/test.expected.jinja
diff --git a/...eeps-scope-isolation-from-for-loops.jinja → ...scope-isolation-from-for-loops/test.jinja b/...eeps-scope-isolation-from-for-loops.jinja → ...scope-isolation-from-for-loops/test.jinja
diff --git a/...oads-imported-macro-syntax.expected.jinja → ...imported-macro-syntax/test.expected.jinja b/...oads-imported-macro-syntax.expected.jinja → ...imported-macro-syntax/test.expected.jinja
diff --git a/...s/eager/loads-imported-macro-syntax.jinja → ...er/loads-imported-macro-syntax/test.jinja b/...s/eager/loads-imported-macro-syntax.jinja → ...er/loads-imported-macro-syntax/test.jinja
diff --git a/...variable-in-deferred-macro.expected.jinja → ...ble-in-deferred-macro/test.expected.jinja b/...variable-in-deferred-macro.expected.jinja → ...ble-in-deferred-macro/test.expected.jinja
diff --git a/...modifies-variable-in-deferred-macro.jinja → ...ies-variable-in-deferred-macro/test.jinja b/...modifies-variable-in-deferred-macro.jinja → ...ies-variable-in-deferred-macro/test.jinja
diff --git a/...op-item-on-current-context.expected.jinja → ...em-on-current-context/test.expected.jinja b/...op-item-on-current-context.expected.jinja → ...em-on-current-context/test.expected.jinja
diff --git a/...defers-loop-item-on-current-context.jinja → ...s-loop-item-on-current-context/test.jinja b/...defers-loop-item-on-current-context.jinja → ...s-loop-item-on-current-context/test.jinja
diff --git a/.../eager/partially-resolves-eager-set.jinja → ...r/partially-resolves-eager-set/test.jinja b/.../eager/partially-resolves-eager-set.jinja → ...r/partially-resolves-eager-set/test.jinja
diff --git a/...pends-set-if-state-changes.expected.jinja → ...-set-if-state-changes/test.expected.jinja b/...pends-set-if-state-changes.expected.jinja → ...-set-if-state-changes/test.expected.jinja
diff --git a/...eager/prepends-set-if-state-changes.jinja → .../prepends-set-if-state-changes/test.jinja b/...eager/prepends-set-if-state-changes.jinja → .../prepends-set-if-state-changes/test.jinja
diff --git a/...-inside-deferred-set-block.expected.jinja → ...de-deferred-set-block/test.expected.jinja b/...-inside-deferred-set-block.expected.jinja → ...de-deferred-set-block/test.expected.jinja
diff --git a/...erves-raw-inside-deferred-set-block.jinja → ...-raw-inside-deferred-set-block/test.jinja b/...erves-raw-inside-deferred-set-block.jinja → ...-raw-inside-deferred-set-block/test.jinja
diff --git a/.../preserves-value-set-in-if.expected.jinja → ...erves-value-set-in-if/test.expected.jinja b/.../preserves-value-set-in-if.expected.jinja → ...erves-value-set-in-if/test.expected.jinja
diff --git a/...ces/eager/preserves-value-set-in-if.jinja → ...ager/preserves-value-set-in-if/test.jinja b/...ces/eager/preserves-value-set-in-if.jinja → ...ager/preserves-value-set-in-if/test.jinja
diff --git a/src/test/resources/eager/puts-deferred-fromed-macro-in-output.expected.jinja b/src/test/resources/eager/puts-deferred-fromed-macro-in-output.expected.jinja
diff --git a/src/test/resources/eager/puts-deferred-fromed-macro-in-output.jinja b/src/test/resources/eager/puts-deferred-fromed-macro-in-output.jinja
diff --git a/src/test/resources/eager/puts-deferred-fromed-macro-in-output/test.expected.jinja b/src/test/resources/eager/puts-deferred-fromed-macro-in-output/test.expected.jinja
@@ -0,0 +1,5 @@
+{% set myname = deferred + 3 %}\
+{% set __macro_getPath_1519775617_temp_variable_1__ %}\
+Hello {{ myname }}\
+{% endset %}\
+{% print __macro_getPath_1519775617_temp_variable_1__ %}
diff --git a/src/test/resources/eager/puts-deferred-fromed-macro-in-output/test.jinja b/src/test/resources/eager/puts-deferred-fromed-macro-in-output/test.jinja
@@ -0,0 +1,3 @@
+{%- from "../supplements/simple-with-call.jinja" import getPath -%}
+{%- set myname = deferred + (1 + 2) -%}
+{% print getPath() %}
diff --git a/src/test/resources/eager/puts-deferred-imported-macro-in-output.expected.jinja b/src/test/resources/eager/puts-deferred-imported-macro-in-output.expected.jinja
diff --git a/...d-macro-in-output.expected.expected.jinja → ...ro-in-output/test.expected.expected.jinja b/...d-macro-in-output.expected.expected.jinja → ...ro-in-output/test.expected.expected.jinja
diff --git a/src/test/resources/eager/puts-deferred-imported-macro-in-output/test.expected.jinja b/src/test/resources/eager/puts-deferred-imported-macro-in-output/test.expected.jinja
@@ -0,0 +1,5 @@
+{% set myname = deferred + 3 %}\
+{% set __macro_getPath_1519775617_temp_variable_1__ %}\
+Hello {{ myname }}\
+{% endset %}\
+{% print __macro_getPath_1519775617_temp_variable_1__ %}
diff --git a/...s-deferred-imported-macro-in-output.jinja → ...erred-imported-macro-in-output/test.jinja b/...s-deferred-imported-macro-in-output.jinja → ...erred-imported-macro-in-output/test.jinja
@@ -1,3 +1,3 @@
-{%- import "simple-with-call.jinja" as simple -%}
+{%- import "../supplements/simple-with-call.jinja" as simple -%}
 {%- set myname = deferred + (1 + 2) -%}
 {% print simple.getPath() %}
diff --git a/...ces/tags/macrotag/eager/takes-param.jinja → ...onstructs-aliased-macro/takes-param.jinja b/...ces/tags/macrotag/eager/takes-param.jinja → ...onstructs-aliased-macro/takes-param.jinja
diff --git a/...cts-aliased-macro.expected.expected.jinja → ...liased-macro/test.expected.expected.jinja b/...cts-aliased-macro.expected.expected.jinja → ...liased-macro/test.expected.expected.jinja
diff --git a/...reconstructs-aliased-macro.expected.jinja → ...structs-aliased-macro/test.expected.jinja b/...reconstructs-aliased-macro.expected.jinja → ...structs-aliased-macro/test.expected.jinja
@@ -1,5 +1,5 @@
 {% set myname = deferred + 3 %}\
-{% set deferred_import_resource_path = 'eager/takes-param.jinja' %}\
+{% set deferred_import_resource_path = 'eager/reconstructs-aliased-macro/takes-param.jinja' %}\
 {% macro macros.takes_param(foo) %}\
 {% set bar = 'bar' %}
 {% print foo %}

diff --git a/...es/eager/reconstructs-aliased-macro.jinja → ...ger/reconstructs-aliased-macro/test.jinja b/...es/eager/reconstructs-aliased-macro.jinja → ...ger/reconstructs-aliased-macro/test.jinja
@@ -1,4 +1,4 @@
-{%- import "eager/takes-param.jinja" as macros -%}
+{%- import "./takes-param.jinja" as macros -%}
 {%- set myname = deferred + (1 + 2) -%}
 {% set answer = macros.takes_param(myname) %}
 {{ answer }}