Merge branch 'Guidoooch-main'

Author: bvenners

build.sbt

@@ -5,7 +5,7 @@ name := "junit-5.10"
 
 organization := "org.scalatestplus"
 
-version := "3.2.19.0"
+version := "3.2.19.1"
 
 homepage := Some(url("https://github.com/scalatest/scalatestplus-junit"))
 

examples/gradle-example/build.gradle

@@ -4,15 +4,16 @@ plugins {
 
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 dependencies {
-    implementation "org.scala-lang:scala3-library_3:3.4.1"
+    implementation "org.scala-lang:scala3-library_3:3.3.3"
 
-    testImplementation "org.scalatest:scalatest_3:3.2.18"
+    testImplementation "org.scalatest:scalatest_3:3.2.19"
     testImplementation "org.junit.platform:junit-platform-launcher:1.10.2"
     testRuntimeOnly "org.junit.platform:junit-platform-engine:1.10.2"
-    testRuntimeOnly "org.scalatestplus:junit-5-10_3:3.2.18.0"
+    testRuntimeOnly "org.scalatestplus:junit-5-10_3:3.2.19.1"
 }
 
 test {

examples/gradle-example/src/test/scala/co/helmethair/scalatest/example/TaggedTest.scala

@@ -9,11 +9,16 @@ object TagTwo extends Tag("TagTwo")
 
 class TaggedTest extends AnyFlatSpec {
 
-  "Integration tests" can "sometimes be slow" taggedAs TagOne in {
-
+  "Excluded tests" should "should not run" taggedAs TagOne in {
+    fail("This test should not run")
   }
 
-  "Unit tests" can "be fast" taggedAs TagTwo in {
+  "Included tests" should "run" taggedAs TagTwo in {}
+}
+
+class ExcludedTestsSuite extends AnyFlatSpec {
 
+  "A test suite with all tests excluded" should "should not run" taggedAs TagOne in {
+    fail("This test should not run")
   }
 }

src/main/scala/org/scalatestplus/junit5/ScalaTestEngine.scala

@@ -262,11 +262,15 @@ class ScalaTestEngine extends org.junit.platform.engine.TestEngine {
             val reporter = new EngineExecutionListenerReporter(listener, clzDesc, engineDesc)
             val children = clzDesc.getChildren.asScala
 
-            val filter =
-              if (children.isEmpty ||
-                  suiteToRun.testNames.size == children.size
-              )  // When testNames size is same as children size, it means all tests are selected, so no need to apply filter, this solves the issue of dynamic test names when running suite.
-                Filter()
+            val filter = {
+              if (children.isEmpty)
+                Filter(
+                  tagsToInclude = None,
+                  excludeNestedSuites = false,
+                  dynaTags = DynaTags(Map.empty, Map(suiteToRun.suiteId -> Map.empty))
+                )
+              if (suiteToRun.testNames.size == children.size)  // When testNames size is same as children size, it means all tests are selected, so no need to apply filter, this solves the issue of dynamic test names when running suite.
+                Filter.default
               else {
                 val SelectedTag = "Selected"
                 val SelectedSet = Set(SelectedTag)
@@ -277,12 +281,13 @@ class ScalaTestEngine extends org.junit.platform.engine.TestEngine {
                   }.toSet
                 val taggedTests: Map[String, Set[String]] = desiredTests.map(_ -> SelectedSet).toMap
                 val suiteId = suiteToRun.suiteId
-                  Filter(
-                    tagsToInclude = Some(SelectedSet),
-                    excludeNestedSuites = true,
-                    dynaTags = DynaTags(Map.empty, Map(suiteId -> taggedTests))
-                  )
+                Filter(
+                  tagsToInclude = Some(SelectedSet),
+                  excludeNestedSuites = true,
+                  dynaTags = DynaTags(Map.empty, Map(suiteId -> taggedTests))
+                )
               }
+            }
 
             if (suiteToRun.isInstanceOf[ParallelTestExecution]) {
               val numThreads = System.getProperty("org.scalatestplus.junit5.numThreads", "0")