Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
a55315b5
Commit
a55315b5
authored
Apr 06, 2016
by
Johnny Lim
Committed by
Stephane Nicoll
Apr 06, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-5614
parent
37fa3a3b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
package-info.java
...springframework/boot/autoconfigure/test/package-info.java
+1
-1
appendix-application-properties.adoc
...cs/src/main/asciidoc/appendix-application-properties.adoc
+1
-1
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+1
-1
pom.xml
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
+1
-1
SpringBootTestContextBootstrapper.java
.../boot/test/context/SpringBootTestContextBootstrapper.java
+2
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/test/package-info.java
View file @
a55315b5
...
@@ -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
;
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View file @
a55315b5
...
@@ -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.
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
a55315b5
...
@@ -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-autoconfigur
e
d-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
...
...
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
View file @
a55315b5
...
@@ -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 us
ing
by spring-boot-starter-web
</description>
servlet container starter us
ed
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>
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
View file @
a55315b5
...
@@ -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
)
{
addConfigAttri
ub
tesClasses
(
configAttributes
,
classes
);
addConfigAttri
bu
tesClasses
(
configAttributes
,
classes
);
}
}
}
}
return
super
.
resolveContextLoader
(
testClass
,
configAttributesList
);
return
super
.
resolveContextLoader
(
testClass
,
configAttributesList
);
}
}
private
void
addConfigAttri
ub
tesClasses
(
private
void
addConfigAttri
bu
tesClasses
(
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
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment