Fixed serialization problem for TestFailedException thrown from Eithe…

…rValues.
scalatest · Aug 18, 2022 · d2c9ecd · d2c9ecd
1 parent 5def737
commit d2c9ecd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/jvm/core/src/main/scala/org/scalatest/EitherValues.scala b/jvm/core/src/main/scala/org/scalatest/EitherValues.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{Resources => _, _}
 import org.scalatest.exceptions.StackDepthException
 import org.scalatest.exceptions.TestFailedException
 
@@ -134,7 +134,9 @@ trait EitherValues extends Serializable {
       }
       catch {
         case cause: NoSuchElementException => 
-          throw new TestFailedException((_: StackDepthException) => Some(Resources.eitherLeftValueNotDefined(leftProj.e)), Some(cause), pos)
+          val e = leftProj.e
+          val p = pos
+          throw new TestFailedException((_: StackDepthException) => Some(Resources.eitherLeftValueNotDefined(e)), Some(cause), p)
       }
     }
   }
@@ -162,7 +164,9 @@ trait EitherValues extends Serializable {
       }
       catch {
         case cause: NoSuchElementException => 
-          throw new TestFailedException((_: StackDepthException) => Some(Resources.eitherRightValueNotDefined(rightProj.e)), Some(cause), pos)
+          val e = rightProj.e
+          val p = pos
+          throw new TestFailedException((_: StackDepthException) => Some(Resources.eitherRightValueNotDefined(e)), Some(cause), p)
       }
     }
   }
@@ -202,7 +206,9 @@ trait EitherValues extends Serializable {
       either match {
         case Right(r) => r
         case _ =>
-          throw new TestFailedException((_: StackDepthException) => Some(Resources.eitherValueNotDefined(either)), None, pos)
+          val e = either
+          val p = pos
+          throw new TestFailedException((_: StackDepthException) => Some(Resources.eitherValueNotDefined(e)), None, p)
       }
     }
   }

diff --git a/jvm/scalatest-test/src/test/scala/org/scalatest/EitherValuesSpec.scala b/jvm/scalatest-test/src/test/scala/org/scalatest/EitherValuesSpec.scala
@@ -24,7 +24,11 @@ import org.scalatest.OptionValues._
 import org.scalatest.SharedHelpers.thisLineNumber
 import org.scalatest.exceptions.TestFailedException
 import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers._
+// SKIP-SCALATESTJS,NATIVE-START
+import SharedHelpers.serializeRoundtrip
+// SKIP-SCALATESTJS,NATIVE-END
 
 class EitherValuesSpec extends AnyFunSpec {
   describe("values on Either") {
@@ -111,5 +115,18 @@ class EitherValuesSpec extends AnyFunSpec {
     it("should be able to used with OptionValues") {
       class TestSpec extends AnyFunSpec with EitherValues with OptionValues
     }
+
+    // SKIP-SCALATESTJS,NATIVE-START
+    it("should throw TestFailedException that is serializable") {
+      class TestEitherValues extends AnyFunSuite with EitherValues
+      val spec = new TestEitherValues
+      val e = Left("error"): Either[String, Int]
+      val v = spec.convertEitherToValuable(e)
+      val caught = intercept[TestFailedException] {
+        v.value
+      }
+      serializeRoundtrip(caught)
+    }
+    // SKIP-SCALATESTJS,NATIVE-END
   } 
 }