fix: proper application of includeTestOutput and includeMainOutput

Resolves #104
lkishalmi · May 8, 2020 · 3782f53 · 3782f53
1 parent 3180d57
commit 3782f53
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 16 deletions.
diff --git a/sample-project/build.gradle b/sample-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.lkishalmi.gatling" version "3.3.2"
+  id "com.github.lkishalmi.gatling" version "3.3.3"
 }
 
 repositories {

diff --git a/src/main/groovy/com/github/lkishalmi/gradle/gatling/GatlingPlugin.groovy b/src/main/groovy/com/github/lkishalmi/gradle/gatling/GatlingPlugin.groovy
@@ -74,14 +74,6 @@ class GatlingPlugin implements Plugin<Project> {
         }
 
         project.dependencies {
-            if (gatlingExt.includeMainOutput) {
-                gatlingImplementation project.sourceSets.main.output
-            }
-            if (gatlingExt.includeTestOutput) {
-                gatlingImplementation project.sourceSets.test.output
-            }
-
-            gatlingRuntimeOnly project.sourceSets.gatling.output
             gatlingRuntimeOnly project.sourceSets.gatling.output
         }
 
@@ -90,6 +82,13 @@ class GatlingPlugin implements Plugin<Project> {
                 implementation "org.scala-lang:scala-library:${p.extensions.getByType(GatlingPluginExtension).scalaVersion}"
                 gatlingImplementation "org.scala-lang:scala-library:${p.extensions.getByType(GatlingPluginExtension).scalaVersion}"
                 gatling "io.gatling.highcharts:gatling-charts-highcharts:${p.extensions.getByType(GatlingPluginExtension).toolVersion}"
+
+                if (gatlingExt.includeMainOutput) {
+                    gatlingImplementation project.sourceSets.main.output
+                }
+                if (gatlingExt.includeTestOutput) {
+                    gatlingImplementation project.sourceSets.test.output
+                }
             }
         }
     }

diff --git a/src/main/groovy/com/github/lkishalmi/gradle/gatling/GatlingPluginExtension.groovy b/src/main/groovy/com/github/lkishalmi/gradle/gatling/GatlingPluginExtension.groovy
@@ -22,8 +22,8 @@ class GatlingPluginExtension implements JvmConfigurable {
 
     Closure simulations = DEFAULT_SIMULATIONS
 
-    def includeMainOutput = true
-    def includeTestOutput = true
+    Boolean includeMainOutput = true
+    Boolean includeTestOutput = true
 
     String logLevel = "WARN"
 

diff --git a/src/test/groovy/functional/WhenCompileSimulationSpec.groovy b/src/test/groovy/functional/WhenCompileSimulationSpec.groovy
@@ -3,6 +3,7 @@ package functional
 import helper.GatlingFuncSpec
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.UnexpectedBuildFailure
+import spock.lang.Ignore
 import spock.lang.Unroll
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
@@ -42,11 +43,13 @@ class WhenCompileSimulationSpec extends GatlingFuncSpec {
         when:
         executeGradle(GATLING_CLASSES_TASK_NAME)
         then:
-        thrown(UnexpectedBuildFailure)
+        def e = thrown(UnexpectedBuildFailure)
+        and:
+        e.buildResult.output.contains(message)
         where:
-        layout   | dir
-        'gradle' | 'src/main'
-        'gradle' | 'src/test'
+        layout  || dir       || message
+        'gradle' | 'src/main' | "TestUtils.java:5: error: cannot find symbol"
+        'gradle' | 'src/test' | "not found: value TestUtils"
     }
 
     def "should not compile without required dependencies"() {
@@ -58,6 +61,31 @@ repositories { jcenter() }
         when:
         executeGradle(GATLING_CLASSES_TASK_NAME)
         then:
-        thrown(UnexpectedBuildFailure)
+        def e = thrown(UnexpectedBuildFailure)
+        and:
+        e.buildResult.output.contains("object lang is not a member of package org.apache.commons")
+    }
+
+    @Ignore
+    def "should not compile with main output excluded"() {
+        given:
+        buildFile << "gatling { includeMainOutput = false }"
+        when:
+        executeGradle(GATLING_CLASSES_TASK_NAME)
+        then:
+        def e = thrown(UnexpectedBuildFailure)
+        and:
+        e.buildResult.output.contains("not found: value MainUtils")
+    }
+
+    def "should not compile with test output excluded"() {
+        given:
+        buildFile << "gatling { includeTestOutput = false }"
+        when:
+        executeGradle(GATLING_CLASSES_TASK_NAME)
+        then:
+        def e = thrown(UnexpectedBuildFailure)
+        and:
+        e.buildResult.output.contains("not found: value TestUtils")
     }
 }