From e75ebff73a032f12a78ace9768a3442eedff5afa Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 2 Jun 2010 02:10:25 -0700
Subject: [PATCH] Use properties in RUN-SUB-TEST where appropriate.  Change
 tests to run properly now that argument SVLs may contain null ranges.

---
 tests/runtime/test-char-set.scm | 62 ++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/tests/runtime/test-char-set.scm b/tests/runtime/test-char-set.scm
index e4fb1a581..a911b05d0 100644
--- a/tests/runtime/test-char-set.scm
+++ b/tests/runtime/test-char-set.scm
@@ -32,9 +32,9 @@ USA.
     (map (lambda (svl)
 	   (run-sub-test
 	    (lambda ()
-	      (assert-equal-canonical-svls (named-call 'SVL-ROUND-TRIP
-						       svl-round-trip svl)
-					   svl))))
+	      (assert-equal-canonical-svls (trim-empty-segments svl)
+					   (svl-round-trip svl)))
+	    'EXPRESSION `(SVL-ROUND-TRIP ,svl)))
 	 interesting-svls)))
 
 (define (svl-round-trip svl)
@@ -46,16 +46,18 @@ USA.
 	   (run-sub-test
 	    (lambda ()
 	      (guarantee-well-formed-scalar-value-list svl)
-	      (assert-equal-canonical-svls
-	       (named-call '%CANONICALIZE-SCALAR-VALUE-LIST
-			   %canonicalize-scalar-value-list
-			   svl)
-	       (svl-round-trip svl)))))
+	      (assert-equal-canonical-svls (canonicalize-svl svl)
+					   (svl-round-trip svl)))))
 	 (append! (append-map! (lambda (i)
 				 (make-random-svls i 100))
 			       (iota 4 1))
 		  (make-random-svls 100 100)))))
 
+(define (canonicalize-svl svl)
+  (named-call '%CANONICALIZE-SCALAR-VALUE-LIST
+	      %canonicalize-scalar-value-list
+	      svl))
+
 (define (make-random-svls n-ranges n-iter)
   (map (lambda (i)
 	 i
@@ -79,13 +81,11 @@ USA.
 	   (map (lambda (value)
 		  (run-sub-test
 		   (lambda ()
-		     (with-test-properties
-			 (lambda ()
-			   (assert-boolean-=
-			    (char-set-member? (scalar-values->char-set svl)
-					      (integer->char value))
-			    (named-call 'SVL-MEMBER? svl-member? svl value)))
-		       'EXPRESSION `(CHAR-SET-MEMBER? ,svl ,value)))))
+		     (assert-boolean-=
+		      (char-set-member? (scalar-values->char-set svl)
+					(integer->char value))
+		      (named-call 'SVL-MEMBER? svl-member? svl value)))
+		   'EXPRESSION `(CHAR-SET-MEMBER? ,svl ,value)))
 		(enumerate-test-values)))
 	 interesting-svls)))
 
@@ -107,10 +107,9 @@ USA.
     (map (lambda (svl)
 	   (run-sub-test
 	    (lambda ()
-	      (assert-equal (named-call 'SVL-INVERT-THRU
-					svl-invert-thru svl)
-			    (named-call 'SVL-INVERT-DIRECT
-					svl-invert-DIRECT svl)))))
+	      (assert-equal (svl-invert-thru svl)
+			    (svl-invert-direct (trim-empty-segments svl))))
+	    'EXPRESSION `(SVL-INVERT ,svl)))
 	 interesting-svls)))
 
 (define (svl-invert-thru svl)
@@ -140,14 +139,13 @@ USA.
 	   (map (lambda (svl2)
 		  (run-sub-test
 		   (lambda ()
-		     (with-test-properties
-			 (lambda ()
-			   (assert-equal
-			    (char-set->scalar-values
-			     (operation (scalar-values->char-set svl1)
-					(scalar-values->char-set svl2)))
-			    (svl-direct svl1 svl2)))
-		       'EXPRESSION `(,name ,svl1 ,svl2)))))
+		     (assert-equal
+		      (char-set->scalar-values
+		       (operation (scalar-values->char-set svl1)
+				  (scalar-values->char-set svl2)))
+		      (svl-direct (trim-empty-segments svl1)
+				  (trim-empty-segments svl2))))
+		   'EXPRESSION `(,name ,svl1 ,svl2)))
 		interesting-svls))
 	 interesting-svls)))
 
@@ -275,13 +273,19 @@ USA.
 	(assert-equal svl1 svl2)))
 
 (define (assert-canonical-svl svl)
-  (assert-true `(CANONICAL-SVL? ,svl)
-	       (canonical-svl? svl)))
+  (assert-true (canonical-svl? svl)
+	       'EXPRESSION `(CANONICAL-SVL? ,svl)))
 
 (define (named-call name operation . args)
   (with-test-properties (lambda () (apply operation args))
     'EXPRESSION (cons name args)))
 
+(define (trim-empty-segments svl)
+  (filter (lambda (segment)
+	    (< (segment-start segment)
+	       (segment-end segment)))
+	  svl))
+
 (define (canonical-svl? items)
   (and (list-of-type? items
 	 (lambda (item)
-- 
2.25.1