jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed extra line breaks from unittest output.

Browse source
This commit is contained in:
gmpreussner 2014-12-21 23:47:01 -05:00
commit 0e65d786d5
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/pure/unittest.nim
View file

@ -35,7 +35,7 @@ var
abortOnError* {.threadvar.}: bool abortOnError* {.threadvar.}: bool
outputLevel* {.threadvar.}: OutputLevel outputLevel* {.threadvar.}: OutputLevel
colorOutput* {.threadvar.}: bool colorOutput* {.threadvar.}: bool
checkpoints {.threadvar.}: seq[string] checkpoints {.threadvar.}: seq[string]
checkpoints = @[] checkpoints = @[]
@ -61,23 +61,23 @@ proc testDone(name: string, s: TestStatus) =
programResult += 1 programResult += 1
if outputLevel != PRINT_NONE and (outputLevel == PRINT_ALL or s == FAILED): if outputLevel != PRINT_NONE and (outputLevel == PRINT_ALL or s == FAILED):
template rawPrint() = echo("[", $s, "] ", name, "\n") template rawPrint() = echo("[", $s, "] ", name)
when not defined(ECMAScript): when not defined(ECMAScript):
if colorOutput and not defined(ECMAScript): if colorOutput and not defined(ECMAScript):
var color = (if s == OK: fgGreen else: fgRed) var color = (if s == OK: fgGreen else: fgRed)
styledEcho styleBright, color, "[", $s, "] ", fgWhite, name, "\n" styledEcho styleBright, color, "[", $s, "] ", fgWhite, name
else: else:
rawPrint() rawPrint()
else: else:
rawPrint() rawPrint()
template test*(name: expr, body: stmt): stmt {.immediate, dirty.} = template test*(name: expr, body: stmt): stmt {.immediate, dirty.} =
bind shouldRun, checkpoints, testDone bind shouldRun, checkpoints, testDone
if shouldRun(name): if shouldRun(name):
checkpoints = @[] checkpoints = @[]
var testStatusIMPL {.inject.} = OK var testStatusIMPL {.inject.} = OK
try: try:
testSetupIMPL() testSetupIMPL()
body body
@ -101,7 +101,7 @@ template fail* =
when not defined(ECMAScript): when not defined(ECMAScript):
if abortOnError: quit(1) if abortOnError: quit(1)
when declared(testStatusIMPL): when declared(testStatusIMPL):
testStatusIMPL = FAILED testStatusIMPL = FAILED
else: else:
@ -111,7 +111,7 @@ template fail* =
macro check*(conditions: stmt): stmt {.immediate.} = macro check*(conditions: stmt): stmt {.immediate.} =
let checked = callsite()[1] let checked = callsite()[1]
var var
argsAsgns = newNimNode(nnkStmtList) argsAsgns = newNimNode(nnkStmtList)
argsPrintOuts = newNimNode(nnkStmtList) argsPrintOuts = newNimNode(nnkStmtList)
@ -120,7 +120,7 @@ macro check*(conditions: stmt): stmt {.immediate.} =
template asgn(a, value: expr): stmt = template asgn(a, value: expr): stmt =
var a = value # XXX: we need "var: var" here in order to var a = value # XXX: we need "var: var" here in order to
# preserve the semantics of var params # preserve the semantics of var params
template print(name, value: expr): stmt = template print(name, value: expr): stmt =
when compiles(string($value)): when compiles(string($value)):
checkpoint(name & " was " & $value) checkpoint(name & " was " & $value)
@ -146,7 +146,7 @@ macro check*(conditions: stmt): stmt {.immediate.} =
checkpoint(lineInfoLit & ": Check failed: " & callLit) checkpoint(lineInfoLit & ": Check failed: " & callLit)
argPrintOuts argPrintOuts
fail() fail()
var checkedStr = checked.toStrLit var checkedStr = checked.toStrLit
inspectArgs(checked) inspectArgs(checked)
result = getAst(rewrite(checked, checked.lineinfo, checkedStr, result = getAst(rewrite(checked, checked.lineinfo, checkedStr,