Integration tests #345

mvicsokolova · 2023-09-11T10:22:46Z

This PR introduces the framework for atomicfu-gradle-plugin integration tests.
To run functional tests:

cd integration-testing
./gradlew functionalTest

Current problems:

Do not copy versions in build scripts of sample projects #gradle
Add tests for the JS IR backend
DependenciesChecker: should also check apiElements and runtimeElements configurations
DependenciesChecker: it'd be nice to check .module or .pom files after publication of the project for "consumable" dependencies that will not be present in the dependencies output
AtomicfuGradlePlugin: configuration of dependencies for MPP project should be reviewed, currently it causes Mpp dependency test to fail
klib dump-ir checks are not enabled for now because of this known problem KT-61143, looking for WA

integration-testing/examples/jvm-sample/build.gradle.kts

mvicsokolova · 2023-10-16T17:54:45Z

integration-testing/examples/jvm-sample/build.gradle.kts

@@ -0,0 +1,28 @@
+buildscript {
+    val atomicfu_version = rootProject.properties["atomicfu_version"]


And what is the proper way to get atomicfu_version here?)

You can override the plugin version in settings.gradle.kts file. In this case, it will be possible to apply the plugin in the plugins { } block

pluginManagement { resolutionStrategy { eachPlugin { val fuVersion = gradle.rootProject.properties["atomicfu_version"]?.toString() if (fuVersion != null && requested.id.id != "kotlinx-atomicfu") { useVersion(fuVersion) } } } }

The error is: The root project is not yet available for build.
And I get the same error for version catalogs, so, I only managed to do it like this:

dependencyResolutionManagement { versionCatalogs { create("libs") { version("atomicfu", "0.22.0-SNAPSHOT") version("kotlin", "1.9.20") } } }

But it's still versions hardcoding 👀

I guess it's fine to leave like it is for now then

...-testing/src/test/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/runner/Environment.kt

mvicsokolova · 2023-10-18T13:20:21Z

atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt

