Apply @⁠DisabledInAotMode to remaining @⁠ContextHierarchy integration…

… tests See gh-29122
spring-projects · Oct 16, 2023 · 0adec6d · 0adec6d
1 parent bb95f2e
commit 0adec6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...st/java/org/springframework/test/context/hierarchies/meta/MetaHierarchyLevelTwoTests.java b/...st/java/org/springframework/test/context/hierarchies/meta/MetaHierarchyLevelTwoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -34,6 +35,7 @@
  */
 @ContextConfiguration
 @ActiveProfiles("prod")
+@DisabledInAotMode // @ContextHierarchy is not supported in AOT.
 class MetaHierarchyLevelTwoTests extends MetaHierarchyLevelOneTests {
 
 	@Configuration

diff --git a/...ierarchies/standard/TestHierarchyLevelTwoWithBareContextConfigurationInSubclassTests.java b/...ierarchies/standard/TestHierarchyLevelTwoWithBareContextConfigurationInSubclassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,6 +35,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
+@DisabledInAotMode // @ContextHierarchy is not supported in AOT.
 class TestHierarchyLevelTwoWithBareContextConfigurationInSubclassTests extends
 		TestHierarchyLevelOneWithBareContextConfigurationInSubclassTests {