From 8a1279315ec88f982378292983837eeb3a6255ef Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 17 Jun 2014 12:08:03 -0700 Subject: [PATCH] Move ApplicationContextTestUtils to src/test Move ApplicationContextTestUtils from src/main to src/test since it is probably of limited use to others. Fixes gh-1034 --- .../builder/SpringApplicationBuilderTests.java | 1 - .../boot/test/ApplicationContextTestUtils.java | 9 +++------ .../test/ApplicationContextTestUtilsTests.java | 14 +++++++------- 3 files changed, 10 insertions(+), 14 deletions(-) rename spring-boot/src/{main => test}/java/org/springframework/boot/test/ApplicationContextTestUtils.java (93%) diff --git a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java index 21eb9f0b7c..6b9ab4a105 100644 --- a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.junit.After; import org.junit.Test; - import org.springframework.boot.test.ApplicationContextTestUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-boot/src/main/java/org/springframework/boot/test/ApplicationContextTestUtils.java b/spring-boot/src/test/java/org/springframework/boot/test/ApplicationContextTestUtils.java similarity index 93% rename from spring-boot/src/main/java/org/springframework/boot/test/ApplicationContextTestUtils.java rename to spring-boot/src/test/java/org/springframework/boot/test/ApplicationContextTestUtils.java index 41f3182aec..8eb622a0f8 100644 --- a/spring-boot/src/main/java/org/springframework/boot/test/ApplicationContextTestUtils.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/ApplicationContextTestUtils.java @@ -16,21 +16,18 @@ package org.springframework.boot.test; - import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; /** - * Application context related test utilities. - * + * Internal application context related test utilities. + * * @author Stephane Nicoll - * @since 1.1.1 */ public abstract class ApplicationContextTestUtils { /** - * Closes this {@link ApplicationContext} and its parent hierarchy - * if any. + * Closes this {@link ApplicationContext} and its parent hierarchy if any. * @param context the context to close (can be {@code null}) */ public static void closeAll(ApplicationContext context) { diff --git a/spring-boot/src/test/java/org/springframework/boot/test/ApplicationContextTestUtilsTests.java b/spring-boot/src/test/java/org/springframework/boot/test/ApplicationContextTestUtilsTests.java index d17e07223c..cbd8b61e32 100644 --- a/spring-boot/src/test/java/org/springframework/boot/test/ApplicationContextTestUtilsTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/ApplicationContextTestUtilsTests.java @@ -16,23 +16,24 @@ package org.springframework.boot.test; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.*; - import org.junit.Test; - import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + /** - * + * Tests for {@link ApplicationContextTestUtils}. + * * @author Stephane Nicoll */ public class ApplicationContextTestUtilsTests { @Test public void closeNull() { - ApplicationContextTestUtils.closeAll(null); + ApplicationContextTestUtils.closeAll(null); } @Test @@ -47,7 +48,6 @@ public class ApplicationContextTestUtilsTests { ConfigurableApplicationContext parent = mock(ConfigurableApplicationContext.class); given(mock.getParent()).willReturn(parent); given(parent.getParent()).willReturn(null); - ApplicationContextTestUtils.closeAll(mock); verify(mock).getParent(); verify(mock).close();