Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5614 from izeye/polish-20160406

Browse Source 
* pr/5614:
  Polish
This commit is contained in:
Stephane Nicoll
2016-04-06 10:27:09 +02:00
parent 37fa3a3b04 a55315b5b5
commit 9524da343f
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/test/package-info.java
View File

@@ -16,6 +16,6 @@
/**
* Test utilities related to auto-configuration.
* @deprecated in 1.4.0 in favor of the {@code spring-test-autoconfigure} module
* @deprecated in 1.4.0 in favor of the {@code spring-boot-test-autoconfigure} module
*/
package org.springframework.boot.autoconfigure.test;

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -793,7 +793,7 @@ content into your application; rather pick only the properties that you need.
spring.rabbitmq.addresses= # Comma-separated list of addresses to which the client should connect.
spring.rabbitmq.cache.channel.checkout-timeout= # Number of milliseconds to wait to obtain a channel if the cache size has been reached.
spring.rabbitmq.cache.channel.size= # Number of channels to retain in the cache.
spring.rabbitmq.cache.connection.mode= # Connection factory cache mode.
spring.rabbitmq.cache.connection.mode=CHANNEL # Connection factory cache mode.
spring.rabbitmq.cache.connection.size= # Number of connections to cache.
spring.rabbitmq.dynamic=true # Create an AmqpAdmin bean.
spring.rabbitmq.host=localhost # RabbitMQ host.

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

@@ -4757,7 +4757,7 @@ database you can use the `@AutoConfigureTestDatabase` annotation:
[[boot-features-testing-spring-boot-applications-testing-autoconfigurd-rest-docs]]
[[boot-features-testing-spring-boot-applications-testing-autoconfigured-rest-docs]]
==== Auto-configured Spring REST Docs tests
Test `@AutoConfigureRestDocs` annotation can be used if you want to use Spring REST Docs
in your tests. It will automatically configure `MockMvc` to use Spring REST Docs and

2
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
View File

@@ -9,7 +9,7 @@
<artifactId>spring-boot-starter-tomcat</artifactId>
<name>Spring Boot Tomcat Starter</name>
<description>Starter for using Tomcat as the embedded servlet container. Default
servlet container starter using by spring-boot-starter-web</description>
servlet container starter used by spring-boot-starter-web</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>

4
spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
View File

@@ -87,13 +87,13 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
Class<?>[] classes = getClasses(testClass);
if (!ObjectUtils.isEmpty(classes)) {
for (ContextConfigurationAttributes configAttributes : configAttributesList) {
addConfigAttriubtesClasses(configAttributes, classes);
addConfigAttributesClasses(configAttributes, classes);
}
}
return super.resolveContextLoader(testClass, configAttributesList);
}
private void addConfigAttriubtesClasses(
private void addConfigAttributesClasses(
ContextConfigurationAttributes configAttributes, Class<?>[] classes) {
List<Class<?>> combined = new ArrayList<Class<?>>();
combined.addAll(Arrays.asList(classes));