Commit a55315b5 authored by Johnny Lim's avatar Johnny Lim Committed by Stephane Nicoll

Polish

Closes gh-5614
parent 37fa3a3b
...@@ -16,6 +16,6 @@ ...@@ -16,6 +16,6 @@
/** /**
* Test utilities related to auto-configuration. * 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; package org.springframework.boot.autoconfigure.test;
...@@ -793,7 +793,7 @@ content into your application; rather pick only the properties that you need. ...@@ -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.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.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.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.cache.connection.size= # Number of connections to cache.
spring.rabbitmq.dynamic=true # Create an AmqpAdmin bean. spring.rabbitmq.dynamic=true # Create an AmqpAdmin bean.
spring.rabbitmq.host=localhost # RabbitMQ host. spring.rabbitmq.host=localhost # RabbitMQ host.
......
...@@ -4757,7 +4757,7 @@ database you can use the `@AutoConfigureTestDatabase` annotation: ...@@ -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 ==== Auto-configured Spring REST Docs tests
Test `@AutoConfigureRestDocs` annotation can be used if you want to use Spring REST Docs 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 in your tests. It will automatically configure `MockMvc` to use Spring REST Docs and
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<artifactId>spring-boot-starter-tomcat</artifactId> <artifactId>spring-boot-starter-tomcat</artifactId>
<name>Spring Boot Tomcat Starter</name> <name>Spring Boot Tomcat Starter</name>
<description>Starter for using Tomcat as the embedded servlet container. Default <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> <url>http://projects.spring.io/spring-boot/</url>
<organization> <organization>
<name>Pivotal Software, Inc.</name> <name>Pivotal Software, Inc.</name>
......
...@@ -87,13 +87,13 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr ...@@ -87,13 +87,13 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
Class<?>[] classes = getClasses(testClass); Class<?>[] classes = getClasses(testClass);
if (!ObjectUtils.isEmpty(classes)) { if (!ObjectUtils.isEmpty(classes)) {
for (ContextConfigurationAttributes configAttributes : configAttributesList) { for (ContextConfigurationAttributes configAttributes : configAttributesList) {
addConfigAttriubtesClasses(configAttributes, classes); addConfigAttributesClasses(configAttributes, classes);
} }
} }
return super.resolveContextLoader(testClass, configAttributesList); return super.resolveContextLoader(testClass, configAttributesList);
} }
private void addConfigAttriubtesClasses( private void addConfigAttributesClasses(
ContextConfigurationAttributes configAttributes, Class<?>[] classes) { ContextConfigurationAttributes configAttributes, Class<?>[] classes) {
List<Class<?>> combined = new ArrayList<Class<?>>(); List<Class<?>> combined = new ArrayList<Class<?>>();
combined.addAll(Arrays.asList(classes)); combined.addAll(Arrays.asList(classes));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment