fix linenumbers in failed assertion traces - take all asserts into account - include asserts inside of expressions

Author: pawelsadlo

utest/src-3/utest/TestBuilder.scala

@@ -1,8 +1,9 @@
 package utest
 
-import scala.quoted.{ Type => QType, _ }
+import scala.quoted.{Type as QType, *}
+import utest.framework.{TestCallTree, TestPath, Tree as UTree}
 
-import utest.framework.{TestCallTree, Tree => UTree, TestPath }
+import scala.util.Success
 
 
 object TestBuilder:
@@ -27,13 +28,15 @@ 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
+    val assertInliner = new TreeMap {
+      override def transformTerm(term: Term)(owner: Symbol): Term = scala.util.Try(term.asExpr) match {
+          case Success(expr) => expr match
+            case '{utest.assert($_)} => Inlined(None,Nil,term) //Inlined results in proper line number generation
+            case _ => super.transformTerm(term)(owner)
+          case _ => super.transformTerm(term)(owner)
       }
-      case other => other
     }
+    val statsWithInlinedAsserts = assertInliner.transformStats(setupStats)(Symbol.spliceOwner)
     val inner =
       if nestedBodyTrees.nonEmpty then Block(statsWithInlinedAsserts, '{Right(${Expr.ofList(nestedBodyTrees)}.toIndexedSeq)}.asTerm)
       else

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

@@ -36,13 +36,60 @@ object LineNumbersTests extends utest.TestSuite {
     test("test7") {
       val result = "testing".trim()
       assert(result == "notMatching")
-      test("innerTest5") {
+      test("innerTest55") {
+        assert(1 == 1)
+      }
+      result
+    }
+    test("test8") {
+      val result = "testing".trim()
+      val blockWithFailingAssert = {
+        assert("matching" == "notMatching")
+        assert(1 == 2)
+      }
+      test("innerTest55") {
+        assert(1 == 1)
+      }
+      result
+    }
+    test("test9") {
+      val result = "testing".trim()
+      val methodWithFailingAssert = println(
+        assert(1 == 2)
+      )
+      test("innerTest55") {
         assert(1 == 1)
       }
       result
     }
+    test("test10") - Obj(1).method{ x =>
+        assert(x.elem == "notMatching")
+    }
+    test("test11"){
+        def xx(body: Int)(rest:Int) = body == rest
+        val partiallyApplied = xx{
+          assert(1 == 2)
+          1
+        }
+
+        ()
+    }
+    test("test12"){
+        def xx(body: => Int)(rest:Int) = body == rest
+        val partiallyAppliedByName = xx{
+          assert(1 == 2)
+          1
+        }
+
+        partiallyAppliedByName(2)
+        ()
+    }
   }
 
+  private case class Obj(arg:Int) {
+    def method[T](tester: Obj => T):T = tester(this)
+    val elem = "elem"
+  }
   val testBody = {
 
     val results = TestRunner.run(
@@ -59,6 +106,11 @@ object LineNumbersTests extends utest.TestSuite {
       stackTraceLinesFromThisFile(4).exists(_.getLineNumber == 28),
       stackTraceLinesFromThisFile(5).exists(_.getLineNumber == 33),
       stackTraceLinesFromThisFile(6).exists(_.getLineNumber == 38),
+      stackTraceLinesFromThisFile(7).exists(_.getLineNumber == 47),
+      stackTraceLinesFromThisFile(8).exists(_.getLineNumber == 58),
+      stackTraceLinesFromThisFile(9).exists(_.getLineNumber == 66),
+      stackTraceLinesFromThisFile(10).exists(_.getLineNumber == 71),
+      stackTraceLinesFromThisFile(11).exists(_.getLineNumber == 80),
     )
 
   }