Merge branch 'feature-testng-7.5' into testng-7.5/3.2.11.x

Author: bvenners

README.md

@@ -3,12 +3,12 @@ ScalaTest + TestNG provides integration support between ScalaTest and TestNG.
 
 **Usage**
 
-To use it for ScalaTest 3.2.9 and TestNG 6.7.x: 
+To use it for ScalaTest 3.2.11 and TestNG 6.7.x: 
 
 SBT: 
 
 ```
-libraryDependencies += "org.scalatestplus" %% "testng-6-7" % "3.2.9.0" % "test"
+libraryDependencies += "org.scalatestplus" %% "testng-6-7" % "3.2.11.0" % "test"
 ```
 
 Maven: 
@@ -17,7 +17,7 @@ Maven:
 <dependency>
   <groupId>org.scalatestplus</groupId>
   <artifactId>testng-6-7_2.13</artifactId>
-  <version>3.2.9.0</version>
+  <version>3.2.11.0</version>
   <scope>test</scope>
 </dependency>
 ```

build.sbt

@@ -1,11 +1,11 @@
 import java.io.PrintWriter
 import scala.io.Source
 
-name := "testng-6.7"
+name := "testng-7.5"
 
 organization := "org.scalatestplus"
 
-version := "3.2.10.0"
+version := "3.2.11.0"
 
 homepage := Some(url("https://github.com/scalatest/scalatestplus-testng"))
 
@@ -31,10 +31,10 @@ scalaVersion := "2.13.6"
 crossScalaVersions := List("2.10.7", "2.11.12", "2.12.15", "2.13.6", "3.0.2")
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest-core" % "3.2.10",
-  "org.testng" % "testng" % "6.7",
+  "org.scalatest" %% "scalatest-core" % "3.2.11",
+  "org.testng" % "testng" % "7.5",
   "commons-io" % "commons-io" % "1.3.2" % "test",
-  "org.scalatest" %% "scalatest-funsuite" % "3.2.10" % "test"
+  "org.scalatest" %% "scalatest-funsuite" % "3.2.11" % "test"
 )
 
 Compile / packageDoc / publishArtifact := !scalaBinaryVersion.value.startsWith("3")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.5.8

src/main/scala/org/scalatestplus/testng/SingleTestAnnotationTransformer.scala

@@ -25,7 +25,7 @@ import java.lang.reflect.Constructor
 // Probably might work as private[testng], but not sure and right before the release.
 private[testng] class SingleTestAnnotationTransformer(testName: String) extends IAnnotationTransformer {
   override def transform( annotation: ITestAnnotation, testClass: java.lang.Class[_], testConstructor: Constructor[_], testMethod: Method): Unit = {
-    if (testName == testMethod.getName) 
+    if (testName != testMethod.getName) 
       annotation.setGroups(Array("org.scalatestplus.testng.singlemethodrun.methodname"))
   }
 }

src/main/scala/org/scalatestplus/testng/TestNGSuiteLike.scala

@@ -26,6 +26,7 @@ import TestNGHelper.getIndentedTextForTest
 import TestNGHelper.yeOldeTestNames
 import org.scalatest.tools.Utils.wrapReporterIfNecessary
 import events.MotionToSuppress
+import scala.collection.JavaConverters._
 
 /**
  * Implementation trait for class <code>TestNGSuite</code>, which represents
@@ -281,20 +282,9 @@ trait TestNGSuiteLike extends Suite { thisSuite =>
     // NOTE: There was another option - we could TestNG's XmlSuites to specify which method to run.
     // This approach was about as much work, offered no clear benefits, and no additional problems either.
 
-    // Using reflection because TestNG has a incompatible change, we want to allow people to use the old and the new version of TestNG.
-    try {
-      val transformerSuperClass = Class.forName("org.testng.IAnnotationTransformer")
-      val transformerSubClass = Class.forName("org.scalatestplus.testng.SingleTestAnnotationTransformer")
-      // Go with TestNG 6
-      val transformerInstance = transformerSubClass.getConstructor(classOf[String]).newInstance(testName).asInstanceOf[SingleTestAnnotationTransformer]
-      testng.setGroups("org.scalatestplus.testng.singlemethodrun.methodname")
-      val method = testng.getClass.getMethod("setAnnotationTransformer", transformerSuperClass)
-      method.invoke(testng, transformerInstance)
-    }
-    catch {
-      case e: ClassNotFoundException => 
-        new UnsupportedOperationException("Sorry, due to incompatible changes in TestNG, running a single test is only supported in TestNG version 6 or later.", e)
-    }
+    val transformer = new SingleTestAnnotationTransformer(testName)
+    testng.setGroups("org.scalatestplus.testng.singlemethodrun.methodname")
+    testng.addListener(transformer)
   }
 
   /*
@@ -341,13 +331,14 @@ trait TestNGSuiteLike extends Suite { thisSuite =>
     }
 
     /**
-     * TestNG's onTestSkipped maps cleanly to TestIgnored. Again, simply build
+     * TestNG's onTestSkipped maps cleanly to TestCanceled. Again, simply build
      * a report and pass it to the Reporter.
      */
     override def onTestSkipped(result: ITestResult): Unit = {
       val testName = result.getName + params(result)
       val formatter = getIndentedTextForTest(testName, 1, true)
-      report(TestIgnored(tracker.nextOrdinal(), thisSuite.suiteName, thisSuite.getClass.getName, Some(thisSuite.getClass.getName), testName, testName, Some(formatter), getTopOfMethod(thisSuite.getClass.getName, result.getName)))
+      val causedBy = result.getSkipCausedBy().asScala.map(_.getMethodName())
+      report(TestCanceled(tracker.nextOrdinal(), "Skipped caused by ", thisSuite.suiteName, thisSuite.getClass.getName, Some(thisSuite.getClass.getName), testName, testName, Vector.empty))
     }
 
     /**

src/test/scala/org/scalatestplus/testng/TestNGSuiteSuite.scala

@@ -19,7 +19,6 @@ package org.scalatestplus.testng {
 import org.scalatest.events._
 import org.scalatestplus.testng.testpackage._
 import org.scalatest.fixture
-import org.hamcrest.core.IsAnything
 import org.scalatestplus.testng.SharedHelpers.EventRecordingReporter
 
   class TestNGSuiteSuite extends funsuite.AnyFunSuite {
@@ -83,9 +82,9 @@ import org.scalatestplus.testng.SharedHelpers.EventRecordingReporter
       status.setCompleted()
 
       assert(reporter.suiteStartingEventsReceived.isEmpty)
-      assert(reporter.testStartingEventsReceived.length == 1)
+      assert(reporter.testStartingEventsReceived.length == 2)
       assert(reporter.testFailedEventsReceived.length == 1)
-      assert(reporter.testIgnoredEventsReceived.length == 1)
+      assert(reporter.testCanceledEventsReceived.length == 1)
       assert(reporter.suiteCompletedEventsReceived.isEmpty)
     }