3002813598
Clean up warnings in spring-test
2024-04-26 15:49:09 +03:00
c21090ad31
Merge branch '6.1.x'
2024-04-22 15:16:50 +02:00
8a8c8fe00e
Detect target of factory method with AOT
...
Previously, if a factory method is defined on a parent, the generated
code would blindly use the method's declaring class for both the target
of the generated code, and the signature of the method.
This commit improves the resolution by considering the factory metadata
in the BeanDefinition.
Closes gh-32609
2024-04-22 15:13:56 +02:00
8727d723f3
Polish "Bean Overriding in Tests" support
2024-04-16 17:08:15 +02:00
b13963ee81
Reject private JUnit Jupiter lifecycle methods annotated with @Autowired
...
Closes gh-32627
2024-04-12 14:27:38 +02:00
2e3a923225
Polish
2024-04-11 08:45:26 +02:00
2d33aac350
Improve Bean Overriding support, testing and documentation
...
This commit improves on the bean overriding feature in several ways:
the API is simplified and polished (metadata and processor contracts,
etc...).
The commit also reworks infrastructure classes (context customizer,
test execution listener, BeanOverrideBeanFactoryPostProcessor, etc...).
Parsing of annotations is now fully stateless.
In order to avoid OverrideMetadata in bean definition and to make a
first step towards AOT support, the BeanOverrideBeanFactoryPostProcessor
now delegates to a BeanOverrideRegistrar to track classes to parse,
the metadata-related state as well as for the field injection methods
for tests.
Lastly, this commit increases the test coverage for the provided
annotations and adds integration tests and fixes a few `@TestBean`
issues.
2024-04-10 18:16:43 +02:00
7a74e45946
Make use of bean definition overriding more visible
...
This commit makes the use of bean definition overriding more visible and
prepare for a deprecation of the feature in the next major release.
As of this commit, use of bean definition overriding logs at INFO level.
The previous log level can be restored by setting the
allowBeanDefinitionOverriding flag explicitly on the BeanFactory (or
via the related ApplicationContext).
A number of tests that are using bean overriding on purpose have been
updated to set this flag, which will make them easier to find once we
actually deprecate the feature.
Closes gh-31288
2024-04-02 14:05:12 +02:00
996e66abdb
Perform NullAway build-time checks in spring-test
...
Closes gh-32475
2024-03-26 18:14:56 +01:00
96d9081190
Merge branch '6.1.x'
2024-03-26 18:10:25 +01:00
88b9c0567d
Refine null-safety in spring-test
...
See gh-32475
2024-03-26 18:09:55 +01:00
bf5b22d64f
Merge branch '6.1.x'
2024-03-26 17:45:25 +01:00
c7c9da56da
Consistent atMost period for Awaitility-based tests
...
Closes gh-32537
2024-03-26 17:45:14 +01:00
5698191ba0
Rename listener to CommonCachesTestExecutionListener
...
See gh-30954
2024-03-20 16:37:22 +01:00
7d197972e0
Polishing
2024-03-20 13:05:30 +01:00
1732844137
Polishing
2024-03-20 12:55:35 +01:00
29d307e211
Clear ApplicationContext cache after a test class completes if necessary
...
The ApplicationContext has a resource cache that it uses while the
context is being refreshed. Once the refresh phase completes, the
cache is cleared as its content is no longer in use. If beans are
lazily initialized, there is a case where the cache might be filled
again as processing is deferred past the refresh phase.
For those cases, the cache is not cleared. This can be a problem when
running in this mode with a large set of test configurations as the TCF
caches the related contexts.
This commit includes an additional TestExecutionListener to the TCF that
clears the resource cache if necessary once a test class completes. It
is ordered so that it runs after `@DirtiesContext` support as marking
the context as dirty will remove it from the cache and make that extra
step unnecessary.
Closes gh-30954
2024-03-20 09:42:41 +01:00
3bd342ee7d
Polish bean override support in the TestContext framework
2024-03-19 12:41:06 +01:00
e58ea0d945
Merge branch '6.1.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
2024-03-19 10:06:48 +01:00
c531a8a705
Nullability refinements and related polishing
...
See gh-32475
2024-03-19 09:58:44 +01:00
8f56b4a8ae
Fix logic error hidden by auto-boxing
2024-03-18 18:19:34 +01:00
2ca10e20ca
Simplify implementation of BeanOverrideParser
...
See gh-29917
2024-03-18 18:13:36 +01:00
0ef5a4090b
Support non-public BeanOverrideProcessors in the TestContext framework
...
Closes gh-32485
2024-03-18 18:02:51 +01:00
73a1c2d509
Polish
2024-03-18 08:59:22 +01:00
89d563097f
Merge branch '6.1.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
2024-03-16 23:24:51 +01:00
eb8b7c4331
Remove superfluous @NonNull declarations
2024-03-16 14:22:17 +01:00
cf31d088e2
Polish AssertJ support for MockMvc
...
See gh-21178
2024-03-15 17:15:32 +01:00
e7d7cb8641
Add AssertJ support for MockMvc
...
This commit adds a new way to use MockMvc by returning a MvcResult that
is AssertJ compatible. Compared to the existing MockMvc infrastructure,
this new model has the following advantages:
* Can be created from a MockMvc instance
* Dedicated builder methods for easier setup
* Assertions use familiar AssertJ syntax with discoverable assertions
through a DSL
* Improved exception message
See gh-21178
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com>
2024-03-15 13:30:32 +01:00
555d4a6004
Add AssertJ support for cookies
...
This commit adds AssertJ compatible assertions for cookies
See gh-21178
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com>
2024-03-15 13:28:12 +01:00
1cdbcc58f3
Add AssertJ support for the Model
...
This commit adds AssertJ compatible assertions for the Model that is
generated from an HTTP request.
See gh-21178
2024-03-15 13:28:12 +01:00
b46e528922
Add AssertJ support for the HTTP handler
...
This commit adds AssertJ compatible assertions for the component that
produces the result from the request.
See gh-21178
2024-03-15 13:28:12 +01:00
e97ae434fb
Add AssertJ support for HTTP requests and responses
...
This commit adds AssertJ compatible assertions for HTTP request and
responses, including headers, media type, and response body. The latter
delegate to the recently included JSON assert support.
See gh-21178
2024-03-15 13:28:11 +01:00
76f45c4289
Add support for JSON assertions using JSON path
...
This commit moves JSON path AssertJ support from Spring Boot.
See gh-21178
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com>
2024-03-15 13:28:11 +01:00
97ebc43ea9
Add support for JSON assertions using JSON compare
...
This commit moves JSON content AssertJ support from Spring Boot.
See gh-21178
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com>
2024-03-15 13:28:11 +01:00
27d5213176
Polish Javadoc for @TestBean support
2024-03-14 13:44:27 +01:00
986c4fd926
Revise use of Objects.requireNonNull()
...
Historically, we have rarely intentionally thrown a
NullPointerException in the Spring Framework. Instead, we prefer to
throw either an IllegalArgumentException or IllegalStateException
instead of a NullPointerException.
However, changes to the code in recent times have introduced the use of
Objects.requireNonNull(Object) which throws a NullPointerException
without an explicit error message.
The latter ends up providing less context than a NullPointerException
thrown by the JVM (since Java 14) due to actually de-referencing a
null-pointer. See https://openjdk.org/jeps/358 .
In light of that, this commit revises our current use of
Objects.requireNonNull(Object) by removing it or replacing it with
Assert.notNull().
However, we still use Objects.requireNonNull(T, String) in a few places
where we are required to throw a NullPointerException in order to
comply with a third-party contract such as Reactive Streams.
Closes gh-32430
2024-03-13 16:00:22 +01:00
d6422d368a
Revise @TestBean support
...
See gh-29917
2024-03-13 16:00:22 +01:00
21ed8aad74
Add missing test
2024-03-13 15:59:28 +01:00
7211db9262
Polishing
2024-03-13 15:59:28 +01:00
68ae1e5700
Fix a link in MockitoResetTestExecutionListener javadoc
2024-03-12 17:43:10 +01:00
8af1d8e842
Remove applyAttributes flag from contribution
...
See gh-29958
2024-03-12 10:43:31 +00:00
052b6357c8
Apply attributes to the underlying HTTP request
...
See gh-29958
2024-03-12 10:43:31 +00:00
282ee02419
Polishing contribution
...
Closes gh-31924
2024-03-12 10:43:31 +00:00
667e30f580
Set UTF-8 as default multipart charset to ContentRequestMatchers
...
See gh-31924
2024-03-12 10:43:31 +00:00
92d1ebefbb
Upgrade to HtmUnit 3.11.0
...
This commit upgrades to a major new release of HtmlUnit. This is a
breaking change as HtmlUnit 3 moves to a `org.htmlunit` package and
calling code needs to be restructured.
Our use of Selenium has been adapted accordingly, moving to Selenium
3, using the new org.seleniumhq.selenium:htmlunit3-driver integration.
Closes gh-30392
2024-03-11 14:36:46 +01:00
71245f9655
Relocate bean override infrastructure to the proper package in the TCF
2024-03-11 14:21:04 +01:00
f30a67c9d0
Remove duplicate dependency
2024-03-11 13:59:23 +01:00
c4e0f96ef7
Polishing
2024-03-11 11:28:59 +01:00
246e4977a2
Polishing Optional usage
2024-03-11 09:13:49 +01:00
6f5d3a4b12
Polish Bean Override support in the TestContext framework
2024-03-10 16:05:55 +01:00
8172d7adfe
Polish
2024-03-09 17:27:44 +01:00
e53ed3e3c6
Merge branch '6.1.x'
2024-03-09 16:03:04 +01:00
4983a802a7
Polish "Fix Javadoc"
...
See gh-32403
2024-03-09 16:02:01 +01:00
abdccffa39
Fix Javadoc
...
This commit fixes various Javadoc issues across the code base.
See gh-32403
2024-03-09 16:02:00 +01:00
729dc0b671
Polishing javadoc
2024-03-08 18:07:51 +01:00
e1bbdf0913
Add support for bean overriding in tests
...
This commit introduces two sets of annotations (`@TestBean` on one side
and `MockitoBean`/`MockitoSpyBean` on the other side), as well as an
extension mecanism based on the `@BeanOverride` meta-annotation.
Extension implementors are expected to only provide an annotation,
a BeanOverrideProcessor implementation and an OverrideMetadata subclass.
Closes gh-29917.
2024-03-08 16:52:39 +01:00
f6dfbac582
Merge branch '6.1.x'
2024-03-05 11:01:29 +01:00
cfd0aee4db
Polish and add MockMvcExtensionsTests.queryParameter
...
Closes gh-32371
2024-03-05 10:59:12 +01:00
132fbe228f
Add query parameters to MockMvc Kotlin DSL
...
See gh-32371
2024-03-05 10:56:41 +01:00
dc6c96de0a
Merge branch '6.1.x'
...
# Conflicts:
# spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java
# spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
# spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
2024-03-04 22:50:22 +01:00
e9110c0729
Polishing
2024-03-04 22:48:52 +01:00
c76d681dc4
Merge branch '6.1.x'
2024-03-01 14:41:49 +01:00
de828e9764
Improve documentation for @Sql execution phases regarding lifecycle
...
Closes gh-32343
2024-03-01 14:37:31 +01:00
f22a1eece4
Polishing
2024-02-28 19:14:37 +01:00
cfb29db278
Initial support for Servlet 6.1
...
Closes gh-31159
2024-02-28 18:54:36 +01:00
122372c580
Spring cleaning: update copyright headers
2024-02-23 12:21:22 +01:00
4bd1485ce4
Spring cleaning: use method references
2024-02-23 12:20:11 +01:00
644887e094
Polish (Linked)HashSet usage
...
See gh-32291
2024-02-21 16:22:31 +01:00
b9c304b890
Polish contribution
...
See gh-32291
2024-02-21 16:19:53 +01:00
e1a32d4ba9
Avoid resizing of fixed-size HashSet/LinkedHashSet variants
...
Add helpers to CollectionUtils for building HashSets and LinkedHashSets
that can hold an expected number of elements without needing to
resize/rehash.
Closes gh-32291
2024-02-21 16:19:53 +01:00
ea4e7df9ca
Consistently declare ignoreUnresolvablePlaceholders as last argument
2024-02-16 15:00:32 +01:00
b6df5a677e
Polishing
2024-02-16 11:41:22 +01:00
e3aa5b6b11
Use new implementation in PropertyPlaceholderHelper
...
This commit removes the previous implementation in favor of the new
PlaceholderParser. The only noticeable side effect is that the exception
is no longer an IllegalArgumentException, but rather the dedicated
PlaceholderResolutionException.
See gh-9628
2024-02-15 15:27:13 +01:00
e73bbd4ad3
Configure jsonpath MappingProvider in WebTestClient
...
This commit improves jsonpath support in WebTestClient by detecting
a suitable json encoder/decoder that can be applied to assert more
complex data structure.
Closes gh-31653
2024-02-15 14:41:30 +01:00
9f8038963f
Allow JsonPathExpectationsHelper to use a custom configuration
...
This commit improves JsonPathExpectationsHelper to allow a custom json
path configuration to be defined. The primary objective of a custom
configuration is to specify a custom mapper that can deserialize complex
object structure.
As part of this commit, it is now possible to invoke a Matcher against
a type that holds generic information, using a regular
ParameterizedTypeReference.
Given that the existing constructor takes a vararg of Object, this
commit also deprecates this constructor in favor of formatting the
expression String upfront.
Closes gh-31651
2024-02-15 13:57:40 +01:00
4f8eca1350
Order methods that take a type as a lambda consistently
...
Closes gh-32062
2024-02-15 13:57:17 +01:00
c04d4da9a3
Polish
2024-02-05 09:11:04 +01:00
ea52ecc5e0
Polish
2024-02-02 18:56:41 +01:00
7e5efdd8dd
Reuse MapPropertySource for DynamicValuesPropertySource implementation
...
Closes gh-32110
2024-01-29 13:04:02 +01:00
3ce7c52030
Update copyright headers
2024-01-26 14:11:37 +01:00
d7778c0212
Polishing
2024-01-23 18:31:31 +01:00
531ac89e7e
Expose sendError message as default body
...
Closes gh-26720
2024-01-23 18:31:26 +01:00
5856d2e54e
Polish contribution
...
See gh-32069
2024-01-21 16:27:59 +01:00
a8fa98e2a6
Remove unnecessary semicolons in enum declarations
...
Closes gh-32069
2024-01-21 16:25:36 +01:00
1b312b6f3f
Polish
2024-01-16 18:45:59 +01:00
dc5a21fbd1
Remove outdated note
...
See gh-20606
2024-01-16 16:43:28 +01:00
e0c5068d0b
Fix incorrect assertions using json path
...
Closes gh-32036
2024-01-16 10:59:43 +01:00
faba044735
Polish JsonPathExpectationsHelperTests
2024-01-15 17:04:11 +01:00
4d885f9aad
Polish
2024-01-15 16:45:53 +01:00
0c42965fc3
Polish
2024-01-15 11:17:19 +01:00
4b0443090a
Polish Javadoc for test annotations
2024-01-09 16:32:22 +01:00
598c972a78
Update ContentRequestMatchers#multipartData Javadoc
...
This commit updates ContentRequestMatchers#multipartData
Javadoc to mention Tomcat fork of Commons FileUpload library
instead of the original variant.
It also adds a similar note to
ContentRequestMatchers#multipartDataContains.
Closes gh-31988
2024-01-09 14:12:09 +01:00
1f2d29ee08
Polish
2024-01-08 17:12:33 +01:00
2d3b02a89d
Polish
2024-01-08 11:48:08 +01:00
085af10afd
Polishing
2024-01-05 18:16:39 +01:00
580d9f81e2
Polishing
2024-01-05 17:06:32 +01:00
79b0d71514
Support the use of @Resource in test classes in AOT mode
...
Closes gh-31733
2024-01-05 16:31:18 +01:00
07097976ef
Polishing
2024-01-05 10:08:57 +01:00
f846d9484c
Add Javadoc to MockHttpServletResponse
...
This commit adds Javadoc to the `getContentLength` method of
`MockHttpServletResponse` to reflect that it gets its value from the
HTTP response header.
Closes gh-31833
2024-01-03 15:19:53 +01:00
6eed2b0aee
Upgrade to "TestNG Engine for the JUnit Platform" version 1.0.5
...
Thanks to a bug fix in 1.0.5, test methods in TestNG test classes can
finally be package private as was always the case with TestNG itself.
See https://github.com/junit-team/testng-engine/issues/16
2024-01-02 16:46:24 +01:00
7cfff4049d
Polish "Remove unnecessary final modifier"
...
See gh-31916
2023-12-28 13:01:44 +01:00
45080e3724
Remove unnecessary final modifier
...
final is useless for private and static methods
See gh-31916
2023-12-28 13:01:43 +01:00
cd8bc2f82a
Remove useless empty inheritDoc Javadoc tag
2023-12-22 11:23:11 +01:00
b56fc50c27
Update copyright headers in spring-test
...
Closes gh-31853
2023-12-16 14:23:37 +01:00
afcd03bddc
Replace assertThat(x.isEmpty()).isTrue() with assertThat(x).isEmpty()
...
Search for : assertThat\((.+).isEmpty\(\)\).isTrue\(\)
Replace with : assertThat($1).isEmpty()
Search for : assertThat\((.+).isEmpty\(\)\).isFalse\(\)
Replace with : assertThat($1).isNotEmpty()
Closes gh-31758
2023-12-06 10:04:56 +01:00
e2852e7355
Replace assertThat(x.contains(y)).isTrue() with assertThat(x).contains(y)
...
Search for : assertThat\((.+)\.contains\((.+)\)\)\.isTrue\(\)
Replace with : assertThat($1).contains($2)
Search for : assertThat\((.+)\.contains\((.+)\)\)\.isFalse\(\)
Replace with : assertThat($1).doesNotContain($2)
Closes gh-31762
2023-12-06 09:48:49 +01:00
59815cefce
Replace assertThat(x.get(i)). with assertThat(x).element(i).
...
Search for : assertThat\((.+)\.get\((\d+)\)\)\.
Replace with : assertThat($1).element($2).
Closes gh-31759
2023-12-06 09:43:59 +01:00
785ad399e9
Replace assertThat(x.iterator().next()) with assertThat(x).element(0)
...
Search for : assertThat\((.+).iterator\(\).next\(\)\)
Replace with : assertThat($1).element(0)
2023-12-06 10:52:39 +08:00
c74d60b9fe
Polishing
2023-12-05 16:14:13 +01:00
db48813181
Polish contribution
...
See gh-31757
2023-12-05 16:14:13 +01:00
a596c0e226
Introduce overloaded MockPart constructor that accepts the Content-Type
...
Closes gh-31757
2023-12-05 15:55:33 +01:00
e870912fa2
Polish Javadoc for MockRestServiceServer
...
See gh-31741
2023-12-03 19:24:46 +01:00
99f50ebeb4
Fix Javadoc for MockRestServiceServer.bindTo(RestClient.Builder)
...
Closes gh-31741
2023-12-03 19:15:35 +01:00
c92a0bd493
Prevent AotDetector to be initialized at build-time
...
This commit moves the condition used by `@DisabledInAotMode` to a
concrete implementation rather than using `@DisabledIf` as it causes
build initialization in a native image.
Closes gh-31705
2023-11-28 15:46:31 +01:00
246833329f
Register runtime hints for skipped exceptions in the TestContext framework
...
Closes gh-31479
2023-11-27 15:42:20 +01:00
97264c77dd
Consistently log exceptions from TestExecutionListeners at WARN level
...
Prior to this commit, the TestContextManager logged an exception from a
TestExecutionListener at WARN level except in prepareTestInstance()
where such an exception was logged at ERROR level (except for a skipped
exception which is logged at INFO level).
For consistency, this commit modifies TestContextManager so that it
always logs non-skipped exceptions from TestExecutionListeners at WARN
level.
Closes gh-31688
2023-11-26 12:44:13 +01:00
b17f3bc07b
Polishing
2023-11-26 12:31:15 +01:00
95e250d4bd
Log test aborted exceptions at INFO level in the TestContext framework
...
Prior to this commit, any time an aborted/skipped exception was thrown
by a TestExecutionListener, the TestContextManager unconditionally
logged the exception at WARN level -- or ERROR level for
prepareTestInstance() callbacks.
Regarding the latter, an aborted/skipped exception is certainly not an
ERROR, and in general the associated log output is very verbose
(including a stack trace) and not something the user should be warned
about it.
To improve the user experience, this commit revises TestContextManager
so that it logs such exceptions at INFO level.
Specifically, the following types of exceptions are considered
aborted/skipped exceptions.
- JUnit Jupiter: org.opentest4j.TestAbortedException
- JUnit 4 org.junit.AssumptionViolatedException
- TestNG: org.testng.SkipException
Closes gh-31479
2023-11-25 18:12:43 +01:00
dbad9fd208
Update copyright headers
2023-11-25 14:59:40 +01:00
b2757d9a21
Add Javadoc to MockHttpServletResponse#getErrorMessage
...
Closes gh-31386
2023-11-24 14:41:36 +01:00
878b33c56f
Further polish LruContextCacheTests
...
See gh-31640
2023-11-21 11:29:09 +01:00
f46902869f
Polish LruContextCacheTests
...
Use AssertJ's extracting() feature instead of ReflectionTestUtils.getField().
Closes gh-31640
2023-11-21 11:22:16 +01:00
8a7144ba42
Document how to log @Sql scripts and statements
...
Closes gh-31589
2023-11-10 11:19:38 +01:00
6c3a3dc7d9
Polishing
2023-11-10 11:18:26 +01:00
42874178ce
Polish RecordApplicationEvents javadoc: add note on captured threads
...
This commit clarifies that the annotation is used to capture events that
are fired from the test `Thread` or descendant threads, since the test
framework uses `InheritableThreadLocal` to store captured events now.
See gh-31079
See gh-30020
2023-11-09 11:07:53 +01:00
fe14c85ada
Fix link in Javadoc of ConfigurableMockMvcBuilder
...
See gh-31542
2023-11-02 14:25:35 +01:00
a5841fede5
Polishing
2023-11-01 16:23:18 +01:00
115a46c5e8
Polish
2023-10-31 17:58:13 +01:00
3d248607dc
Update copyright headers
2023-10-30 15:21:02 +01:00
cb9382d986
Polishing
2023-10-29 10:16:32 +01:00
6c4cbd2aab
Support ContextLoader config in @SpringJUnit[Web]Config
...
Prior to this commit, @SpringJUnitConfig and @SpringJUnitWebConfig
did not declare `loader` attributes that alias @ContextConfiguration's
`loader` attribute. Consequently, it was not possible to configure a
custom ContextLoader via those annotations.
The lack of those `loader` attributes was an oversight, and this commit
introduces them to support custom ContextLoader configuration directly
via the @SpringJUnitConfig and @SpringJUnitWebConfig annotations.
Closes gh-31498
2023-10-25 16:12:17 +02:00
d7e6b79336
Log and skip resource hint registration for classpath location patterns
...
Since we do not yet have support for registering resource hints for
classpath location patterns, we have decided to explicitly skip such
resources and log a warning to inform users that they need to manually
supply resource hints for the exact resources needed by their
application.
This commit applies this change for @PropertySource and
@TestPropertySource.
See gh-31162
Closes gh-31429
2023-10-25 12:42:36 +02:00
e57b942b4d
MockMvcBuilder supports filter name in addition to initParams
...
Closes gh-31474
2023-10-24 10:33:58 +01:00
2d792f000a
Polish "Apply SingleSpaceSeparator Checkstyle module"
...
See gh-31469
2023-10-22 14:18:18 +02:00
64e9fcad53
Apply SingleSpaceSeparator Checkstyle module
...
This commit also fixes its violations.
Closes gh-31469
2023-10-22 14:09:57 +02:00
8a05661707
Polishing
2023-10-22 13:35:49 +02:00
f72bf0c177
Revert "Skipping duplicate test classes during test AOT processing"
...
This reverts commit 1281f03b96
2023-10-22 13:35:49 +02:00
563112c1b7
Ensure integration tests pass in AOT mode
...
See gh-29122
2023-10-22 13:35:49 +02:00
37e6fe5b64
Update copyright headers
2023-10-22 11:28:40 +02:00
dab7e03c93
Polish
...
See gh-28041
2023-10-20 18:34:52 +02:00
4bf995fa8b
Support "*" mapping in MockMvc filter registration
...
Prior to this commit, configuring a Servlet filter in MockMvc with a
defined mapping would only consider "/*" as a catch-all pattern.
This commit relaxes this rule by also accepting "*" mappings.
Closes gh-28041
2023-10-20 18:32:06 +02:00
919faa2ce2
Order modifiers to align with JLS
...
This commit also applies Checkstyle ModifierOrder to enforce it.
See gh-31368
2023-10-17 16:13:56 +02:00
1fb2a37957
Apply @DisabledInAotMode for @EJB and SpEL usage
...
Most of the remaining failures are due to @Resource usage.
Current AOT test results for the spring-test module:
Test run finished after 6140 ms
[ 399 containers found ]
[ 64 containers skipped ]
[ 335 containers started ]
[ 0 containers aborted ]
[ 333 containers successful ]
[ 2 containers failed ]
[ 745 tests found ]
[ 116 tests skipped ]
[ 628 tests started ]
[ 1 tests aborted ]
[ 589 tests successful ]
[ 38 tests failed ]
Failing Test Classes:
org.springframework.test.context.groovy.AbsolutePathGroovySpringContextTests
org.springframework.test.context.groovy.GroovySpringContextTests
org.springframework.test.context.groovy.RelativePathGroovySpringContextTests
org.springframework.test.context.jdbc.BeforeTestClassSqlScriptsTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$ConfigOverriddenByDefaultTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests$DoubleNestedWithOverriddenConfigTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests$DoubleNestedWithOverriddenConfigTests$TripleNestedWithInheritedConfigAndTestInterfaceTests
org.springframework.test.context.junit.jupiter.orm.JpaEntityListenerTests
org.springframework.test.context.junit4.AbsolutePathSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ConcreteTransactionalJUnit4SpringContextTests
org.springframework.test.context.junit4.InheritedConfigSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ParameterizedDependencyInjectionTests
org.springframework.test.context.junit4.RelativePathSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.SpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.annotation.AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.spr9799.Spr9799XmlConfigTests
org.springframework.test.context.testng.ConcreteTransactionalTestNGSpringContextTests
See gh-29122
2023-10-16 21:39:17 +02:00
88cd0700b2
Filter out TestNG @EJB tests in AOT end-to-end tests
...
See gh-29122
2023-10-16 21:39:17 +02:00
9cac5eeeab
Consistently use generated name in embedded databases
...
... to avoid database name conflicts when test classes are executed in
a different order.
See gh-29122
2023-10-16 21:38:47 +02:00
0adec6d15a
Apply @DisabledInAotMode to remaining @ContextHierarchy integration tests
...
See gh-29122
2023-10-16 21:35:57 +02:00
bb95f2e5ca
Apply @DisabledInAotMode to @ContextHierarchy integration tests
...
This commit applies @DisabledInAotMode to all integration test classes
in the spring-test module that use @ContextHierarchy since that
feature is not supported for AOT optimizations.
Current AOT test results for the spring-test module:
Test run finished after 6888 ms
[ 403 containers found ]
[ 57 containers skipped ]
[ 346 containers started ]
[ 0 containers aborted ]
[ 338 containers successful ]
[ 8 containers failed ]
[ 757 tests found ]
[ 98 tests skipped ]
[ 654 tests started ]
[ 9 tests aborted ]
[ 576 tests successful ]
[ 69 tests failed ]
Failing Test Classes:
org.springframework.test.context.configuration.interfaces.SqlConfigInterfaceTests
org.springframework.test.context.expression.ExpressionUsageTests
org.springframework.test.context.groovy.AbsolutePathGroovySpringContextTests
org.springframework.test.context.groovy.GroovySpringContextTests
org.springframework.test.context.groovy.RelativePathGroovySpringContextTests
org.springframework.test.context.hierarchies.meta.MetaHierarchyLevelTwoTests
org.springframework.test.context.hierarchies.standard.TestHierarchyLevelTwoWithBareContextConfigurationInSubclassTests
org.springframework.test.context.jdbc.CustomScriptSyntaxSqlScriptsTests
org.springframework.test.context.jdbc.GlobalCustomScriptSyntaxSqlScriptsTests
org.springframework.test.context.jdbc.InferredDataSourceTransactionalSqlScriptsTests
org.springframework.test.context.jdbc.InfrastructureProxyTransactionalSqlScriptsTests
org.springframework.test.context.jdbc.MultipleDataSourcesAndTransactionManagersSqlScriptsTests
org.springframework.test.context.jdbc.MultipleDataSourcesAndTransactionManagersTransactionalSqlScriptsTests
org.springframework.test.context.jdbc.NonTransactionalSqlScriptsTests
org.springframework.test.context.jdbc.RepeatableSqlAnnotationSqlScriptsChildTests
org.springframework.test.context.jdbc.RepeatableSqlAnnotationSqlScriptsParentTests
org.springframework.test.context.jdbc.TransactionalAfterTestMethodSqlScriptsTests
org.springframework.test.context.jdbc.TransactionalInlinedStatementsSqlScriptsTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$ConfigOverriddenByDefaultTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests$DoubleNestedWithOverriddenConfigTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests$DoubleNestedWithOverriddenConfigTests$TripleNestedWithInheritedConfigAndTestInterfaceTests
org.springframework.test.context.junit.jupiter.orm.JpaEntityListenerTests
org.springframework.test.context.junit4.AbsolutePathSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ConcreteTransactionalJUnit4SpringContextTests
org.springframework.test.context.junit4.InheritedConfigSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ParameterizedDependencyInjectionTests
org.springframework.test.context.junit4.RelativePathSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.SpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.annotation.AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.rules.TransactionalSqlScriptsSpringRuleTests
org.springframework.test.context.junit4.spr9799.Spr9799XmlConfigTests
org.springframework.test.context.testng.ConcreteTransactionalTestNGSpringContextTests
org.springframework.test.context.testng.transaction.ejb.CommitForRequiredEjbTxDaoTestNGTests
org.springframework.test.context.testng.transaction.ejb.CommitForRequiresNewEjbTxDaoTestNGTests
org.springframework.test.context.testng.transaction.ejb.RollbackForRequiredEjbTxDaoTestNGTests
org.springframework.test.context.testng.transaction.ejb.RollbackForRequiresNewEjbTxDaoTestNGTests
org.springframework.test.context.transaction.ejb.CommitForRequiredEjbTxDaoTests
org.springframework.test.context.transaction.ejb.CommitForRequiresNewEjbTxDaoTests
org.springframework.test.context.transaction.ejb.RollbackForRequiredEjbTxDaoTests
org.springframework.test.context.transaction.ejb.RollbackForRequiresNewEjbTxDaoTests
See gh-29122
2023-10-16 17:11:00 +02:00
44931dca44
Include all failing test classes in AOT end-to-end test report
...
Prior to this commit, AotIntegrationTests only printed "failing test
classes" for tests that failed at the class level.
This commit updates the reporting logic to report test classes for
failing test methods as well.
Current results for the spring-test module:
Test run finished after 6531 ms
[ 403 containers found ]
[ 27 containers skipped ]
[ 376 containers started ]
[ 0 containers aborted ]
[ 366 containers successful ]
[ 10 containers failed ]
[ 757 tests found ]
[ 61 tests skipped ]
[ 689 tests started ]
[ 9 tests aborted ]
[ 585 tests successful ]
[ 95 tests failed ]
Failing Test Classes:
org.springframework.test.context.configuration.interfaces.ContextHierarchyInterfaceTests
org.springframework.test.context.configuration.interfaces.SqlConfigInterfaceTests
org.springframework.test.context.expression.ExpressionUsageTests
org.springframework.test.context.groovy.AbsolutePathGroovySpringContextTests
org.springframework.test.context.groovy.GroovySpringContextTests
org.springframework.test.context.groovy.RelativePathGroovySpringContextTests
org.springframework.test.context.hierarchies.meta.MetaHierarchyLevelTwoTests
org.springframework.test.context.hierarchies.standard.ClassHierarchyWithMergedConfigLevelOneTests
org.springframework.test.context.hierarchies.standard.ClassHierarchyWithMergedConfigLevelTwoTests
org.springframework.test.context.hierarchies.standard.ClassHierarchyWithOverriddenConfigLevelTwoTests
org.springframework.test.context.hierarchies.standard.DirtiesContextWithContextHierarchyTests
org.springframework.test.context.hierarchies.standard.SingleTestClassWithTwoLevelContextHierarchyAndMixedConfigTypesTests
org.springframework.test.context.hierarchies.standard.SingleTestClassWithTwoLevelContextHierarchyTests
org.springframework.test.context.hierarchies.standard.TestHierarchyLevelTwoWithBareContextConfigurationInSubclassTests
org.springframework.test.context.hierarchies.standard.TestHierarchyLevelTwoWithBareContextConfigurationInSuperclassTests
org.springframework.test.context.hierarchies.standard.TestHierarchyLevelTwoWithSingleLevelContextHierarchyAndMixedConfigTypesTests
org.springframework.test.context.hierarchies.standard.TestHierarchyLevelTwoWithSingleLevelContextHierarchyTests
org.springframework.test.context.hierarchies.web.ControllerIntegrationTests
org.springframework.test.context.hierarchies.web.DispatcherWacRootWacEarTests
org.springframework.test.context.hierarchies.web.RootWacEarTests
org.springframework.test.context.jdbc.CustomScriptSyntaxSqlScriptsTests
org.springframework.test.context.jdbc.GlobalCustomScriptSyntaxSqlScriptsTests
org.springframework.test.context.jdbc.InferredDataSourceTransactionalSqlScriptsTests
org.springframework.test.context.jdbc.InfrastructureProxyTransactionalSqlScriptsTests
org.springframework.test.context.jdbc.MultipleDataSourcesAndTransactionManagersSqlScriptsTests
org.springframework.test.context.jdbc.MultipleDataSourcesAndTransactionManagersTransactionalSqlScriptsTests
org.springframework.test.context.jdbc.NonTransactionalSqlScriptsTests
org.springframework.test.context.jdbc.RepeatableSqlAnnotationSqlScriptsChildTests
org.springframework.test.context.jdbc.RepeatableSqlAnnotationSqlScriptsParentTests
org.springframework.test.context.jdbc.TransactionalAfterTestMethodSqlScriptsTests
org.springframework.test.context.jdbc.TransactionalInlinedStatementsSqlScriptsTests
org.springframework.test.context.junit.jupiter.nested.ContextHierarchyNestedTests$NestedTestCaseWithInheritedConfigTests
org.springframework.test.context.junit.jupiter.nested.ContextHierarchyNestedTests$NestedTestCaseWithInheritedConfigTests$DoubleNestedTestCaseWithOverriddenConfigTests
org.springframework.test.context.junit.jupiter.nested.ContextHierarchyNestedTests$NestedTestCaseWithInheritedConfigTests$DoubleNestedTestCaseWithOverriddenConfigTests$TripleNestedWithInheritedConfigAndTestInterfaceTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$ConfigOverriddenByDefaultTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests$DoubleNestedWithOverriddenConfigTests
org.springframework.test.context.junit.jupiter.nested.TestExecutionListenersNestedTests$InheritedAndExtendedConfigTests$DoubleNestedWithOverriddenConfigTests$TripleNestedWithInheritedConfigAndTestInterfaceTests
org.springframework.test.context.junit.jupiter.orm.JpaEntityListenerTests
org.springframework.test.context.junit4.AbsolutePathSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ConcreteTransactionalJUnit4SpringContextTests
org.springframework.test.context.junit4.InheritedConfigSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.ParameterizedDependencyInjectionTests
org.springframework.test.context.junit4.RelativePathSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.SpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.annotation.AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests
org.springframework.test.context.junit4.rules.TransactionalSqlScriptsSpringRuleTests
org.springframework.test.context.junit4.spr9799.Spr9799XmlConfigTests
org.springframework.test.context.testng.ConcreteTransactionalTestNGSpringContextTests
org.springframework.test.context.testng.transaction.ejb.CommitForRequiredEjbTxDaoTestNGTests
org.springframework.test.context.testng.transaction.ejb.CommitForRequiresNewEjbTxDaoTestNGTests
org.springframework.test.context.testng.transaction.ejb.RollbackForRequiredEjbTxDaoTestNGTests
org.springframework.test.context.testng.transaction.ejb.RollbackForRequiresNewEjbTxDaoTestNGTests
org.springframework.test.context.transaction.ejb.CommitForRequiredEjbTxDaoTests
org.springframework.test.context.transaction.ejb.CommitForRequiresNewEjbTxDaoTests
org.springframework.test.context.transaction.ejb.RollbackForRequiredEjbTxDaoTests
org.springframework.test.context.transaction.ejb.RollbackForRequiresNewEjbTxDaoTests
org.springframework.test.web.servlet.samples.client.context.JavaConfigTests
org.springframework.test.web.servlet.samples.client.context.WebAppResourceTests
org.springframework.test.web.servlet.samples.client.context.XmlConfigTests
org.springframework.test.web.servlet.samples.context.JavaConfigTests
org.springframework.test.web.servlet.samples.context.WebAppResourceTests
org.springframework.test.web.servlet.samples.context.XmlConfigTests
See gh-29122
2023-10-16 16:56:20 +02:00
32b4f55d92
Update copyright headers
2023-10-16 16:19:55 +02:00
119a9ffc3e
Rename test class to NestedTests for AOT integration testing
...
Prior to this commit, the NestedTestCase resulted in errors during our
AOT end-to-end integration tests since it did not comply to our "*Tests"
naming convention.
See gh-29122
2023-10-16 16:19:55 +02:00
Sam Brannen
Stéphane Nicoll
Simon Baslé
Sébastien Deleuze
Juergen Hoeller
rstoyanchev
PhilKes
Anton Ždanov
Yanming Zhou
Maksim Sasnouski
corby kim
Patrick Strawderman
mnhock
Juergen Hoeller
Brian Clozel
Yaklede
Sam Brannen
HyeongMokJeong
Donghun Shin
Stéphane Nicoll
Brian Clozel
Simon Baslé
yanghaojia
rstoyanchev
Johnny Lim
Chen Jianbin