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 branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-08-09 12:02:16 +01:00
parent 63cd0afadb 5c8fc72b41
commit b817dc1e04
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5707,9 +5707,10 @@ how your tests will run:
_any_ servlet environment (mock or otherwise). _any_ servlet environment (mock or otherwise).
NOTE: If your test is `@Transactional`, it will rollback the transaction at the end of NOTE: If your test is `@Transactional`, it will rollback the transaction at the end of
each test method by default. If you're using this arrangement in combination with either each test method by default. However, as using this arrangement with either `RANDOM_PORT`
`RANDOM_PORT` or `DEFINED_PORT`, any transaction initiated on the server won't rollback as or `DEFINED_PORT` implicitly provides a real servlet environment, HTTP client and
the test is running in a different thread than the server processing. server will run in separate threads, thus separate transactions. Any transaction
initiated on the server won't rollback in this case.
NOTE: In addition to `@SpringBootTest` a number of other annotations are also NOTE: In addition to `@SpringBootTest` a number of other annotations are also
provided for testing more specific slices of an application. See below for details. provided for testing more specific slices of an application. See below for details.