Merge pull request #89 from ferozco/fo/inherit-env-var

Test sets inherit existing environemnt

Author: tkrullmann

src/integrationTest/kotlin/org/unbrokendome/gradle/plugins/testsets/EnvironmentVariablesIntegrationTest.kt

@@ -5,7 +5,9 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isNotNull
 import assertk.assertions.prop
 import org.gradle.testkit.runner.BuildTask
+import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 
@@ -71,7 +73,68 @@ class EnvironmentVariablesIntegrationTest : AbstractGradleIntegrationTest() {
                 .prop("outcome", BuildTask::getOutcome)
                 .isEqualTo(TaskOutcome.SUCCESS)
         }
+    }
+
+    @Test
+    fun `should inherit existing environment variables`() {
+        directory(projectDir) {
+            file("build.gradle.kts", """
+                plugins {
+                    `java`
+                    id("org.unbroken-dome.test-sets")
+                }
+                
+                repositories {
+                    jcenter()
+                }
+                
+                testSets {
+                    createTestSet("integrationTest") { 
+                        environment("TESTVAR2", "TESTVALUE")
+                    }
+                }
+                
+                dependencies {
+                    testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.2")
+                    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.5.2")
+                }
+                
+                tasks.withType<Test> {
+                    useJUnitPlatform()
+                }
+            """)
 
+            directory("src/integrationTest/java") {
+                file("EnvironmentTest.java", """
+                    import static org.junit.jupiter.api.Assertions.*;
+                    import org.junit.jupiter.api.Test;
+                    
+                    class EnvironmentTest {
+                        
+                        @Test
+                        void shouldHaveEnvironmentAvailable() {
+                            String value = System.getenv("TESTVAR");
+                            assertEquals("TESTVALUE", value);
+                            value = System.getenv("TESTVAR2");
+                            assertEquals("TESTVALUE", value);
+                        }
+                    }
+                """)
+            }
+
+            val result = GradleRunner.create()
+                    .withProjectDir(projectDir)
+                    .withPluginClasspath()
+                    .withArguments("integrationTest",  "-s")
+                    .withEnvironment(mapOf("TESTVAR" to "TESTVALUE"))
+                    .build()
+
+            assertThat(result, "result")
+                    .prop("for task integrationTest") { it.task(":integrationTest") }
+                    .isNotNull()
+                    .prop("outcome", BuildTask::getOutcome)
+                    .isEqualTo(TaskOutcome.SUCCESS)
+        }
     }
 
 

src/main/kotlin/org/unbrokendome/gradle/plugins/testsets/TestSetsPlugin.kt

@@ -162,7 +162,7 @@ class TestSetsPlugin
             testSet.sourceSet.let { sourceSet ->
                 task.testClassesDirs = sourceSet.output.classesDirs
                 task.classpath = sourceSet.runtimeClasspath
-                task.environment = testSet.environment
+                task.environment(testSet.environment)
                 task.systemProperties = testSet.systemProperties
             }
         }

src/main/kotlin/org/unbrokendome/gradle/plugins/testsets/internal/TestTaskEnvironmentObserver.kt

@@ -14,7 +14,7 @@ internal class TestTaskEnvironmentObserver(
     override fun environmentVariablesChanged(testSet: TestSetBase, newEnvironment: Map<String, Any?>) {
         val testTaskName = (testSet as TestSet).testTaskName
         (tasks.findByName(testTaskName) as? Test?)?.let { task ->
-            task.environment = newEnvironment
+            task.environment(newEnvironment)
         }
     }
 }