This commit is contained in:
Stephane Nicoll
2016-09-20 18:26:21 +02:00
parent d61bf18fa2
commit 7bd1253c5d
2 changed files with 21 additions and 21 deletions

View File

@@ -37,7 +37,7 @@ import static io.spring.initializr.test.generator.ProjectAssert.DEFAULT_PACKAGE_
class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests {
@Parameterized.Parameters(name = "{0}")
public static Object[] parameters() {
static Object[] parameters() {
Object[] maven = ["maven", "pom.xml"]
Object[] gradle = ["gradle", "build.gradle"]
Object[] parameters = [maven, gradle]
@@ -55,17 +55,17 @@ class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests {
}
@Test
public void standardJarJava() {
void standardJarJava() {
testStandardJar('java')
}
@Test
public void standardJarGroovy() {
void standardJarGroovy() {
testStandardJar('groovy')
}
@Test
public void standardJarKotlin() {
void standardJarKotlin() {
testStandardJar('kotlin')
}
@@ -78,17 +78,17 @@ class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests {
}
@Test
public void standardWarJava() {
void standardWarJava() {
testStandardWar('java')
}
@Test
public void standardWarGroovy() {
void standardWarGroovy() {
testStandardWar('java')
}
@Test
public void standardWarKotlin() {
void standardWarKotlin() {
testStandardWar('kotlin')
}
@@ -102,7 +102,7 @@ class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests {
}
@Test
public void versionOverride() {
void versionOverride() {
def request = createProjectRequest('web')
request.buildProperties.versions['spring-foo.version'] = {'0.1.0.RELEASE'}
request.buildProperties.versions['spring-bar.version'] = {'0.2.0.RELEASE'}
@@ -112,7 +112,7 @@ class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests {
}
@Test
public void bomWithVersionProperty() {
void bomWithVersionProperty() {
def foo = new Dependency(id: 'foo', groupId: 'org.acme', artifactId: 'foo', bom: 'the-bom')
def bom = new BillOfMaterials(groupId: 'org.acme', artifactId: 'foo-bom',
version: '1.3.3', versionProperty: 'foo.version')

View File

@@ -34,7 +34,7 @@ import static io.spring.initializr.test.generator.ProjectAssert.DEFAULT_PACKAGE_
class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
@Parameterized.Parameters(name = "{0}")
public static Object[] parameters() {
static Object[] parameters() {
Object[] java = ["java", "java"]
Object[] groovy = ["groovy", "groovy"]
Object[] kotlin = ["kotlin", "kt"]
@@ -53,7 +53,7 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void standardJar() {
void standardJar() {
def request = createProjectRequest()
request.language = language
generateProject(request).isGenericProject(DEFAULT_PACKAGE_NAME, DEFAULT_APPLICATION_NAME,
@@ -61,7 +61,7 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void standardWar() {
void standardWar() {
def request = createProjectRequest('web')
request.language = language
request.packaging = 'war'
@@ -70,7 +70,7 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void standardMainClass() {
void standardMainClass() {
def request = createProjectRequest()
request.language = language
@@ -80,7 +80,7 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void standardTestClass() {
void standardTestClass() {
def request = createProjectRequest()
request.language = language
@@ -90,7 +90,7 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void standardTestClassWeb() {
void standardTestClassWeb() {
def request = createProjectRequest('web')
request.language = language
@@ -100,17 +100,17 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void standardServletInitializer() {
void standardServletInitializer() {
testServletInitializr(null, 'standard')
}
@Test
public void springBoot14M2ServletInitializer() {
void springBoot14M2ServletInitializer() {
testServletInitializr('1.4.0.M2', 'standard')
}
@Test
public void springBoot14ServletInitializer() {
void springBoot14ServletInitializer() {
testServletInitializr('1.4.0.M3', 'spring-boot-1.4')
}
@@ -127,7 +127,7 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void springBoot14M1TestClass() {
void springBoot14M1TestClass() {
def request = createProjectRequest()
request.language = language
request.bootVersion = '1.4.0.M1'
@@ -138,7 +138,7 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void springBoot14TestClass() {
void springBoot14TestClass() {
def request = createProjectRequest()
request.language = language
request.bootVersion = '1.4.0.M2'
@@ -149,7 +149,7 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void springBoot14TestClassWeb() {
void springBoot14TestClassWeb() {
def request = createProjectRequest('web')
request.language = language
request.bootVersion = '1.4.0.M2'