Skip to content

Commit f6cd37a

Browse files
jasmith-hsjasmith-hs
authored
Merge pull request #1298 from HubSpot/3.0/base-jinjava-test-config
[8] Jinjava 3.0: Add a test utility for building a test version of JinjavaConfig
2 parents 5185f45 + 80ac4c4 commit f6cd37a

67 files changed

Lines changed: 343 additions & 270 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/BaseJinjavaTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public abstract class BaseJinjavaTest {
1010
public void baseSetup() {
1111
jinjava =
1212
new Jinjava(
13-
JinjavaConfig
14-
.newBuilder()
13+
BaseJinjavaTest
14+
.newConfigBuilder()
1515
.withLegacyOverrides(
1616
LegacyOverrides
1717
.newBuilder()
@@ -22,4 +22,8 @@ public void baseSetup() {
2222
.build()
2323
);
2424
}
25+
26+
public static JinjavaConfig.Builder newConfigBuilder() {
27+
return JinjavaConfig.builder();
28+
}
2529
}

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public Optional<LocationResolver> getLocationResolver() {
7272
}
7373
}
7474
);
75-
JinjavaConfig config = JinjavaConfig
76-
.newBuilder()
75+
JinjavaConfig config = BaseJinjavaTest
76+
.newConfigBuilder()
7777
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
7878
.withExecutionMode(executionMode)
7979
.withNestedInterpretationEnabled(true)
@@ -777,8 +777,8 @@ public void itHandlesAutoEscape() {
777777

778778
@Test
779779
public void itWrapsCertainOutputInRaw() {
780-
JinjavaConfig config = JinjavaConfig
781-
.newBuilder()
780+
JinjavaConfig config = BaseJinjavaTest
781+
.newConfigBuilder()
782782
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
783783
.withExecutionMode(EagerExecutionMode.instance())
784784
.withNestedInterpretationEnabled(false)
@@ -865,13 +865,16 @@ public void itHandlesUnknownFunctionErrors() {
865865
JinjavaInterpreter eagerInterpreter = new JinjavaInterpreter(
866866
jinjava,
867867
jinjava.getGlobalContextCopy(),
868-
JinjavaConfig.newBuilder().withExecutionMode(EagerExecutionMode.instance()).build()
868+
BaseJinjavaTest
869+
.newConfigBuilder()
870+
.withExecutionMode(EagerExecutionMode.instance())
871+
.build()
869872
);
870873
JinjavaInterpreter defaultInterpreter = new JinjavaInterpreter(
871874
jinjava,
872875
jinjava.getGlobalContextCopy(),
873-
JinjavaConfig
874-
.newBuilder()
876+
BaseJinjavaTest
877+
.newConfigBuilder()
875878
.withExecutionMode(DefaultExecutionMode.instance())
876879
.build()
877880
);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ public String assertExpectedNonEagerOutput(String name) {
7676
JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
7777
jinjava,
7878
jinjava.getGlobalContextCopy(),
79-
JinjavaConfig
80-
.newBuilder()
79+
BaseJinjavaTest
80+
.newConfigBuilder()
8181
.withExecutionMode(DefaultExecutionMode.instance())
8282
.withNestedInterpretationEnabled(true)
8383
.withLegacyOverrides(
@@ -107,8 +107,8 @@ public String assertExpectedNonEagerOutput(String name) {
107107
JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
108108
jinjava,
109109
jinjava.getGlobalContextCopy(),
110-
JinjavaConfig
111-
.newBuilder()
110+
BaseJinjavaTest
111+
.newConfigBuilder()
112112
.withExecutionMode(DefaultExecutionMode.instance())
113113
.withNestedInterpretationEnabled(true)
114114
.withLegacyOverrides(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public Optional<LocationResolver> getLocationResolver() {
5050
}
5151
}
5252
);
53-
JinjavaConfig config = JinjavaConfig
54-
.newBuilder()
53+
JinjavaConfig config = BaseJinjavaTest
54+
.newConfigBuilder()
5555
.withNestedInterpretationEnabled(true)
5656
.withLegacyOverrides(
5757
LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()

‎src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.google.common.collect.ImmutableSet;
88
import com.google.common.collect.Lists;
99
import com.google.common.collect.Maps;
10+
import com.hubspot.jinjava.BaseJinjavaTest;
1011
import com.hubspot.jinjava.Jinjava;
1112
import com.hubspot.jinjava.JinjavaConfig;
1213
import com.hubspot.jinjava.interpret.Context;
@@ -24,7 +25,6 @@
2425
import java.util.List;
2526
import java.util.Map;
2627
import java.util.Objects;
27-
import java.util.Optional;
2828
import java.util.Set;
2929
import java.util.function.Supplier;
3030
import org.junit.Before;
@@ -394,8 +394,8 @@ public void itBlocksDisabledFunctions() {
394394
String rendered = jinjava.render(template, context);
395395
assertEquals("hi 1 2 ", rendered);
396396

397-
final JinjavaConfig config = JinjavaConfig
398-
.newBuilder()
397+
final JinjavaConfig config = BaseJinjavaTest
398+
.newConfigBuilder()
399399
.withDisabled(disabled)
400400
.build();
401401

@@ -429,7 +429,7 @@ public void itBlocksDisabledExpTests() {
429429
@Test
430430
public void itStoresResolvedFunctions() {
431431
context.put("datetime", 12345);
432-
final JinjavaConfig config = JinjavaConfig.newBuilder().build();
432+
final JinjavaConfig config = BaseJinjavaTest.newConfigBuilder().build();
433433
String template =
434434
"{% for i in range(1, 5) %}{{i}} {% endfor %}\n{{ unixtimestamp(datetime) }}";
435435
final RenderResult renderResult = jinjava.renderForResult(template, context, config);

‎src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import com.google.common.collect.Lists;
77
import com.google.common.io.Resources;
8+
import com.hubspot.jinjava.BaseJinjavaTest;
89
import com.hubspot.jinjava.Jinjava;
9-
import com.hubspot.jinjava.JinjavaConfig;
1010
import com.hubspot.jinjava.LegacyOverrides;
1111
import com.hubspot.jinjava.interpret.Context;
1212
import com.hubspot.jinjava.interpret.IndexOutOfRangeException;
@@ -33,7 +33,9 @@ public class ExtendedSyntaxBuilderTest {
3333
@Before
3434
public void setup() {
3535
interpreter =
36-
new Jinjava(JinjavaConfig.newBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build())
36+
new Jinjava(
37+
BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build()
38+
)
3739
.newInterpreter();
3840
JinjavaInterpreter.pushCurrent(interpreter);
3941

@@ -191,8 +193,8 @@ public void literalTuple() {
191193
public void mapLiteral() {
192194
interpreter =
193195
new Jinjava(
194-
JinjavaConfig
195-
.builder()
196+
BaseJinjavaTest
197+
.newConfigBuilder()
196198
.withMaxOutputSize(MAX_STRING_LENGTH)
197199
.withLegacyOverrides(LegacyOverrides.THREE_POINT_0.withEvaluateMapKeys(false))
198200
.build()

‎src/test/java/com/hubspot/jinjava/el/ext/AdditionOperatorTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.assertj.core.api.Assertions.entry;
55

6+
import com.hubspot.jinjava.BaseJinjavaTest;
67
import com.hubspot.jinjava.Jinjava;
7-
import com.hubspot.jinjava.JinjavaConfig;
88
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
99
import com.hubspot.jinjava.interpret.OutputTooBigException;
1010
import java.util.Collection;
@@ -22,7 +22,9 @@ public class AdditionOperatorTest {
2222
@Before
2323
public void setup() {
2424
interpreter =
25-
new Jinjava(JinjavaConfig.newBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build())
25+
new Jinjava(
26+
BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build()
27+
)
2628
.newInterpreter();
2729
JinjavaInterpreter.pushCurrent(interpreter);
2830
}

‎src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainParityTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44

55
import com.google.common.collect.ImmutableList;
66
import com.google.common.collect.ImmutableMap;
7+
import com.hubspot.jinjava.BaseJinjavaTest;
78
import com.hubspot.jinjava.Jinjava;
8-
import com.hubspot.jinjava.JinjavaConfig;
99
import com.hubspot.jinjava.LegacyOverrides;
10-
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
1110
import com.hubspot.jinjava.interpret.RenderResult;
1211
import java.util.Arrays;
1312
import java.util.HashMap;
@@ -33,17 +32,17 @@ public void setup() {
3332

3433
jinjavaOptimized =
3534
new Jinjava(
36-
JinjavaConfig
37-
.newBuilder()
35+
BaseJinjavaTest
36+
.newConfigBuilder()
3837
.withEnableFilterChainOptimization(true)
3938
.withLegacyOverrides(legacyOverrides)
4039
.build()
4140
);
4241

4342
jinjavaUnoptimized =
4443
new Jinjava(
45-
JinjavaConfig
46-
.newBuilder()
44+
BaseJinjavaTest
45+
.newConfigBuilder()
4746
.withEnableFilterChainOptimization(false)
4847
.withLegacyOverrides(legacyOverrides)
4948
.build()

‎src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainPerformanceTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

5+
import com.hubspot.jinjava.BaseJinjavaTest;
56
import com.hubspot.jinjava.Jinjava;
6-
import com.hubspot.jinjava.JinjavaConfig;
77
import java.util.HashMap;
88
import java.util.Map;
99
import org.junit.Before;
@@ -26,12 +26,15 @@ public class AstFilterChainPerformanceTest {
2626
public void setup() {
2727
jinjavaOptimized =
2828
new Jinjava(
29-
JinjavaConfig.newBuilder().withEnableFilterChainOptimization(true).build()
29+
BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(true).build()
3030
);
3131

3232
jinjavaUnoptimized =
3333
new Jinjava(
34-
JinjavaConfig.newBuilder().withEnableFilterChainOptimization(false).build()
34+
BaseJinjavaTest
35+
.newConfigBuilder()
36+
.withEnableFilterChainOptimization(false)
37+
.build()
3538
);
3639

3740
context = new HashMap<>();

‎src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import com.google.common.collect.ImmutableMap;
66
import com.google.common.collect.ImmutableSet;
7+
import com.hubspot.jinjava.BaseJinjavaTest;
78
import com.hubspot.jinjava.Jinjava;
8-
import com.hubspot.jinjava.JinjavaConfig;
99
import com.hubspot.jinjava.interpret.Context;
1010
import com.hubspot.jinjava.interpret.RenderResult;
1111
import com.hubspot.jinjava.interpret.TemplateError.ErrorItem;
@@ -27,7 +27,7 @@ public class AstFilterChainTest {
2727
public void setup() {
2828
jinjava =
2929
new Jinjava(
30-
JinjavaConfig.newBuilder().withEnableFilterChainOptimization(true).build()
30+
BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(true).build()
3131
);
3232

3333
context = new HashMap<>();
@@ -101,7 +101,7 @@ public void itHandlesUnknownFilterInChain() {
101101
public void itMatchesNonChainedBehaviorForUnknownFilter() {
102102
String template = "{{ name | unknown_filter | lower | md5 }}";
103103
Jinjava jinjavaUnoptimized = new Jinjava(
104-
JinjavaConfig.newBuilder().withEnableFilterChainOptimization(false).build()
104+
BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(false).build()
105105
);
106106
RenderResult optimizedResult = jinjava.renderForResult(template, context);
107107
RenderResult unoptimizedResult = jinjavaUnoptimized.renderForResult(
@@ -120,8 +120,8 @@ public void itSkipsDisabledFilterAndContinuesChain() {
120120
ImmutableSet.of("lower")
121121
);
122122
Jinjava jinjavaWithDisabled = new Jinjava(
123-
JinjavaConfig
124-
.newBuilder()
123+
BaseJinjavaTest
124+
.newConfigBuilder()
125125
.withEnableFilterChainOptimization(true)
126126
.withDisabled(disabled)
127127
.build()
@@ -147,15 +147,15 @@ public void itMatchesNonChainedBehaviorForDisabledFilter() {
147147
String template = "{{ name|trim|lower|capitalize }}";
148148

149149
Jinjava optimized = new Jinjava(
150-
JinjavaConfig
151-
.newBuilder()
150+
BaseJinjavaTest
151+
.newConfigBuilder()
152152
.withEnableFilterChainOptimization(true)
153153
.withDisabled(disabled)
154154
.build()
155155
);
156156
Jinjava unoptimized = new Jinjava(
157-
JinjavaConfig
158-
.newBuilder()
157+
BaseJinjavaTest
158+
.newConfigBuilder()
159159
.withEnableFilterChainOptimization(false)
160160
.withDisabled(disabled)
161161
.build()

0 commit comments

Comments
 (0)