Rossen Stoyanchev
658c7f99d7
Lenient date parsing in HeadersResultMatchers
...
Rather than formatting the expected value, and be susceptible to
minor formatting differences (e.g. 01 vs 1 for day of month), parse the
actual header value leniently with HttpHeaders and compare time values.
Issue: SPR-17330
2018-10-12 15:41:42 -04:00
Rossen Stoyanchev
c5ca56bd50
Polish
2018-10-12 12:15:45 -04:00
Juergen Hoeller
bfc5ad890e
MockHttpServletRequest resets InputStream/Reader on setContent
...
Issue: SPR-17373
2018-10-12 16:00:31 +02:00
Juergen Hoeller
0b2c482e29
Upgrade to Selenium HtmlUnit Driver 2.33
2018-10-12 13:17:14 +02:00
Rossen Stoyanchev
8df0bc88d2
Improve access to raw content in WebTestClient
...
If the content has not been consumed, cause it to be produced, and
wait for a certain amount of time before giving up, so the raw content
can be made available. This can occur when:
1) In a mock server scenario the Flux representing the client request
content is passed directly to the mock server request, but is never
consumed because of an error before the body is read.
2) Test obtains FluxExchangeResult (e.g. for streaming) but instead of
consuming the Flux, it calls getResponseBodyContent() instead.
Issue: SPR-17363
2018-10-11 20:25:56 -04:00
Rossen Stoyanchev
c567e65eea
WritetapConnector internal refactoring
...
Extract a common delegate class to share between the request and the
to wiretap a Publisher and record and buffer its data.
Preparation for SPR-17363.
2018-10-11 19:47:37 -04:00
Rossen Stoyanchev
050f44d75b
Rename WebTestClientConnectorTests to match class name
2018-10-11 19:47:37 -04:00
Juergen Hoeller
efdbddd358
Full alignment of spring-test vs spring-web MockCookie variants
...
Issue: SPR-17321
2018-10-09 23:13:18 +02:00
Rossen Stoyanchev
29ff8a8d12
More defensive check for MockAsyncContext
...
Avoid automatically unwrapping the request in TestDispatcherServlet,
if we find the MockAsyncContext.
Issue: SPR-17353
2018-10-09 11:56:47 -04:00
Rossen Stoyanchev
1489457025
Restore calls to setLocale in MockHttpServletResponse
...
Issue: SPR-17284
2018-10-05 13:50:41 -04:00
Sam Brannen
e63bffcfa0
Introduce not-null precondition for MockCookie parsing
2018-10-02 13:07:20 +02:00
Sam Brannen
77205ca165
Polish MockCookie contribution
...
Issue: SPR-17321, #1974
2018-10-02 13:06:16 +02:00
Sam Brannen
31095f1d4e
Move MockCookie parsing tests to correct class
...
Issue: SPR-17321, #1974
2018-10-02 12:43:17 +02:00
Sam Brannen
49bc746640
Polish MockCookie[Tests]
2018-10-02 12:41:07 +02:00
Michael Bell
1b8421c7fe
Fix MockCookie parsing when attribute is omitted
...
Issue: SPR-17321, #1974
2018-10-02 06:18:45 -04:00
Juergen Hoeller
255015fc6b
Prepared for backport to 4.3.20 and 5.0.10
...
Issue: SPR-17295
2018-09-29 17:08:57 +02:00
Juergen Hoeller
a76b8deda5
Consistent copyright header and fine-tuned javadoc in test/web mocks
...
Issue: SPR-17295
2018-09-24 00:27:50 +02:00
Juergen Hoeller
51ba322947
MockHttpServletRequest allows for removing registered header values
...
Includes full alignment of spring-test vs spring-web mock variants.
Issue: SPR-17295
2018-09-23 14:44:15 +02:00
Juergen Hoeller
80e52de231
Upgrade to HtmlUnit 2.33 and Apache Johnzon 1.1.10
2018-09-20 11:55:50 +02:00
Juergen Hoeller
cbc0fad961
Upgrade to Kotlin 1.2.70
...
Includes Hibernate ORM 5.1.16 and Hibernate Validator 6.0.13.
2018-09-13 18:23:42 +02:00
Juergen Hoeller
e49896d95f
Upgrade to Mockito 2.22, XMLUnit 2.6.2, JavaMail 1.6.2
...
Also includes Apache Johnzon 1.1.9.
2018-09-10 10:52:24 +02:00
Sam Brannen
c450f8dd82
Revert "PoC: migrate from JUnit 4 to JUnit Jupiter Assertions"
...
This reverts commit fd352b84b3 , and the
PoC will be moved to a feature branch.
2018-09-06 15:58:58 +02:00
Sam Brannen
fd352b84b3
PoC: migrate from JUnit 4 to JUnit Jupiter Assertions
2018-09-06 14:36:19 +02:00
Toshiaki Maki
d570f82456
Use long for expires and lastModified in HeaderAssertions
...
This commit changes the type of parameters so that HeaderAssertions
can assert expires and lastModified properly.
Issue: SPR-17194
2018-09-05 17:16:14 -04:00
Juergen Hoeller
9614817e88
Do not proxy test instances based on "original instance" convention
...
Issue: SPR-17137
2018-08-24 00:49:01 +02:00
Juergen Hoeller
a6a6cf7d97
Upgrade to Java Activation Framework 1.2 as API dependency
...
Includes XMLUnit 2.6.1 and Undertow 2.0.13.
Issue: SPR-16115
2018-08-17 16:01:15 +02:00
Juergen Hoeller
6bcb454a0d
Polishing
2018-08-16 19:31:10 +02:00
Juergen Hoeller
04d2d1da0d
Consistently use double quotes (even if no interpolation needed)
...
Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
2018-08-16 15:32:44 +02:00
Sam Brannen
d3be1cc6cb
Use single quotes in Gradle build where appropriate
2018-08-15 17:57:56 +02:00
Sam Brannen
69e4f21f90
Use JUnit 5 Maven BOM in Gradle build
...
Issue: SPR-17129
2018-08-15 17:43:23 +02:00
Sam Brannen
50dc8c2358
Update JavaDoc for @BootstrapWith regarding local override
...
Issue: SPR-17006
2018-08-15 17:17:24 +02:00
Sam Brannen
d20d95b7ac
Allow directly present @BootstrapWith to override meta annotations
...
Prior to this commit, if a test class was meta-annotated with multiple
@BootstrapWith declarations that registered different
TestContextBootstrapper implementations, such a configuration would
result in an IllegalStateException, and there was no way to override
this behavior.
This commit addresses this shortcoming by relaxing the explicit
TestContextBootstrapper resolution in BootstrapUtils so that a directly
present @BootstrapWith annotation will now override declarations of
@BootstrapWith that are meta-present. In other words, if @BootstrapWith
is used as a meta-annotation, it can be overridden directly on the test
class via an explicit, local declaration of @BootstrapWith.
Issue: SPR-17006
2018-08-15 16:17:05 +02:00
Sam Brannen
1b54d2119d
Polishing
2018-08-15 12:27:45 +02:00
Juergen Hoeller
de38af6843
Upgrade to JUnit Jupiter 5.3 RC1 (and Jetty 9.4.12 RC1)
...
Includes Groovy 2.5.2, Undertow 2.0.12, Hibernate Validator 6.0.12.
Issue: SPR-17129
2018-08-14 20:33:30 +02:00
Sam Brannen
8126ffbc8c
Fix broken links in JavaDoc
...
Issue: SPR-17174
2018-08-13 12:22:52 +02:00
Kazuhiro Sera
be211ceead
Fix typos detected by github.com/client9/misspell
2018-08-08 12:50:46 +02:00
Juergen Hoeller
821ab62492
Upgrade to RxJava 2.2 and Kotlin 1.2.60
...
Includes latest dependency updates (Mockito 2.21, Log4J 2.11.1, Hibernate ORM 5.3.4, Protobuf 3.6.1, JRuby 9.2, HtmlUnit 2.32, Selenium 3.14) for Spring Framework 5.1.
Issue: SPR-16388
Issue: SPR-16239
2018-08-03 23:18:10 +02:00
Rossen Stoyanchev
c55c9eb029
Polish
2018-08-03 17:41:38 +03:00
Vedran Pavic
bb2db87c2f
Add support for adding cookies as headers in MockHttpServletResponse
...
Issue: SPR-17110
2018-08-03 16:44:14 +03:00
Juergen Hoeller
2474c48749
Polishing
2018-08-02 16:55:53 +02:00
stsypanov
b5c691bdac
SPR-17074 Replace pointless wrapping with Arrays.asList with iteration over array
2018-08-02 12:07:00 +02:00
Vedran Pavic
70dbaf9751
Publish binding event for replaced attributes in MockHttpSession
...
Issue: SPR-17109
2018-08-01 13:07:41 +02:00
Juergen Hoeller
9b671f8408
Polishing
2018-07-31 23:57:19 +02:00
Сергей Цыпанов
f8340838b3
Use lambda expressions for lazy instantiation ( #1911 )
...
Issue: SPR-17074
2018-07-31 13:03:18 +02:00
Rossen Stoyanchev
23bda9a5a7
Fix compiler warnings
2018-07-27 08:49:45 -04:00
Rossen Stoyanchev
fcbf06f050
Disable equals in JsonPath~ and XPathAssertions
...
Issue: SPR-17091
2018-07-27 08:40:56 -04:00
Rossen Stoyanchev
bcb485b5ed
bindToApplicatonContext uses WebSessionManager bean
...
Issue: SPR-17094
2018-07-26 15:53:41 -04:00
Rossen Stoyanchev
c022f7c19d
Polish
2018-07-26 15:53:41 -04:00
Juergen Hoeller
3881a4aded
Polishing
2018-07-25 14:16:02 +02:00
Juergen Hoeller
47d8fe83df
Upgrade to Interceptor API 1.2.2, Moneta 1.3, Rome 1.11
2018-07-24 14:44:56 +02:00
Juergen Hoeller
1603c4ab2f
Programmatic ObjectProvider retrieval through BeanFactory API
...
Introduces getBeanProvider(Class) and getBeanProvider(ResolvableType), also narrowing getBean(String, Class) and isTypeMatch(String, Class) to a non-null Class argument and enriching NoUniqueBeanDefinitionException with a full ResolvableType. In addition, ObjectProvider supports iterable/stream access for collection-style resolution of multiple matching beans now, and collection injection falls back to an empty collection in a single-constructor case with non-null arguments.
Issue: SPR-17075
Issue: SPR-11419
Issue: SPR-15338
2018-07-24 00:42:03 +02:00
Rossen Stoyanchev
c57e1afd2b
ResulatMatcher.matchAll
...
Issue: SPR-16417
2018-07-20 23:02:47 -04:00
Rossen Stoyanchev
91122ec0f5
Add Consumer methods to WebTestClient assertion classes
...
Issue: SPR-16574
2018-07-20 22:28:40 -04:00
Rossen Stoyanchev
20de5003ff
Hamcrest methods in WebTestClient
...
Issue: SPR-16729
2018-07-20 17:40:38 -04:00
Rossen Stoyanchev
0c62d6b5da
Polish
...
Leaving out hamcrest for now, to address more broadly.
Issue: SPR-16741
2018-07-20 17:40:38 -04:00
Eric Deandrea
2734f01067
Provide XML assertions in WebTestClient
...
Adds XML-based assertions in
org.springframework.test.web.reactive.server.WebTestClient.BodyContentSpec
for asserting against the XML body as well as xPath,
similar to those assertions offered when using
MockMvcResultMatchers.xpath().
Issue: SPR-16741
2018-07-20 17:38:04 -04:00
Juergen Hoeller
9a43d2ec20
Revised log levels: less WARN and INFO, fine-tuned DEBUG vs TRACE
...
Issue: SPR-16946
2018-07-20 15:05:16 +02:00
Juergen Hoeller
867b3d233d
Upgrade to OkHttp 3.11, Apache HttpClient 4.5.6, Hibernate Validator 6.0.11
2018-07-19 17:52:08 +02:00
Juergen Hoeller
b3d6283d7d
CookieAssertionTests expects language tag compliance by default
...
Issue: SPR-16700
2018-07-17 18:18:54 +02:00
Rossen Stoyanchev
75e45103b5
Polish DefaultUriBuilderFactory
2018-07-16 21:21:34 -04:00
Rossen Stoyanchev
fd90b73748
Correlated WebFlux server log messages
...
Issue: SPR-16966
2018-07-05 08:27:13 -04:00
Sam Brannen
160002cf8b
Polishing
2018-07-04 14:33:39 +02:00
Sam Brannen
755add3087
Verify that TestContextBootstrapper resolution ignores duplicates
...
This commit introduces a test to verify that multiple declarations of
@BootstrapWith that register the same TestContextBootstrapper type
(i.e., duplicates) do not result in an error.
Issue: SPR-17006
2018-07-04 13:58:49 +02:00
Juergen Hoeller
d22d408261
Propagate read-only status through Session.setDefaultReadOnly(true)
...
Issue: SPR-16956
2018-07-03 22:22:19 +02:00
Juergen Hoeller
4ff1e3e74b
Consistent abstract declaration for utility classes (plus polishing)
...
Issue: SPR-16968
2018-07-01 02:31:20 +02:00
Rossen Stoyanchev
d74e09a925
Polish MockClientHttpRequest
2018-06-29 17:37:45 -04:00
Rossen Stoyanchev
7f555785dd
Add getBodyAsString() to MockClientHttpRequest
...
Issue: SPR-16988
2018-06-29 17:34:23 -04:00
Juergen Hoeller
e22466e9d5
Polishing
2018-06-29 19:44:15 +02:00
Juergen Hoeller
6f8a524eaa
Upgrade to Tomcat 9.0.10, RxJava 2.1.16, EclipseLink 2.7.2, Selenium 3.13
2018-06-28 14:52:35 +02:00
Juergen Hoeller
b0ece0e967
Remove hard configuration validation from SpringClassRule/MethodRule
...
Issue: SPR-16967
2018-06-28 14:15:16 +02:00
Phillip Webb
a89e716cc7
Use tabs rather than spaces in tests
...
Update tests to ensure that tabs are used instead of spaces. Also
consistently apply a new line at the end of each file.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
81451aa800
Organize imports
...
Reorganize imports to ensure consistent ordering. This commit also
expands any `.*` static imports in favor of using fully-qualified
method references.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
5cedd0d5d4
Consistently use tabs rather than spaces
...
Update code that has accidentally used spaces instead of tabs.
Also remove all trailing whitespace.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
0b53c1096a
Always use 'this.' when accessing fields
...
Ensure that `this.` is used consistently when accessing class
fields.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
eeebd51f57
Use consistent class design
...
Update all classes so that inner classes are always last. Also
ensure that utility classes are always final and have a private
constructor and make exceptions final whenever possible.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
0ad0f341bd
Don't use single letter catch variables
...
Update existing catch blocks to ensure that `ex` is always used
in preference to `e` or `t` as the variable name.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
04a8c285df
Fix annotation styling issues
...
Update all annotations so that each is on its own line and
consistently use the short form (i.e. don't use `value=`) when
possible.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
e9d1b39aff
Apply consistent copyright header
...
Add copyright header to `package-info.java` files and fix a few
malformed headers on existing java files.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
c3a17dfd47
Ensure all files end with a newline
...
Update all files to ensure that they always end with a new line.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Phillip Webb
e0480f75ac
Fix javadoc checkstyle issues
...
Fix checkstyle violations for javadoc.
Issue: SPR-16968
2018-06-28 10:28:44 +02:00
Sam Brannen
802763d26f
Reintroduce suppression of deprecation warning
2018-06-15 00:43:21 +03:00
Sam Brannen
8027e1f109
Remove obsolete suppression of deprecation warning
2018-06-14 22:48:34 +03:00
Sam Brannen
4ae4788e93
Delete unused import
2018-06-14 22:46:10 +03:00
Juergen Hoeller
3fc8ec498c
MockHttpServletRequest returns a single InputStream or Reader
...
Issue: SPR-16505
Issue: SPR-16499
2018-06-13 22:03:16 +02:00
Juergen Hoeller
9c36b53833
Upgrade to JAXB 2.3.0.1, Aalto XML 1.1, Rome 1.10
2018-06-11 22:01:51 +02:00
Rossen Stoyanchev
a31204938a
Getter for DispatcherSerlvet in MockMvc
...
Issue: SPR-16924
2018-06-11 12:42:55 -04:00
Brian Clozel
417354da8a
Remove dependency management noise from POMs
...
Prior to this commit, the generated POMs for Spring Framework modules
would contain unneeded/harmful information from the Spring Framework
build:
1. The BOM imports applied to each module by the dependency
management plugin, for example for Netty or Reactor Netty.
Spring should not export that opinion to its POMs.
2. The exclusion of "org.slf4:jcl-over-slf4j" from *all* dependencies,
which made the POMs much larger than necessary and suggested to
developers that they should exclude it as well when using all those
listed dependencies. In fact, only Apache Tiles currently brings that
transitively.
This commit removes that information from the POMs.
The dependencyManagement Gradle plugin is disabled for POM generation
and we manually resolve the dependency versions during the generation
phase.
The Gradle build is streamlined to exclude "org.slf4:jcl-over-slf4j"
only when necessary.
Issue: SPR-16893
2018-06-11 15:57:54 +02:00
Juergen Hoeller
0941081b0a
Upgrade to HSQLDB 2.4.1, Derby 10.14.2.0, HtmlUnit 2.31, Selenium 3.12
2018-06-06 21:24:53 +02:00
Rossen Stoyanchev
72b1d4c648
Remove explicit references to Reactor Netty version
...
...now that 0.8 is also listed in the Reactor bom.
Issue: SPR-16387
2018-06-06 14:35:54 -04:00
Rossen Stoyanchev
124d4c833c
Support for Servlet request params with HTTP DELETE
...
This commit adds FormContentFilter, which is the same as the
HttpPutFormContentFilter but also supports DELETE.
The HttpPutFormContentFilter is now deprecated.
Issue: SPR-16874
2018-06-04 15:48:47 -04:00
Rossen Stoyanchev
a3216432b5
Polish
...
Issue: SPR-16387
2018-05-31 15:38:30 -04:00
Violeta Georgieva
ffbc75ae47
Upgrade to Reactor Netty 0.8
...
Issue: SPR-16387
2018-05-31 15:37:39 -04:00
Juergen Hoeller
8593fec22c
Avoid ConstantConditions warnings suppression (plus related polishing)
...
Issue: SPR-15756
2018-05-29 21:47:10 +02:00
Rossen Stoyanchev
2acf91a438
Polish
2018-05-26 09:24:23 -04:00
Juergen Hoeller
836a09d5c0
Upgrade to Woodstox 5.1, XMLUnit 2.6, Gson 2.8.5
2018-05-25 00:18:06 +02:00
Rossen Stoyanchev
2a993bf9ff
Respect async request timeout of -1 in MockMvc
...
When falling back on the timeout associated with the async request,
a value of -1 must be treated as: never time out.
Issue: SPR-16869
2018-05-24 12:33:19 -04:00
Juergen Hoeller
285eb94a03
Upgrade to Hibernate Validator 6.0.10
2018-05-18 22:22:12 +02:00
Sebastien Deleuze
265960f09c
Add StatusResultMatchers.isEqualTo Kotlin extension
...
Issue: SPR-16429
2018-05-15 15:37:47 +02:00
Rossen Stoyanchev
15182b29a4
Add MockWebSession for use with MockServerWebExchange
...
Issue: SPR-16772
2018-05-11 10:53:28 -04:00
Rossen Stoyanchev
4da43de7e1
Remove individual detection of forwarded headers
...
This commit removes all places where forwarded headers are checked
implicitly, on an ad-hoc basis.
ForwardedHeaderFilter is expected to be used instead providing
centralized control over using or discarding such headers.
Issue: SPR-16668
2018-05-11 09:31:39 -04:00