Use unittest and no longer possible crash on unhandled exception

This commit is contained in:
kdeme 2019-10-16 18:20:11 +02:00 committed by zah
parent dc9f7351a1
commit f8d506dcb1

View File

@ -1,5 +1,5 @@
import import
json, strutils, eth/rlp json, strutils, unittest, eth/rlp
proc append(output: var RlpWriter, js: JsonNode) = proc append(output: var RlpWriter, js: JsonNode) =
case js.kind case js.kind
@ -25,37 +25,32 @@ proc `==`(lhs: JsonNode, rhs: string): bool =
proc runTests*(filename: string) = proc runTests*(filename: string) =
let js = json.parseFile(filename) let js = json.parseFile(filename)
suite filename:
for testname, testdata in js: for testname, testdata in js:
template testStatus(status: string) = test testname:
echo status, " ", filename, " :: ", testname
let let
input = testdata{"in"} input = testdata{"in"}
output = testdata{"out"} output = testdata{"out"}
if input.isNil or output.isNil or output.kind != JString: if input.isNil or output.isNil or output.kind != JString:
testStatus "IGNORED" skip()
continue continue
if input == "VALID": if input == "VALID":
var rlp = rlpFromHex(output.str) var rlp = rlpFromHex(output.str)
discard rlp.inspect discard rlp.inspect
elif input == "INVALID": elif input == "INVALID":
var success = false var success = true
var inspectOutput = "" var inspectOutput = ""
try: expect MalformedRlpError, UnsupportedRlpError, ValueError:
var rlp = rlpFromHex(output.str) var rlp = rlpFromHex(output.str)
inspectOutput = rlp.inspect(1) inspectOutput = rlp.inspect(1)
discard rlp.getType discard rlp.getType
while rlp.hasData: discard rlp.toNodes while rlp.hasData: discard rlp.toNodes
except MalformedRlpError, UnsupportedRlpError, ValueError: success = false
success = true
if not success: if not success:
testStatus "FAILED"
echo " ACCEPTED MALFORMED BYTES: ", output.str echo " ACCEPTED MALFORMED BYTES: ", output.str
echo " INTERPRETATION:\n", inspectOutput echo " INTERPRETATION:\n", inspectOutput
program_result = 1
continue
else: else:
if input.kind == JString and input.str.len != 0 and input.str[0] == '#': if input.kind == JString and input.str.len != 0 and input.str[0] == '#':
continue continue
@ -65,12 +60,5 @@ proc runTests*(filename: string) =
let let
actual = outRlp.finish.hexRepr actual = outRlp.finish.hexRepr
expected = output.str expected = output.str
if actual != expected: check actual == expected
testStatus "FAILED"
echo " EXPECTED BYTES: ", expected
echo " ACTUAL BYTES: ", actual
program_result = 1
continue
testStatus "OK"