Refactor Integration Test project setup steps #3492
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- deduplicate project copying code - move custom repos into template.settings.gradle.kts & remove redundant template.root.gradle.kts - pass template.settings.gradle.kts as a Gradle task input, so the project-copying code can use it - refactor `copyAndApplyGitDiff()` to try and make it a bit more legible
adam-enko
changed the title
adam-enko
changed the title
whyoleg
approved these changes
Feb 9, 2024
...ts/gradle/src/testExternalProjectKotlinxCoroutines/kotlin/CoroutinesGradleIntegrationTest.kt
Show resolved
Hide resolved
|
I haven't run changes locally, but looks legit :) |
- it makes it clearer about the order of the setup tasks (first prepare files, then apply diff) - also Coroutines test does the same, and it's unusual if they aren't both the same
dkrasnoff
approved these changes
Feb 13, 2024
| @@ -101,6 +102,13 @@ testing { | |||
|
|
|||
| targets.configureEach { | |||
| testTask.configure { | |||
|
|
|||
| inputs.file(templateSettingsGradleKts) | |||
| systemProperty( | |||
There was a problem hiding this comment.
If I understand correctly, we set a system property, which is used in AbstractGradleIntegrationTest. However, it is not clear to me where we set the second templateProjectDir system property.
There was a problem hiding this comment.
Good point, it's not clear.
I've moved inputs.file(templateSettingsGradleKts) to the registerTestProjectSuite() util function, so it's next to the templateProjectDir input.
This also triggered me to add property names and path sensitivity.
Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
AbstractGradleIntegrationTesttemplate.settings.gradle.kts& remove redundanttemplate.root.gradle.ktstemplate.settings.gradle.ktsas a Gradle task input, so the project-copying code can use ittemplate.settings.gradle.kts, so Gradle only searches MavenLocal for DokkacopyAndApplyGitDiff()to try and make it a bit more legibleVerification
To test locally I recommend enabling configuration cache, as this will make the tasks run in parallel