* Converted more files to tcltest and factored out common code.

1 files changed, 10 insertions, 17 deletions

diff --git a/tests/macEmbed.test b/tests/macEmbed.test
index bd9cdbc..e5a7bab 100644
--- a/tests/macEmbed.test
+++ b/tests/macEmbed.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: macEmbed.test,v 1.6 2002/07/13 20:28:35 dgp Exp $
+# RCS: @(#) $Id: macEmbed.test,v 1.7 2002/07/13 21:52:34 dgp Exp $
 
 package require tcltest 2.1
 namespace import -force tcltest::configure
@@ -24,14 +24,7 @@ test macEmbed-1.2 {TkpUseWindow procedure, bad window identifier} {macOnly} {
     list [catch {toplevel .t -use 47} msg] $msg
 } {1 {The window ID 47 does not correspond to a valid Tk Window.}}
 
-if {[string compare testembed [info commands testembed]] != 0} {
-    puts "This application hasn't been compiled with the testembed command,"
-    puts "therefore I am skipping all of these tests."
-    ::tcltest::cleanupTests
-    return
-}
-
-test macEmbed-1.3 {TkpUseWindow procedure, creating Container records} {macOnly} {
+test macEmbed-1.3 {TkpUseWindow procedure, creating Container records} {testembed macOnly} {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
@@ -40,7 +33,7 @@ test macEmbed-1.3 {TkpUseWindow procedure, creating Container records} {macOnly}
 	toplevel .t -use $w
 	list [testembed] [expr [lindex [lindex [testembed all] 1] 0] - $w]
 } {{{XXX .f2 {} {}} {XXX .f1 XXX .t}} 0}
-test macEmbed-1.4 {TkpUseWindow procedure, creating Container records} {macOnly} {
+test macEmbed-1.4 {TkpUseWindow procedure, creating Container records} {testembed macOnly} testembed {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
@@ -55,7 +48,7 @@ test macEmbed-1.4 {TkpUseWindow procedure, creating Container records} {macOnly}
 # Can't think of any way to test the procedures TkpMakeWindow,
 # TkpMakeContainer, or EmbedErrorProc.
 
-test macEmbed-2.1 {EmbeddedEventProc procedure} {macOnly} {
+test macEmbed-2.1 {EmbeddedEventProc procedure} {testembed macOnly} {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -66,7 +59,7 @@ test macEmbed-2.1 {EmbeddedEventProc procedure} {macOnly} {
     update
 	testembed
 } {}
-test macEmbed-2.2 {EmbeddedEventProc procedure} {macOnly} {
+test macEmbed-2.2 {EmbeddedEventProc procedure} {testembed macOnly} {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -75,7 +68,7 @@ test macEmbed-2.2 {EmbeddedEventProc procedure} {macOnly} {
     destroy .f1
     testembed
 } {}
-test macEmbed-2.3 {EmbeddedEventProc procedure} {macOnly} {
+test macEmbed-2.3 {EmbeddedEventProc procedure} {testembed macOnly} {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -86,7 +79,7 @@ test macEmbed-2.3 {EmbeddedEventProc procedure} {macOnly} {
     list [testembed] [winfo children .]
 } {{} {}}
 
-test macEmbed-3.1 {EmbeddedEventProc procedure, detect creation} {macOnly} {
+test macEmbed-3.1 {EmbeddedEventProc procedure, detect creation} {testembed macOnly} {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -168,7 +161,7 @@ test macEmbed-4.1 {EmbedStructureProc procedure, configure events} {macOnly} {
     update
 	winfo geometry .t1
 } {180x100+0+0}
-test macEmbed-4.2 {EmbedStructureProc procedure, destroy events} {macOnly} {
+test macEmbed-4.2 {EmbedStructureProc procedure, destroy events} {testembed macOnly} {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -205,7 +198,7 @@ test unixEmbed-5.1 {TkpClaimFocus procedure} {macOnly tempNotMac} {
 } {{{} .} .f1}
 catch {interp delete child}
 
-test macEmbed-6.1 {EmbedWindowDeleted procedure, check parentPtr} {macOnly} {
+test macEmbed-6.1 {EmbedWindowDeleted procedure, check parentPtr} {testembed macOnly} {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
@@ -220,7 +213,7 @@ test macEmbed-6.1 {EmbedWindowDeleted procedure, check parentPtr} {macOnly} {
     }
     set x
 } {{{XXX .f4 {} {}} {XXX .f3 {} {}} {XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f4 {} {}} {XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f2 {} {}}} {}}
-test macEmbed-6.2 {EmbedWindowDeleted procedure, check embeddedPtr} {macOnly} {
+test macEmbed-6.2 {EmbedWindowDeleted procedure, check embeddedPtr} {testembed macOnly} {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1