-    val config = config
-    withPluginWhenEvaluated("kotlin") {
-        if (config.transformJvm) configureJvmTransformation()
+private fun Project.configureMultiplatformPluginDependencies(version: String) {


The only conceptual change in the AtomicfuGradlePlugin is in configureMultiplatformPluginDependencies, all other changes are just refactoring: changing the order of declarations.

mvicsokolova · 2023-10-18T13:20:55Z

atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt

-    val config = config
-    withPluginWhenEvaluated("kotlin") {
-        if (config.transformJvm) configureJvmTransformation()
+private fun Project.configureMultiplatformPluginDependencies(version: String) {


The only conceptual change in the AtomicfuGradlePlugin is in configureMultiplatformPluginDependencies, all other changes are just refactoring: changing the order of declarations.

fzhinkin

Great job! Overall looks good, there's only a few minor issues to address.

integration-testing/examples/jvm-sample/src/main/kotlin/Sample.kt

...nctionalTest/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/checker/ArtifactChecker.kt

...rc/functionalTest/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/runner/BuildRunner.kt

fzhinkin · 2023-10-24T08:09:51Z

integration-testing/build.gradle.kts

+}
+
+plugins {
+    kotlin("jvm") version "${project.properties["kotlin_version"]}" // todo: is there a more consise way to get kotlin_version from gradle.properties?


Maybe versions catalog?

When I configure version catalog like this, I get "The root project is not yet available for build." 👀

dependencyResolutionManagement { versionCatalogs { create("libs") { version("atomicfu", gradle.rootProject.properties["atomicfu_version"]) } } }

...esting/src/functionalTest/kotlin/kotlinx.atomicfu.gradle.plugin.test/cases/MppProjectTest.kt

integration-testing/examples/mpp-sample/build.gradle.kts

integration-testing/build.gradle.kts

shanshin · 2023-10-24T17:22:22Z

...ting/src/functionalTest/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/runner/Utils.kt

+    return BuildResult(exitCode, logFile)
+}
+
+private fun buildSystemCommand(projectDir: File, commands: List<String>, properties: List<String>): List<String> {


I would prefer to use TestKit instead of a custom GradleRunner - because supporting it in the future requires additional labor.

TextKit has some problems with the plugin's classpath, however, if configured correctly, they should not appear.

shanshin · 2023-10-24T17:41:54Z

...g/src/functionalTest/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/runner/Commands.kt

+
+internal fun GradleBuild.clean(): BuildResult = runGradle(listOf("clean"))
+
+internal fun GradleBuild.build(): BuildResult = runGradle(listOf("clean", "build"))


cleanAndBuild?

shanshin · 2023-10-24T17:57:05Z

...rc/functionalTest/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/runner/BuildRunner.kt

+    val output: String by lazy { logFile.readText() }
+
+    // Gets the list of dependencies for the given configuration
+    fun getDependenciesForConfig(configuration: String): List<String> {


It might be better to use regular expressions

shanshin · 2023-10-24T19:14:24Z

integration-testing/examples/jvm-sample/build.gradle.kts

@@ -0,0 +1,28 @@
+buildscript {
+    val atomicfu_version = rootProject.properties["atomicfu_version"]


You can override the plugin version in settings.gradle.kts file. In this case, it will be possible to apply the plugin in the plugins { } block

pluginManagement { resolutionStrategy { eachPlugin { val fuVersion = gradle.rootProject.properties["atomicfu_version"]?.toString() if (fuVersion != null && requested.id.id != "kotlinx-atomicfu") { useVersion(fuVersion) } } } }

integration-testing/build.gradle.kts

shanshin · 2023-10-25T10:26:50Z

atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt

+private fun Project.configureMultiplatformPluginDependencies(version: String) {
+    val multiplatformExtension = kotlinExtension as? KotlinMultiplatformExtension ?: error("Expected kotlin multiplatform extension")
+    val atomicfuDependency = "org.jetbrains.kotlinx:atomicfu:$version"
+    multiplatformExtension.sourceSets.getByName("commonMain").dependencies {


Can there be a situation when there are no commonMain or commonTest source sets in the project?

I guess, commonMain и commonTest always exist in the mpp project acording to the kotlin-gradle-plugin structure

integration-testing/examples/jvm-sample/gradle.properties

integration-testing/examples/mpp-sample/build.gradle.kts

mvicsokolova · 2023-11-07T12:40:55Z

The reason of the current build failure: mavenTest depends on atomicfu-gradle-plugin:publishToMavenLocal now and the locally published atomicfu-jvm:0.22.0-SNAPSHOT.jar should be added to it's classpath.

fzhinkin · 2023-11-08T09:23:41Z

As an extra effort to keep things nice and clean, it might be worth adding a separate set of publishToLocal tasks that will write artifacts to a temporary repo in the build directory (like int tests do).
In that case, we can be sure that atomicfu-artifacts won't be published even to the local maven repo if something is broken.
Not sure how difficult it would be to add such "publishToBuildLocal" publication tasks though.

mvicsokolova · 2023-11-08T20:27:26Z

I fixed mavenTest task by depending directly to the :atomicfu:publishToMavenLocal task, which should be avoided, but I guess we can stick to this solution for now. I've created an issue to collect improvements for integration tests, including adding separate tasks to publish artifacts to the custom local repo. (#362)

...onalTest/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/checker/DependenciesChecker.kt

...rc/functionalTest/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/runner/BuildRunner.kt

integration-testing/examples/mpp-sample/src/commonTest/kotlin/IntArithmeticTest.kt

integration-testing/build.gradle.kts

- made integration-testing part of the rootProject - removed duplicated gradle.properties - integration-testing depends on atomicfu-gradle-plugin publication

Pass atomicfu and kotlin versions to sample projects as parameters

…blication of the atomicfu-gradle-plugin

…ck atomicfu jar file

This reverts commit 7b10481.

…by the time of atomicfu-gradle-plugin application

…IntArithmeticTest.kt Co-authored-by: Filipp Zhinkin <filipp.zhinkin@gmail.com>

mvicsokolova · 2023-11-11T13:21:54Z

Rebased on the latest develop with Kotlin updated to 1.9.20

mvicsokolova · 2023-11-13T10:07:34Z

Well, something happened (after rebase to develop with updated Kotlin 1.9.20) and mpp-sample build is failing with this error again 🪦
Probably, because of some kotlin-stdlib conflicts on the classpath and locally this error is fixed with cleaning local kotlin repo: ~/.m2/org/jetbrains/kotlin/

> Task :compileKotlinJs FAILED
e: java.lang.AssertionError: Built-in class kotlin.Any is not found
  at org.jetbrains.kotlin.builtins.KotlinBuiltIns$3.invoke(KotlinBuiltIns.java:93)
  at org.jetbrains.kotlin.builtins.KotlinBuiltIns$3.invoke(KotlinBuiltIns.java:88)

…sitories

fzhinkin · 2023-11-13T11:55:13Z

integration-testing/examples/mpp-sample/build.gradle.kts

@@ -25,6 +25,7 @@ apply(plugin = "kotlinx-atomicfu")

 repositories {
    mavenCentral()
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")


Is there a reason to have these repos ordered differently in jvm- and mpp-sample projects?

The problem with unresolved classes from kotlin-stdlib may've been caused by the maven local repository being corrupted by some other process, and it's priority caused gradle to search for stdlib classes there first. As gradle can not work properly with mavenLocal, it's better not to set it first in the repo list .

mvicsokolova force-pushed the integration-tests branch from 8c218bd to 1b1ccda Compare September 11, 2023 10:53

mvicsokolova force-pushed the integration-tests branch from 1b1ccda to 2e8a11f Compare October 4, 2023 15:13

mvicsokolova changed the title ~~WIP: introduced simple JVM-only project in integration tests~~ WIP: Integration tests Oct 4, 2023

mvicsokolova force-pushed the integration-tests branch from cd6564d to ae77f31 Compare October 12, 2023 15:28

mvicsokolova marked this pull request as ready for review October 12, 2023 16:13

mvicsokolova force-pushed the integration-tests branch from 6f9fdf0 to ca40dbb Compare October 16, 2023 17:48

mvicsokolova commented Oct 16, 2023

View reviewed changes

integration-testing/examples/jvm-sample/build.gradle.kts Outdated Show resolved Hide resolved

mvicsokolova commented Oct 16, 2023

View reviewed changes

...-testing/src/test/kotlin/kotlinx.atomicfu.gradle.plugin.test/framework/runner/Environment.kt Outdated Show resolved Hide resolved

mvicsokolova force-pushed the integration-tests branch from e395a11 to 9a2703e Compare October 18, 2023 13:10

mvicsokolova requested a review from shanshin October 18, 2023 13:14

mvicsokolova commented Oct 18, 2023

View reviewed changes

mvicsokolova changed the title ~~WIP: Integration tests~~ Integration tests Oct 23, 2023

mvicsokolova requested a review from fzhinkin October 23, 2023 11:52

fzhinkin requested changes Oct 24, 2023

View reviewed changes

shanshin reviewed Oct 25, 2023

View reviewed changes

mvicsokolova requested review from shanshin and fzhinkin November 2, 2023 15:24

This comment was marked as resolved.

Sign in to view

fzhinkin requested changes Nov 10, 2023

View reviewed changes

mvicsokolova requested a review from fzhinkin November 10, 2023 14:35

fzhinkin reviewed Nov 10, 2023

View reviewed changes

integration-testing/examples/mpp-sample/src/commonTest/kotlin/IntArithmeticTest.kt Outdated Show resolved Hide resolved

fzhinkin reviewed Nov 10, 2023

View reviewed changes

integration-testing/build.gradle.kts Show resolved Hide resolved

mvicsokolova added 3 commits November 11, 2023 14:21

Introduced integration tests for JVM and MPP projects

1bf56b2

Minor fixups

3653759

WIP: minor review fixes

4e25e4e

mvicsokolova and others added 18 commits November 11, 2023 14:21

Composite build setup:

eed2954

- made integration-testing part of the rootProject - removed duplicated gradle.properties - integration-testing depends on atomicfu-gradle-plugin publication

fixup

ecde8a9

Retrieve values of project properties from the global provider

8e0fd64

Pass atomicfu and kotlin versions to sample projects as parameters

Pass versions to sample projects via version catalogs

8197b01

Fix mavenTest problem WIP: added dependency KotlinCompile to local pu…

7efebc6

…blication of the atomicfu-gradle-plugin

mavenTest depends on atomicfu:publishToMavenLocal to be able to che…

0f4c4e5

…ck atomicfu jar file

Make functionalTest dependOn atomicfu publication

3fb1cce

functionalTest should depend on the global publishToMavenLocal task

80709ea

Pass dependencies to the funcitonalTest sourceSet

7b99c56

Revert "Pass dependencies to the funcitonalTest sourceSet"

b74544f

This reverts commit 7b10481.

Revert the last changes and depend only on atomicfu-gradle-plugin

3890abc

fixes

8d31501

atomicfu and atomicfu-transformer artifacts should also be published …

d00033b

…by the time of atomicfu-gradle-plugin application

Minor fix: add new lines at the end of all files

48f93df

Minor fix: in case the name of the group starts with a digit

8118b85

fixup

2abbb53

Update integration-testing/examples/mpp-sample/src/commonTest/kotlin/…

b69c7d9

…IntArithmeticTest.kt Co-authored-by: Filipp Zhinkin <filipp.zhinkin@gmail.com>

Do not cache functionalTest outputs

ea02a32

mvicsokolova force-pushed the integration-tests branch from fd3ad7a to ea02a32 Compare November 11, 2023 13:21

fzhinkin approved these changes Nov 13, 2023

View reviewed changes

mvicsokolova added 2 commits November 13, 2023 10:29

Import kotlin.test.* to the test class in mpp-sample

191ac44

Add kotlin-test dependency to commonMain sourceSet

77121f8

mvicsokolova added 3 commits November 13, 2023 11:38

Remove kotlin-stdlib dependency

f4253f9

Trying to fix unresoved kotlin.Any problem: changed the order of repo…

1ba8e2b

…sitories

Final fix of the repo order in sample projects

f3af8ee

fzhinkin reviewed Nov 13, 2023

View reviewed changes

mvicsokolova merged commit 9d2a3e4 into develop Nov 13, 2023

mvicsokolova deleted the integration-tests branch November 13, 2023 12:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integration tests #345

Integration tests #345

mvicsokolova commented Sep 11, 2023 •

edited

Loading

mvicsokolova Oct 16, 2023

shanshin Oct 24, 2023

mvicsokolova Nov 1, 2023

mvicsokolova Nov 1, 2023

mvicsokolova Oct 18, 2023

mvicsokolova Oct 18, 2023

fzhinkin left a comment

fzhinkin Oct 24, 2023

mvicsokolova Nov 1, 2023

shanshin Oct 24, 2023

shanshin Oct 24, 2023

mvicsokolova Nov 2, 2023

shanshin Oct 24, 2023

shanshin Oct 24, 2023

shanshin Oct 25, 2023

mvicsokolova Nov 2, 2023

mvicsokolova commented Nov 7, 2023 •

edited

Loading

This comment was marked as resolved.

fzhinkin commented Nov 8, 2023

mvicsokolova commented Nov 8, 2023 •

edited

Loading

mvicsokolova commented Nov 11, 2023

mvicsokolova commented Nov 13, 2023 •

edited

Loading

fzhinkin Nov 13, 2023

mvicsokolova Nov 13, 2023

		@@ -0,0 +1,28 @@
		buildscript {
		val atomicfu_version = rootProject.properties["atomicfu_version"]


		internal fun GradleBuild.clean(): BuildResult = runGradle(listOf("clean"))

		internal fun GradleBuild.build(): BuildResult = runGradle(listOf("clean", "build"))

Integration tests #345

Integration tests #345

Conversation

mvicsokolova commented Sep 11, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fzhinkin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mvicsokolova commented Nov 7, 2023 • edited Loading

This comment was marked as resolved.

fzhinkin commented Nov 8, 2023

mvicsokolova commented Nov 8, 2023 • edited Loading

mvicsokolova commented Nov 11, 2023

mvicsokolova commented Nov 13, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mvicsokolova commented Sep 11, 2023 •

edited

Loading

mvicsokolova commented Nov 7, 2023 •

edited

Loading

mvicsokolova commented Nov 8, 2023 •

edited

Loading

mvicsokolova commented Nov 13, 2023 •

edited

Loading