Skip to content

Commit 9f99f85

Browse files
jaredstehlerjaredstehler
committed
cleaning tests
1 parent aeac9e7 commit 9f99f85

20 files changed

Lines changed: 32 additions & 77 deletions

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ public class ExpressionResolverTest {
2727

2828
@Before
2929
public void setup() {
30-
Jinjava jinjava = new Jinjava();
31-
context = new Context();
32-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
30+
interpreter = new Jinjava().newInterpreter();
31+
context = interpreter.getContext();
3332
}
3433

3534
@Test

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public class ExtendedSyntaxBuilderTest {
2828

2929
@Before
3030
public void setup() {
31-
Jinjava jinjava = new Jinjava();
32-
context = new Context();
33-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
31+
interpreter = new Jinjava().newInterpreter();
3432
JinjavaInterpreter.pushCurrent(interpreter);
33+
34+
context = interpreter.getContext();
3535
}
3636

3737
@After

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.junit.Test;
1111

1212
import com.hubspot.jinjava.Jinjava;
13-
import com.hubspot.jinjava.interpret.Context;
1413
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
1514

1615

@@ -19,13 +18,10 @@ public class AdditionOperatorTest {
1918

2019

2120
private JinjavaInterpreter interpreter;
22-
private Context context;
2321

2422
@Before
2523
public void setup() {
26-
Jinjava jinjava = new Jinjava();
27-
context = new Context();
28-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
24+
interpreter = new Jinjava().newInterpreter();
2925
}
3026

3127
@Test

‎src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.junit.Test;
1010

1111
import com.hubspot.jinjava.Jinjava;
12-
import com.hubspot.jinjava.interpret.Context;
1312
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
1413
import com.hubspot.jinjava.objects.date.StrftimeFormatter;
1514

@@ -23,9 +22,7 @@ public class DateTimeFormatFilterTest {
2322

2423
@Before
2524
public void setup() {
26-
Jinjava jinjava = new Jinjava();
27-
Context context = new Context();
28-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
25+
interpreter = new Jinjava().newInterpreter();
2926
filter = new DateTimeFormatFilter();
3027
d = ZonedDateTime.parse("2013-11-06T14:22:00.000+00:00[UTC]");
3128
}

‎src/test/java/com/hubspot/jinjava/lib/filter/IntFilterTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.junit.Test;
77

88
import com.hubspot.jinjava.Jinjava;
9-
import com.hubspot.jinjava.interpret.Context;
109
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
1110

1211

@@ -17,9 +16,7 @@ public class IntFilterTest {
1716

1817
@Before
1918
public void setup() {
20-
Jinjava jinjava = new Jinjava();
21-
Context context = new Context();
22-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
19+
interpreter = new Jinjava().newInterpreter();
2320
filter = new IntFilter();
2421
}
2522

‎src/test/java/com/hubspot/jinjava/lib/filter/ReplaceFilterTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.junit.Test;
77

88
import com.hubspot.jinjava.Jinjava;
9-
import com.hubspot.jinjava.interpret.Context;
109
import com.hubspot.jinjava.interpret.InterpretException;
1110
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
1211

@@ -18,9 +17,7 @@ public class ReplaceFilterTest {
1817

1918
@Before
2019
public void setup() {
21-
Jinjava jinjava = new Jinjava();
22-
Context context = new Context();
23-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
20+
interpreter = new Jinjava().newInterpreter();
2421
filter = new ReplaceFilter();
2522
}
2623

‎src/test/java/com/hubspot/jinjava/lib/filter/TrimFilterTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.junit.Test;
77

88
import com.hubspot.jinjava.Jinjava;
9-
import com.hubspot.jinjava.interpret.Context;
109
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
1110

1211

@@ -17,9 +16,7 @@ public class TrimFilterTest {
1716

1817
@Before
1918
public void setup() {
20-
Jinjava jinjava = new Jinjava();
21-
Context context = new Context();
22-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
19+
interpreter = new Jinjava().newInterpreter();
2320
filter = new TrimFilter();
2421
}
2522

‎src/test/java/com/hubspot/jinjava/lib/filter/UrlEncodeFilterTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.junit.Test;
1010

1111
import com.hubspot.jinjava.Jinjava;
12-
import com.hubspot.jinjava.interpret.Context;
1312
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
1413

1514

@@ -20,9 +19,7 @@ public class UrlEncodeFilterTest {
2019

2120
@Before
2221
public void setup() {
23-
Jinjava jinjava = new Jinjava();
24-
Context context = new Context();
25-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
22+
interpreter = new Jinjava().newInterpreter();
2623
filter = new UrlEncodeFilter();
2724
}
2825

‎src/test/java/com/hubspot/jinjava/lib/tag/CallTagTest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,16 @@
1414
import com.google.common.base.Throwables;
1515
import com.google.common.io.Resources;
1616
import com.hubspot.jinjava.Jinjava;
17-
import com.hubspot.jinjava.interpret.Context;
1817
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
1918

2019

2120
public class CallTagTest {
2221

23-
Context context;
2422
JinjavaInterpreter interpreter;
2523

2624
@Before
2725
public void setup() {
28-
Jinjava jinjava = new Jinjava();
29-
context = new Context();
30-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
26+
interpreter = new Jinjava().newInterpreter();
3127
JinjavaInterpreter.pushCurrent(interpreter);
3228
}
3329

‎src/test/java/com/hubspot/jinjava/lib/tag/ForTagTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public class ForTagTest {
3535

3636
@Before
3737
public void setup() {
38-
Jinjava jinjava = new Jinjava();
39-
context = new Context();
40-
interpreter = new JinjavaInterpreter(jinjava, context, jinjava.getGlobalConfig());
38+
interpreter = new Jinjava().newInterpreter();
39+
context = interpreter.getContext();
40+
4141
tag = new ForTag();
4242
}
4343

0 commit comments

Comments
 (0)