Merge branch '3.5.x' into 4.0.x

Closes gh-50498

Author: snicoll

core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProvider.java

@@ -56,8 +56,8 @@ public interface ApplicationContextAssertProvider<C extends ApplicationContext>
 		extends ApplicationContext, AssertProvider<ApplicationContextAssert<C>>, Closeable {
 
 	/**
-	 * Return an assert for AspectJ.
-	 * @return an AspectJ assert
+	 * Return an assert for AssertJ.
+	 * @return an AssertJ assert
 	 * @deprecated to prevent accidental use. Prefer standard AssertJ
 	 * {@code assertThat(context)...} calls instead.
 	 */
@@ -132,6 +132,7 @@ static <T extends ApplicationContextAssertProvider<C>, C extends ApplicationCont
 		Assert.isTrue(type.isInterface(), "'type' must be an interface");
 		Assert.notNull(contextType, "'contextType' must not be null");
 		Assert.isTrue(contextType.isInterface(), "'contextType' must be an interface");
+		Assert.notNull(contextSupplier, "'contextSupplier' must not be null");
 		Class<?>[] interfaces = merge(new Class<?>[] { type, contextType }, additionalContextInterfaces);
 		return (T) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), interfaces,
 				new AssertProviderApplicationContextInvocationHandler(contextType, contextSupplier));

core/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProviderTests.java

@@ -20,9 +20,7 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -32,19 +30,18 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link ApplicationContextAssertProvider} and
  * {@link AssertProviderApplicationContextInvocationHandler}.
  *
  * @author Phillip Webb
  */
-@ExtendWith(MockitoExtension.class)
 class ApplicationContextAssertProviderTests {
 
 	@Mock
-	@SuppressWarnings("NullAway.Init")
-	private ConfigurableApplicationContext mockContext;
+	private final ConfigurableApplicationContext mockContext = mock();
 
 	private RuntimeException startupFailure;
 
@@ -70,15 +67,7 @@ void getWhenTypeIsNullShouldThrowException() {
 	}
 
 	@Test
-	@SuppressWarnings("NullAway") // Test null check
 	void getWhenTypeIsClassShouldThrowException() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> ApplicationContextAssertProvider.get(null, ApplicationContext.class, this.mockContextSupplier))
-			.withMessageContaining("'type' must not be null");
-	}
-
-	@Test
-	void getWhenContextTypeIsNullShouldThrowException() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> ApplicationContextAssertProvider.get(TestAssertProviderApplicationContextClass.class,
 					ApplicationContext.class, this.mockContextSupplier))
@@ -87,21 +76,30 @@ void getWhenContextTypeIsNullShouldThrowException() {
 
 	@Test
 	@SuppressWarnings("NullAway") // Test null check
-	void getWhenContextTypeIsClassShouldThrowException() {
+	void getWhenContextTypeIsNullShouldThrowException() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> ApplicationContextAssertProvider.get(TestAssertProviderApplicationContext.class, null,
 					this.mockContextSupplier))
 			.withMessageContaining("'contextType' must not be null");
 	}
 
 	@Test
-	void getWhenSupplierIsNullShouldThrowException() {
+	void getWhenContextTypeIsClassShouldThrowException() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> ApplicationContextAssertProvider.get(TestAssertProviderApplicationContext.class,
 					StaticApplicationContext.class, this.mockContextSupplier))
 			.withMessageContaining("'contextType' must be an interface");
 	}
 
+	@Test
+	@SuppressWarnings("NullAway") // Test null check
+	void getWhenSupplierIsNullShouldThrowException() {
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ApplicationContextAssertProvider.get(TestAssertProviderApplicationContext.class,
+					ApplicationContext.class, null))
+			.withMessageContaining("'contextSupplier' must not be null");
+	}
+
 	@Test
 	void getWhenContextStartsShouldReturnProxyThatCallsRealMethods() {
 		ApplicationContextAssertProvider<ApplicationContext> context = get(this.mockContextSupplier);