root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #6921 from izeye/polish-20160919 

* pr/6921:
  Polish
This commit is contained in:
Phillip Webb 2016-09-18 23:38:48 -07:00
parent e239e64cb1 a994b11a73
commit feee401f87
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -3788,7 +3788,7 @@ providers (in this order):
* <<boot-features-caching-provider-generic,Generic>> * <<boot-features-caching-provider-generic,Generic>>
* <<boot-features-caching-provider-jcache,JCache (JSR-107)>> (EhCache 3, Hazelcast, * <<boot-features-caching-provider-jcache,JCache (JSR-107)>> (EhCache 3, Hazelcast,
Infinspan, etc) Infinispan, etc)
* <<boot-features-caching-provider-ehcache2,EhCache 2.x>> * <<boot-features-caching-provider-ehcache2,EhCache 2.x>>
* <<boot-features-caching-provider-hazelcast,Hazelcast>> * <<boot-features-caching-provider-hazelcast,Hazelcast>>
* <<boot-features-caching-provider-infinispan,Infinispan>> * <<boot-features-caching-provider-infinispan,Infinispan>>

2
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java
View File

@ -41,7 +41,7 @@ public class AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests {
private ApplicationContext context; private ApplicationContext context;
@Test @Test
public void testContextLoades() throws Exception { public void testContextLoads() throws Exception {
// gh-6897 // gh-6897
assertThat(this.context).isNotNull(); assertThat(this.context).isNotNull();
assertThat(this.context.getBeanNamesForType(DataSource.class)).isNotEmpty(); assertThat(this.context.getBeanNamesForType(DataSource.class)).isNotEmpty();

4
spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperTests.java
View File

@ -61,10 +61,10 @@ public class SpringBootTestContextBootstrapperTests {
BootstrapContext bootstrapContext = mock(BootstrapContext.class); BootstrapContext bootstrapContext = mock(BootstrapContext.class);
bootstrapper.setBootstrapContext(bootstrapContext); bootstrapper.setBootstrapContext(bootstrapContext);
given((Class) bootstrapContext.getTestClass()).willReturn(testClass); given((Class) bootstrapContext.getTestClass()).willReturn(testClass);
CacheAwareContextLoaderDelegate contextLoaderDeleagte = mock( CacheAwareContextLoaderDelegate contextLoaderDelegate = mock(
CacheAwareContextLoaderDelegate.class); CacheAwareContextLoaderDelegate.class);
given(bootstrapContext.getCacheAwareContextLoaderDelegate()) given(bootstrapContext.getCacheAwareContextLoaderDelegate())
.willReturn(contextLoaderDeleagte); .willReturn(contextLoaderDelegate);
bootstrapper.buildTestContext(); bootstrapper.buildTestContext();
} }

2
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View File

@ -139,7 +139,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
private File classesDirectory; private File classesDirectory;
/** /**
* Flag to indicate if the run processes should be forked. {@code fork } is * Flag to indicate if the run processes should be forked. {@code fork} is
* automatically enabled if an agent or jvmArguments are specified, or if devtools is * automatically enabled if an agent or jvmArguments are specified, or if devtools is
* present. * present.
* @since 1.2 * @since 1.2