group hooks

2 files changed, 33 insertions, 25 deletions

diff --git a/tests/impl.scm b/tests/impl.scm
index f8757cd..27e3b72 100644
--- a/tests/impl.scm
+++ b/tests/impl.scm
@@ -10,18 +10,22 @@
     (for-each (lambda (key value)
                 (let ((name (symbol->string key)))
                   (test-body (string-append "contains " name)
-                               (test-contains? key))
+                    (test-contains? key))
                   (test-eq name value (test-ref key))))
-              '(setup-test! after-test before-test! report-test
-                            skip-test? when-test-skipped
-                            setup-group! after-group before-group!
-                            report-group on-exception)
-              (list default-setup-test! default-after-test
-                    default-before-test! default-report-test
-                    default-skip-test? default-when-test-skipped
-                    default-setup-group! default-after-group
-                    default-before-group! default-report-group
-                    default-on-exception)))
+              '(skip-test? when-test-skipped before-test! setup-test!
+                           cleanup-test! after-test report-test
+                           on-exception-in-test
+                           skip-group? when-group-skipped before-group!
+                           setup-group! cleanup-group! after-group
+                           report-group on-exception-in-group)
+              (list default-skip-test? default-when-test-skipped
+                    default-before-test! default-setup-test! default-cleanup-test!
+                    default-after-test default-report-test
+                    default-on-exception-in-test
+                    default-skip-group? default-when-group-skipped
+                    default-before-group! default-setup-group! default-cleanup-group!
+                    default-after-group default-report-group
+                    default-on-exception-in-group)))
   (let ((pair (cons #f #f)))
     (test-eq "default pair" pair (test-ref/default 'nonexistent-key pair))))
 
@@ -67,16 +71,21 @@
     (dict-set! (test-dto)
                default-test-info-dict
                'skip-test? dummy
+               'when-test-skipped dummy
                'before-test! dummy
                'setup-test! dummy
-               'when-test-skipped dummy
+               'cleanup-test! dummy
                'after-test values
                'report-test dummy
-               'on-exception dummy
-               'setup-group! dummy
+               'on-exception-in-test dummy
+               'skip-group? dummy
+               'when-group-skipped dummy
                'before-group! dummy
+               'setup-group! dummy
+               'cleanup-group! dummy
                'after-group values
-               'report-group dummy)))
+               'report-group dummy
+               'on-exception-in-group dummy)))
 
 (test-group "call-as-test, dummy dict"
   (test-group "before test"
@@ -150,9 +159,10 @@
                       dummy-dict
                       'exception-not-called?
                       #t
-                      'on-exception
+                      'on-exception-in-test
                       (lambda (exn return)
-                        (test-set! 'exception-not-called? #f))
+                        (test-set! 'exception-not-called? #f)
+                        (return))
                       'after-test
                       (lambda (previous-dict)
                         (return (dict-ref (test-dto)
@@ -165,12 +175,11 @@
            (caught #f))
       (test-body "called"
         (parameterize ((test-info (dict-set! (test-dto) dummy-dict
-                                             'on-exception
+                                             'on-exception-in-test
                                              (lambda (exn return)
                                                (set! caught exn)
                                                (return)))))
-          (call-as-test #f (lambda ()
-                             (raise message)))
+          (call-as-test #f (lambda () (raise message)))
           caught)))))
 
 ;;; ;;;;;;;;;;;;;;;;
@@ -383,7 +392,7 @@
       (parameterize ((test-info silent-dict))
         (test-error #f
           (lambda (ex) #t)
-          #f)
+          #t)
         (test-info-dict)))
     (eqv? 1 (dict-ref (test-dto) dict 'failed)))
   (test-body "incorrectly thrown exception"
diff --git a/tests/run.scm b/tests/run.scm
index e70e8af..2c0d342 100644
--- a/tests/run.scm
+++ b/tests/run.scm
@@ -2,7 +2,6 @@
   (chicken-5 (import r7rs))
   (else))
 
-(import (cuprate) (srfi 225))
-  (include "impl.scm")
-
-
+(import (cuprate) (srfi 225) (cuprate rewriters))
+(parameterize ((test-info (test-set 'verbose? #t)))
+  (include "impl.scm"))