diff --git a/kiss/src/kiss/Macros.hx b/kiss/src/kiss/Macros.hx index 5a1d6c33..fb183897 100644 --- a/kiss/src/kiss/Macros.hx +++ b/kiss/src/kiss/Macros.hx @@ -386,6 +386,12 @@ class Macros { } }; + k.doc("assertEquals", 2, null, "(assertEquals )"); + macros["assertEquals"] = (wholeExp:ReaderExp, exps:Array, k:KissState) -> { + var b = wholeExp.expBuilder(); + b.callSymbol("assert", [b.callSymbol("=", exps)]); + } + function stringsThatMatch(exp:ReaderExp, formName:String) { return switch (exp.def) { case StrExp(s): diff --git a/kiss/src/test/cases/BasicTestCase.kiss b/kiss/src/test/cases/BasicTestCase.kiss index 08c1aa15..2cc24b4a 100644 --- a/kiss/src/test/cases/BasicTestCase.kiss +++ b/kiss/src/test/cases/BasicTestCase.kiss @@ -341,7 +341,8 @@ From:[(assert false (+ \"false \" \"should \" \"have \" \"been \" \"true\"))]" message))) (assert true) - (assert ![])) + (assert ![]) + (assertEquals 6 6 6)) (function _testApply [] (Assert.equals 6 (apply + [1 2 3]))) diff --git a/projects/aoc/src/UtilMacros.kiss b/projects/aoc/src/UtilMacros.kiss index 9f2beac2..8243b5c5 100644 --- a/projects/aoc/src/UtilMacros.kiss +++ b/projects/aoc/src/UtilMacros.kiss @@ -9,7 +9,4 @@ ,@body)) (defMacro dayTodo [num] - `(day ,num (print "TODO"))) - -(defMacro assertEquals [expected actual] - `(assert (= ,expected ,actual))) \ No newline at end of file + `(day ,num (print "TODO"))) \ No newline at end of file