Migrate rest of test suite from JUnit 4 to JUnit Jupiter

This commit migrates the rest of Spring's test suite to JUnit Jupiter,
except spring-test which will be migrated in a separate commit.

See gh-23451

spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;

spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.GenericConversionService;

spring-expression/src/test/java/org/springframework/expression/spel/CachedMethodExecutorTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;

spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java

@@ -19,8 +19,8 @@ package org.springframework.expression.spel;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.AccessException;
@@ -229,7 +229,7 @@ public class ConstructorInvocationTests extends AbstractExpressionTests {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testArgumentConversion01() {
 		// Closest ctor will be new String(String) and converter supports Double>String
 		// TODO currently failing as with new ObjectToArray converter closest constructor

spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java

@@ -17,7 +17,7 @@ package org.springframework.expression.spel;
 
 import java.math.BigDecimal;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.TypeComparator;

spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java

@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.AccessException;

spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java

@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.AccessException;
 import org.springframework.expression.EvaluationContext;

spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java

@@ -19,7 +19,7 @@ package org.springframework.expression.spel;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.EvaluationContext;

spring-expression/src/test/java/org/springframework/expression/spel/ExpressionWithConversionTests.java

@@ -21,8 +21,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.ConversionService;
@@ -58,7 +58,7 @@ public class ExpressionWithConversionTests extends AbstractExpressionTests {
 		listOfInteger.add(6);
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		ExpressionWithConversionTests.typeDescriptorForListOfString = new TypeDescriptor(ExpressionWithConversionTests.class.getDeclaredField("listOfString"));
 		ExpressionWithConversionTests.typeDescriptorForListOfInteger = new TypeDescriptor(ExpressionWithConversionTests.class.getDeclaredField("listOfInteger"));

spring-expression/src/test/java/org/springframework/expression/spel/InProgressTests.java

@@ -19,7 +19,7 @@ package org.springframework.expression.spel;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.spel.standard.SpelExpression;
 

spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java

@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.AccessException;
 import org.springframework.expression.EvaluationContext;

spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java

@@ -19,7 +19,7 @@ package org.springframework.expression.spel;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.spel.ast.InlineList;
 import org.springframework.expression.spel.standard.SpelExpression;

spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.EvaluationException;

spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.spel.standard.SpelExpression;
 import org.springframework.expression.spel.support.StandardEvaluationContext;

spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java

@@ -19,7 +19,7 @@ package org.springframework.expression.spel;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.AccessException;
 import org.springframework.expression.EvaluationContext;

spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.spel.ast.InlineMap;
 import org.springframework.expression.spel.standard.SpelExpression;

spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java

@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.AccessException;

spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.Operation;

spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java

@@ -19,7 +19,7 @@ package org.springframework.expression.spel;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.spel.ast.Operator;
 import org.springframework.expression.spel.standard.SpelExpression;

spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the messages and exceptions that come out for badly formed expressions

spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.spel.standard.SpelExpression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;

spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;

spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java

@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.AccessException;

spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java

@@ -19,7 +19,7 @@ package org.springframework.expression.spel;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.TypeDescriptor;

spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java

@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;

spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java

@@ -19,7 +19,7 @@ package org.springframework.expression.spel;
 import java.util.Collection;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.Expression;

spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java

@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.asm.MethodVisitor;
 import org.springframework.expression.AccessException;

spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationPerformanceTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelCompiler;
@@ -28,13 +28,13 @@ import static org.assertj.core.api.Assertions.fail;
 /**
  * Checks the speed of compiled SpEL expressions.
  *
- * <p>By default these tests are marked @Ignore since they can fail on a busy machine
+ * <p>By default these tests are marked @Disabled since they can fail on a busy machine
  * because they compare relative performance of interpreted vs compiled.
  *
  * @author Andy Clement
  * @since 4.1
  */
-@Ignore
+@Disabled
 public class SpelCompilationPerformanceTests extends AbstractExpressionTests {
 
 	int count = 50000;  // number of evaluations that are timed in one run

spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java

@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;

spring-expression/src/test/java/org/springframework/expression/spel/SpelExceptionTests.java

@@ -19,7 +19,7 @@ package org.springframework.expression.spel;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;

spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java

@@ -35,7 +35,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.TypeDescriptor;

spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java

@@ -17,7 +17,7 @@ package org.springframework.expression.spel;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.spel.support.StandardTypeLocator;

spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.EvaluationException;

spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;

spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java

@@ -18,7 +18,7 @@ package org.springframework.expression.spel.ast;
 
 import java.util.Arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 

spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java

@@ -21,7 +21,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.expression.TypedValue;

spring-expression/src/test/java/org/springframework/expression/spel/standard/PropertiesConversionSpelTests.java

@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.support.StandardEvaluationContext;

spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java

@@ -18,7 +18,7 @@ package org.springframework.expression.spel.standard;
 
 import java.util.function.Consumer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.ExpressionException;

spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java

@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.EvaluationContext;

spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java

@@ -18,7 +18,7 @@ package org.springframework.expression.spel.support;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.EvaluationException;