From 7a30577958aa7b8f3c1544e52a00530183b85691 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Fri, 26 May 2000 13:23:52 +0000
Subject: [PATCH] ...

original commit: 2b11ef3af25141548c64ffd594da4a6d8d72a559
---
 collects/tests/framework/frame.ss | 47 ++++++++++++++++---------------
 collects/tests/framework/main.ss  | 20 +++++++------
 collects/tests/framework/text.ss  |  4 +--
 3 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/collects/tests/framework/frame.ss b/collects/tests/framework/frame.ss
index f724d092..cfb4de7f 100644
--- a/collects/tests/framework/frame.ss
+++ b/collects/tests/framework/frame.ss
@@ -18,6 +18,27 @@
  'basic-mixin-creation
  '(frame:basic-mixin frame%))
 
+(test-creation
+ 'info-mixin-creation
+ '(frame:info-mixin frame:basic%))
+(test-creation
+ 'info%-creation
+ 'frame:info%)
+
+(test-creation
+ 'text-info-mixin-creation
+ '(frame:text-info-mixin frame:info%))
+(test-creation
+ 'text-info%-creation
+ 'frame:text-info%)
+
+(test-creation
+ 'pasteboard-info-mixin-creation
+ '(frame:pasteboard-info-mixin frame:info%))
+(test-creation
+ 'pasteboard-info%-creation
+ 'frame:pasteboard-info%)
+
 (test-creation
  'standard-menus%-creation
  'frame:standard-menus%)
@@ -33,7 +54,7 @@
  '(frame:text-mixin frame:editor%))
 (test-creation
  'text-mixin-creation
- '(frame:text-mixin (frame:editor-mixin frame:standard-menus%)))
+ '(frame:text-mixin frame:editor%))
 
 (test-creation
  'searchable%-creation
@@ -42,22 +63,12 @@
  'searchable-mixin
  '(frame:searchable-mixin frame:text%))
 
-(test-creation
- 'info-mixin-creation
- '(frame:info-mixin frame:searchable%))
-(test-creation
- 'text-info-mixin-creation
- '(frame:text-info-mixin (frame:info-mixin frame:searchable%)))
-(test-creation
- 'text-info%-creation
- 'frame:text-info%)
-
 (test-creation
  'text-info-file%-creation
  'frame:text-info-file%)
 (test-creation
  'text-info-file-mixin-creation
- '(frame:file-mixin frame:text-info%))
+ '(frame:file-mixin frame:text%))
 
 (test-creation
  'pasteboard-mixin-creation
@@ -69,16 +80,9 @@
  'pasteboard%-creation
  'frame:pasteboard%)
 
-(test-creation
- 'pasteboard-info-mixin-creation
- '(frame:info-mixin frame:searchable%))
-(test-creation
- 'pasteboard-info%-creation
- 'frame:pasteboard-info%)
-
 (test-creation
  'pasteboard-info-file-mixin-creation
- '(frame:file-mixin frame:pasteboard-info%))
+ '(frame:file-mixin frame:pasteboard%))
 (test-creation
  'pasteboard-info-file%-creation
  'frame:pasteboard-info-file%)
@@ -130,5 +134,4 @@
 
 (test-open "frame:editor open" 'frame:text%)
 (test-open "frame:searchable open" 'frame:searchable%)
-(test-open "frame:text-info open" 'frame:text-info%)
-(test-open "frame:text-info-file open" 'frame:text-info-file%)
+(test-open "frame:text-info open" 'frame:text-info-file%)
diff --git a/collects/tests/framework/main.ss b/collects/tests/framework/main.ss
index 9a8b6628..a50e3c6d 100644
--- a/collects/tests/framework/main.ss
+++ b/collects/tests/framework/main.ss
@@ -158,15 +158,17 @@
 					  (string-append
 					   (exn-message x)
 					   "; rest of string: "
-					   (apply
-					    string
-					    (let loop ()
-					      (if (char-ready? in-port)
-						  (let ([char (read-char in-port)])
-						    (if (eof-object? char)
-							null
-							(cons char (loop))))
-						  null))))))])
+					   (format
+					    "~s"
+					    (apply
+					     string
+					     (let loop ()
+					       (if (char-ready? in-port)
+						   (let ([char (read-char in-port)])
+						     (if (eof-object? char)
+							 null
+							 (cons char (loop))))
+						   null)))))))])
 		   (read in-port))])
 	    (unless (or (eof-object? answer)
 			(and (list? answer)
diff --git a/collects/tests/framework/text.ss b/collects/tests/framework/text.ss
index 9835d513..2936213d 100644
--- a/collects/tests/framework/text.ss
+++ b/collects/tests/framework/text.ss
@@ -62,9 +62,9 @@
 (test-creation 'frame:text%
 	       'text:searching%
 	       'text:searching-creation)
-(test-creation 'frame:text-info%
+(test-creation '(frame:searchable-mixin frame:text%)
 	       '(text:info-mixin (editor:info-mixin text:searching%))
 	       'text:info-mixin-creation)
-(test-creation 'frame:text-info%
+(test-creation '(frame:searchable-mixin frame:text%)
 	       'text:info%
 	       'text:info-creation)
\ No newline at end of file