fix linenumbers in failed assertion traces - take all asserts into account

Author: pawelsadlo

utest/src-3/utest/TestBuilder.scala

@@ -27,12 +27,17 @@ object TestBuilder:
 
   private def testCallTreeExpr(using Quotes)(nestedBodyTrees: List[Expr[TestCallTree]], setupStats: List[quotes.reflect.Statement]): Expr[TestCallTree] =
     import quotes.reflect._
+    val statsWithInlinedAsserts:List[Statement] = setupStats.map {
+      case term:Term => term.asExpr match{
+        case '{utest.assert($_)} => Inlined(None,Nil,term) //Inlined results in proper line number generation
+        case _ => term
+      }
+      case other => other
+    }
     val inner =
-      if nestedBodyTrees.nonEmpty then Block(setupStats, '{Right(${Expr.ofList(nestedBodyTrees)}.toIndexedSeq)}.asTerm)
+      if nestedBodyTrees.nonEmpty then Block(statsWithInlinedAsserts, '{Right(${Expr.ofList(nestedBodyTrees)}.toIndexedSeq)}.asTerm)
       else
-        val term = setupStats.takeRight(1).head.asInstanceOf[Term]
-        val inlinedTerm = Inlined(None,Nil,term) //Inlined results in proper line number generation
-        Block(setupStats.dropRight(1), '{Left(${inlinedTerm.asExpr})}.asTerm)
+        Block(statsWithInlinedAsserts.dropRight(1), '{Left(${statsWithInlinedAsserts.last.asExpr})}.asTerm)
     '{ TestCallTree(${inner.asExprOf[Either[Any, IndexedSeq[TestCallTree]]]}) }
 
   private def processTest(using Quotes)(test: quotes.reflect.Apply, pathOld: Seq[String], index: Int): (Expr[UTree[String]], Expr[TestCallTree]) =

utest/test/src-jvm/test/utest/LineNumbersTests.scala

@@ -28,6 +28,19 @@ object LineNumbersTests extends utest.TestSuite {
         assert(1 == 2)
       }
     }
+    test("test6") {
+      val result = "testing".trim()
+      assert(result == "notMatching")
+      result
+    }
+    test("test7") {
+      val result = "testing".trim()
+      assert(result == "notMatching")
+      test("innerTest5") {
+        assert(1 == 1)
+      }
+      result
+    }
   }
 
   val testBody = {
@@ -44,7 +57,8 @@ object LineNumbersTests extends utest.TestSuite {
       stackTraceLinesFromThisFile(2).exists(_.getLineNumber == 17),
       stackTraceLinesFromThisFile(3).exists(_.getLineNumber == 21),
       stackTraceLinesFromThisFile(4).exists(_.getLineNumber == 28),
-
+      stackTraceLinesFromThisFile(5).exists(_.getLineNumber == 33),
+      stackTraceLinesFromThisFile(6).exists(_.getLineNumber == 38),
     )
 
   }