Skip to content

Commit f1742bc

Browse files
jasmith-hsjasmith-hs
committed
Use sensible current path for eager execution test fixtures for relative
path resolving
1 parent ffacfab commit f1742bc

43 files changed

Lines changed: 105 additions & 101 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/test/java/com/hubspot/jinjava/EagerTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public String getString(
6060
JinjavaInterpreter interpreter
6161
) throws IOException {
6262
return Resources.toString(
63-
Resources.getResource(String.format("tags/macrotag/%s", fullName)),
63+
Resources.getResource(fullName),
6464
StandardCharsets.UTF_8
6565
);
6666
}
@@ -89,7 +89,7 @@ public Optional<LocationResolver> getLocationResolver() {
8989
);
9090
interpreter = new JinjavaInterpreter(parentInterpreter);
9191
expectedTemplateInterpreter =
92-
new ExpectedTemplateInterpreter(jinjava, interpreter, "eager");
92+
ExpectedTemplateInterpreter.withSensibleCurrentPath(jinjava, interpreter, "eager");
9393
localContext = interpreter.getContext();
9494

9595
localContext.put("deferred", DeferredValue.instance());
@@ -1590,7 +1590,6 @@ public void itReconstructsAliasedMacroSecondPass() {
15901590

15911591
@Test
15921592
public void itReconstructsBlockPathWhenDeferred() {
1593-
interpreter.getContext().getCurrentPathStack().push("Child path", 0, 0);
15941593
expectedTemplateInterpreter.assertExpectedOutputNonIdempotent(
15951594
"reconstructs-block-path-when-deferred/test"
15961595
);
@@ -1606,7 +1605,6 @@ public void itReconstructsBlockPathWhenDeferredSecondPass() {
16061605

16071606
@Test
16081607
public void itReconstructsBlockPathWhenDeferredNested() {
1609-
interpreter.getContext().getCurrentPathStack().push("Child path", 0, 0);
16101608
expectedTemplateInterpreter.assertExpectedOutputNonIdempotent(
16111609
"reconstructs-block-path-when-deferred-nested/test"
16121610
);

src/test/resources/tags/macrotag/filters.jinja renamed to src/test/resources/eager/allows-variable-sharing-alias-name/filters.jinja

File renamed without changes.

‎src/test/resources/eager/allows-variable-sharing-alias-name/test.expected.jinja‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% do %}\
2-
{% set current_path = 'filters.jinja' %}\
2+
{% set current_path = 'eager/allows-variable-sharing-alias-name/filters.jinja' %}\
33
{% set __temp_import_alias_854547461__ = {} %}\
44
{% for __ignored__ in [0] %}
55
{% set bar = deferred %}\
@@ -8,10 +8,10 @@
88
{% set filters = {} %}\
99
{% do __temp_import_alias_854547461__.update({'filters': filters}) %}\
1010
{% do filters.update(deferred) %}
11-
{% do __temp_import_alias_854547461__.update({'bar': bar,'foo': 123,'import_resource_path': 'filters.jinja','filters': filters}) %}\
11+
{% do __temp_import_alias_854547461__.update({'bar': bar,'foo': 123,'import_resource_path': 'eager/allows-variable-sharing-alias-name/filters.jinja','filters': filters}) %}\
1212
{% endfor %}\
1313
{% set filters = __temp_import_alias_854547461__ %}\
14-
{% set current_path = '' %}\
14+
{% set current_path = 'eager/allows-variable-sharing-alias-name/test.jinja' %}\
1515
{% enddo %}
1616

1717
{{ filters }}

‎src/test/resources/eager/allows-variable-sharing-alias-name/test.jinja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
{% import 'filters.jinja' as filters %}
1+
{% import './filters.jinja' as filters %}
22

33
{{ filters }}

‎src/test/resources/eager/does-not-override-import-modification-in-for/test.expected.jinja‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% set foo = 'start' %}\
22
{% for __ignored__ in [0] %}
33
{% do %}\
4-
{% set current_path = 'deferred-modification.jinja' %}\
4+
{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
55
{% set __temp_import_alias_3016318__ = {} %}\
66
{% for __ignored__ in [0] %}\
77
{% if deferred %}
@@ -13,14 +13,14 @@
1313

1414
{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
1515
{% do __temp_import_alias_3016318__.update({'foo': foo}) %}
16-
{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}\
16+
{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
1717
{% endfor %}\
1818
{% set bar1 = __temp_import_alias_3016318__ %}\
19-
{% set current_path = '' %}\
19+
{% set current_path = 'eager/does-not-override-import-modification-in-for/test.jinja' %}\
2020
{% enddo %}
2121
{{ bar1.foo }}
2222
{% do %}\
23-
{% set current_path = 'deferred-modification.jinja' %}\
23+
{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
2424
{% set __temp_import_alias_3016319__ = {} %}\
2525
{% for __ignored__ in [0] %}\
2626
{% if deferred %}
@@ -32,15 +32,15 @@
3232

3333
{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
3434
{% do __temp_import_alias_3016319__.update({'foo': foo}) %}
35-
{% do __temp_import_alias_3016319__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\
35+
{% do __temp_import_alias_3016319__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
3636
{% endfor %}\
3737
{% set bar2 = __temp_import_alias_3016319__ %}\
38-
{% set current_path = '' %}\
38+
{% set current_path = 'eager/does-not-override-import-modification-in-for/test.jinja' %}\
3939
{% enddo %}
4040
{{ bar2.foo }}
4141

4242
{% do %}\
43-
{% set current_path = 'deferred-modification.jinja' %}\
43+
{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
4444
{% set __temp_import_alias_3016318__ = {} %}\
4545
{% for __ignored__ in [0] %}\
4646
{% if deferred %}
@@ -52,14 +52,14 @@
5252

5353
{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
5454
{% do __temp_import_alias_3016318__.update({'foo': foo}) %}
55-
{% do __temp_import_alias_3016318__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\
55+
{% do __temp_import_alias_3016318__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
5656
{% endfor %}\
5757
{% set bar1 = __temp_import_alias_3016318__ %}\
58-
{% set current_path = '' %}\
58+
{% set current_path = 'eager/does-not-override-import-modification-in-for/test.jinja' %}\
5959
{% enddo %}
6060
{{ bar1.foo }}
6161
{% do %}\
62-
{% set current_path = 'deferred-modification.jinja' %}\
62+
{% set current_path = 'eager/supplements/deferred-modification.jinja' %}\
6363
{% set __temp_import_alias_3016319__ = {} %}\
6464
{% for __ignored__ in [0] %}\
6565
{% if deferred %}
@@ -71,10 +71,10 @@
7171

7272
{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
7373
{% do __temp_import_alias_3016319__.update({'foo': foo}) %}
74-
{% do __temp_import_alias_3016319__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\
74+
{% do __temp_import_alias_3016319__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
7575
{% endfor %}\
7676
{% set bar2 = __temp_import_alias_3016319__ %}\
77-
{% set current_path = '' %}\
77+
{% set current_path = 'eager/does-not-override-import-modification-in-for/test.jinja' %}\
7878
{% enddo %}
7979
{{ bar2.foo }}
8080
{% endfor %}

‎src/test/resources/eager/does-not-override-import-modification-in-for/test.jinja‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% set foo = 'start' %}
22
{% for i in range(2) %}
3-
{% import "deferred-modification.jinja" as bar1 %}
3+
{% import "../supplements/deferred-modification.jinja" as bar1 %}
44
{{ bar1.foo }}
5-
{% import "deferred-modification.jinja" as bar2 %}
5+
{% import "../supplements/deferred-modification.jinja" as bar2 %}
66
{{ bar2.foo }}
77
{% endfor %}
88
{{ foo }}

src/test/resources/tags/macrotag/eager/settings.jinja renamed to src/test/resources/eager/fails-on-modification-in-aliased-macro/settings.jinja

File renamed without changes.

‎src/test/resources/eager/fails-on-modification-in-aliased-macro/test.jinja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% import 'eager/settings.jinja' as shared %}
1+
{% import './settings.jinja' as shared %}
22

33
{% if deferred %}
44
{{ shared.load_settings() }}

‎src/test/resources/eager/handles-deferred-from-import-as/test.jinja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{%- set myname = deferred + (3 + 4) -%}
2-
{%- from "macro-and-set.jinja" import foo as from_foo, bar as from_bar -%}
2+
{%- from "../supplements/macro-and-set.jinja" import foo as from_foo, bar as from_bar -%}
33
from_foo: {{ from_foo() }}
44
from_bar: {{ from_bar }}

‎src/test/resources/eager/handles-deferred-import-vars/test.expected.jinja‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ bar: {{ bar }}
88
---
99
{% set myname = deferred + 7 %}\
1010
{% do %}\
11-
{% set current_path = 'macro-and-set.jinja' %}\
11+
{% set current_path = 'eager/supplements/macro-and-set.jinja' %}\
1212
{% set __temp_import_alias_902286926__ = {} %}\
1313
{% for __ignored__ in [0] %}
1414
{% set bar = myname + 19 %}\
1515
{% do __temp_import_alias_902286926__.update({'bar': bar}) %}
1616
Hello {{ myname }}
17-
{% do __temp_import_alias_902286926__.update({'import_resource_path': 'macro-and-set.jinja'}) %}\
17+
{% do __temp_import_alias_902286926__.update({'import_resource_path': 'eager/supplements/macro-and-set.jinja'}) %}\
1818
{% endfor %}\
1919
{% set simple = __temp_import_alias_902286926__ %}\
20-
{% set current_path = '' %}\
20+
{% set current_path = 'eager/handles-deferred-import-vars/test.jinja' %}\
2121
{% enddo %}\
22-
simple.foo: {% set deferred_import_resource_path = 'macro-and-set.jinja' %}\
22+
simple.foo: {% set deferred_import_resource_path = 'eager/supplements/macro-and-set.jinja' %}\
2323
{% macro simple.foo() %}\
2424
Hello {{ myname }}\
2525
{% endmacro %}\

0 commit comments

Comments
 (0)