From 27779bec0a8411f5ff7a233f4a24630e3d977340 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 4 Mar 2025 17:50:19 +0000 Subject: [PATCH] Remove AutoConfigurationReproTests Removed in favor of WebServerFactoryCustomizerBeanPostProcessorTests which, through the expectations that it sets up on the mock bean factory, already checks that early initialization will not be triggered. Closes gh-44511 --- .../AutoConfigurationReproTests.java | 67 ------------------- .../src/test/resources/early-init-test.xml | 11 --- 2 files changed, 78 deletions(-) delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/resources/early-init-test.xml diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java deleted file mode 100644 index 900f0c0868..0000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2012-2019 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. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.boot.autoconfigure; - -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.ImportResource; -import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests to reproduce reported issues. - * - * @author Phillip Webb - */ -class AutoConfigurationReproTests { - - private ConfigurableApplicationContext context; - - @AfterEach - void cleanup() { - if (this.context != null) { - this.context.close(); - } - } - - @Test - void doesNotEarlyInitializeFactoryBeans() { - SpringApplication application = new SpringApplication(EarlyInitConfig.class, - PropertySourcesPlaceholderConfigurer.class, ServletWebServerFactoryAutoConfiguration.class); - this.context = application.run("--server.port=0"); - String bean = (String) this.context.getBean("earlyInit"); - assertThat(bean).isEqualTo("bucket"); - } - - @Configuration(proxyBeanMethods = false) - static class Config { - - } - - @Configuration(proxyBeanMethods = false) - @ImportResource("classpath:/early-init-test.xml") - static class EarlyInitConfig { - - } - -} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/early-init-test.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/early-init-test.xml deleted file mode 100644 index 2ef5e73d12..0000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/early-init-test.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - -