Skip to content

[8] Jinjava 3.0: Add a test utility for building a test version of JinjavaConfig #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasmith-hs wants to merge 1 commit into
base: 3.0/test-objects
Choose a base branch
from
Open

[8] Jinjava 3.0: Add a test utility for building a test version of JinjavaConfig #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/test/java/com/hubspot/jinjava/BaseJinjavaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ public abstract class BaseJinjavaTest {
public void baseSetup() {
jinjava =
new Jinjava(
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withLegacyOverrides(
LegacyOverrides
.newBuilder()
Expand All @@ -22,4 +22,8 @@ public void baseSetup() {
.build()
);
}

public static JinjavaConfig.Builder newConfigBuilder() {
return JinjavaConfig.builder();
}
}
17 changes: 10 additions & 7 deletions src/test/java/com/hubspot/jinjava/EagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public Optional<LocationResolver> getLocationResolver() {
}
}
);
JinjavaConfig config = JinjavaConfig
.newBuilder()
JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
.withExecutionMode(executionMode)
.withNestedInterpretationEnabled(true)
Expand Down Expand Up @@ -777,8 +777,8 @@ public void itHandlesAutoEscape() {

@Test
public void itWrapsCertainOutputInRaw() {
JinjavaConfig config = JinjavaConfig
.newBuilder()
JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
.withExecutionMode(EagerExecutionMode.instance())
.withNestedInterpretationEnabled(false)
Expand Down Expand Up @@ -865,13 +865,16 @@ public void itHandlesUnknownFunctionErrors() {
JinjavaInterpreter eagerInterpreter = new JinjavaInterpreter(
jinjava,
jinjava.getGlobalContextCopy(),
JinjavaConfig.newBuilder().withExecutionMode(EagerExecutionMode.instance()).build()
BaseJinjavaTest
.newConfigBuilder()
.withExecutionMode(EagerExecutionMode.instance())
.build()
);
JinjavaInterpreter defaultInterpreter = new JinjavaInterpreter(
jinjava,
jinjava.getGlobalContextCopy(),
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withExecutionMode(DefaultExecutionMode.instance())
.build()
);
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ public String assertExpectedNonEagerOutput(String name) {
JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
jinjava,
jinjava.getGlobalContextCopy(),
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withExecutionMode(DefaultExecutionMode.instance())
.withNestedInterpretationEnabled(true)
.withLegacyOverrides(
Expand Down Expand Up @@ -107,8 +107,8 @@ public String assertExpectedNonEagerOutput(String name) {
JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
jinjava,
jinjava.getGlobalContextCopy(),
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withExecutionMode(DefaultExecutionMode.instance())
.withNestedInterpretationEnabled(true)
.withLegacyOverrides(
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/hubspot/jinjava/FullSnippetsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public Optional<LocationResolver> getLocationResolver() {
}
}
);
JinjavaConfig config = JinjavaConfig
.newBuilder()
JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withNestedInterpretationEnabled(true)
.withLegacyOverrides(
LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.Jinjava;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.interpret.Context;
Expand All @@ -24,7 +25,6 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
import org.junit.Before;
Expand Down Expand Up @@ -394,8 +394,8 @@ public void itBlocksDisabledFunctions() {
String rendered = jinjava.render(template, context);
assertEquals("hi 1 2 ", rendered);

final JinjavaConfig config = JinjavaConfig
.newBuilder()
final JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withDisabled(disabled)
.build();

Expand Down Expand Up @@ -429,7 +429,7 @@ public void itBlocksDisabledExpTests() {
@Test
public void itStoresResolvedFunctions() {
context.put("datetime", 12345);
final JinjavaConfig config = JinjavaConfig.newBuilder().build();
final JinjavaConfig config = BaseJinjavaTest.newConfigBuilder().build();
String template =
"{% for i in range(1, 5) %}{{i}} {% endfor %}\n{{ unixtimestamp(datetime) }}";
final RenderResult renderResult = jinjava.renderForResult(template, context, config);
Expand Down
10 changes: 6 additions & 4 deletions src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import com.google.common.collect.Lists;
import com.google.common.io.Resources;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.Jinjava;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.LegacyOverrides;
import com.hubspot.jinjava.interpret.Context;
import com.hubspot.jinjava.interpret.IndexOutOfRangeException;
Expand All @@ -33,7 +33,9 @@ public class ExtendedSyntaxBuilderTest {
@Before
public void setup() {
interpreter =
new Jinjava(JinjavaConfig.newBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build())
new Jinjava(
BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build()
)
.newInterpreter();
JinjavaInterpreter.pushCurrent(interpreter);

Expand Down Expand Up @@ -191,8 +193,8 @@ public void literalTuple() {
public void mapLiteral() {
interpreter =
new Jinjava(
JinjavaConfig
.builder()
BaseJinjavaTest
.newConfigBuilder()
.withMaxOutputSize(MAX_STRING_LENGTH)
.withLegacyOverrides(LegacyOverrides.THREE_POINT_0.withEvaluateMapKeys(false))
.build()
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/com/hubspot/jinjava/el/ext/AdditionOperatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;

import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.Jinjava;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.OutputTooBigException;
import java.util.Collection;
Expand All @@ -22,7 +22,9 @@ public class AdditionOperatorTest {
@Before
public void setup() {
interpreter =
new Jinjava(JinjavaConfig.newBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build())
new Jinjava(
BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build()
)
.newInterpreter();
JinjavaInterpreter.pushCurrent(interpreter);
}
Expand Down
11 changes: 5 additions & 6 deletions src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainParityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.Jinjava;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.LegacyOverrides;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.RenderResult;
import java.util.Arrays;
import java.util.HashMap;
Expand All @@ -33,17 +32,17 @@ public void setup() {

jinjavaOptimized =
new Jinjava(
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withEnableFilterChainOptimization(true)
.withLegacyOverrides(legacyOverrides)
.build()
);

jinjavaUnoptimized =
new Jinjava(
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withEnableFilterChainOptimization(false)
.withLegacyOverrides(legacyOverrides)
.build()
Expand Down
9 changes: 6 additions & 3 deletions src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainPerformanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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

import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.Jinjava;
import com.hubspot.jinjava.JinjavaConfig;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
Expand All @@ -26,12 +26,15 @@ public class AstFilterChainPerformanceTest {
public void setup() {
jinjavaOptimized =
new Jinjava(
JinjavaConfig.newBuilder().withEnableFilterChainOptimization(true).build()
BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(true).build()
);

jinjavaUnoptimized =
new Jinjava(
JinjavaConfig.newBuilder().withEnableFilterChainOptimization(false).build()
BaseJinjavaTest
.newConfigBuilder()
.withEnableFilterChainOptimization(false)
.build()
);

context = new HashMap<>();
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.Jinjava;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.interpret.Context;
import com.hubspot.jinjava.interpret.RenderResult;
import com.hubspot.jinjava.interpret.TemplateError.ErrorItem;
Expand All @@ -27,7 +27,7 @@ public class AstFilterChainTest {
public void setup() {
jinjava =
new Jinjava(
JinjavaConfig.newBuilder().withEnableFilterChainOptimization(true).build()
BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(true).build()
);

context = new HashMap<>();
Expand Down Expand Up @@ -101,7 +101,7 @@ public void itHandlesUnknownFilterInChain() {
public void itMatchesNonChainedBehaviorForUnknownFilter() {
String template = "{{ name | unknown_filter | lower | md5 }}";
Jinjava jinjavaUnoptimized = new Jinjava(
JinjavaConfig.newBuilder().withEnableFilterChainOptimization(false).build()
BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(false).build()
);
RenderResult optimizedResult = jinjava.renderForResult(template, context);
RenderResult unoptimizedResult = jinjavaUnoptimized.renderForResult(
Expand All @@ -120,8 +120,8 @@ public void itSkipsDisabledFilterAndContinuesChain() {
ImmutableSet.of("lower")
);
Jinjava jinjavaWithDisabled = new Jinjava(
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withEnableFilterChainOptimization(true)
.withDisabled(disabled)
.build()
Expand All @@ -147,15 +147,15 @@ public void itMatchesNonChainedBehaviorForDisabledFilter() {
String template = "{{ name|trim|lower|capitalize }}";

Jinjava optimized = new Jinjava(
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withEnableFilterChainOptimization(true)
.withDisabled(disabled)
.build()
);
Jinjava unoptimized = new Jinjava(
JinjavaConfig
.newBuilder()
BaseJinjavaTest
.newConfigBuilder()
.withEnableFilterChainOptimization(false)
.withDisabled(disabled)
.build()
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstBinaryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.junit.Assert.fail;

import com.hubspot.jinjava.BaseInterpretingTest;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.LegacyOverrides;
import com.hubspot.jinjava.el.ext.DeferredParsingException;
Expand All @@ -22,8 +23,8 @@ public class EagerAstBinaryTest extends BaseInterpretingTest {

@Before
public void setup() {
JinjavaConfig config = JinjavaConfig
.newBuilder()
JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
.withExecutionMode(EagerExecutionMode.instance())
.withNestedInterpretationEnabled(true)
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstChoiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.junit.Assert.fail;

import com.hubspot.jinjava.BaseInterpretingTest;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.LegacyOverrides;
import com.hubspot.jinjava.el.ext.DeferredParsingException;
Expand All @@ -23,8 +24,8 @@ public class EagerAstChoiceTest extends BaseInterpretingTest {

@Before
public void setup() {
JinjavaConfig config = JinjavaConfig
.newBuilder()
JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
.withExecutionMode(EagerExecutionMode.instance())
.withNestedInterpretationEnabled(true)
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstDotTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import com.google.common.collect.ImmutableMap;
import com.hubspot.jinjava.BaseInterpretingTest;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.LegacyOverrides;
import com.hubspot.jinjava.interpret.Context;
Expand All @@ -19,8 +20,8 @@ public class EagerAstDotTest extends BaseInterpretingTest {

@Before
public void setup() {
JinjavaConfig config = JinjavaConfig
.newBuilder()
JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
.withExecutionMode(EagerExecutionMode.instance())
.withNestedInterpretationEnabled(true)
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethodTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.junit.Assert.fail;

import com.hubspot.jinjava.BaseInterpretingTest;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.LegacyOverrides;
import com.hubspot.jinjava.el.ext.DeferredParsingException;
Expand All @@ -27,8 +28,8 @@ public class EagerAstMethodTest extends BaseInterpretingTest {

@Before
public void setup() {
JinjavaConfig config = JinjavaConfig
.newBuilder()
JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
.withExecutionMode(EagerExecutionMode.instance())
.withNestedInterpretationEnabled(true)
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstRangeBracketTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.assertj.core.api.Assertions.assertThat;

import com.hubspot.jinjava.BaseInterpretingTest;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.LegacyOverrides;
import com.hubspot.jinjava.interpret.Context;
Expand All @@ -17,8 +18,8 @@ public class EagerAstRangeBracketTest extends BaseInterpretingTest {

@Before
public void setup() {
JinjavaConfig config = JinjavaConfig
.newBuilder()
JinjavaConfig config = BaseJinjavaTest
.newConfigBuilder()
.withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
.withExecutionMode(EagerExecutionMode.instance())
.withNestedInterpretationEnabled(true)
Expand Down
Loading