Merge pull request #11886 from Vedran Pavić

* gh-11886:
  Polish "Update deployment tests to include Actuator"
  Update deployment tests to include Actuator

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml

@@ -31,6 +31,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 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.
@@ -41,4 +41,14 @@ public class SampleGlassfishDeployApplicationIT {
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}
 
+	@Test
+	public void testHealth() throws Exception {
+		String url = "http://localhost:" + this.port + "/bootapp/actuator/health";
+		System.out.println(url);
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+				String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).isEqualTo("{\"status\":\"UP\"}");
+	}
+
 }

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml

@@ -28,6 +28,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 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.
@@ -40,4 +40,14 @@ public class SampleTomcatDeployApplicationIT {
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}
 
+	@Test
+	public void testHealth() throws Exception {
+		String url = "http://localhost:" + this.port + "/bootapp/actuator/health";
+		System.out.println(url);
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+				String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).isEqualTo("{\"status\":\"UP\"}");
+	}
+
 }

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml

@@ -33,6 +33,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 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.
@@ -40,4 +40,14 @@ public class SampleTomEEDeployApplicationIT {
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}
 
+	@Test
+	public void testHealth() throws Exception {
+		String url = "http://localhost:" + this.port + "/bootapp/actuator/health";
+		System.out.println(url);
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+				String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).isEqualTo("{\"status\":\"UP\"}");
+	}
+
 }

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml

@@ -28,6 +28,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

@@ -7,6 +7,7 @@
 			<module name="com.fasterxml.jackson.core.jackson-databind" />
 			<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
 			<module name="org.jboss.resteasy.resteasy-jackson2-provider" />
+			<module name="org.slf4j" />
 		</exclusions>
 	</deployment>
 </jboss-deployment-structure>

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 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.
@@ -40,4 +40,14 @@ public class SampleWildFlyDeployApplicationIT {
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}
 
+	@Test
+	public void testHealth() throws Exception {
+		String url = "http://localhost:" + this.port + "/bootapp/actuator/health";
+		System.out.println(url);
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+				String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).isEqualTo("{\"status\":\"UP\"}");
+	}
+
 }

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml

@@ -27,6 +27,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 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.
@@ -40,4 +40,14 @@ public class SampleWlpDeployApplicationIT {
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}
 
+	@Test
+	public void testHealth() throws Exception {
+		String url = "http://localhost:" + this.port + "/bootapp/actuator/health";
+		System.out.println(url);
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+				String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).isEqualTo("{\"status\":\"UP\"}");
+	}
+
 }