Skip to content

Commit cb4e3aa

Browse files
jasmith-hsjasmith-hs
committed
Helper for constructing JinjavaConfig in tests
1 parent f94f35c commit cb4e3aa

62 files changed

Lines changed: 224 additions & 540 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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ public abstract class BaseJinjavaTest {
3030

3131
@Before
3232
public void baseSetup() {
33-
jinjava =
34-
new Jinjava(
35-
JinjavaConfig
36-
.newBuilder()
37-
.withMethodValidator(METHOD_VALIDATOR)
38-
.withReturnTypeValidator(RETURN_TYPE_VALIDATOR)
39-
.build()
40-
);
33+
jinjava = new Jinjava(BaseJinjavaTest.newConfigBuilder().build());
34+
}
35+
36+
public static JinjavaConfig.Builder newConfigBuilder() {
37+
return JinjavaConfig
38+
.newBuilder()
39+
.withMethodValidator(METHOD_VALIDATOR)
40+
.withReturnTypeValidator(RETURN_TYPE_VALIDATOR);
4141
}
4242
}

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,8 @@ public Optional<LocationResolver> getLocationResolver() {
7272
}
7373
}
7474
);
75-
JinjavaConfig config = JinjavaConfig
76-
.newBuilder()
77-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
78-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
75+
JinjavaConfig config = BaseJinjavaTest
76+
.newConfigBuilder()
7977
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
8078
.withExecutionMode(executionMode)
8179
.withNestedInterpretationEnabled(true)
@@ -775,10 +773,8 @@ public void itHandlesAutoEscape() {
775773

776774
@Test
777775
public void itWrapsCertainOutputInRaw() {
778-
JinjavaConfig config = JinjavaConfig
779-
.newBuilder()
780-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
781-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
776+
JinjavaConfig config = BaseJinjavaTest
777+
.newConfigBuilder()
782778
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
783779
.withExecutionMode(EagerExecutionMode.instance())
784780
.withNestedInterpretationEnabled(false)
@@ -865,20 +861,16 @@ public void itHandlesUnknownFunctionErrors() {
865861
JinjavaInterpreter eagerInterpreter = new JinjavaInterpreter(
866862
jinjava,
867863
jinjava.getGlobalContextCopy(),
868-
JinjavaConfig
869-
.newBuilder()
870-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
871-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
864+
BaseJinjavaTest
865+
.newConfigBuilder()
872866
.withExecutionMode(EagerExecutionMode.instance())
873867
.build()
874868
);
875869
JinjavaInterpreter defaultInterpreter = new JinjavaInterpreter(
876870
jinjava,
877871
jinjava.getGlobalContextCopy(),
878-
JinjavaConfig
879-
.newBuilder()
880-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
881-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
872+
BaseJinjavaTest
873+
.newConfigBuilder()
882874
.withExecutionMode(DefaultExecutionMode.instance())
883875
.build()
884876
);

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@ public String assertExpectedNonEagerOutput(String name) {
7676
JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
7777
jinjava,
7878
jinjava.getGlobalContextCopy(),
79-
JinjavaConfig
80-
.newBuilder()
81-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
82-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
79+
BaseJinjavaTest
80+
.newConfigBuilder()
8381
.withExecutionMode(DefaultExecutionMode.instance())
8482
.withNestedInterpretationEnabled(true)
8583
.withLegacyOverrides(
@@ -109,10 +107,8 @@ public String assertExpectedNonEagerOutput(String name) {
109107
JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
110108
jinjava,
111109
jinjava.getGlobalContextCopy(),
112-
JinjavaConfig
113-
.newBuilder()
114-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
115-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
110+
BaseJinjavaTest
111+
.newConfigBuilder()
116112
.withExecutionMode(DefaultExecutionMode.instance())
117113
.withNestedInterpretationEnabled(true)
118114
.withLegacyOverrides(

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@ public Optional<LocationResolver> getLocationResolver() {
5050
}
5151
}
5252
);
53-
JinjavaConfig config = JinjavaConfig
54-
.newBuilder()
55-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
56-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
53+
JinjavaConfig config = BaseJinjavaTest
54+
.newConfigBuilder()
5755
.withNestedInterpretationEnabled(true)
5856
.withLegacyOverrides(
5957
LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -480,10 +480,8 @@ public void itBlocksDisabledFunctions() {
480480
String rendered = jinjava.render(template, context);
481481
assertEquals("hi 1 2 ", rendered);
482482

483-
final JinjavaConfig config = JinjavaConfig
484-
.newBuilder()
485-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
486-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
483+
final JinjavaConfig config = BaseJinjavaTest
484+
.newConfigBuilder()
487485
.withDisabled(disabled)
488486
.build();
489487

@@ -517,11 +515,7 @@ public void itBlocksDisabledExpTests() {
517515
@Test
518516
public void itStoresResolvedFunctions() {
519517
context.put("datetime", 12345);
520-
final JinjavaConfig config = JinjavaConfig
521-
.newBuilder()
522-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
523-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
524-
.build();
518+
final JinjavaConfig config = BaseJinjavaTest.newConfigBuilder().build();
525519
String template =
526520
"{% for i in range(1, 5) %}{{i}} {% endfor %}\n{{ unixtimestamp(datetime) }}";
527521
final RenderResult renderResult = jinjava.renderForResult(template, context, config);

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ public class ExtendedSyntaxBuilderTest {
3535
public void setup() {
3636
interpreter =
3737
new Jinjava(
38-
JinjavaConfig
39-
.newBuilder()
40-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
41-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
42-
.withMaxOutputSize(MAX_STRING_LENGTH)
43-
.build()
38+
BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build()
4439
)
4540
.newInterpreter();
4641
JinjavaInterpreter.pushCurrent(interpreter);
@@ -199,10 +194,8 @@ public void literalTuple() {
199194
public void mapLiteral() {
200195
interpreter =
201196
new Jinjava(
202-
JinjavaConfig
203-
.newBuilder()
204-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
205-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
197+
BaseJinjavaTest
198+
.newConfigBuilder()
206199
.withMaxOutputSize(MAX_STRING_LENGTH)
207200
.withLegacyOverrides(
208201
LegacyOverrides.newBuilder().withEvaluateMapKeys(false).build()

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@ public class AdditionOperatorTest {
2424
public void setup() {
2525
interpreter =
2626
new Jinjava(
27-
JinjavaConfig
28-
.newBuilder()
29-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
30-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
31-
.withMaxOutputSize(MAX_STRING_LENGTH)
32-
.build()
27+
BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build()
3328
)
3429
.newInterpreter();
3530
JinjavaInterpreter.pushCurrent(interpreter);

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,17 @@ public void setup() {
3333

3434
jinjavaOptimized =
3535
new Jinjava(
36-
JinjavaConfig
37-
.newBuilder()
38-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
39-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
36+
BaseJinjavaTest
37+
.newConfigBuilder()
4038
.withEnableFilterChainOptimization(true)
4139
.withLegacyOverrides(legacyOverrides)
4240
.build()
4341
);
4442

4543
jinjavaUnoptimized =
4644
new Jinjava(
47-
JinjavaConfig
48-
.newBuilder()
49-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
50-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
45+
BaseJinjavaTest
46+
.newConfigBuilder()
5147
.withEnableFilterChainOptimization(false)
5248
.withLegacyOverrides(legacyOverrides)
5349
.build()

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,13 @@ public class AstFilterChainPerformanceTest {
2727
public void setup() {
2828
jinjavaOptimized =
2929
new Jinjava(
30-
JinjavaConfig
31-
.newBuilder()
32-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
33-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
34-
.withEnableFilterChainOptimization(true)
35-
.build()
30+
BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(true).build()
3631
);
3732

3833
jinjavaUnoptimized =
3934
new Jinjava(
40-
JinjavaConfig
41-
.newBuilder()
42-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
43-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
35+
BaseJinjavaTest
36+
.newConfigBuilder()
4437
.withEnableFilterChainOptimization(false)
4538
.build()
4639
);

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ public class AstFilterChainTest {
1919
public void setup() {
2020
jinjava =
2121
new Jinjava(
22-
JinjavaConfig
23-
.newBuilder()
24-
.withMethodValidator(BaseJinjavaTest.METHOD_VALIDATOR)
25-
.withReturnTypeValidator(BaseJinjavaTest.RETURN_TYPE_VALIDATOR)
26-
.withEnableFilterChainOptimization(true)
27-
.build()
22+
BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(true).build()
2823
);
2924

3025
context = new HashMap<>();

0 commit comments

Comments
 (0)