Sam Brannen
5685e9dfa3
Add Checkstyle rules for deprecated JUnit APIs
...
This commit adds Checkstyle rules to disallow imports of the following.
- junit.framework.*
- org.junit.Assert.assertThat
- org.junit.Assume.assumeThat
See gh-22894
2019-05-12 14:46:55 +02:00
Sam Brannen
9e1ed6c771
Fix build on JDK 9+
2019-05-12 13:46:14 +02:00
Sam Brannen
da1b004254
Merge branch '5.1.x'
2019-05-11 18:21:44 +02:00
Sam Brannen
e1b0bf22bf
Polish Javadoc for AssertionErrors
...
See gh-22932
2019-05-11 18:21:06 +02:00
Sam Brannen
33fcde4c3e
Merge branch '5.1.x'
2019-05-11 18:04:48 +02:00
Sam Brannen
233b225b4f
Remove JUnit dependency from HeaderResultMatchers
...
Prior to this commit, HeaderResultMatchers had a direct dependency on
org.junit.Assert which forces JUnit 4 to be present on the classpath.
This commit fixes this by introducing assertNotNull() in
org.springframework.test.util.AssertionErrors and delegating to that
instead.
Fixes gh-22932
2019-05-11 18:03:42 +02:00
Sam Brannen
6ef7d7124e
Clean up warnings
2019-05-11 15:51:06 +02:00
Sam Brannen
64819bbc1d
Clean up warnings
2019-05-10 18:00:29 +02:00
Sam Brannen
0cff7eb32c
Fix Javadoc links
2019-05-10 17:40:03 +02:00
Sam Brannen
9b61316c2e
Clean up warnings in spring-web
2019-05-10 17:31:23 +02:00
Stephane Nicoll
f188aab5f2
Merge branch '5.1.x'
2019-05-10 10:49:59 +02:00
Stephane Nicoll
8c77d0b70d
Merge pull request #22941 from chenqimiao
...
* pr/22941:
Fix typo in package-info.java
2019-05-10 10:49:43 +02:00
chenqimiao
e3137f11df
Fix typo in package-info.java
...
Closes gh-22941
2019-05-10 10:49:13 +02:00
Stephane Nicoll
6d69a4e03a
Merge branch '5.1.x'
2019-05-10 09:57:25 +02:00
Stephane Nicoll
4430ec7d2d
Merge pull request #22938 from crewmanmud
...
* pr/22938:
Fix typo
2019-05-10 09:57:07 +02:00
Andrew McCallum
9294b1d7eb
Fix typo
...
Closes gh-22938
2019-05-10 09:56:47 +02:00
Stephane Nicoll
4606209ad4
Merge branch '5.1.x'
2019-05-09 17:09:54 +02:00
Spring Buildmaster
f4380e3040
Next Development Version
2019-05-09 14:55:58 +00:00
Sam Brannen
d8f1d56100
Fix broken test
2019-05-09 16:21:54 +02:00
Sam Brannen
1be29d5933
Document automatic constructor injection in JUnit Jupiter
...
Closes gh-22928
2019-05-09 16:16:32 +02:00
Sebastien Deleuze
c601ecf169
Merge branch '5.1.x'
2019-05-09 15:00:53 +02:00
Sebastien Deleuze
c8d49ed284
Fix EncoderHttpMessageWriter.isStreamingMediaType()
...
Closes gh-22936
2019-05-09 14:57:15 +02:00
Juergen Hoeller
0b50d1eff3
Merge branch '5.1.x'
2019-05-09 14:29:37 +02:00
Denis Zavedeev
484ec64305
Minor integration doc refinements
2019-05-09 14:27:22 +02:00
Denis Zavedeev
c80028b71e
Fix trivial errors in integration.adoc
2019-05-09 13:50:26 +02:00
Sam Brannen
8e29eca1eb
Merge branch '5.1.x'
2019-05-09 13:25:21 +02:00
Sam Brannen
59fdce1116
Fix bug in EncoderHttpMessageWriter.isStreamingMediaType()
2019-05-09 13:24:27 +02:00
Sam Brannen
e465f51d56
Suppress deprecation warnings
2019-05-09 13:21:42 +02:00
Sam Brannen
dc1c110288
Delete dead code
2019-05-09 13:21:27 +02:00
Rossen Stoyanchev
fd48bf1dbe
Merge branch '5.1.x'
2019-05-08 21:05:42 -04:00
Rossen Stoyanchev
c717d245bd
Upgrade to Californium-SR8
2019-05-08 21:04:45 -04:00
Rossen Stoyanchev
ed61f44545
Upgrade to Disprosium-M1
...
Closes gh-22930
2019-05-08 20:55:31 -04:00
Rossen Stoyanchev
06c3a058f4
Use most recent RSocket RC for M2 release
2019-05-08 20:34:22 -04:00
Juergen Hoeller
8b08b6812a
Merge branch '5.1.x'
2019-05-09 02:26:23 +02:00
Juergen Hoeller
190b751147
Support any HttpEntity implementing ResolvableTypeProvider
...
Closes gh-22931
2019-05-09 02:09:31 +02:00
Phillip Webb
798b51f4a3
Migrate to BDD Mockito
...
Migrate all tests to consistently use BDD Mockito. Also add
checksyle rule to enforce going forwards.
2019-05-08 13:46:13 -07:00
Phillip Webb
816bbee8de
Remove '.*' imports from tests
...
Organize test imports to expand all '.*' static imports into
fully qualified imports.
This update will allow us to use additional checkstyle rules in
the future, and will also help if we migrate fully to AssertJ.
2019-05-08 09:55:09 -07:00
Phillip Webb
1b985fb3da
Update static import limit in eclipse prefs
...
Update eclipse preferences so that static imports no longer use
`.*`.
2019-05-08 09:53:01 -07:00
Phillip Webb
66eb86f055
Delete unused Matchers class
...
Delete the `Matches` class since it's no longer being used.
2019-05-08 09:52:39 -07:00
Juergen Hoeller
c4a95c99e5
Upgrade to Reactor Californium SR7
2019-05-08 18:19:19 +02:00
Juergen Hoeller
d3b713d5f0
Upgrade to Protobuf 3.7.1 and HtmlUnit 2.35
2019-05-08 17:52:56 +02:00
Juergen Hoeller
fb29088670
Revise LinkedCaseInsensitiveMap's lazy key/value/entry collections
...
Closes gh-22926
2019-05-08 17:52:28 +02:00
Juergen Hoeller
82d32f0875
Remove unused import
2019-05-08 17:51:54 +02:00
Sam Brannen
4038d590a1
Suppress deprecation warning in Gradle build
2019-05-08 17:18:41 +02:00
Rossen Stoyanchev
44659f4945
Unwrap Part content in asyncPart builder method
...
Closes gh-22876
2019-05-08 10:59:58 -04:00
Sam Brannen
6a05b97df3
Log identity hash for ApplicationContext for context cache hits/misses
...
DefaultCacheAwareContextLoaderDelegate now logs the identity hash code
for an application context instance that was stored in or retrieved from
the context cache in the Spring TestContext Framework.
Closes gh-22925
2019-05-08 16:39:23 +02:00
Sam Brannen
4d1637a9b7
Avoid warnings in RequestMappingHandlerMappingTests
2019-05-08 16:29:31 +02:00
Phil Webb
d7320de871
Migrate away from ExpectedException ( #22922 )
...
* Add limited checkstyles to test code
Add a limited set of checkstyle rules to the test codebase to improve
code consistency.
* Fix checksyle violations in test code
* Organize imports to fix checkstyle for test code
* Migrate to assertThatExceptionOfType
Migrate aware from ExpectedException rules to AssertJ exception
assertions. Also include a checkstyle rules to ensure that the
the ExpectedException is not accidentally used in the future.
See gh-22894
2019-05-08 16:25:52 +02:00
Rossen Stoyanchev
7e6e3d7027
Switch writeAcceptCharset to false by default
...
Closes gh-22506
2019-05-08 09:56:52 -04:00
Rossen Stoyanchev
a9f0eae4ab
Merge branch '5.1.x'
2019-05-08 09:41:10 -04:00