From 455505a108ae54862cfedea3f0894145a4dae406 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sat, 5 Aug 2017 08:51:28 -0700 Subject: [PATCH] Rename embedded servlet tests Rename `spring-boot-integration-tests-embedded-servlet-container` to `spring-boot-server-tests`. See gh-9316 --- spring-boot-tests/spring-boot-integration-tests/pom.xml | 2 +- .../pom.xml | 4 ++-- .../test/java/com/example/ResourceHandlingApplication.java | 0 .../boot/context/embedded/AbstractApplicationLauncher.java | 0 .../AbstractEmbeddedServletContainerIntegrationTests.java | 0 .../boot/context/embedded/ApplicationBuilder.java | 0 .../boot/context/embedded/BootRunApplicationLauncher.java | 0 ...mbeddedServletContainerJarDevelopmentIntegrationTests.java | 0 .../EmbeddedServletContainerJarPackagingIntegrationTests.java | 0 ...mbeddedServletContainerWarDevelopmentIntegrationTests.java | 0 .../EmbeddedServletContainerWarPackagingIntegrationTests.java | 0 .../boot/context/embedded/ExplodedApplicationLauncher.java | 0 .../boot/context/embedded/IdeApplicationLauncher.java | 0 .../boot/context/embedded/PackagedApplicationLauncher.java | 0 .../org/springframework/boot/context/embedded/Versions.java | 0 .../src/test/resources/pom-template.xml | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/pom.xml (92%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/com/example/ResourceHandlingApplication.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/java/org/springframework/boot/context/embedded/Versions.java (100%) rename spring-boot-tests/spring-boot-integration-tests/{spring-boot-integration-tests-embedded-servlet-container => spring-boot-server-tests}/src/test/resources/pom-template.xml (100%) diff --git a/spring-boot-tests/spring-boot-integration-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/pom.xml index f8cd852060a..dc0e7fddb5b 100644 --- a/spring-boot-tests/spring-boot-integration-tests/pom.xml +++ b/spring-boot-tests/spring-boot-integration-tests/pom.xml @@ -17,7 +17,7 @@ spring-boot-devtools-tests - spring-boot-integration-tests-embedded-servlet-container + spring-boot-server-tests spring-boot-launch-script-tests spring-boot-security-tests diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml similarity index 92% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml index 386638d460d..3cfac345088 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml @@ -7,9 +7,9 @@ spring-boot-integration-tests ${revision} - spring-boot-integration-tests-embedded-servlet-container + spring-boot-server-tests jar - Spring Boot Embedded Servlet Container Integration Tests + Spring Boot Server Tests ${basedir}/../../.. diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/com/example/ResourceHandlingApplication.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/com/example/ResourceHandlingApplication.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/com/example/ResourceHandlingApplication.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/com/example/ResourceHandlingApplication.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/Versions.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/Versions.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/Versions.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/Versions.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/resources/pom-template.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/resources/pom-template.xml similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/resources/pom-template.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/resources/pom-template.xml