From c9f3688df9283390abc4f56074e205c12f913632 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 4 Mar 2025 17:45:23 +0000 Subject: [PATCH] Remove redundant tests Closes gh-44520 --- .../boot/autoconfigure/SpringJUnitTests.java | 61 ------------------- ...urceAutoConfigurationIntegrationTests.java | 55 ----------------- ...geSourceAutoConfigurationProfileTests.java | 57 ----------------- .../application-switch-messages.properties | 1 - .../test/resources/switch-messages.properties | 1 - 5 files changed, 175 deletions(-) delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/resources/application-switch-messages.properties delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/resources/switch-messages.properties diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java deleted file mode 100644 index 84982b51e66..00000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java +++ /dev/null @@ -1,61 +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.Test; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.test.annotation.DirtiesContext; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Dave Syer - */ -@DirtiesContext -@SpringBootTest -class SpringJUnitTests { - - @Autowired - private ApplicationContext context; - - @Value("${foo:spam}") - private String foo = "bar"; - - @Test - void testContextCreated() { - assertThat(this.context).isNotNull(); - } - - @Test - void testContextInitialized() { - assertThat(this.foo).isEqualTo("bucket"); - } - - @Configuration(proxyBeanMethods = false) - @Import({ PropertyPlaceholderAutoConfiguration.class }) - static class TestConfiguration { - - } - -} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java deleted file mode 100644 index be856f254ef..00000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java +++ /dev/null @@ -1,55 +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.context; - -import java.util.Locale; - -import org.junit.jupiter.api.Test; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.DirtiesContext; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests for {@link MessageSourceAutoConfiguration}. - * - * @author Dave Syer - */ -@SpringBootTest("spring.messages.basename:test/messages") -@ImportAutoConfiguration({ MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) -@DirtiesContext -class MessageSourceAutoConfigurationIntegrationTests { - - @Autowired - private ApplicationContext context; - - @Test - void testMessageSourceFromPropertySourceAnnotation() { - assertThat(this.context.getMessage("foo", null, "Foo message", Locale.UK)).isEqualTo("bar"); - } - - @Configuration(proxyBeanMethods = false) - static class Config { - - } - -} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java deleted file mode 100644 index 049b86e06d9..00000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java +++ /dev/null @@ -1,57 +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.context; - -import java.util.Locale; - -import org.junit.jupiter.api.Test; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ActiveProfiles; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests for {@link MessageSourceAutoConfiguration}. - * - * @author Dave Syer - */ -@SpringBootTest -@ImportAutoConfiguration({ MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) -@ActiveProfiles("switch-messages") -@DirtiesContext -class MessageSourceAutoConfigurationProfileTests { - - @Autowired - private ApplicationContext context; - - @Test - void testMessageSourceFromPropertySourceAnnotation() { - assertThat(this.context.getMessage("foo", null, "Foo message", Locale.UK)).isEqualTo("bar"); - } - - @Configuration(proxyBeanMethods = false) - static class Config { - - } - -} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application-switch-messages.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application-switch-messages.properties deleted file mode 100644 index f771bfbfbaa..00000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application-switch-messages.properties +++ /dev/null @@ -1 +0,0 @@ -spring.messages.basename:test/messages diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/switch-messages.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/switch-messages.properties deleted file mode 100644 index f771bfbfbaa..00000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/switch-messages.properties +++ /dev/null @@ -1 +0,0 @@ -spring.messages.basename:test/messages