615cf63a82
Make MockBean resolve right type for abstract test class
...
Fixes gh-20916
2020-06-17 17:25:03 -07:00
9e08490522
Merge branch 'gh-21271'
...
Closes gh-21271
2020-06-16 12:52:17 +01:00
753bea64c6
Enable varargs compilation warnings
...
See gh-21271
2020-06-16 12:50:53 +01:00
056d5f3120
Enable deprecation compilation warnings
...
See gh-21271
2020-06-16 12:50:47 +01:00
0a05b4c9fd
Update copyright year of changed files
2020-06-05 15:36:09 -07:00
038ae93406
Update copyright year of changed files
2020-05-13 16:48:51 -07:00
49921d65ac
Ensure @ActiveProfiles replaces existing profiles
...
Update `SpringBootContextLoader` to both add `spring.profiles.active`
properties and to directly call `Environment.setActiveProfiles`.
The additional `setActiveProfiles` call prevents `AbstractEnvironment`
from accidentally loading `spring.profiles.active` properties directly
when `doGetActiveProfiles` is called.
Directly setting active profiles has only become necessary since we
started adding properties using the square bracket notation. Previously
we added a comma-separated list which would be picked up by both the
`AbstractEnvironment` and the `ConfigurationFileApplicationListener`.
Closes gh-21302
2020-05-08 17:16:06 -07:00
846db6105f
Merge branch '2.2.x'
...
Closes gh-21364
2020-05-08 14:51:49 +02:00
60ff8bafb5
Polish "Align TestRestTemplate Javadoc with documentation"
...
See gh-21318
2020-05-08 14:49:50 +02:00
f11c030b71
Align TestRestTemplate Javadoc with documentation
...
See gh-21318
2020-05-08 14:48:21 +02:00
ad1248e4ec
Replace "folder" with "directory"
...
Consistently use the term "directory" instead of "folder"
Closes gh-21218
2020-04-28 19:20:24 -07:00
c7d7facc3a
Remove empty test rule package
...
See gh-21137
2020-04-27 10:32:44 +02:00
c7baf5fda1
Update copyright year of changed file
...
See gh-21009
2020-04-25 08:55:27 +02:00
5eb5bf0a2d
Polish
...
See gh-21009
2020-04-25 08:54:47 +02:00
85e9f713b0
Update copyright year of changed files
...
See gh-21007
2020-04-25 08:50:51 +02:00
29717423a3
Remove this keyword on member method invocations
...
See gh-21007
2020-04-25 08:49:44 +02:00
b73d5038d5
Merge branch '2.2.x'
2020-04-23 14:35:08 -07:00
9bb53a4c37
Polish
2020-04-23 14:31:49 -07:00
b3ccefdb57
Merge branch '2.2.x'
...
Closes gh-21102
2020-04-23 10:19:10 -07:00
4dc9bbe127
@SpringBootTest classes with different args shouldn't share a context
...
Fixes gh-20866
2020-04-23 10:18:14 -07:00
21bb249a73
Merge branch '2.2.x'
...
Closes gh-21090
2020-04-22 14:36:36 -07:00
b9c2b7b257
Prevent early initialization in MockitoPostProcessor
...
Fixes gh-20665
2020-04-22 14:35:50 -07:00
7ab2bca376
Support commas in @ActiveProfiles
...
Update `SpringBootContextLoader` so that it correctly deals with an
`@ActiveProfiles` annotation that contains a comma.
Fixes gh-19537
Co-authored-by: Scott Frederick <sfrederick@pivotal.io>
Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
2020-04-17 18:47:56 -07:00
3ca896e63f
Polish
2020-04-07 12:10:49 -07:00
f4c68dbc98
Do not set server.port=-1 for non embedded tests
...
Closes gh-16998
2020-04-02 18:12:39 +02:00
674f1e77b5
Fix typos
...
See gh-20704
2020-03-28 08:42:59 +01:00
ef9f1d39a3
Remove redundant MockitoAnnotations.initMocks()
...
See gh-20601
2020-03-22 08:43:50 +01:00
1eee83a07e
Update copyright year of changed files
2020-01-30 17:09:49 -08:00
eb852f1ad6
Disable bean overriding by default in ApplicationContextRunner
...
For consistency with SpringApplication, this commit disables bean
overriding by default in ApplicationContextRunner. Bean overriding can
be enabled again using withAllowBeanDefinitionOverriding.
Closes gh-18019
2020-01-28 15:57:28 +01:00
95be419527
Use Class.forName rather than ClassLoader.loadClass
...
This commit changes uses of ClassLoader.loadClass to Class.forName for
consistency with what was initiated in #19342 and better compatibility
with GraalVM.
Closes gh-19824
2020-01-23 10:47:53 +01:00
29d8b6db5a
Merge branch '2.2.x'
...
Closes gh-19822
2020-01-20 15:18:18 +00:00
f708aace65
Merge branch '2.1.x' into 2.2.x
...
Fixes gh-19821
2020-01-20 15:18:00 +00:00
c85f19b75b
Revert "Add profiles directly to the application environment for tests"
...
This reverts commit 487b9cbf96
2020-01-20 15:01:09 +00:00
8f102aee68
Remove deprecated 2.2 code
...
See gh-19699
2020-01-16 14:44:52 +01:00
f57281340c
Merge branch '2.2.x'
2020-01-13 16:46:49 -08:00
3cfbfebbb1
Merge branch '2.1.x' into 2.2.x
2020-01-13 16:45:40 -08:00
9bd49562fe
Update copyright year of changed files
2020-01-13 14:09:11 -08:00
6944e52052
Merge branch '2.2.x'
2020-01-07 13:49:43 -08:00
ac10ebba33
Fix checkstyle
2020-01-07 13:49:02 -08:00
c82d728c93
Merge branch '2.2.x'
...
Closes gh-19561
2020-01-07 13:34:43 -08:00
67fab60fbd
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19560
2020-01-07 13:33:32 -08:00
487b9cbf96
Add profiles directly to the application environment for tests
...
Prior to this commit, active profiles were being added to the Spring Boot
application environment by setting the `spring.profiles.active` property.
This could result in profiles getting parsed differently than other uses of `@ActiveProfiles`.
Setting the profiles directly in the `Environment` prevents this parsing.
See gh-19556
2020-01-07 13:23:09 -08:00
2c1e81adf0
Polish
2019-12-26 10:42:40 +01:00
9b0569cf81
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19309
2019-12-05 16:15:15 +00:00
bc53fe0344
Recommend mockito-inline for mocking and spying of CGLib proxies
...
This reverts commit 52050c173c
2019-12-05 16:13:02 +00:00
fd94608f73
Polish "Restore proxying of @Bean methods in @TestConfiguration"
...
See gh-18675
2019-10-22 09:13:00 +02:00
7faa606920
Restore proxying of @Bean methods in @TestConfiguration
...
See gh-18675
2019-10-22 09:10:05 +02:00
0bc5803e34
Merge branch '2.1.x'
...
Closes gh-18603
2019-10-15 14:38:59 +02:00
e4ba6049ff
Clarify scope of "@SpringBootTest#classes"
...
See gh-18229
2019-10-15 14:36:28 +02:00
887c3b71f3
Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable()
...
See gh-18559
2019-10-12 16:51:53 +01:00
96f85a40de
Support customization of WebTestClient.Builder when using @SpringBootTest
...
Closes gh-15132
2019-10-02 17:51:00 +01:00
b65ba60980
Polish 'Simplify some code'
...
See gh-18438
2019-10-01 22:08:20 -07:00
e6b45de41e
Simplify some code
...
See gh-18438
2019-10-01 22:08:02 -07:00
c605419f19
Merge branch '2.1.x'
...
Closes gh-18379
2019-09-27 16:34:59 +02:00
92ae7b21a1
Fix typo in ApplicationContextAssert
...
See gh-18372
2019-09-27 16:32:32 +02:00
ad32603635
Restore compatibility with MockRestServiceServer
...
Closes gh-17885
2019-09-16 10:17:41 +02:00
3d5530d15d
Merge branch '2.1.x'
...
Closes gh-18234
2019-09-16 10:03:19 +02:00
9065c4997d
Fix rebase from master
2019-09-16 09:52:55 +02:00
e05f42f0f3
Polish Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter"
...
See gh-18214
2019-09-16 09:44:01 +02:00
b9c8d7dd60
Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter
...
See gh-18214
2019-09-16 09:42:55 +02:00
b4350a9d96
Remove unnecessary blank lines
...
See gh-18089
2019-09-03 08:48:10 +02:00
3e35a6616c
Fix duplicated words
...
See gh-18004
2019-09-01 09:09:38 +02:00
ba6fe60134
Merge branch '2.1.x'
...
Closes gh-17948
2019-08-23 19:15:02 +01:00
52050c173c
Fix spying on scoped beans with @SpyBean
...
Previously, when spying on a scoped bean the creation of the spy
would be performed using the scoped proxy. This would result in
the spy being unable to spy on any of the target bean's methods as
the scoped proxy's implementations of those methods would be final.
This commit updates MockitoPostProcessor so that the creation of the
spy and injection of the @SpyBean-annotated field is performed using
the scoped target. The scoped target has not be proxied so this
allows Mockito to spy on all of its methods.
Closes gh-17817
2019-08-23 19:03:08 +01:00
ab87b2a39b
Polish
2019-08-19 16:05:43 +01:00
d4affd7f85
Use hasSize() assertion in favor of length checks
...
See gh-17874
2019-08-17 06:39:41 +02:00
34c31ce099
Remove BeanTypeRegistry
...
Remove `BeanTypeRegistry` and rely entirely on standard calls Spring
Framework APIs.
Closes gh-17594
2019-08-01 10:15:15 +01:00
da4f436140
Change SearchStrategy EXHAUSTIVE to TYPE_HIERARCHY
...
Fixup references following upstream Spring Framework change.
2019-07-31 15:11:43 +01:00
8d2f2b75bd
Upgrade to AssertJ 3.13.1
...
See gh-17690
2019-07-30 09:48:33 +02:00
8bc780762a
Merge branch '2.1.x'
2019-07-24 11:42:48 +01:00
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
6c0dbacfce
Polish
2019-07-23 15:43:51 +01:00
0d92af7d55
Add hasJsonPath and doesNotHaveJsonPath asserts
...
Extend `JsonContentAssert` with `hasJsonPath` and `doesNotHaveJsonPath`
methods which can be used to check the path regardless of the value it
may or may not contain.
Prior to this commit there wasn't an easy way to assert that the
Jackson `@JsonInclude(JsonInclude.Include.NON_NULL)` annotation was
applied since `assertDoesNotHavePathValue` would pass for both
`{"name" : null}` and `{}`.
Closes gh-17608
2019-07-23 15:43:51 +01:00
900ec9f3ec
Fix error message formatting placeholders
...
Fix the formatting message placeholders to '%s' since '{}' isn't
supported by AssertJ.
See gh-15569
2019-07-23 15:43:51 +01:00
41957ec2ad
Polish "Polish OutputCapture and its JUnit Jupiter extension"
...
See gh-17049
2019-07-18 17:46:56 +01:00
e1c595a67f
Polish OutputCapture and its JUnit Jupiter extension
...
- Polish Javadoc
- Improve error message in OutputCapture
- Use ExtensionContext.Store in OutputCaptureExtension
See gh-17049
2019-07-18 17:46:55 +01:00
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
eff1147ccc
Rename classpath runner package
...
Remove `runner` since we're no longer tied to JUnit 4.
See gh-17491
2019-07-15 13:40:26 +01:00
1117fdb2b3
Make ModifiedClassPathExtension package private
...
Meta-annotate `ClassPathExclusions` and `ClassPathOverrides` with
so that the `ModifiedClassPathExtension` no longer needs to be
used directly.
See gh-17491
2019-07-15 13:38:26 +01:00
0f0278e69b
Migrate ModifiedClassPath tests to JUnit 5
...
Migrate the remaining JUnit 4 tests to JUnit 5, making use of the
new `ModifiedClassPathExtension`.
See gh-17491
2019-07-15 00:31:03 +01:00
0cb6a7f47d
Polish
2019-07-15 00:24:19 +01:00
01933f9b06
Merge previously split strings
...
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
cdf43a7489
Polish
2019-07-14 19:42:56 +01:00
8d4a2add63
Allow OutputCaptureRule to be used with AssertJ
...
Update `OutputCaptureRule` so that it now implements
`CapturedOutput` and can be used directly with AssertJ.
Closes gh-17512
2019-07-14 19:42:42 +01:00
82047a2544
Polish
...
See gh-17505
2019-07-14 11:38:40 +02:00
426ef749db
Polish
...
See gh-17413
2019-07-09 07:40:30 +02:00
2816635418
Polish
2019-07-04 17:51:20 +01:00
a66c4d3096
Unify method visibility of private classes
...
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.
Closes gh-7316
2019-07-03 11:39:47 -07:00
605599138e
Merge branch '2.1.x'
2019-06-28 23:56:02 -07:00
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
e560b7f6ba
Remove public modifier on JUnit5 lifecycle methods
...
See gh-17292
2019-06-21 18:09:05 +02:00
a189e4cf96
Merge branch '2.1.x'
...
Closes gh-17220
2019-06-17 14:05:16 +01:00
645514f848
Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
...
See gh-16485
2019-06-17 13:54:41 +01:00
7340d546b8
Honour base path from @WebAppConfiguration in @WebMvcTest
...
See gh-16485
2019-06-17 13:37:55 +01:00
30cfe7b4c5
Polish
2019-06-13 08:02:26 -07:00
aad21d1996
Polish "Support default headers with RestTemplateBuilder"
...
Broaden the scope of customizer support so that instead of focusing
just on headers, we can now customize any outgoing `HttpClientRequest`.
Also update auto-configuration to automatically add any
`RestTemplateRequestCustomizer` beans to the builder.
See gh-17091
2019-06-12 16:34:31 -07:00
43b1a667ce
Support default headers with RestTemplateBuilder
...
Update `RestTemplateBuilder` so that it is easier to apply custom
headers to the outgoing request. The update is particularly useful
for setting the `User-Agent` header, for example so that a GitHub
username can be used when calling `api.github.com`.
See gh-17091
2019-06-12 13:49:39 -07:00
266d6334b2
Fix checkstyle RedundantModifier test violations
2019-06-07 20:46:33 -07:00
Madhura Bhave
Andy Wilkinson
Phillip Webb
Phillip Webb
Stephane Nicoll
Andrii Hrytsiuk
dreis2211
Johnny Lim
Scott Frederick
Dmytro Nosan
kenneth
Roland Weisleder
Leonard Brünings
Sam Brannen
Lorenzo Dee
Ilya Lukyanovich