From a4b4b850d515095e7ec7c1cc7dea029f9c861628 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 Feb 2015 16:44:06 +0000 Subject: [PATCH] Remove duplicate deployment tests Closes gh-2472 --- .../spring-boot-deployment-tests/pom.xml | 25 ---- .../spring-boot-deployment-wildfly/pom.xml | 115 ------------------ .../main/java/sample/SampleController.java | 30 ----- .../java/sample/SampleWildFlyApplication.java | 25 ---- .../SampleWildFlyApplicationTestIT.java | 40 ------ 5 files changed, 235 deletions(-) delete mode 100644 spring-boot-integration-tests/spring-boot-deployment-tests/pom.xml delete mode 100644 spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/pom.xml delete mode 100644 spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/main/java/sample/SampleController.java delete mode 100644 spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/main/java/sample/SampleWildFlyApplication.java delete mode 100644 spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/test/java/sample/SampleWildFlyApplicationTestIT.java diff --git a/spring-boot-integration-tests/spring-boot-deployment-tests/pom.xml b/spring-boot-integration-tests/spring-boot-deployment-tests/pom.xml deleted file mode 100644 index 3ba1171ec6..0000000000 --- a/spring-boot-integration-tests/spring-boot-deployment-tests/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-parent - 1.2.0.BUILD-SNAPSHOT - ../spring-boot-parent - - spring-boot-deployment-tests - pom - Spring Boot Deployment Tests - Spring Boot Deployment Tests - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - - ${basedir}/.. - - - spring-boot-deployment-wildfly - - diff --git a/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/pom.xml b/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/pom.xml deleted file mode 100644 index b623f2d008..0000000000 --- a/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/pom.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-deployment-tests - 1.2.0.BUILD-SNAPSHOT - - spring-boot-deployment-wildfly - war - Spring Boot WildFly Deployment - Spring Boot WildFly Deployment - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - - ${basedir}/../.. - 8.2.0.Final - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - javax.servlet - javax.servlet-api - provided - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - reserve-network-port - - reserve-network-port - - process-resources - - - appserver.port - - - - - - - org.codehaus.cargo - cargo-maven2-plugin - 1.4.11 - - - wildfly8x - - http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip - - - - - ${appserver.port} - standalone-full - - - - - - /bootapp - - http://localhost:${appserver.port}/bootapp - 30000 - - - - - - start-cargo - pre-integration-test - - start - - - - stop-cargo - post-integration-test - - stop - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - ${appserver.port} - - - - - - diff --git a/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/main/java/sample/SampleController.java b/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/main/java/sample/SampleController.java deleted file mode 100644 index e671d503b3..0000000000 --- a/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/main/java/sample/SampleController.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2012-2014 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; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class SampleController { - - @RequestMapping("/") - public String hello() { - return "Hello World"; - } - -} diff --git a/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/main/java/sample/SampleWildFlyApplication.java b/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/main/java/sample/SampleWildFlyApplication.java deleted file mode 100644 index e357aa8706..0000000000 --- a/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/main/java/sample/SampleWildFlyApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2012-2014 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; - -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.web.SpringBootServletInitializer; - -@SpringBootApplication -public class SampleWildFlyApplication extends SpringBootServletInitializer { - -} diff --git a/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/test/java/sample/SampleWildFlyApplicationTestIT.java b/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/test/java/sample/SampleWildFlyApplicationTestIT.java deleted file mode 100644 index bf17b5f1a1..0000000000 --- a/spring-boot-integration-tests/spring-boot-deployment-tests/spring-boot-deployment-wildfly/src/test/java/sample/SampleWildFlyApplicationTestIT.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2012-2014 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; - -import org.junit.Test; -import org.springframework.boot.test.TestRestTemplate; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -import static org.junit.Assert.assertEquals; - -public class SampleWildFlyApplicationTestIT { - - private int port = Integer.valueOf(System.getProperty("port")); - - @Test - public void testHome() throws Exception { - String url = "http://localhost:" + this.port + "/bootapp/"; - System.out.println(url); - ResponseEntity entity = new TestRestTemplate().getForEntity(url, - String.class); - assertEquals(HttpStatus.OK, entity.getStatusCode()); - assertEquals("Hello World", entity.getBody()); - } - -}