From 3fb1bdef8541cf9b63626c127c7e347f794762d6 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 13 Jul 2017 11:25:34 +0100
Subject: [PATCH] Add support to ContextLoader for configuring context's parent

Closes gh-9749
---
 .../boot/test/context/AbstractContextLoader.java      | 11 +++++++++++
 .../boot/test/context/ContextLoader.java              | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractContextLoader.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractContextLoader.java
index f850e0e7ab..dcd2bd2ea7 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractContextLoader.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractContextLoader.java
@@ -62,6 +62,8 @@ class AbstractContextLoader<T extends ConfigurableApplicationContext, L extends
 
 	private ClassLoader classLoader;
 
+	private ApplicationContext parent;
+
 	protected AbstractContextLoader(Supplier<T> contextSupplier) {
 		this.contextSupplier = contextSupplier;
 	}
@@ -115,6 +117,12 @@ class AbstractContextLoader<T extends ConfigurableApplicationContext, L extends
 		return self();
 	}
 
+	@Override
+	public L parent(ApplicationContext parent) {
+		this.parent = parent;
+		return self();
+	}
+
 	/**
 	 * Add the specified auto-configuration classes.
 	 * @param autoConfigurations the auto-configuration classes to add
@@ -226,6 +234,9 @@ class AbstractContextLoader<T extends ConfigurableApplicationContext, L extends
 
 	private T configureApplicationContext() {
 		T context = AbstractContextLoader.this.contextSupplier.get();
+		if (this.parent != null) {
+			context.setParent(this.parent);
+		}
 		if (this.classLoader != null) {
 			Assert.isInstanceOf(DefaultResourceLoader.class, context);
 			((DefaultResourceLoader) context).setClassLoader(this.classLoader);
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ContextLoader.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ContextLoader.java
index 7d50eae773..421ba80814 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ContextLoader.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ContextLoader.java
@@ -134,6 +134,16 @@ public interface ContextLoader {
 	 */
 	ContextLoader classLoader(ClassLoader classLoader);
 
+	/**
+	 * Configure the
+	 * {@link org.springframework.context.ConfigurableApplicationContext#setParent(ApplicationContext)
+	 * parent} of the {@link ApplicationContext}.
+	 *
+	 * @param parent the parent
+	 * @return this instance
+	 */
+	ContextLoader parent(ApplicationContext parent);
+
 	/**
 	 * Create and refresh a new {@link ApplicationContext} based on the current state of
 	 * this loader. The context is consumed by the specified {@code consumer} and closed