Andy Wilkinson
aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
0644a79401
Repackage output capture and always use extension declaratively
...
Closes gh-17029
2019-05-31 18:33:10 +01:00
Phillip Webb
d11d5ceb29
Split up JUnit 5 OutputCapture class
...
Split the JUnit 5 `OutputCapture` class into separate `OutputExtension`
and `CapturedOutput` classes. The JUnit 5 callback methods are now
contained only in the `OutputExtension` class so no longer pollute the
public API that users will interact with.
The `CapturedOutput` class has also been updated to capture System.err
and System.out separately to allow distinct assertions if required.
Closes gh-17029
2019-05-30 23:44:35 -07:00
Phillip Webb
3a9ca5fa30
Update copyright header of changed files
2019-05-14 21:05:53 -07:00
Madhura Bhave
1db1c8b03c
Validate our own tests work with JUnit5 and the vintage engine
...
Closes gh-14737
Co-authored-by: Stephane Nicoll <snicoll@pivotal.io >
2019-05-08 16:05:44 +02:00
Andy Wilkinson
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
Andy Wilkinson
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
Andy Wilkinson
6920c39349
Merge branch '1.3.x' into 1.4.x
2019-03-20 15:06:50 +00:00
Andy Wilkinson
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Madhura Bhave
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
Stephane Nicoll
23218add90
Polish
2017-12-12 11:57:30 +01:00
Phillip Webb
425dbc3e52
Update copyright header for edited files
2017-03-06 15:04:07 -08:00
Stephane Nicoll
b2ec03cd4e
Restore couchbase support
...
This commit effectively reverts the changes that were applied to
workaround the breakage in spring-data-couchbase.
Closes gh-8200
2017-02-07 12:03:27 +01:00
Stephane Nicoll
e0c8e1f514
Ignore test until couchbase support is restored
...
The changes required to restore our Couchbase support are too involved
and we should hear from the data couchbase team first.
See gh-8200
2017-02-06 13:27:22 +01:00
Phillip Webb
2f815a907a
Migrate existing tests from deprecated package
...
Update the existing tests to use the relocated `spring-boot-test`
classes. Restructuring was achieved using the following command:
find . -type f -name '*.java' -exec sed -i '' \
-e s/org.springframework.boot.test.ConfigFileApplicationContextInitializer/\
org.springframework.boot.test.context.ConfigFileApplicationContextInitializer/g \
-e s/org.springframework.boot.test.EnvironmentTestUtils/\
org.springframework.boot.test.util.EnvironmentTestUtils/g \
-e s/org.springframework.boot.test.IntegrationTest/\
org.springframework.boot.test.context.IntegrationTest/g \
-e s/org.springframework.boot.test.IntegrationTestPropertiesListener/\
org.springframework.boot.test.context.IntegrationTestPropertiesListener/g \
-e s/org.springframework.boot.test.OutputCapture/\
org.springframework.boot.test.rule.OutputCapture/g \
-e s/org.springframework.boot.test.SpringApplicationConfiguration/\
org.springframework.boot.test.context.SpringApplicationConfiguration/g \
-e s/org.springframework.boot.test.SpringApplicationContextLoader/\
org.springframework.boot.test.context.SpringApplicationContextLoader/g \
-e s/org.springframework.boot.test.SpringBootMockServletContext/\
org.springframework.boot.test.mock.web.SpringBootMockServletContext/g \
-e s/org.springframework.boot.test.TestRestTemplate/\
org.springframework.boot.test.web.client.TestRestTemplate/g \
-e s/org.springframework.boot.test.WebIntegrationTest/\
org.springframework.boot.test.context.web.WebIntegrationTest/g {} \;
See gh-5293
2016-03-23 22:17:50 -07:00
Andy Wilkinson
01b7a7d9d3
Add missing copyright headers
2016-02-25 12:12:57 +00:00
Andy Wilkinson
99b3af9216
Use a random server port in the Couchbase sample’s tests
2016-02-19 16:13:42 +00:00
Stephane Nicoll
da3b49e024
Polish contribution
...
Closes gh-3499
2016-02-16 09:31:50 +01:00
Eddú Meléndez
76f1ca4188
Add Couchbase support
...
Closes gh-3498
2016-02-16 09:31:50 +01:00
