* Converted several files in the test suite for testing by

	tcltest 2.1.

1 files changed, 13 insertions, 18 deletions

diff --git a/tests/raise.test b/tests/raise.test
index f5d88d7..12b56cf 100644
--- a/tests/raise.test
+++ b/tests/raise.test
@@ -8,19 +8,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: raise.test,v 1.5 1999/08/18 00:11:13 jenn Exp $
+# RCS: @(#) $Id: raise.test,v 1.6 2002/07/13 00:30:25 dgp Exp $
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
+package require tcltest 2.1
+namespace import -force tcltest::test
+namespace import -force tcltest::testConstraint
+eval tcltest::configure $argv
 
-if {[info commands testmakeexist] == {}} {
-    puts "This application hasn't been compiled with the \"testmakeexist\""
-    puts "command, so I can't run this test.  Are you sure you're using"
-    puts "tktest instead of wish?"
-    ::tcltest::cleanupTests
-    return
-}
+testConstraint testmakeexist [llength [info commands testmakeexist]]
 
 # Procedure to create a bunch of overlapping windows, which should
 # make it easy to detect differences in order.
@@ -79,25 +74,25 @@ test raise-1.1 {preserve creation order} {
     update
     raise_getOrder
 } {d d d b c e e e}
-test raise-1.2 {preserve creation order} {
+test raise-1.2 {preserve creation order} testmakeexist {
     raise_setup
     testmakeexist .raise.a
     update
     raise_getOrder
 } {d d d b c e e e}
-test raise-1.3 {preserve creation order} {
+test raise-1.3 {preserve creation order} testmakeexist {
     raise_setup
     testmakeexist .raise.c
     update
     raise_getOrder
 } {d d d b c e e e}
-test raise-1.4 {preserve creation order} {
+test raise-1.4 {preserve creation order} testmakeexist {
     raise_setup
     testmakeexist .raise.e
     update
     raise_getOrder
 } {d d d b c e e e}
-test raise-1.5 {preserve creation order} {
+test raise-1.5 {preserve creation order} testmakeexist {
     raise_setup
     testmakeexist .raise.d .raise.c .raise.b
     update
@@ -141,21 +136,21 @@ test raise-3.1 {raise internal windows after creation} {
     raise .raise.a .raise.d
     raise_getOrder
 } {a d d a c e e e}
-test raise-3.2 {raise internal windows after creation} {
+test raise-3.2 {raise internal windows after creation} testmakeexist {
     raise_setup
     testmakeexist .raise.a .raise.b
     raise .raise.a .raise.b
     update
     raise_getOrder
 } {d d d a c e e e}
-test raise-3.3 {raise internal windows after creation} {
+test raise-3.3 {raise internal windows after creation} testmakeexist {
     raise_setup
     testmakeexist .raise.a .raise.d
     raise .raise.a .raise.b
     update
     raise_getOrder
 } {d d d a c e e e}
-test raise-3.4 {raise internal windows after creation} {
+test raise-3.4 {raise internal windows after creation} testmakeexist {
     raise_setup
     testmakeexist .raise.a .raise.c .raise.d
     raise .raise.a .raise.b