Author: yamakenz
Date: Tue Jun 12 12:15:54 2007
New Revision: 4579

Modified:
   sigscheme-trunk/test/test-srfi2.scm

Log:
* test/test-srfi2.scm
  - Cosmetic changes with test-name


Modified: sigscheme-trunk/test/test-srfi2.scm
==============================================================================
--- sigscheme-trunk/test/test-srfi2.scm (original)
+++ sigscheme-trunk/test/test-srfi2.scm Tue Jun 12 12:15:54 2007
@@ -49,92 +49,95 @@
 (define true #t)
 (define false #f)
 
-(tn "and-let* invalid form")
+(tn "and-let* invalid forms")
 (assert-error (tn) (lambda () (and-let* ((#t) . #t) #t)))
 (assert-error (tn) (lambda () (and-let* ((foo #t) . #t) #t)))
 
-; and-let*
-(assert-true  "and-let* test 1" (and-let* () #t))
-(assert-true  "and-let* test 2" (and-let* () #t #t))
-(assert-true  "and-let* test 3" (and-let* () #t #t #t))
-(assert-false "and-let* test 4" (and-let* () #f))
-(assert-false "and-let* test 5" (and-let* () #t #f))
-(assert-false "and-let* test 6" (and-let* () #t #t #f))
-(assert-false "and-let* test 7" (and-let* ((false (< 2 1)))
-                                          #t))
-(assert-false "and-let* test 8" (and-let* ((true  (< 1 2))
-                                           (false (< 2 1)))
-                                          #t))
-(assert-true  "and-let* test 9" (and-let* ((one 1)
-                                           (two (+ one 1))
-                                           (three (+ two 1)))
-                                          (= three 3)))
-(assert-false "and-let* test 10" (and-let* ((one 1)
-                                            (two (+ one 1))
-                                            (three (+ two 1)))
-                                           (= three 4)))
-
-;; <bound-variable> style claw
-(assert-true  "and-let* #11" (and-let* (true)
-                               'ok))
-(assert-true  "and-let* #12" (and-let* (even?)
-                               'ok))
-(assert-false "and-let* #13" (and-let* (false)
-                               'ok))
-(assert-true  "and-let* #14" (and-let* (even?
-                                        true)
-                               'ok))
-(assert-false "and-let* #15" (and-let* (even?
-                                        true
-                                        false)
-                               'ok))
-
-;; (<expression>) style claw
-(assert-true  "and-let* #16" (and-let* ((#t))
-                               'ok))
-(assert-false "and-let* #17" (and-let* ((#f))
-                               'ok))
-(assert-true  "and-let* #18" (and-let* (((integer? 1)))
-                               'ok))
-(assert-false "and-let* #19" (and-let* (((integer? #t)))
-                               'ok))
-(assert-true  "and-let* #20" (and-let* (((integer? 1))
-                                        ((integer? 2)))
-                               'ok))
-(assert-false "and-let* #21" (and-let* (((integer? 1))
-                                        ((integer? 2))
-                                        ((integer? #t)))
-                               'ok))
-;; procedure itself as value
-(assert-true "and-let* #22" (and-let* ((even?))
-                               'ok))
-
-;; combined form
-(assert-true  "and-let* #23" (and-let* (true
-                                        even?
-                                        ((integer? 1)))
-                               'ok))
-(assert-true  "and-let* #24" (and-let* (true
-                                        even?
-                                        ((integer? 1))
-                                        (foo '(1 2 3))
-                                        ((list? foo))
-                                        (bar foo))
-                               'ok))
-(assert-false "and-let* #25" (and-let* (true
-                                        even?
-                                        ((integer? 1))
-                                        (foo '#(1 2 3))
-                                        ((list? foo))
-                                        (bar foo))
-                               'ok))
-(assert-false "and-let* #26" (and-let* (true
-                                        even?
-                                        ((integer? 1))
-                                        (foo '(1 2 3))
-                                        (bar (car foo))
-                                        bar
-                                        ((null? bar)))
-                               'ok))
+(tn "and-let* misc normal forms")
+(assert-true  (tn) (and-let* () #t))
+(assert-true  (tn) (and-let* () #t #t))
+(assert-true  (tn) (and-let* () #t #t #t))
+(assert-false (tn) (and-let* () #f))
+(assert-false (tn) (and-let* () #t #f))
+(assert-false (tn) (and-let* () #t #t #f))
+
+(tn "and-let* (<variable> <expression>) style claw")
+(assert-false (tn) (and-let* ((false (< 2 1)))
+                     #t))
+(assert-false (tn) (and-let* ((true  (< 1 2))
+                              (false (< 2 1)))
+                     #t))
+(assert-true  (tn) (and-let* ((one 1)
+                              (two (+ one 1))
+                              (three (+ two 1)))
+                     (= three 3)))
+(assert-false (tn) (and-let* ((one 1)
+                              (two (+ one 1))
+                              (three (+ two 1)))
+                     (= three 4)))
+
+(tn "and-let* <bound-variable> style claw")
+(assert-true  (tn) (and-let* (true)
+                     'ok))
+(assert-true  (tn) (and-let* (even?)
+                     'ok))
+(assert-false (tn) (and-let* (false)
+                     'ok))
+(assert-true  (tn) (and-let* (even?
+                              true)
+                     'ok))
+(assert-false (tn) (and-let* (even?
+                              true
+                              false)
+                     'ok))
+
+(tn "and-let* (<expression>) style claw")
+(assert-true  (tn) (and-let* ((#t))
+                     'ok))
+(assert-false (tn) (and-let* ((#f))
+                     'ok))
+(assert-true  (tn) (and-let* (((integer? 1)))
+                     'ok))
+(assert-false (tn) (and-let* (((integer? #t)))
+                     'ok))
+(assert-true  (tn) (and-let* (((integer? 1))
+                              ((integer? 2)))
+                     'ok))
+(assert-false (tn) (and-let* (((integer? 1))
+                              ((integer? 2))
+                              ((integer? #t)))
+                     'ok))
+
+(tn "and-let* procedure itself as value")
+(assert-true (tn) (and-let* ((even?))
+                    'ok))
+
+(tn "and-let* combined forms")
+(assert-true  (tn) (and-let* (true
+                              even?
+                              ((integer? 1)))
+                     'ok))
+(assert-true  (tn) (and-let* (true
+                              even?
+                              ((integer? 1))
+                              (foo '(1 2 3))
+                              ((list? foo))
+                              (bar foo))
+                     'ok))
+(assert-false (tn) (and-let* (true
+                              even?
+                              ((integer? 1))
+                              (foo '#(1 2 3))
+                              ((list? foo))
+                              (bar foo))
+                     'ok))
+(assert-false (tn) (and-let* (true
+                              even?
+                              ((integer? 1))
+                              (foo '(1 2 3))
+                              (bar (car foo))
+                              bar
+                              ((null? bar)))
+                     'ok))
 
 (total-report)

Reply via email to