Andy Wilkinson
1a0e008a8c
Prevent Netty tcNative from loading classes with wrong class loader
...
In our tests, the JNI code in Netty tcNative can cause some of its
classes to be loaded using a ModifiedClassPathClassLoader. When the
wrong class loader is used, SSL-related tests fail, for example due
to the same Netty tcNative classes being loaded by two different
ClassLoders and no longer being the same. This appears to be
dependent upon the order in which tests are executed and results in
intermittent test failures.
It looks like this should be addressed in Netty tcNative 2.0.40 which
preloads all of its classes. In the meantime, this commit updates
ModifiedClassPathClassLodaer to ignore Netty tcNative classes so that
they're only ever loaded by the system class loader.
Closes gh-26749
2021-06-08 11:20:02 +01:00
Stephane Nicoll
75f31f6bc4
Merge branch '2.4.x'
...
Closes gh-26748
2021-06-03 09:27:01 +02:00
Stephane Nicoll
ad99aa2f4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26747
2021-06-03 09:26:38 +02:00
dreis2211
f470151535
Remove reference to surefirebooter JAR
...
See gh-26737
2021-06-03 09:24:56 +02:00
Stephane Nicoll
e9ed92a305
Polish
2021-06-02 14:14:04 +02:00
Stephane Nicoll
942691753d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26645
2021-05-24 11:39:38 +02:00
dreis2211
01ee6190a2
Remove workaround for SUREFIRE-1679
...
See gh-26632
2021-05-24 11:15:58 +02:00
Stephane Nicoll
ef093bc9c6
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26570
2021-05-17 14:24:03 +02:00
Stephane Nicoll
306b6f6999
Configure SessionCookieConfig in MockServletWebServer
...
Closes gh-26479
2021-05-17 14:05:45 +02:00
Stephane Nicoll
559af275a4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26405
2021-05-07 09:14:35 +02:00
Sach Nguyen
afa77b8253
Fix wrong reference to Cassandra in DockerImageNames#couchbase
...
See gh-26399
2021-05-07 09:12:43 +02:00
Andy Wilkinson
ecf8437d4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25430
2021-02-25 14:28:28 +00:00
dreis2211
101d88a840
Update Testcontainers image versions
...
See gh-25412
2021-02-25 14:27:41 +00:00
Stephane Nicoll
b6fc0913cf
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 17:44:05 +01:00
Stephane Nicoll
515b18e142
Merge branch '2.3.x'
...
Closes gh-24108
2020-11-10 17:10:26 +01:00
Stephane Nicoll
9e901b6e07
Upgrade to Testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 16:24:16 +01:00
Stephane Nicoll
23ad2b4156
Rationalize Testcontainers image versions
...
This commit rationalizes the Docker image names used in integration
tests.
Closes gh-24107
2020-11-10 16:04:27 +01:00
Stephane Nicoll
45f1133e1e
Merge branch '2.3.x'
2020-11-10 09:49:49 +01:00
Stephane Nicoll
339c8d0a26
Revert "Upgrade to Testcontainers 1.15.0"
2020-11-10 09:47:46 +01:00
Stephane Nicoll
5123eb0c74
Fix deprecation in Testcontainers 1.15.0
...
See gh-24103
2020-11-10 09:39:18 +01:00
Stephane Nicoll
7fb21fbff3
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 08:47:51 +01:00
Stephane Nicoll
c1a1b5fe71
Upgrade to Testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 08:46:15 +01:00
Johnny Lim
e48af31ced
Polish
...
See gh-23081
2020-08-26 10:47:45 +02:00
dreis2211
c00d5c5643
Introduce @ForkedClassPath for testing unmodified class path
...
See gh-22710
2020-08-12 17:21:31 +01:00
Andy Wilkinson
969dd35e45
Upgrade to Mockito 3.4.6
...
Closes gh-22838
2020-08-10 15:22:03 +01:00
Phillip Webb
8d06b0f368
Merge branch '2.3.x'
2020-08-06 10:15:36 -07:00
Phillip Webb
4924573074
Merge branch '2.2.x' into 2.3.x
2020-08-06 10:15:22 -07:00
Phillip Webb
fdd6a89a61
Polish
2020-08-06 10:14:01 -07:00
Andy Wilkinson
8b3f8a6138
Merge branch '2.3.x'
...
Closes gh-22768
2020-08-06 15:14:16 +01:00
Andy Wilkinson
11d1002f15
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22767
2020-08-06 15:13:55 +01:00
Andy Wilkinson
07699ea6ff
Retry when dependency resolution fails in ModifiedClassPathClassLoader
...
Closes gh-22763
2020-08-06 15:12:20 +01:00
Andy Wilkinson
989fc36528
Polish
2020-08-03 10:51:22 +01:00
Andy Wilkinson
11a296b068
Polish "Fix NPE in BeanDefinitionLoader when XML support is disabled"
...
See gh-22696
2020-08-03 09:54:43 +01:00
dreis2211
507eb9498b
Use Class.getDeclaredConstructor().newInstance()
...
See gh-21913
2020-07-07 11:12:35 +01:00
Andy Wilkinson
96e6b74894
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22243
2020-07-07 09:56:21 +01:00
Andy Wilkinson
a0f1424393
Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
...
See gh-22214
2020-07-07 09:54:52 +01:00
XenoAmess
75a64bd901
Fix unwrapping of captured PrintStream in test support's OutputCapture
...
See gh-22214
2020-07-07 09:53:34 +01:00
Phillip Webb
ad1248e4ec
Replace "folder" with "directory"
...
Consistently use the term "directory" instead of "folder"
Closes gh-21218
2020-04-28 19:20:24 -07:00
Stephane Nicoll
b5e23e7405
Update copyright year of changed files
...
See gh-20020
2020-02-03 17:39:40 +01:00
Johnny Lim
b67ece48e4
Polish
...
See gh-20020
2020-02-03 17:37:01 +01:00
dreis2211
d8e2349e47
Use Supplier variants of Assert
...
See gh-19864
2020-01-28 15:04:11 +01:00
dreis2211
d75de39456
Upgrade to JUnit Jupiter 5.6.0
...
See gh-19907
2020-01-26 08:39:12 +01:00
Stephane Nicoll
e044817fe7
Migrate remaining use of ClassLoader.loadClass to Class.forName
...
Closes gh-19824
2020-01-23 13:15:45 +01:00
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
2020-01-23 10:47:53 +01:00
Phillip Webb
fd792cedaf
Polish DisabledIfDockerUnavailable
...
Convert `DisabledIfDockerUnavailable` to be an annotation and make
it slightly less noisy.
2020-01-16 16:54:43 -08:00
Phillip Webb
862462b791
Update copyright year of changed files
2020-01-13 17:04:19 -08:00
Phillip Webb
f57281340c
Merge branch '2.2.x'
2020-01-13 16:46:49 -08:00
Phillip Webb
3cfbfebbb1
Merge branch '2.1.x' into 2.2.x
2020-01-13 16:45:40 -08:00
Phillip Webb
9bd49562fe
Update copyright year of changed files
2020-01-13 14:09:11 -08:00
Brian Clozel
e0171a5da8
Polish
2020-01-10 22:29:57 +01:00
Andy Wilkinson
b5ae8b0af5
Disable tests that use Docker when Docker is unavailable
...
Closes gh-19616
2020-01-10 20:35:18 +00:00
Andy Wilkinson
ce99db1902
Port the build to Gradle
...
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Andy Wilkinson
bdffa860d9
Increase startup timeout for Docker containers
...
Closes gh-19569
2020-01-08 11:39:36 +00:00
Stephane Nicoll
2c1e81adf0
Polish
2019-12-26 10:42:40 +01:00
Phillip Webb
83d4d94e8b
Cache ModifiedClassPathClassLoaders
...
Closes gh-18694
2019-10-22 15:25:31 -07:00
Phillip Webb
8d08d654d1
Merge branch '2.1.x'
...
Closes gh-18693
2019-10-22 15:18:32 -07:00
Andy Wilkinson
29080b87ec
Protect autoconfigure module against slow starting test containers
2019-09-04 10:15:10 +01:00
dreis2211
07b857e57a
Use disabledWithoutDocker option for @Testcontainers
...
See gh-18095
2019-09-03 09:51:53 +02:00
dreis2211
b4350a9d96
Remove unnecessary blank lines
...
See gh-18089
2019-09-03 08:48:10 +02:00
dreis2211
3e35a6616c
Fix duplicated words
...
See gh-18004
2019-09-01 09:09:38 +02:00
thelproad
9c1f503e46
Simplify if statements
...
See gh-17884
2019-08-17 06:50:32 +02:00
Phillip Webb
da4f436140
Change SearchStrategy EXHAUSTIVE to TYPE_HIERARCHY
...
Fixup references following upstream Spring Framework change.
2019-07-31 15:11:43 +01:00
Phillip Webb
8bc780762a
Merge branch '2.1.x'
2019-07-24 11:42:48 +01:00
Phillip Webb
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
Andy Wilkinson
41957ec2ad
Polish "Polish OutputCapture and its JUnit Jupiter extension"
...
See gh-17049
2019-07-18 17:46:56 +01:00
dreis2211
2038fac825
Remove testsupport.assertj package
...
See gh-17557
2019-07-18 14:20:28 +02:00
Phillip Webb
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
dreis2211
4ec035977b
Polish testsupport.junit.platform package
...
See gh-17524
2019-07-15 21:35:25 +01:00
Phillip Webb
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
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
2019-07-15 13:38:26 +01:00
Phillip Webb
b6ec1332a0
Polish ModifiedClassPathClassLoader
...
Remove the `ModifiedClassPathClassLoaderFactory` in favor of
factory methods on `ModifiedClassPathClassLoader`.
See gh-17491
2019-07-15 13:37:34 +01:00
Phillip Webb
4fe5e9e31e
Remove direct junit-platform-launcher dependency
...
Replace any direct `junit-platform-launcher` dependencies and instead
rely on the test runner providing it. Launcher related class are not
handled via reflection.
This update allows us to workaround SUREFIRE-1679.
Closes gh-17517
2019-07-15 13:35:08 +01:00
Phillip Webb
543fcdbbfd
Delete internal OutputCaptureRule
...
Delete our internal `OutputCaptureRule` since we not longer have any
tests using it.
2019-07-15 00:36:13 +01:00
Phillip Webb
13b39cbbbf
Delete ModifiedClassPathRunner
...
Delete `ModifiedClassPathRunner` since we no longer have any tests
that use it.
See gh-17491
2019-07-15 00:33:00 +01:00
Phillip Webb
bd81bb90eb
Polish ModifiedClassPath support
...
See gh-17491
2019-07-15 00:32:34 +01:00
dreis2211
2a4c48cb91
Add JUnit 5 ModifiedClassPathExtension
...
Add a JUnit 5 extension that allows tests to be run with a
modified classpath. Since JUnit 5 does not currently offer a way
to run tests with a different classpath, we instead fake the
original invocation and launch an entirely new run for each
method.
See gh-17491
2019-07-15 00:28:53 +01:00
dreis2211
90d824f6cb
Extract ModifiedClassPathClass logic
...
Extract classes from `ModifiedClassPathRunner` so that they can
be reused.
See gh-17491
2019-07-15 00:27:42 +01:00
Phillip Webb
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
Phillip Webb
cdf43a7489
Polish
2019-07-14 19:42:56 +01:00
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
2019-07-14 19:42:42 +01:00
dreis2211
32549cfc85
Remove folder that only contains package-info
...
See gh-17471
2019-07-10 06:24:40 +01:00
Andreas Gebhardt
ed7cfedb51
Fix JavaDoc within spring-boot-test-support
...
See gh-17443
2019-07-08 12:48:02 +01:00
Andy Wilkinson
2816635418
Polish
2019-07-04 17:51:20 +01:00
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
2019-07-03 11:39:47 -07:00
Phillip Webb
605599138e
Merge branch '2.1.x'
2019-06-28 23:56:02 -07:00
Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
Madhura Bhave
30cfe7b4c5
Polish
2019-06-13 08:02:26 -07:00
Phillip Webb
b3d5cd538d
Add JUnit 5 checkstyle rules
...
Add a rule to enforce JUnit 5 usage and conventions.
Closes gh-17093
2019-06-10 16:16:45 -07:00
Andy Wilkinson
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01:00
Andy Wilkinson
aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
Brian Clozel
c74badd4f2
Auto-configure Elasticsearch REST client in Spring Data
...
This commit auto-configures the Elasticsearch REST client support
as a template for Spring Data Elasticsearch. As of this commit,
using the transport client is still possible but developers
should migrate.
This commit also removes the deprecated annotation on the
Elasticsearch auto-configuration for the transport client, since
this deprecation notice is already present on the configuration
property.
Closes gh-17024
Closes gh-16542
2019-06-03 21:20:06 +02:00
Phillip Webb
ad5e905bd7
Update copyright header of changed files
2019-05-30 11:30:43 -07:00
Phillip Webb
68aec8b6ee
Polish
2019-05-30 11:30:27 -07:00
Madhura Bhave
684a1c7a3c
Migrate tests to JUnit5 testcontainer extensions
...
Closes gh-15456
2019-05-08 16:05:44 +02:00
Phillip Webb
17aaf26590
Use consistent javadoc style for annotation links
...
Closes gh-13920
2019-04-24 19:37:59 -07:00
Phillip Webb
b879972d0d
Migrate to MergedAnnotations API
...
Migrate away from `AnnotationUtils` and `AnnotatedElementUtils`
when possible to the new `MergedAnnotations` API.
Closes gh-16551
2019-04-18 15:40:02 -07:00
Andy Wilkinson
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
Andy Wilkinson
747e419db1
Merge branch '2.1.x'
2019-02-13 17:45:45 +00:00
Andy Wilkinson
9fb0b97f96
Decorate test containers so tests are skipped without Docker
...
Closes gh-15901
Closes gh-15638
2019-02-13 17:44:45 +00:00
Andy Wilkinson
db31e42751
Merge branch '2.1.x'
2019-02-12 09:58:21 +00:00
Andy Wilkinson
a975c0ad16
Use Testcontainers’ CassandraContainer rather than our own
...
Closes gh-15901
2019-02-12 09:58:05 +00:00
Andy Wilkinson
7e51e1a076
Merge branch '2.1.x'
2019-02-12 09:26:59 +00:00
Michael Simons
316126e8f0
Replace custom Neo4j container with Testcontainers version
...
See gh-15638
2019-02-12 09:24:44 +00:00
Andy Wilkinson
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson
62fbf48446
Start Elasticsearch with single-node discovery type
...
See gh-15441
2018-12-12 21:02:28 +00:00
Andy Wilkinson
47fc35105d
Allow more time for the Elasticsearch container to start
...
See gh-15441
2018-12-12 19:41:30 +00:00
Andy Wilkinson
2b453bbb16
Minimise dependencies on Log4j2
...
Closes gh-15441
2018-12-12 08:19:34 +00:00
Phillip Webb
94798062ab
Configure Cassandra JMX Reporting
...
Allow Cassandra JMX reporting to be configured via a property, and
disable it by default since it won't work with Dropwizard metrics 4.
Also update some of our own tests to explicitly disable it.
Closes gh-14778
2018-10-10 10:00:44 -07:00
Phillip Webb
d76bba5e6f
Migrate from ExpectedException rule to AssertJ
...
Replace ExpectedException JUnit rules with AssertJ exception
assertions.
Closes gh-14336
2018-10-02 10:55:28 -07:00
Andy Wilkinson
c1b864c826
Polish
2018-09-18 11:18:28 +01:00
Stephane Nicoll
eedeaa29e5
Polish "Replace loops with Arrays.setAll where possible"
...
Closes gh-14125
2018-08-20 10:23:16 +02:00
dreis2211
0bc66dc4a9
Replace loops with Arrays.setAll where possible
...
See gh-14125
2018-08-20 10:16:50 +02:00
Andy Wilkinson
de7899fba4
Improve reliability by give Cassandra more time and attempts to start
2018-07-19 19:57:54 +01:00
Johnny Lim
75639aa682
Polish
...
Closes gh-13192
2018-05-17 15:29:50 +02:00
dreis2211
15d67d6b12
Remove MockServletWebServer.emptyEnumeration()
...
Closes gh-13084
2018-05-07 14:41:06 +02:00
Phillip Webb
2d70a7ae5e
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
Andy Wilkinson
c9f04c3977
Avoid race between container starting and getting mapped port
2018-04-24 11:03:54 +01:00
Andy Wilkinson
f6cc1cbd76
Make Testcontainer wait strategies final
2018-04-24 10:38:57 +01:00
Andy Wilkinson
f39cea0428
Try to stabilize build by giving Cassandra longer to start
2018-04-24 10:27:11 +01:00
Andy Wilkinson
6c504a5098
Fix deprecation warnings in Testcontainers wait strategies
...
See gh-12821
2018-04-24 10:27:11 +01:00
Madhura Bhave
9c7612e681
Fix NPE in WaitStrategy used for test containers
2018-04-12 10:30:36 -07:00
Phillip Webb
98a2a91d16
Polish
2018-03-29 14:00:13 -07:00
Stephane Nicoll
006decea2a
Merge branch '1.5.x'
2018-03-27 15:47:56 +02:00
Phillip Webb
4b9c3c137e
Polish Collection.toArray
...
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.
Fixes gh-12160
2018-02-22 21:11:30 -08:00
Andy Wilkinson
5522174e96
Provide package info for all packages included in javadoc
2018-02-08 16:50:37 +00:00
dreis2211
c1675c2d5f
Use InvocationOnMock.getArgument() where possible
...
Closes gh-11818
2018-01-29 08:06:00 +01:00
dreis2211
a7663c88d3
Replace casted Mockito.any() calls
...
Closes gh-11817
2018-01-29 07:50:29 +01:00
Andy Wilkinson
1a1a62b744
Protect tests against Cassandra startup failures
...
On CI, Cassandra running inside the Docker container sometimes fails
to start or the start times out. This has nothing to do with Boot so
we attempt to protect our tests from the flakiness of the container
by allowing 3 startup attempts.
2018-01-24 21:34:11 +00:00
Phillip Webb
85d3f5a180
Fix NPE in test containers
...
Fix NPE accidentally introduced during refinement.
2018-01-08 22:04:59 -08:00
Phillip Webb
201da97774
Further refine test containers
2018-01-08 16:32:39 -08:00
Andy Wilkinson
996b3ef7f2
Refine test containers
2018-01-08 14:05:05 -08:00
Madhura Bhave
e28915bd4b
Make integration tests self-contained
...
Fixes gh-10516
2018-01-04 11:26:40 -08:00
Stephane Nicoll
47c8b5731a
polish
2017-12-13 14:41:39 +01:00
Stephane Nicoll
23218add90
Polish
2017-12-12 11:57:30 +01:00
Johnny Lim
6d54072e04
Remove "final" keywords
...
Closes gh-11294
2017-12-08 11:13:07 -08:00
Stephane Nicoll
9965221378
Merge branch '1.5.x'
2017-11-29 14:21:45 +01:00
Phillip Webb
b6166dc12a
Move `Assume` to spring-boot-test-support
...
Fixes gh-10866
2017-11-03 19:07:23 -07:00
Johnny Lim
6168fae720
Remove explicit type arguments
...
See gh-10494
2017-10-24 14:44:20 +01:00
Phillip Webb
0ba4830b4f
Relocate projects to spring-boot-project
...
Move projects to better reflect the way that Spring Boot is released.
The following projects are under `spring-boot-project`:
- `spring-boot`
- `spring-boot-autoconfigure`
- `spring-boot-tools`
- `spring-boot-starters`
- `spring-boot-actuator`
- `spring-boot-actuator-autoconfigure`
- `spring-boot-test`
- `spring-boot-test-autoconfigure`
- `spring-boot-devtools`
- `spring-boot-cli`
- `spring-boot-docs`
See gh-9316
2017-10-04 16:34:23 -07:00