Commit 4289e9a
authored
[JUnit 5] Migrate tests which can be easily converted (#2878)
JUnit 4 -> 5 migrations are often done in a 3-step process:
1. Update dependencies to JUnit 5, including the vintage module, causing all tests to leverage the new JUnit 5 Platform (completed in #2850)
2. Incrementally migrate JUnit 4 tests to JUnit 5 tests
3. Once no JUnit 4 usage remains, remove the dependency on the vintage module
This PR begins step 2 by migrating tests which can be easily converted.
IntelliJ provides a convenient way to migrate tests but unfortunately there is no support for automatically migrating JUnit 4 tests which leverage any of the following:
1. The `expected` parameter in test annotations
2. The `timeout` parameter in test annotations
3. The class-level `@RunWith` annotation (e.g., `@RunWith(Parameterized.class)` and `@RunWith(MockitoJUnitRunner.class)`)
Therefore, this PR leverages the migrate functionality but defers the above scenarios as follows:
```
grep -r -e "@test(" -e "@RunWith(" . | cut -d ':' -f1 | xargs -I {} git restore {}
```
All changes in this PR are fully automated with the migrate functionality, except for the changes to the top-level pom.xml to add `org.junit.*` to both `ignoredUsedUndeclaredDependency` and `ignoredUnusedDeclaredDependency`.
Additionally, there were a few cases of the migrate functionality migrating a superclass but not being able to migrate a subclass (due to the above limitations). The superclass was restored in this case.1 parent 759e2ac commit 4289e9a
File tree
613 files changed
+1582
-1685
lines changed- codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions
- codegen/src/test
- java/software/amazon/awssdk/codegen
- customization/processors
- emitters
- internal
- jmespath
- model
- intermediate
- service
- poet
- builder
- client
- common
- endpointdiscovery
- eventstream
- model
- paginators
- waiters
- resources/software/amazon/awssdk/codegen/poet/client
- core
- arns/src/test/java/software/amazon/awssdk/arns
- auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal
- auth/src/test/java/software/amazon/awssdk/auth
- credentials
- internal
- signer
- internal
- aws-core/src/test/java/software/amazon/awssdk/awscore
- client/endpoint
- eventstream
- exception
- interceptor
- retry
- util
- json-utils/src/test/java/software/amazon/awssdk/protocols/jsoncore
- metrics-spi/src/test/java/software/amazon/awssdk/metrics
- internal
- profiles/src/test/java/software/amazon/awssdk/profiles
- protocols
- aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor
- aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json
- internal/dom
- aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query
- interceptor
- aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall
- protocol-core/src/test/java/software/amazon/awssdk/protocols/core
- regions/src/test/java/software/amazon/awssdk/regions
- internal/util
- providers
- servicemetadata
- sdk-core/src/test/java/software/amazon/awssdk/core
- async
- client
- config
- document
- exception
- http
- interceptor
- internal
- async
- http
- pipeline/stages
- timers
- io
- retry
- sync
- util
- waiters
- retry
- backoff
- conditions
- sync
- util
- waiters
- http-client-spi/src/test/java/software/amazon/awssdk/http
- software/amazon/awssdk/internal/http
- http-clients
- apache-client/src/test/java/software/amazon/awssdk/http/apache
- internal
- conn
- impl
- aws-crt-client/src
- it/java/software/amazon/awssdk/http/crt
- test/java/software/amazon/awssdk/http/crt
- netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty
- fault
- internal
- http2
- nrs
- utils
- url-connection-client/src
- it/java/software/amazon/awssdk/http/urlconnection
- test/java/software/amazon/awssdk/http/urlconnection
- metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal
- task
- transform
- services-custom
- dynamodb-enhanced/src
- it/java/software/amazon/awssdk/enhanced/dynamodb
- test/java/software/amazon/awssdk/enhanced/dynamodb
- converters
- attribute
- functionaltests
- internal
- converter/attribute
- extensions
- immutable
- mapper
- operations
- mapper
- mocktests
- model
- s3-transfer-manager/src
- it/java/software/amazon/awssdk/transfer/s3
- test/java/software/amazon/awssdk/transfer/s3
- internal
- progress
- services
- apigateway/src/it/java/software/amazon/awssdk/services/apigateway
- applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling
- autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling
- cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation
- cloudhsm/src/it/java/software/amazon/awssdk/services/cloudhsm
- cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain
- cloudsearch/src/it/java/software/amazon/awssdk/services/cloudsearch
- cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail
- cloudwatchevents/src/it/java/software/amazon/awssdk/services/cloudwatchevents
- cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs
- cloudwatch/src/it/java/software/amazon/awssdk/services/cloudwatch
- codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy
- codepipeline/src/it/java/software/amazon/awssdk/services/codepipeline
- datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline
- directconnect/src/it/java/software/amazon/awssdk/services/directconnect
- directory/src/it/java/software/amazon/awssdk/services/directory
- docdb/src/test/java/software/amazon/awssdk/services/docdb/internal
- dynamodb/src
- it/java/software/amazon/awssdk/services/dynamodb
- streams
- test/java
- software/amazon/awssdk/services/dynamodb
- utils
- resources
- test/util
- ec2/src/test/java/software/amazon/awssdk/services/ec2
- ecr/src/it/java/software/amazon/awssdk/services/ecr
- ecs/src/it/java/software/amazon/awssdk/services/ecs
- efs/src/it/java/software/amazon/awssdk/services/efs
- elasticache/src/it/java/software/amazon/awssdk/services/elasticache
- elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk
- elasticloadbalancing/src/it/java/software/amazon/awssdk/services/elasticloadbalancing
- elasticsearch/src/it/java/software/amazon/awssdk/services/elasticsearch
- emr/src/it/java/software/amazon/awssdk/services/emr
- firehose/src/it/java/software/amazon/awssdk/services/firehose
- gamelift/src/it/java/software/amazon/awssdk/services/gamelift
- glacier/src
- it/java/software/amazon/awssdk/services/glacier
- test/java/software/amazon/awssdk/services/glacier
- iam/src/it/java/software/amazon/awssdk/services/iam
- inspector/src/test/java/software/amazon/awssdk/services/inspector
- kinesis/src/it/java/software/amazon/awssdk/services/kinesis
- kms/src/it/java/software/amazon/awssdk/services/kms
- lambda/src/it/java/software/amazon/awssdk/services/lambda
- machinelearning/src/it/java/software/amazon/awssdk/services/machinelearning
- neptune/src/test/java/software/amazon/awssdk/services/neptune/internal
- pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint
- polly/src
- it/java/software/amazon/awssdk/services/polly/internal/presigner
- test/java/software/amazon/awssdk/services/polly/internal/presigner
- model/transform
- rds/src/test/java/software/amazon/awssdk/services/rds
- internal
- route53/src
- it/java/software/amazon/awssdk/services/route53
- test/java/software/amazon/awssdk/services/route53
- s3control/src
- it/java/software.amazon.awssdk.services.s3control
- test/java/software/amazon/awssdk/services/s3control/internal
- functionaltests
- arns
- signing
- interceptors
- s3/src
- it/java/software/amazon/awssdk/services/s3
- signer
- test/java/software/amazon/awssdk/services/s3
- checksums
- functionaltests
- internal
- endpoints
- handlers
- resource
- settingproviders
- presigner/model
- servicecatalog/src/it/java/software/amazon/awssdk/services/servicecatalog
- ses/src/it/java/software/amazon/awssdk/services/ses
- sfn/src/it/java/software/amazon/awssdk/services/sfn
- sns/src
- it/java/software/amazon/awssdk
- core/auth/policy
- services/sns
- test/java/software/amazon/awssdk/services/sns
- sqs/src
- it/java/software/amazon/awssdk/services/sqs
- auth/policy
- test/java/software/amazon/awssdk/services/sqs
- ssm/src/it/java/software/amazon/awssdk/services/ssm
- sso/src/test/java/software/amazon/awssdk/services/sso
- auth
- internal
- sts/src
- it/java/software/amazon/awssdk/services/sts
- test/java/software/amazon/awssdk/services/sts/internal
- transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming
- waf/src/it/java/software/amazon/awssdk/services/waf
- workspaces/src/it/java/software/amazon/awssdk/services/workspaces
- test
- codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services
- customizeduseragent
- customresponsemetadata
- documenttype
- protocolrestjson
- model
- retry
- tostring
- waiters
- http-client-tests/src/main/java/software/amazon/awssdk/http
- protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests
- clockskew
- connection
- crc32
- customservicemetadata
- exception
- retry
- timeout
- async
- sync
- test-utils/src
- main/java/software/amazon/awssdk/testutils
- test/java/software/amazon/awssdk
- core/auth/policy
- testutils
- smoketest
- utils/src/test/java/software/amazon/awssdk/utils
- async
- builder
- cache
- internal
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
613 files changed
+1582
-1685
lines changedLines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
23 | | - | |
| 22 | + | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
| 34 | + | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
0 commit comments