See gh-243
This commit is contained in:
Stephane Nicoll
2016-07-06 11:02:20 +02:00
parent f1322750b8
commit 4192e601fe
4 changed files with 28 additions and 11 deletions

View File

@@ -1,6 +1,6 @@
package ${packageName}
import org.springframework.boot.builder.SpringApplicationBuilder<% if (newTestInfrastructure) { %>
import org.springframework.boot.builder.SpringApplicationBuilder<% if (newServletInitializer) { %>
import org.springframework.boot.web.support.SpringBootServletInitializer<% } else { %>
import org.springframework.boot.context.web.SpringBootServletInitializer<% } %>

View File

@@ -1,6 +1,6 @@
package ${packageName};
import org.springframework.boot.builder.SpringApplicationBuilder;<% if (newTestInfrastructure) { %>
import org.springframework.boot.builder.SpringApplicationBuilder;<% if (newServletInitializer) { %>
import org.springframework.boot.web.support.SpringBootServletInitializer;<% } else { %>
import org.springframework.boot.context.web.SpringBootServletInitializer;<% } %>

View File

@@ -1,6 +1,6 @@
package ${packageName}
import org.springframework.boot.builder.SpringApplicationBuilder<% if (newTestInfrastructure) { %>
import org.springframework.boot.builder.SpringApplicationBuilder<% if (newServletInitializer) { %>
import org.springframework.boot.web.support.SpringBootServletInitializer<% } else { %>
import org.springframework.boot.context.web.SpringBootServletInitializer<% } %>

View File

@@ -101,23 +101,40 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
@Test
public void standardServletInitializer() {
def request = createProjectRequest()
request.language = language
request.packaging = 'war'
def project = generateProject(request)
project.sourceCodeAssert("src/main/$language/com/example/ServletInitializer.$extension")
.equalsTo(new ClassPathResource("project/$language/standard/ServletInitializer.$expectedExtension"))
testServletInitializr(null, 'standard')
}
@Test
public void springBoot14M2ServletInitializer() {
testServletInitializr('1.4.0.M2', 'standard')
}
@Test
public void springBoot14ServletInitializer() {
testServletInitializr('1.4.0.M3', 'spring-boot-1.4')
}
private void testServletInitializr(String bootVersion, String expectedOutput) {
def request = createProjectRequest()
request.language = language
request.packaging = 'war'
request.bootVersion = '1.4.0.M3'
if (bootVersion) {
request.bootVersion = bootVersion
}
def project = generateProject(request)
project.sourceCodeAssert("src/main/$language/com/example/ServletInitializer.$extension")
.equalsTo(new ClassPathResource("project/$language/spring-boot-1.4/ServletInitializer.$expectedExtension"))
.equalsTo(new ClassPathResource("project/$language/$expectedOutput/ServletInitializer.$expectedExtension"))
}
@Test
public void springBoot14M1TestClass() {
def request = createProjectRequest()
request.language = language
request.bootVersion = '1.4.0.M1'
def project = generateProject(request)
project.sourceCodeAssert("src/test/$language/com/example/DemoApplicationTests.$extension")
.equalsTo(new ClassPathResource("project/$language/standard/DemoApplicationTests.$expectedExtension"))
}
@Test