diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index 200f8900ea5..89dfe246372 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -19,6 +19,7 @@ package org.springframework.expression.spel; import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.expression.ConstructorResolver; @@ -41,6 +42,11 @@ import static org.assertj.core.api.Assertions.assertThatException; */ class ConstructorInvocationTests extends AbstractExpressionTests { + @BeforeEach + void resetCounter() { + Tester.counter = 0; + } + @Test void constructorWithArgument() { evaluate("new String('hello world')", "hello world", String.class); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java index 3681bc30742..0144b2b3fd8 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java @@ -2966,6 +2966,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { assertThat((Boolean) expression.getValue(tvar)).isFalse(); TestClass7 tc7 = new TestClass7(); + TestClass7.reset(); expression = parse("property == 'UK'"); assertThat((Boolean) expression.getValue(tc7)).isTrue(); TestClass7.property = null; diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java index e4a490512d6..3b754776a76 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java @@ -37,6 +37,7 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; import org.assertj.core.api.InstanceOfAssertFactories; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; @@ -85,6 +86,12 @@ class SpelReproTests extends AbstractExpressionTests { private static final ParserContext DOLLARSQUARE_TEMPLATE_PARSER_CONTEXT = new TemplateParserContext("$[", "]"); + @BeforeEach + void resetGoo() { + Goo.reset(); + } + + @Test void NPE_SPR5661() { evaluate("joinThreeStrings('a',null,'c')", "anullc", String.class); @@ -1880,7 +1887,11 @@ class SpelReproTests extends AbstractExpressionTests { static class Goo { - public static Goo instance = new Goo(); + public static Goo instance; + + static void reset() { + instance = new Goo(); + } public String bar = "key";