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

src/test/java/com/foo/ComponentBeanDefinitionParserTests.java

@@ -19,9 +19,9 @@ package com.foo;
 
 import java.util.List;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -37,13 +37,13 @@ public class ComponentBeanDefinitionParserTests {
 
 	private static DefaultListableBeanFactory bf;
 
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
 		bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource("com/foo/component-config.xml"));
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void tearDownAfterClass() throws Exception {
 		bf.destroySingletons();
 	}

src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.aop.config;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
@@ -52,7 +52,7 @@ public class AopNamespaceHandlerScopeIntegrationTests {
 	private ApplicationContext context;
 
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		XmlWebApplicationContext wac = new XmlWebApplicationContext();
 		wac.setConfigLocations(CONTEXT);

src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java

@@ -21,7 +21,7 @@ import java.lang.reflect.Method;
 import java.util.List;
 import javax.servlet.ServletException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;

src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java

@@ -19,7 +19,7 @@ package org.springframework.cache.annotation;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;

src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java

@@ -23,9 +23,9 @@ import java.lang.annotation.Target;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
@@ -63,7 +63,7 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 	private ServletRequestAttributes newRequestAttributesWithSession;
 
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.oldRequestAttributes = new ServletRequestAttributes(new MockHttpServletRequest());
 		this.newRequestAttributes = new ServletRequestAttributes(new MockHttpServletRequest());
@@ -77,7 +77,7 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 		this.newRequestAttributesWithSession = new ServletRequestAttributes(newRequestWithSession);
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		RequestContextHolder.setRequestAttributes(null);
 	}

src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java

@@ -16,9 +16,9 @@
 
 package org.springframework.context.annotation.scope;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.ApplicationContext;
@@ -57,7 +57,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 	private ServletRequestAttributes newRequestAttributesWithSession;
 
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		MockHttpServletRequest oldRequestWithSession = new MockHttpServletRequest();
 		oldRequestWithSession.setSession(new MockHttpSession());
@@ -68,7 +68,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 		this.newRequestAttributesWithSession = new ServletRequestAttributes(newRequestWithSession);
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		RequestContextHolder.resetRequestAttributes();
 	}

src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java

@@ -19,8 +19,8 @@ package org.springframework.core.env;
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -99,7 +99,7 @@ public class EnvironmentSystemIntegrationTests {
 
 	private final ConfigurableEnvironment prodWebEnv = new StandardServletEnvironment();
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		prodEnv.setActiveProfiles(PROD_ENV_NAME);
 		devEnv.setActiveProfiles(DEV_ENV_NAME);

src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.core.env;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.GenericApplicationContext;
 

src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java

@@ -20,8 +20,8 @@ import java.lang.reflect.Method;
 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.MethodParameter;
 import org.springframework.core.convert.TypeDescriptor;
@@ -29,7 +29,7 @@ import org.springframework.expression.MethodExecutor;
 
 public class Spr7538Tests {
 
-	@Ignore @Test
+	@Disabled @Test
 	public void repro() throws Exception {
 		AlwaysTrueReleaseStrategy target = new AlwaysTrueReleaseStrategy();
 		BeanFactoryTypeConverter converter = new BeanFactoryTypeConverter();

src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java

@@ -19,8 +19,8 @@ package org.springframework.scheduling.annotation;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.aspectj.lang.annotation.Aspect;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator;
 import org.springframework.aop.support.AopUtils;
@@ -55,7 +55,7 @@ import static org.mockito.Mockito.mock;
 @SuppressWarnings("resource")
 public class ScheduledAndTransactionalAnnotationIntegrationTests {
 
-	@Before
+	@BeforeEach
 	public void assumePerformanceTests() {
 		Assume.group(TestGroup.PERFORMANCE);
 	}

src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java

@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.List;
 import javax.sql.DataSource;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;

src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.transaction.annotation;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;