From 0d4c82613339fd74bb3a26bb1974cb8b223ffbbd Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Fri, 4 Dec 1998 06:13:25 +0000
Subject: [PATCH] ...

original commit: f1f9ba33ed196612917165828d1d5fc7721b3115
---
 collects/framework/framework.ss   |  2 ++
 collects/framework/text.ss        |  4 +++-
 collects/tests/framework/README   |  2 +-
 collects/tests/framework/frame.ss | 29 ++++++++++++++++-------------
 collects/tests/framework/main.ss  |  2 +-
 collects/tests/framework/text.ss  | 14 ++++++++++----
 6 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/collects/framework/framework.ss b/collects/framework/framework.ss
index 1772488a..f5b8239b 100644
--- a/collects/framework/framework.ss
+++ b/collects/framework/framework.ss
@@ -1,3 +1,5 @@
+(require-library "errortrace.ss" "errortrace")
+
 (require-relative-library "frameworks.ss")
 
 (require-library "string.ss")
diff --git a/collects/framework/text.ss b/collects/framework/text.ss
index 5d841678..65df52b4 100644
--- a/collects/framework/text.ss
+++ b/collects/framework/text.ss
@@ -463,7 +463,9 @@
 	 (lambda (start len)
 	   (super-after-delete start len)
 	   (enqueue-for-frame 'edit-position-changed
-			      'framework:edit-position-changed))])))
+			      'framework:edit-position-changed))])
+      (sequence
+	(apply super-init args))))
 
   (define clever-file-format<%> (interface (text<%>)))
 
diff --git a/collects/tests/framework/README b/collects/tests/framework/README
index 98485822..269eb015 100644
--- a/collects/tests/framework/README
+++ b/collects/tests/framework/README
@@ -43,7 +43,7 @@ tests.
   - frames: |# frame.ss #|
   - canvases: |# canvas.ss #|
   - texts: |# text.ss #|
-  - pasteboards: |# text.ss #|
+  - pasteboards: |# pasteboard.ss #|
 
 - basic connections between classes
 
diff --git a/collects/tests/framework/frame.ss b/collects/tests/framework/frame.ss
index f3eef313..42e0a94f 100644
--- a/collects/tests/framework/frame.ss
+++ b/collects/tests/framework/frame.ss
@@ -43,11 +43,14 @@
    '(frame:searchable-mixin frame:text%))
 
   (test-creation
-   'text-info%-creation
-   'frame:text-info%)
+   'info-mixin-creation
+   '(frame:info-mixin frame:searchable%))
   (test-creation
    'text-info-mixin-creation
-   '(frame:info-mixin frame:searchable%))
+   '(frame:text-info-mixin (frame:info-mixin frame:searchable%)))
+  (test-creation
+   'text-info%-creation
+   'frame:text-info%)
 
   (test-creation
    'text-info-file%-creation
@@ -56,26 +59,26 @@
    'text-info-file-mixin-creation
    '(frame:file-mixin frame:text-info%))
 
-  (test-creation
-   'pasteboard%-creation
-   'frame:pasteboard%)
   (test-creation
    'pasteboard-mixin-creation
    '(frame:pasteboard-mixin frame:editor%))
   (test-creation
    'pasteboard-mixin-creation
    '(frame:pasteboard-mixin (frame:editor-mixin frame:standard-menus%)))
-
   (test-creation
-   'pasteboard-info%-creation
-   'frame:pasteboard-info%)
+   '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%-creation
-   'frame:pasteboard-info-file%)
   (test-creation
    'pasteboard-info-file-mixin-creation
-   '(frame:file-mixin frame:pasteboard-info%)))
+   '(frame:file-mixin frame:pasteboard-info%))
+  (test-creation
+   'pasteboard-info-file%-creation
+   'frame:pasteboard-info-file%))
diff --git a/collects/tests/framework/main.ss b/collects/tests/framework/main.ss
index d6fcf7f2..fe8b2bfe 100644
--- a/collects/tests/framework/main.ss
+++ b/collects/tests/framework/main.ss
@@ -226,7 +226,7 @@
 						 (or only-these-tests null))))
 		 ("Only run test named <test-name>" "test-name")]))])
 	(parse-command-line "framework-test" argv command-line-flags
-			    (lambda files
+			    (lambda (collected . files)
 			      (printf "processing ~a~n" files)
 			      (set! files-to-process (if (null? files) all-files files)))
 			    `("Names of the tests; defaults to all tests"))
diff --git a/collects/tests/framework/text.ss b/collects/tests/framework/text.ss
index 08c213af..82b1a011 100644
--- a/collects/tests/framework/text.ss
+++ b/collects/tests/framework/text.ss
@@ -6,7 +6,7 @@
      (send-sexp-to-mred
       `(let* ([% (class-asi ,frame%
 		   (override
-		    [get-editor% (lambda (), class)]))]
+		    [get-editor% (lambda () ,class)]))]
 	      [f (make-object % "test text")])
 	 (send f show #t)))
       (wait-for-frame "test text")
@@ -14,17 +14,23 @@
        `(send (get-top-level-focus-window) show #f)))))
 
 (test-creation 'frame:text%
-	       '(editor:basic-mixin (text:basic-mixin text%))
+	       '(text:basic-mixin (editor:basic-mixin text%))
 	       'text:basic-mixin-creation)
 (test-creation 'frame:text%
 	       'text:basic%
 	       'text:basic-creation)
+
+(define (return-args class)
+  `(class ,class ()
+     (sequence
+       (super-init void))))
 (test-creation 'frame:text%
-	       '(editor:return-mixin text:basic%)
+	       (return-args '(text:return-mixin text:basic%))
 	       'text:return-mixin-creation)
 (test-creation 'frame:text%
-	       'text:return%
+	       (return-args 'text:return%)
 	       'text:return-creation)
+
 (test-creation 'frame:text%
 	       '(editor:file-mixin text:basic%)
 	       'editor:file-mixin-creation)