status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add optional outputName to jsonTest macro

This commit is contained in:
andri lim 2020-04-21 10:44:35 +07:00 committed by zah
parent 6667f943cf
commit 8747fe1ecd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_helpers.nim
View File

@ -65,7 +65,7 @@ proc lacksSupportedForks*(fixtures: JsonNode): bool =
var status = initOrderedTable[string, OrderedTable[string, Status]]()
macro jsonTest*(s: static[string], handler: untyped, skipTest: untyped = skipNothing): untyped =
proc jsonTestImpl*(inputFolder, outputName: string, handler, skipTest: NimNode): NimNode {.compileTime.} =
let
testStatusIMPL = ident("testStatusIMPL")
testName = ident("testName")
@ -77,7 +77,7 @@ macro jsonTest*(s: static[string], handler: untyped, skipTest: untyped = skipNot
result = quote:
var filenames: seq[string] = @[]
for filename in walkDirRec("tests" / "fixtures" / `s`):
for filename in walkDirRec("tests" / "fixtures" / `inputFolder`):
if not filename.endsWith(".json"):
continue
var (folder, name) = filename.splitPath()
@ -112,9 +112,15 @@ macro jsonTest*(s: static[string], handler: untyped, skipTest: untyped = skipNot
status.sort do (a: (string, OrderedTable[string, Status]),
b: (string, OrderedTable[string, Status])) -> int: cmp(a[0], b[0])
generateReport(`s`, status)
generateReport(`outputName`, status)
status.clear()
macro jsonTest*(inputFolder, outputName: static[string], handler: untyped, skipTest: untyped = skipNothing): untyped =
result = jsonTestImpl(inputFolder, outputName, handler, skipTest)
macro jsonTest*(inputFolder: static[string], handler: untyped, skipTest: untyped = skipNothing): untyped =
result = jsonTestImpl(inputFolder, inputFolder, handler, skipTest)
func ethAddressFromHex*(s: string): EthAddress = hexToByteArray(s, result)
func safeHexToSeqByte*(hexStr: string): seq[byte] =