Andy Wilkinson
0d6ea79007
Start building against Spring Framework 5.3.0 snapshots
...
See gh-21929
4 years ago
Madhura Bhave
f47e06c4ef
Merge branch '2.3.x'
...
Closes gh-22007
4 years ago
Madhura Bhave
f4ad30c448
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22006
4 years ago
Madhura Bhave
615cf63a82
Make MockBean resolve right type for abstract test class
...
Fixes gh-20916
4 years ago
Andy Wilkinson
9e08490522
Merge branch 'gh-21271'
...
Closes gh-21271
4 years ago
Andy Wilkinson
753bea64c6
Enable varargs compilation warnings
...
See gh-21271
4 years ago
Andy Wilkinson
056d5f3120
Enable deprecation compilation warnings
...
See gh-21271
4 years ago
Phillip Webb
0a05b4c9fd
Update copyright year of changed files
5 years ago
Phillip Webb
038ae93406
Update copyright year of changed files
5 years ago
Phillip Webb
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
5 years ago
Stephane Nicoll
846db6105f
Merge branch '2.2.x'
...
Closes gh-21364
5 years ago
Stephane Nicoll
60ff8bafb5
Polish "Align TestRestTemplate Javadoc with documentation"
...
See gh-21318
5 years ago
Andrii Hrytsiuk
f11c030b71
Align TestRestTemplate Javadoc with documentation
...
See gh-21318
5 years ago
Phillip Webb
ad1248e4ec
Replace "folder" with "directory"
...
Consistently use the term "directory" instead of "folder"
Closes gh-21218
5 years ago
dreis2211
c7d7facc3a
Remove empty test rule package
...
See gh-21137
5 years ago
Stephane Nicoll
c7baf5fda1
Update copyright year of changed file
...
See gh-21009
5 years ago
dreis2211
5eb5bf0a2d
Polish
...
See gh-21009
5 years ago
Stephane Nicoll
85e9f713b0
Update copyright year of changed files
...
See gh-21007
5 years ago
Johnny Lim
29717423a3
Remove this keyword on member method invocations
...
See gh-21007
5 years ago
Phillip Webb
b73d5038d5
Merge branch '2.2.x'
5 years ago
Phillip Webb
9bb53a4c37
Polish
5 years ago
Madhura Bhave
b3ccefdb57
Merge branch '2.2.x'
...
Closes gh-21102
5 years ago
Madhura Bhave
4dc9bbe127
@SpringBootTest classes with different args shouldn't share a context
...
Fixes gh-20866
5 years ago
Madhura Bhave
21bb249a73
Merge branch '2.2.x'
...
Closes gh-21090
5 years ago
Madhura Bhave
b9c2b7b257
Prevent early initialization in MockitoPostProcessor
...
Fixes gh-20665
5 years ago
Phillip Webb
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>
5 years ago
Phillip Webb
3ca896e63f
Polish
5 years ago
Stephane Nicoll
f4c68dbc98
Do not set server.port=-1 for non embedded tests
...
Closes gh-16998
5 years ago
dreis2211
674f1e77b5
Fix typos
...
See gh-20704
5 years ago
dreis2211
ef9f1d39a3
Remove redundant MockitoAnnotations.initMocks()
...
See gh-20601
5 years ago
Phillip Webb
1eee83a07e
Update copyright year of changed files
5 years ago
Stephane Nicoll
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
5 years ago
Stephane Nicoll
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
5 years ago
Andy Wilkinson
29d8b6db5a
Merge branch '2.2.x'
...
Closes gh-19822
5 years ago
Andy Wilkinson
f708aace65
Merge branch '2.1.x' into 2.2.x
...
Fixes gh-19821
5 years ago
Andy Wilkinson
c85f19b75b
Revert "Add profiles directly to the application environment for tests"
...
This reverts commit 487b9cbf96
.
Fixes gh-19788
5 years ago
Scott Frederick
8f102aee68
Remove deprecated 2.2 code
...
See gh-19699
5 years ago
Phillip Webb
f57281340c
Merge branch '2.2.x'
5 years ago
Phillip Webb
3cfbfebbb1
Merge branch '2.1.x' into 2.2.x
5 years ago
Phillip Webb
9bd49562fe
Update copyright year of changed files
5 years ago
Madhura Bhave
6944e52052
Merge branch '2.2.x'
5 years ago
Madhura Bhave
ac10ebba33
Fix checkstyle
5 years ago
Madhura Bhave
c82d728c93
Merge branch '2.2.x'
...
Closes gh-19561
5 years ago
Madhura Bhave
67fab60fbd
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19560
5 years ago
Scott Frederick
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
5 years ago
Stephane Nicoll
2c1e81adf0
Polish
5 years ago
Andy Wilkinson
9b0569cf81
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19309
5 years ago
Andy Wilkinson
bc53fe0344
Recommend mockito-inline for mocking and spying of CGLib proxies
...
This reverts commit 52050c173c
.
See gh-17817
Closes gh-19020
5 years ago
Stephane Nicoll
fd94608f73
Polish "Restore proxying of @Bean methods in @TestConfiguration"
...
See gh-18675
5 years ago
Dmytro Nosan
7faa606920
Restore proxying of @Bean methods in @TestConfiguration
...
See gh-18675
5 years ago
Stephane Nicoll
0bc5803e34
Merge branch '2.1.x'
...
Closes gh-18603
5 years ago
Stephane Nicoll
e4ba6049ff
Clarify scope of "@SpringBootTest#classes"
...
See gh-18229
5 years ago
Johnny Lim
887c3b71f3
Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable()
...
See gh-18559
5 years ago
Andy Wilkinson
96f85a40de
Support customization of WebTestClient.Builder when using @SpringBootTest
...
Closes gh-15132
5 years ago
Phillip Webb
b65ba60980
Polish 'Simplify some code'
...
See gh-18438
5 years ago
kenneth
e6b45de41e
Simplify some code
...
See gh-18438
5 years ago
Stephane Nicoll
c605419f19
Merge branch '2.1.x'
...
Closes gh-18379
5 years ago
Roland Weisleder
92ae7b21a1
Fix typo in ApplicationContextAssert
...
See gh-18372
5 years ago
Phillip Webb
ad32603635
Restore compatibility with MockRestServiceServer
...
Closes gh-17885
5 years ago
Stephane Nicoll
3d5530d15d
Merge branch '2.1.x'
...
Closes gh-18234
5 years ago
Stephane Nicoll
9065c4997d
Fix rebase from master
5 years ago
Stephane Nicoll
e05f42f0f3
Polish Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter"
...
See gh-18214
5 years ago
Leonard Brünings
b9c8d7dd60
Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter
...
See gh-18214
5 years ago
dreis2211
b4350a9d96
Remove unnecessary blank lines
...
See gh-18089
5 years ago
dreis2211
3e35a6616c
Fix duplicated words
...
See gh-18004
5 years ago
Andy Wilkinson
ba6fe60134
Merge branch '2.1.x'
...
Closes gh-17948
5 years ago
Andy Wilkinson
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
5 years ago
Andy Wilkinson
ab87b2a39b
Polish
5 years ago
dreis2211
d4affd7f85
Use hasSize() assertion in favor of length checks
...
See gh-17874
5 years ago
Phillip Webb
34c31ce099
Remove BeanTypeRegistry
...
Remove `BeanTypeRegistry` and rely entirely on standard calls Spring
Framework APIs.
Closes gh-17594
5 years ago
Phillip Webb
da4f436140
Change SearchStrategy EXHAUSTIVE to TYPE_HIERARCHY
...
Fixup references following upstream Spring Framework change.
5 years ago
dreis2211
8d2f2b75bd
Upgrade to AssertJ 3.13.1
...
See gh-17690
5 years ago
Phillip Webb
8bc780762a
Merge branch '2.1.x'
5 years ago
Phillip Webb
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
5 years ago
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
5 years ago
Phillip Webb
6c0dbacfce
Polish
5 years ago
Phillip Webb
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
5 years ago
Phillip Webb
900ec9f3ec
Fix error message formatting placeholders
...
Fix the formatting message placeholders to '%s' since '{}' isn't
supported by AssertJ.
See gh-15569
5 years ago
Andy Wilkinson
41957ec2ad
Polish "Polish OutputCapture and its JUnit Jupiter extension"
...
See gh-17049
5 years ago
Sam Brannen
e1c595a67f
Polish OutputCapture and its JUnit Jupiter extension
...
- Polish Javadoc
- Improve error message in OutputCapture
- Use ExtensionContext.Store in OutputCaptureExtension
See gh-17049
5 years ago
Phillip Webb
a9ba7080ce
Merge branch '2.1.x'
5 years ago
Phillip Webb
eff1147ccc
Rename classpath runner package
...
Remove `runner` since we're no longer tied to JUnit 4.
See gh-17491
5 years ago
Phillip Webb
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
5 years ago
dreis2211
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
5 years ago
Phillip Webb
0cb6a7f47d
Polish
5 years ago
Phillip Webb
01933f9b06
Merge previously split strings
...
Merge some string lines that were previously split because of the
90 chars wide formatting.
5 years ago
Phillip Webb
cdf43a7489
Polish
5 years ago
Phillip Webb
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
5 years ago
dreis2211
82047a2544
Polish
...
See gh-17505
5 years ago
Johnny Lim
426ef749db
Polish
...
See gh-17413
5 years ago
Andy Wilkinson
2816635418
Polish
5 years ago
Phillip Webb
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
5 years ago
Phillip Webb
605599138e
Merge branch '2.1.x'
5 years ago
Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
5 years ago
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
5 years ago
Stephane Nicoll
e560b7f6ba
Remove public modifier on JUnit5 lifecycle methods
...
See gh-17292
5 years ago
Andy Wilkinson
a189e4cf96
Merge branch '2.1.x'
...
Closes gh-17220
6 years ago
Andy Wilkinson
645514f848
Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
...
See gh-16485
6 years ago
Lorenzo Dee
7340d546b8
Honour base path from @WebAppConfiguration in @WebMvcTest
...
See gh-16485
6 years ago
Madhura Bhave
30cfe7b4c5
Polish
6 years ago