From c0c41ddda5398855b6c44f727be197c2650db3c4 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:29:02 +0100
Subject: [PATCH] Disable unsupported tests in AOT mode as well

---
 ...nWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java | 2 ++
 ...nWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java
index b3b8d6f1c1..f105c6adf8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java
@@ -27,6 +27,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.bean.override.example.ExampleGenericServiceCaller;
 import org.springframework.test.context.bean.override.example.IntegerExampleGenericService;
 import org.springframework.test.context.bean.override.example.StringExampleGenericService;
@@ -49,6 +50,7 @@ import static org.mockito.Mockito.mockingDetails;
  * @see MockitoBeanWithMultipleExistingBeansAndExplicitQualifierIntegrationTests
  */
 @Disabled("Disabled until @Primary is supported for BeanOverrideStrategy.REPLACE_OR_CREATE")
+@DisabledInAotMode
 @ExtendWith(SpringExtension.class)
 class MockitoBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java
index a0b1f33e1d..9480d6bc16 100644
--- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java
@@ -27,6 +27,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.bean.override.example.ExampleGenericServiceCaller;
 import org.springframework.test.context.bean.override.example.IntegerExampleGenericService;
 import org.springframework.test.context.bean.override.example.StringExampleGenericService;
@@ -48,6 +49,7 @@ import static org.mockito.Mockito.mockingDetails;
  * @see MockitoSpyBeanWithMultipleExistingBeansAndExplicitQualifierIntegrationTests
  */
 @Disabled("Disabled until @Primary is supported for @MockitoSpyBean")
+@DisabledInAotMode
 @ExtendWith(SpringExtension.class)
 class MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests {