fix

1 files changed, 22 insertions, 21 deletions

diff --git a/mcgoron.srfi.64.scm b/mcgoron.srfi.64.scm
index a69c4c8..287c6c5 100644
--- a/mcgoron.srfi.64.scm
+++ b/mcgoron.srfi.64.scm
@@ -61,23 +61,21 @@
   (displayables get-displayables set-displayables!))
 
 (define (on-test-begin runner)
-  (let ((kind (test-result-kind runner)))
+  (let ((kind (test-result-kind runner))
+        (aux (test-runner-aux-value runner)))
     (cond
       ((eq? kind 'skip)
-       (set-tests-skipped-in-group! runner
+       (set-tests-skipped-in-group! aux
                                     (+ 1
-                                       (get-tests-skipped-in-group
-                                        runner))))
+                                       (get-tests-skipped-in-group aux))))
       ((test-passed? runner)
-       (set-tests-passed-in-group! runner
+       (set-tests-passed-in-group! aux
                                    (+ 1
-                                      (get-tests-passed-in-group
-                                       runner))))
+                                      (get-tests-passed-in-group aux))))
       (else
-       (set-tests-failed-in-group! runner
+       (set-tests-failed-in-group! aux
                                    (+ 1
-                                      (get-tests-failed-in-group
-                                       runner)))))
+                                      (get-tests-failed-in-group aux)))))
     (write `(test ,(test-runner-test-name runner)
                   (result ,kind)
                   (properties ,@(test-result-alist runner))))
@@ -88,17 +86,18 @@
   (newline))
 
 (define (on-group-end runner)
-  (let ((passed (get-tests-passed-in-group runner))
-        (failed (get-tests-failed-in-group runner))
-        (skipped (get-tests-skipped-in-group runner)))
+  (let* ((aux (test-runner-aux-value runner))
+         (passed (get-tests-passed-in-group aux))
+         (failed (get-tests-failed-in-group aux))
+         (skipped (get-tests-skipped-in-group aux)))
     (write `(end (passed ,passed)
                  (failed ,failed)
                  (skipped ,skipped)
                  (tests ,(+ passed failed skipped))))
-    (newline))
-  (set-tests-passed-in-group! runner 0)
-  (set-tests-failed-in-group! runner 0)
-  (set-tests-skipped-in-group! runner 0))
+    (newline)
+    (set-tests-passed-in-group! aux 0)
+    (set-tests-failed-in-group! aux 0)
+    (set-tests-skipped-in-group! aux 0)))
 
 (define (on-bad-count runner actual expected)
   (write `(warning expected ,expected
@@ -113,9 +112,9 @@
 (define (on-final runner)
   (write `(summary
            (pass (expected ,(test-runner-pass-count runner))
-                 (not-expected ,(test-runner-pass-count runner)))
-           (fail (expected ,(test-runner-fail-count runner))
-                 (not-expected ,(test-runner-xfail-count runner)))
+                 (not-expected ,(test-runner-xpass-count runner)))
+           (fail (not-expected ,(test-runner-fail-count runner))
+                 (expected ,(test-runner-xfail-count runner)))
            (skipped ,(test-runner-skip-count runner)))))
 
 (define (add-displayable! runner predicate transformer)
@@ -132,5 +131,7 @@
     (test-runner-on-test-begin! runner on-test-begin)
     (test-runner-on-group-begin! runner on-group-begin)
     (test-runner-on-group-end! runner on-group-end)
+    (test-runner-on-bad-end-name! runner on-bad-end-name)
     (test-runner-on-bad-count! runner on-bad-end-name)
-    (test-runner-on-final! runner on-final)))
\ No newline at end of file
+    (test-runner-on-final! runner on-final)
+    runner))
\ No newline at end of file