Merge branch 'feature/assumption-failure' of https://github.com/retronym/scalatestplus-junit

Author: cheeseng

src/main/scala/org/scalatestplus/junit/RunNotifierReporter.scala

@@ -61,11 +61,7 @@ private[junit] class RunNotifierReporter(runNotifier: RunNotifier) extends Repor
         runNotifier.fireTestStarted(Description.createSuiteDescription(testDescriptionName(suiteName, suiteClassName, testName)))
 
       case TestFailed(ordinal, message, suiteName, suiteId, suiteClassName, testName, testText, recordedEvents, analysis, throwable, duration, formatter, location, rerunnable, payload, threadName, timeStamp) =>
-        val throwableOrNull =
-          throwable match {
-            case Some(t) => t
-            case None => null // Yuck. Not sure if the exception passed to new Failure can be null, but it could be given this code. Usually throwable would be defined.
-          }
+        val throwableOrNull = throwable.orNull // Yuck. Not sure if the exception passed to new Failure can be null, but it could be given this code. Usually throwable would be defined.
         val description = Description.createSuiteDescription(testDescriptionName(suiteName, suiteClassName, testName))
         runNotifier.fireTestFailure(new Failure(description, throwableOrNull))
         runNotifier.fireTestFinished(description)
@@ -76,27 +72,23 @@ private[junit] class RunNotifierReporter(runNotifier: RunNotifier) extends Repor
       case TestIgnored(ordinal, suiteName, suiteId, suiteClassName, testName, testText, formatter, location, payload, threadName, timeStamp) => 
         runNotifier.fireTestIgnored(Description.createSuiteDescription(testDescriptionName(suiteName, suiteClassName, testName)))
 
-// TODO: I dont see TestCanceled here. Probably need to add it
-      // Closest thing we can do with pending is report an ignored test
+      case TestCanceled(ordering, message, suiteName, suiteId, suiteClassName, testName, testText, recordedEvents, throwable, duration, formatter, location, rerunner, payload, threadName, timeStamp) =>
+        val throwableOrNull = throwable.orNull // Yuck. Not sure if the exception passed to new Failure can be null, but it could be given this code. Usually throwable would be defined.
+        val description = Description.createSuiteDescription(testDescriptionName(suiteName, suiteClassName, testName))
+        runNotifier.fireTestAssumptionFailed(new Failure(description, throwableOrNull))
+        runNotifier.fireTestFinished(description)
+
       case TestPending(ordinal, suiteName, suiteId, suiteClassName, testName, testText, recordedEvents, duration, formatter, location, payload, threadName, timeStamp) =>
         runNotifier.fireTestIgnored(Description.createSuiteDescription(testDescriptionName(suiteName, suiteClassName, testName)))
 
-      case SuiteAborted(ordinal, message, suiteName, suiteId, suiteClassName, throwable, duration, formatter, location, rerunnable, payload, threadName, timeStamp) => 
-        val throwableOrNull =
-          throwable match {
-            case Some(t) => t
-            case None => null // Yuck. Not sure if the exception passed to new Failure can be null, but it could be given this code. Usually throwable would be defined.
-          }
+      case SuiteAborted(ordinal, message, suiteName, suiteId, suiteClassName, throwable, duration, formatter, location, rerunnable, payload, threadName, timeStamp) =>
+        val throwableOrNull = throwable.orNull // Yuck. Not sure if the exception passed to new Failure can be null, but it could be given this code. Usually throwable would be defined.
         val description = Description.createSuiteDescription(suiteDescriptionName(suiteName, suiteClassName))
         runNotifier.fireTestFailure(new Failure(description, throwableOrNull)) // Best we can do in JUnit, as far as I know
         runNotifier.fireTestFinished(description)
 
-      case RunAborted(ordinal, message, throwable, duration, summary, formatter, location, payload, threadName, timeStamp) => 
-        val throwableOrNull =
-          throwable match {
-            case Some(t) => t
-            case None => null // Yuck. Not sure if the exception passed to new Failure can be null, but it could be given this code. Usually throwable would be defined.
-          }
+      case RunAborted(ordinal, message, throwable, duration, summary, formatter, location, payload, threadName, timeStamp) =>
+        val throwableOrNull = throwable.orNull // Yuck. Not sure if the exception passed to new Failure can be null, but it could be given this code. Usually throwable would be defined.
         val possiblyEmptyMessage = messageOrThrowablesDetailMessage(message, throwable)
         val description = Description.createSuiteDescription(Resources.runAborted() + " " + possiblyEmptyMessage)
         runNotifier.fireTestFailure(new Failure(description, throwableOrNull)) // Best we can do in JUnit, as far as I know

src/test/java/org/scalatestplus/junit/JUnit3TestCase.java

@@ -16,6 +16,7 @@
 package org.scalatestplus.junit;
 
 import junit.framework.TestCase;
+import org.junit.Assume;
 
 public class JUnit3TestCase extends TestCase {
 

src/test/scala/org/scalatestplus/junit/RunNotifierSuite.scala

@@ -80,6 +80,29 @@ class RunNotifierSuite extends funsuite.AnyFunSuite {
     assert(runNotifier.passed.get.getDescription.getDisplayName === "theTestName(SuiteClassName)")
   }
 
+  test("report(TestCanceled) generates a fireTestAssumptionFailed invocation") {
+    class MyRunNotifier extends RunNotifier {
+      var methodInvocationCount = 0
+      var passed: Option[Failure] = None
+
+      override def fireTestAssumptionFailed(failure: Failure): Unit = {
+        methodInvocationCount += 1
+        passed = Some(failure)
+      }
+    }
+    val runNotifier = new MyRunNotifier
+
+    val reporter = new RunNotifierReporter(runNotifier)
+    val exception = new IllegalArgumentException
+
+    import scala.language.reflectiveCalls
+
+    reporter(TestCanceled(ordinal, "No msg", "SuiteClassName", "suite ID", Some("fully.qualified.SuiteClassName"), "theTestName", "theTestName", Vector.empty, Some(exception)))
+    assert(runNotifier.passed.get.getDescription.getDisplayName === "theTestName(fully.qualified.SuiteClassName)")
+    reporter(TestCanceled(ordinal, "No msg", "SuiteClassName", "suite ID", None, "theTestName", "theTestName", Vector.empty, Some(exception)))
+    assert(runNotifier.passed.get.getDescription.getDisplayName === "theTestName(SuiteClassName)")
+  }
+
   test("report(TestSucceeded) generates a fireTestFinished invocation") {
     class MyRunNotifier extends RunNotifier {
       var methodInvocationCount = 0