Index: tests/winDde.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/winDde.test,v
retrieving revision 1.15
diff -u -r1.15 winDde.test
--- tests/winDde.test	16 May 2003 17:29:49 -0000	1.15
+++ tests/winDde.test	16 May 2003 20:08:57 -0000
@@ -250,44 +250,93 @@
 
 # -------------------------------------------------------------------------
 
-test winDde-7.1 {DDE in slave interpreter} {pcOnly} {
-    global slave
-    set name slave-7.1
-    list [catch {
-        set slave [interp create $name]
-        $slave eval [list load $lib dde]
-        $slave eval [list dde servername $name]
-    } msg] $msg
-} {0 slave-7.1}
+test winDde-7.1 {Load DDE in slave interpreter } \
+    -constraints pcOnly \
+    -setup {
+	interp create slave
+    } \
+    -body {
+	list [catch {
+	    slave eval [list load $lib dde]
+	    slave eval [list dde servername -- dde-interp-7.1]
+	} msg] $msg
+    } \
+    -cleanup {
+	interp delete slave
+    } \
+    -result {0 dde-interp-7.1}
 
-test winDde-7.2 {DDE present in slave interp} {pcOnly} {
-    global slave
-    list [catch {
-        dde services TclEval $slave
-    } msg] $msg
-} [list 0 [list [list TclEval $slave]]]
+test winDde-7.2 {DDE slave cleanup} \
+    -constraints pcOnly \
+    -setup {
+	interp create slave
+	slave eval [list load $lib dde]
+	slave eval [list dde servername -- dde-interp-7.5]
+	interp delete slave
+    } \
+    -body {
+	list [catch {
+	    dde services TclEval {}
+	    set s [dde services TclEval {}]
+	    set m [list [list TclEval dde-interp-7.5]]
+	    if {[lsearch -exact $s $m] != -1} {
+		set s
+	    }
+	} msg] $msg
+    } \
+    -result {0 {}}
 
-test winDde-7.3 {DDE slave servername collision force} {pcOnly} {
-    global slave
-    list [catch {dde servername -exact -- $slave} msg] $msg
-} [list 0 $slave]
+test winDde-7.3 {DDE present in slave interp} \
+    -constraints pcOnly \
+    -setup {
+	interp create slave
+	slave eval [list load $lib dde]
+	slave eval [list dde servername -- dde-interp-7.3]
+    } \
+    -body {
+	list [catch {
+	    dde services TclEval dde-interp-7.3
+	} msg] $msg
+    } \
+    -cleanup {
+	interp delete slave
+    } \
+    -result {0 {{TclEval dde-interp-7.3}}}
 
-test winDde-7.4 {DDE slave servername collision} {pcOnly} {
-    global slave
-    list [catch {dde servername -- $slave} msg] $msg
-} [list 0 [list $slave "#2"]]
+test winDde-7.4 {interp name collision with -exact} \
+    -constraints pcOnly \
+    -setup {
+	interp create slave
+	slave eval [list load $lib dde]
+	slave eval [list dde servername -- dde-interp-7.4]
+    } \
+    -body {
+	list [catch {
+	    dde servername -exact -- dde-interp-7.4
+	} msg] $msg
+    } \
+    -cleanup {
+	interp delete slave
+    } \
+    -result {0 dde-interp-7.4}
+
+test winDde-7.5 {interp name collision without -exact} \
+    -constraints pcOnly \
+    -setup {
+	interp create slave
+	slave eval [list load $lib dde]
+	slave eval [list dde servername -- dde-interp-7.5]
+    } \
+    -body {
+	list [catch {
+	    dde servername -- dde-interp-7.5
+	} msg] $msg
+    } \
+    -cleanup {
+	interp delete slave
+    } \
+    -result "0 {dde-interp-7.5 \#2}"
 
-test winDde-7.5 {DDE slave cleanup} {pcOnly} {
-    global slave
-    list [catch {
-        interp delete $slave
-        set s [dde services TclEval {}]
-        set m [list [list TclEval $slave]]
-        if {[lsearch -exact $s $m] != -1} {
-            set s
-        }
-    } msg] $msg
-} {0 {}}
 
 # -------------------------------------------------------------------------
 
