a check in unittest generated by template doesn't show actual value

[alehander92]

import unittest

type
  A = object
    b: int

template t: untyped =
  check(a.b == 2)

suite "0":
  test "1":

    var a = A(b: 0)
    check(a.b == 2)

suite "1":
  test "1":

    var a = A(b: 0)
    t()

[Suite] 0
t2.nim(14, 14): Check failed: a.b == 2
a.b was 0
[FAILED] 1

[Suite] 1
t2.nim(8, 12): Check failed: a.b == 2
[FAILED] 1

[chrisheller]

While I was looking at unittest.nim for #12031, I took a quick look at this. The reason that the template doesn't print the actual value is because the check macro is testing for nnkIdent for the equality test, but the template has not been resolved yet, so the "==" is still nnkOpenSymChoice at that point.

Updating unittest.nim with this change makes the above test code work properly.

diff --git a/lib/pure/unittest.nim b/lib/pure/unittest.nim
index 469e75c16..0b65fc888 100644
--- a/lib/pure/unittest.nim
+++ b/lib/pure/unittest.nim
@@ -610,7 +610,7 @@ macro check*(conditions: untyped): untyped =
 
     var counter = 0
 
-    if exp[0].kind == nnkIdent and
+    if exp[0].kind in {nnkIdent, nnkOpenSymChoice} and
         $exp[0] in ["not", "in", "notin", "==", "<=",
                     ">=", "<", ">", "!=", "is", "isnot"]:

There is another place in that same section of code that also checks for nnkIdent, but I didn't have an immediate test case to trigger any incorrect behavior there, so I didn't change anything.