Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update CLI test auto-configuration to 1.4's new test infrastructure

Browse Source 
Closes gh-6973
This commit is contained in:
Andy Wilkinson 2016-09-21 15:15:35 +01:00
parent be78dc4b99
commit fc0d4e45a5
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 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.
@ -69,6 +69,7 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati
"org.springframework.boot.context.properties.ConfigurationProperties",
"org.springframework.boot.context.properties.EnableConfigurationProperties",
"org.springframework.boot.autoconfigure.EnableAutoConfiguration",
"org.springframework.boot.autoconfigure.SpringBootApplication",
"org.springframework.boot.context.properties.ConfigurationProperties",
"org.springframework.boot.context.properties.EnableConfigurationProperties");
imports.addStarImports("org.springframework.stereotype",

11
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java
View File

@ -41,8 +41,7 @@ public class SpringTestCompilerAutoConfiguration extends CompilerAutoConfigurati
@Override
public boolean matches(ClassNode classNode) {
return AstUtils.hasAtLeastOneAnnotation(classNode,
"SpringApplicationConfiguration");
return AstUtils.hasAtLeastOneAnnotation(classNode, "SpringBootTest");
}
@Override
@ -66,8 +65,10 @@ public class SpringTestCompilerAutoConfiguration extends CompilerAutoConfigurati
@Override
public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
imports.addStarImports("org.junit.runner", "org.springframework.boot.test",
"org.springframework.http", "org.springframework.test.context.junit4",
"org.springframework.test.annotation")
.addImports("org.springframework.test.context.web.WebAppConfiguration");
"org.springframework.boot.test.context",
"org.springframework.boot.test.web.client", "org.springframework.http",
"org.springframework.test.context.junit4",
"org.springframework.test.annotation").addImports(
"org.springframework.boot.test.context.SpringBootTest.WebEnvironment");
}
}

3
spring-boot-cli/test-samples/integration.groovy
View File

@ -1,5 +1,4 @@
@SpringApplicationConfiguration(Application)
@IntegrationTest
@SpringBootTest(classes=Application)
class BookTests {
@Autowired
Book book

15
spring-boot-cli/test-samples/integration_auto.groovy
View File

@ -1,15 +1,15 @@
@SpringApplicationConfiguration(Application)
@IntegrationTest('server.port:0')
@WebAppConfiguration
@DirtiesContext
package com.example
@SpringBootApplication
@SpringBootTest(classes=RestTests, webEnvironment=WebEnvironment.RANDOM_PORT)
class RestTests {
@Value('${local.server.port}')
int port
@Autowired
TestRestTemplate testRestTemplate;
@Test
void testHome() {
assertEquals('Hello', new TestRestTemplate().getForObject('http://localhost:' + port, String))
assertEquals('Hello', testRestTemplate.getForObject('/', String))
}
@RestController
@ -17,4 +17,5 @@ class RestTests {
@RequestMapping('/')
String hello() { 'Hello' }
}
}

3
spring-boot-cli/test-samples/integration_auto_test.groovy
View File

@ -1,5 +1,4 @@
@SpringApplicationConfiguration(ReactorApplication)
@IntegrationTest('server.port:0')
@SpringBootTest(classes=ReactorApplication, webEnvironment=WebEnvironment.RANDOM_PORT)
class RestTests {
@Autowired