From 5f1f04a33ac0506ef5e80ba7ddc636e605ffa5ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sat, 13 Jan 2018 00:59:49 -0500
Subject: [PATCH 1/2] Add test to spring-boot-sample-quartz

See gh-11621
---
 .../spring-boot-sample-quartz/pom.xml         |  5 +++
 .../quartz/SampleQuartzApplicationTests.java  | 43 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 spring-boot-samples/spring-boot-sample-quartz/src/test/java/sample/quartz/SampleQuartzApplicationTests.java

diff --git a/spring-boot-samples/spring-boot-sample-quartz/pom.xml b/spring-boot-samples/spring-boot-sample-quartz/pom.xml
index ae3d5d553c7..082cd0bc818 100644
--- a/spring-boot-samples/spring-boot-sample-quartz/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-quartz/pom.xml
@@ -19,6 +19,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-quartz</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/spring-boot-samples/spring-boot-sample-quartz/src/test/java/sample/quartz/SampleQuartzApplicationTests.java b/spring-boot-samples/spring-boot-sample-quartz/src/test/java/sample/quartz/SampleQuartzApplicationTests.java
new file mode 100644
index 00000000000..58c62ce96b3
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-quartz/src/test/java/sample/quartz/SampleQuartzApplicationTests.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://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 sample.quartz;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.springframework.boot.test.rule.OutputCapture;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link SampleQuartzApplication}.
+ *
+ * @author Eddú Meléndez
+ */
+public class SampleQuartzApplicationTests {
+
+	@Rule
+	public OutputCapture outputCapture = new OutputCapture();
+
+	@Test
+	public void test() {
+		SampleQuartzApplication.main(new String[0]);
+		String output = this.outputCapture.toString();
+		assertThat(output).contains("Hello World!");
+	}
+
+}

From 51f0d88eecdbbdb37f34136f85096c6bffd929f7 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 17 Jan 2018 14:31:52 +0100
Subject: [PATCH 2/2] Polish "Add test to spring-boot-sample-quartz"

Closes gh-11621
---
 spring-boot-samples/spring-boot-sample-quartz/pom.xml  |  1 +
 .../sample/quartz/SampleQuartzApplicationTests.java    | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-boot-samples/spring-boot-sample-quartz/pom.xml b/spring-boot-samples/spring-boot-sample-quartz/pom.xml
index 082cd0bc818..0db481251c0 100644
--- a/spring-boot-samples/spring-boot-sample-quartz/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-quartz/pom.xml
@@ -19,6 +19,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-quartz</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-boot-samples/spring-boot-sample-quartz/src/test/java/sample/quartz/SampleQuartzApplicationTests.java b/spring-boot-samples/spring-boot-sample-quartz/src/test/java/sample/quartz/SampleQuartzApplicationTests.java
index 58c62ce96b3..60890e9ad99 100644
--- a/spring-boot-samples/spring-boot-sample-quartz/src/test/java/sample/quartz/SampleQuartzApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-quartz/src/test/java/sample/quartz/SampleQuartzApplicationTests.java
@@ -19,7 +19,9 @@ package sample.quartz;
 import org.junit.Rule;
 import org.junit.Test;
 
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.context.ConfigurableApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,9 +37,11 @@ public class SampleQuartzApplicationTests {
 
 	@Test
 	public void test() {
-		SampleQuartzApplication.main(new String[0]);
-		String output = this.outputCapture.toString();
-		assertThat(output).contains("Hello World!");
+		try (ConfigurableApplicationContext context = SpringApplication.run(
+				SampleQuartzApplication.class)) {
+			String output = this.outputCapture.toString();
+			assertThat(output).contains("Hello World!");
+		}
 	}
 
 }