From 7b7e9f4a17f54efe2bb1eab0a80e211da5e685d0 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 23 Feb 2002 22:15:33 +0000 Subject: [PATCH] .. original commit: 0e1bf3babada3872e47bed929a6013e007b774cd --- collects/framework/framework.ss | 4 +++- collects/tests/framework/README | 5 +++++ collects/tests/framework/load.ss | 20 ++++++++------------ collects/tests/framework/main.ss | 1 + 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/collects/framework/framework.ss b/collects/framework/framework.ss index 038a752d..6da0c0b6 100644 --- a/collects/framework/framework.ss +++ b/collects/framework/framework.ss @@ -12,10 +12,12 @@ "framework-unit.ss" "framework-sig.ss" - "macro.ss") + "macro.ss" + "specs.ss") (provide-signature-elements framework^) (provide (all-from "macro.ss")) + (provide (all-from "specs.ss")) (define-values/invoke-unit/sig frameworkc^ diff --git a/collects/tests/framework/README b/collects/tests/framework/README index d43da532..9aaed54c 100644 --- a/collects/tests/framework/README +++ b/collects/tests/framework/README @@ -34,6 +34,11 @@ test as last time, or `all' to run all of the tests. | This tests that preferences are saved and restored correctly, both | immediately and across reboots of mred. + +- specs |# spec-test.ss #| + + | this tests that the specs are compiled properly. + - individual object tests: | These tests are simple object creation and basic operations. diff --git a/collects/tests/framework/load.ss b/collects/tests/framework/load.ss index 730c6436..7348410f 100644 --- a/collects/tests/framework/load.ss +++ b/collects/tests/framework/load.ss @@ -1,7 +1,7 @@ (module load mzscheme (require "test-suite-utils.ss") - (define old-load-framework-automatically? (load-framework-automatically)) + (load-framework-automatically #f) (define (test/load file exp) (test @@ -23,11 +23,8 @@ (eval ',exp) (void)))))) - (load-framework-automatically #f) - - (test/load "prefs-file-unit.ss" 'framework:prefs-file@) - (test/load "prefs-file.ss" 'prefs-file:get-preferences-filename) - + (test/load "specs.ss" '(contract (lambda (x) #t) 1 'pos 'neg)) + (test/load "gui-utils-unit.ss" 'framework:gui-utils@) (test/load "gui-utils.ss" 'gui-utils:next-untitled-name) @@ -36,10 +33,9 @@ (test/load "macro.ss" '(mixin () () ())) - (test/load "framework-unit.ss" '(list framework@ framework-no-prefs@ frameworkc@)) - (test/load "framework.ss" '(list prefs-file:get-preferences-filename - test:button-push + (test/load "framework-unit.ss" '(list framework@ frameworkc@)) + (test/load "framework.ss" '(list test:button-push gui-utils:next-untitled-name - frame:basic-mixin)) - - (load-framework-automatically old-load-framework-automatically?)) + frame:basic-mixin + (mixin () () ()) + (contract (lambda (x) #t) 1 'pos 'neg)))) diff --git a/collects/tests/framework/main.ss b/collects/tests/framework/main.ss index 59b8d646..b5eecd60 100644 --- a/collects/tests/framework/main.ss +++ b/collects/tests/framework/main.ss @@ -74,6 +74,7 @@ (lambda (x) (when (member x all-files) (shutdown-mred) + (load-framework-automatically #t) (let/ec k (dynamic-wind (lambda ()