From 5bbd31e7a35a110701d5cbfc6604b3d9c045fea0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 5 Jan 2018 11:49:39 +0000 Subject: [PATCH] Rename test classes so that their tests are run by Maven --- ...tionTest.java => SampleTestNoMockitoApplicationTests.java} | 2 +- ...verrideAutoConfigurationEnabledFalseIntegrationTests.java} | 4 ++-- ...OverrideAutoConfigurationEnabledTrueIntegrationTests.java} | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/{SampleTestNoMockitoApplicationTest.java => SampleTestNoMockitoApplicationTests.java} (93%) rename spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/{OverrideAutoConfigurationEnabledFalseIntegrationTest.java => OverrideAutoConfigurationEnabledFalseIntegrationTests.java} (97%) rename spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/{OverrideAutoConfigurationEnabledTrueIntegrationTest.java => OverrideAutoConfigurationEnabledTrueIntegrationTests.java} (97%) diff --git a/spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java b/spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTests.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java rename to spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTests.java index 70e89a1f24b..42963d80084 100644 --- a/spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java +++ b/spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTests.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Madhura Bhave */ @RunWith(SpringRunner.class) -public class SampleTestNoMockitoApplicationTest { +public class SampleTestNoMockitoApplicationTests { // gh-7065 diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledFalseIntegrationTest.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledFalseIntegrationTests.java similarity index 97% rename from spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledFalseIntegrationTest.java rename to spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledFalseIntegrationTests.java index 95ca0dae260..1100e5068e6 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledFalseIntegrationTest.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledFalseIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2018 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. @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; @OverrideAutoConfiguration(enabled = false) @BootstrapWith(SpringBootTestContextBootstrapper.class) @ImportAutoConfiguration(ExampleTestConfig.class) -public class OverrideAutoConfigurationEnabledFalseIntegrationTest { +public class OverrideAutoConfigurationEnabledFalseIntegrationTests { @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTest.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTests.java similarity index 97% rename from spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTest.java rename to spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTests.java index e10ec20dc4e..e3f5179e504 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTest.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2018 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. @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; @OverrideAutoConfiguration(enabled = true) @BootstrapWith(SpringBootTestContextBootstrapper.class) @ImportAutoConfiguration(ExampleTestConfig.class) -public class OverrideAutoConfigurationEnabledTrueIntegrationTest { +public class OverrideAutoConfigurationEnabledTrueIntegrationTests { @Autowired private ApplicationContext context;