From 239f668604ceabc2b78d4b689f425485041eb2c4 Mon Sep 17 00:00:00 2001 From: Brian Date: Sun, 18 Apr 2021 20:48:22 -0700 Subject: [PATCH 1/3] Fixed tests not outputting results --- releases/ALUnit-v1.0.lsp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/releases/ALUnit-v1.0.lsp b/releases/ALUnit-v1.0.lsp index 5e8e9f7..cc7746a 100644 --- a/releases/ALUnit-v1.0.lsp +++ b/releases/ALUnit-v1.0.lsp @@ -392,11 +392,9 @@ SOFTWARE. (mapcar '(lambda (testName) (setq *ALU:currentTestName* testName) - (foreach - testExpression + (eval (cdr - (assoc testName *ALU:allTests*)) - (eval testExpression))) + (assoc testName *ALU:allTests*)))) (cdr testSuite)) (ALU:printElapsedTime) (ALU:printTestInfo)) @@ -415,16 +413,14 @@ SOFTWARE. | @output: Standard ALUnit output. |; -(defun runTest ( testName / testExpression) +(defun runTest ( testName ) (ALU:resetTestInfo) (ALU:printOutputHeader) (ALU:startTimer) (setq *ALU:currentTestName* testName) - (foreach - testExpression + (eval (cdr - (assoc testName *ALU:allTests*)) - (eval testExpression)) + (assoc testName *ALU:allTests*))) (ALU:printElapsedTime) (ALU:printTestInfo) (print)) From a3157afacc2e7e1dbc8c1a612f377e43de36f5c3 Mon Sep 17 00:00:00 2001 From: Brian Date: Sun, 18 Apr 2021 22:59:29 -0700 Subject: [PATCH 2/3] Fixed ACAD 2017+ issue of millisecs getting rounded --- releases/ALUnit-v1.0.lsp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/releases/ALUnit-v1.0.lsp b/releases/ALUnit-v1.0.lsp index cc7746a..5b21e2f 100644 --- a/releases/ALUnit-v1.0.lsp +++ b/releases/ALUnit-v1.0.lsp @@ -304,7 +304,7 @@ SOFTWARE. | *ALU:testSuites* - assoc list of test suites and a list of their tests | *ALU:testsRun* - counter for total tests run in the current batch | *ALU:failMessages* - list of messages to print after testing - | *ALU:startTime* - date number for start of testing + | *ALU:startTime* - milliseconds since boot time for start of testing | *ALU:currentTestName* - name of test currently running |; @@ -473,7 +473,7 @@ SOFTWARE. (defun ALU:startTimer ( / ) (setq *ALU:startTime* - (getvar "date")) + (getvar "millisecs")) (princ)) @@ -482,20 +482,16 @@ SOFTWARE. | @output: Elapsed time in milliseconds. |; -(defun ALU:printElapsedTime ( / MILLISEC_CONVERSION DECIMAL_FORMAT - ZERO_DECIMAL_PLACES) - (setq MILLISEC_CONVERSION 86400000 - DECIMAL_FORMAT 2 +(defun ALU:printElapsedTime ( / DECIMAL_FORMAT ZERO_DECIMAL_PLACES) + (setq DECIMAL_FORMAT 2 ZERO_DECIMAL_PLACES 0) (princ (strcat "\nTime: " (rtos - (* - MILLISEC_CONVERSION - (- - (getvar "date") - *ALU:startTime*)) + (- + (getvar "millisecs") + *ALU:startTime*) DECIMAL_FORMAT ZERO_DECIMAL_PLACES) " ms")) From e2ba65699e40e87eba8fad0132d9b03fddb8149b Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 14 Aug 2021 12:41:50 -0700 Subject: [PATCH 3/3] Updated to match release file --- src/Test.lsp | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/Test.lsp b/src/Test.lsp index 6d606e7..19184be 100644 --- a/src/Test.lsp +++ b/src/Test.lsp @@ -22,7 +22,7 @@ | *ALU:testSuites* - assoc list of test suites and a list of their tests | *ALU:testsRun* - counter for total tests run in the current batch | *ALU:failMessages* - list of messages to print after testing - | *ALU:startTime* - date number for start of testing + | *ALU:startTime* - milliseconds since boot time for start of testing | *ALU:currentTestName* - name of test currently running |; @@ -110,11 +110,9 @@ (mapcar '(lambda (testName) (setq *ALU:currentTestName* testName) - (foreach - testExpression + (eval (cdr - (assoc testName *ALU:allTests*)) - (eval testExpression))) + (assoc testName *ALU:allTests*)))) (cdr testSuite)) (ALU:printElapsedTime) (ALU:printTestInfo)) @@ -133,16 +131,14 @@ | @output: Standard ALUnit output. |; -(defun runTest ( testName / testExpression) +(defun runTest ( testName ) (ALU:resetTestInfo) (ALU:printOutputHeader) (ALU:startTimer) (setq *ALU:currentTestName* testName) - (foreach - testExpression + (eval (cdr - (assoc testName *ALU:allTests*)) - (eval testExpression)) + (assoc testName *ALU:allTests*))) (ALU:printElapsedTime) (ALU:printTestInfo) (print)) @@ -195,7 +191,7 @@ (defun ALU:startTimer ( / ) (setq *ALU:startTime* - (getvar "date")) + (getvar "millisecs")) (princ)) @@ -204,20 +200,16 @@ | @output: Elapsed time in milliseconds. |; -(defun ALU:printElapsedTime ( / MILLISEC_CONVERSION DECIMAL_FORMAT - ZERO_DECIMAL_PLACES) - (setq MILLISEC_CONVERSION 86400000 - DECIMAL_FORMAT 2 +(defun ALU:printElapsedTime ( / DECIMAL_FORMAT ZERO_DECIMAL_PLACES) + (setq DECIMAL_FORMAT 2 ZERO_DECIMAL_PLACES 0) (princ (strcat "\nTime: " (rtos - (* - MILLISEC_CONVERSION - (- - (getvar "date") - *ALU:startTime*)) + (- + (getvar "millisecs") + *ALU:startTime*) DECIMAL_FORMAT ZERO_DECIMAL_PLACES) " ms"))