Skip to content

Commit

Permalink
Polish
Browse files Browse the repository at this point in the history
  • Loading branch information
izeye authored and snicoll committed Apr 6, 2016
1 parent 37fa3a3 commit a55315b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-starters/spring-boot-starter-tomcat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ protected ContextLoader resolveContextLoader(Class<?> testClass,
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));
Expand Down

0 comments on commit a55315b

Please sign in to comment.