fix: filter out missing simulations configured by static list

lkishalmi · Sep 6, 2019 · 15394d5 · 15394d5
1 parent 1ebd283
commit 15394d5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/main/groovy/com/github/lkishalmi/gradle/gatling/GatlingRunTask.groovy b/src/main/groovy/com/github/lkishalmi/gradle/gatling/GatlingRunTask.groovy
@@ -48,7 +48,11 @@ class GatlingRunTask extends DefaultTask {
                 scalaDirs.find { simu.startsWith(it) }.relativize(simu).join(".") - ".scala"
             }
         } else if (simulationFilter != null && simulationFilter instanceof Iterable<String>) {
-            retval = simulationFilter
+            def scalaDirs = project.sourceSets.gatling.scala.srcDirs
+            retval = simulationFilter.findAll { simuClz ->
+                def file = simuClz.replaceAll("\\.", "/")
+                scalaDirs.any { new File(it, "${file}.scala").exists() }
+            }
         } else {
             throw new IllegalArgumentException("`simulations` property neither Closure nor Iterable<String>, simulations: $simulationFilter")
         }

diff --git a/src/test/groovy/unit/GatlingRunTaskTest.groovy b/src/test/groovy/unit/GatlingRunTaskTest.groovy
@@ -86,9 +86,7 @@ class GatlingRunTaskTest extends GatlingUnitSpec {
 
         when: 'fake source dirs without simulations'
         project.sourceSets {
-            gatling {
-                scala.srcDirs = [overridenSrc]
-            }
+            gatling.scala.srcDirs = [overridenSrc]
         }
         then:
         gatlingRunTask.resolveSimulations().size() == 0
@@ -106,9 +104,7 @@ class GatlingRunTaskTest extends GatlingUnitSpec {
 
         when: 'fake source dirs without simulations'
         project.sourceSets {
-            gatling {
-                scala.srcDir overridenSrc
-            }
+            gatling.scala.srcDir overridenSrc
         }
         then:
         gatlingRunTask.resolveSimulations().size() == 2
@@ -126,10 +122,22 @@ class GatlingRunTaskTest extends GatlingUnitSpec {
     }
 
     def "should fail if extension static list is not in sourceSet"() {
-
+        when: 'fake source dirs without simulations and static list'
+        project.sourceSets {
+            gatling.scala.srcDirs = ["test/gatling/scala"]
+        }
+        project.gatling { simulations = ["computerdatabase.BasicSimulation"] }
+        then:
+        gatlingRunTask.resolveSimulations().size() == 0
     }
 
     def "should fail if gatlingRun static list is not in sourceSet"() {
-
+        when: 'fake source dirs without simulations and static list'
+        project.sourceSets {
+            gatling.scala.srcDirs = ["test/gatling/scala"]
+        }
+        project.gatlingRun { simulations = ["computerdatabase.BasicSimulation"] }
+        then:
+        gatlingRunTask.resolveSimulations().size() == 0
     }
 }