Another round of TIP #581-related name changes. Now merely concentrated on consistancy in the test-cases

1 files changed, 32 insertions, 32 deletions

diff --git a/tests/place.test b/tests/place.test
index e7cf5ff..d389be9 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -53,17 +53,17 @@ test place-1.3 {Tk_PlaceCmd procedure, "info" option} -setup {
 } -result {-in {.t.a b} -x 1 -relx 0.2 -y 2 -rely 0.2 -width {} -relwidth 0.3 -height 4 -relheight {} -anchor w -bordermode ignore}
 
 
-test place-2.1 {ConfigureSlave procedure, -height option} -body {
+test place-2.1 {ConfigureContent procedure, -height option} -body {
     place .t.f2 -height abcd
 } -returnCodes error -result {bad screen distance "abcd"}
-test place-2.2 {ConfigureSlave procedure, -height option} -setup {
+test place-2.2 {ConfigureContent procedure, -height option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -height 40
     update
     winfo height .t.f2
 } -result {40}
-test place-2.3 {ConfigureSlave procedure, -height option} -setup {
+test place-2.3 {ConfigureContent procedure, -height option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -height 120
@@ -74,17 +74,17 @@ test place-2.3 {ConfigureSlave procedure, -height option} -setup {
 } -result {60}
 
 
-test place-3.1 {ConfigureSlave procedure, -relheight option} -body {
+test place-3.1 {ConfigureContent procedure, -relheight option} -body {
     place .t.f2 -relheight abcd
 } -returnCodes error -result {expected floating-point number but got "abcd"}
-test place-3.2 {ConfigureSlave procedure, -relheight option} -setup {
+test place-3.2 {ConfigureContent procedure, -relheight option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relheight .5
     update
     winfo height .t.f2
 } -result {40}
-test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
+test place-3.3 {ConfigureContent procedure, -relheight option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relheight .8
@@ -95,30 +95,30 @@ test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
 } -result {60}
 
 
-test place-4.1 {ConfigureSlave procedure, bad -in options} -setup {
+test place-4.1 {ConfigureContent procedure, bad -in options} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f2
 } -returnCodes error -result {can't place .t.f2 relative to itself}
-test place-4.2 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.2 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     set result [list [winfo manager .t.f2]]
     catch {place .t.f2 -in .t.f2}
     lappend result [winfo manager .t.f2]
 } -result {{} {}}
-test place-4.3 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.3 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     winfo manager .t.f2
     place .t.f2 -in .t.f2
 } -returnCodes error -result {can't place .t.f2 relative to itself}
-test place-4.4 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.4 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .
 } -returnCodes error -result {can't place .t.f2 relative to .}
-test place-4.5 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.5 {ConfigureContent procedure, bad -in option} -setup {
 } -body {
     frame .t.f1
     place .t.f1 -in .t.f1
@@ -139,17 +139,17 @@ test place-4.7 {prevent management loops} -setup {
     place .t.f3 -in .t.f1
 } -returnCodes error -result {can't put .t.f3 inside .t.f1, would cause management loop}
 
-test place-5.1 {ConfigureSlave procedure, -relwidth option} -body {
+test place-5.1 {ConfigureContent procedure, -relwidth option} -body {
     place .t.f2 -relwidth abcd
 } -returnCodes error -result {expected floating-point number but got "abcd"}
-test place-5.2 {ConfigureSlave procedure, -relwidth option} -setup {
+test place-5.2 {ConfigureContent procedure, -relwidth option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relwidth .5
     update
     winfo width .t.f2
 } -result {75}
-test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
+test place-5.3 {ConfigureContent procedure, -relwidth option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relwidth .8
@@ -159,17 +159,17 @@ test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
     winfo width .t.f2
 } -result {30}
 
-test place-6.1 {ConfigureSlave procedure, -width option} -body {
+test place-6.1 {ConfigureContent procedure, -width option} -body {
     place .t.f2 -width abcd
 } -returnCodes error -result {bad screen distance "abcd"}
-test place-6.2 {ConfigureSlave procedure, -width option} -setup {
+test place-6.2 {ConfigureContent procedure, -width option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -width 100
     update
     winfo width .t.f2
 } -result {100}
-test place-6.3 {ConfigureSlave procedure, -width option} -setup {
+test place-6.3 {ConfigureContent procedure, -width option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -width 120
@@ -267,7 +267,7 @@ if {[tk windowingsystem] == "win32"} {
     }
 }
 
-test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
+test place-8.1 {PlaceStructureProc, mapping and unmapping content} -setup {
     place forget .t.f2
     place forget .t.f
 } -body {
@@ -283,7 +283,7 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
     placeUpdate
     lappend result [winfo ismapped .t.f2]
 } -result {1 0 40 30 0 1}
-test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup {
+test place-8.2 {PlaceStructureProc, mapping and unmapping content} -setup {
     place forget .t.f2
     place forget .t.f
     update idletasks
@@ -380,17 +380,17 @@ test place-9.11 {PlaceObjCmd, info errors} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {wrong # args: should be "place info pathName"}
-test place-9.12 {PlaceObjCmd, slaves errors} -setup {
+test place-9.12 {PlaceObjCmd, content errors} -setup {
     destroy .foo
 } -body {
     frame .foo
-    place slaves .foo bar
+    place content .foo bar
 } -cleanup {
     destroy .foo
-} -returnCodes error -result {wrong # args: should be "place slaves pathName"}
+} -returnCodes error -result {wrong # args: should be "place content pathName"}
 
 
-test place-10.1 {ConfigureSlave} -setup {
+test place-10.1 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -398,7 +398,7 @@ test place-10.1 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {unknown option "-badopt"}
-test place-10.2 {ConfigureSlave} -setup {
+test place-10.2 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -406,7 +406,7 @@ test place-10.2 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {value for "-anchor" missing}
-test place-10.3 {ConfigureSlave} -setup {
+test place-10.3 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -414,7 +414,7 @@ test place-10.3 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {bad bordermode "j": must be inside, outside, or ignore}
-test place-10.4 {ConfigureSlave} -setup {
+test place-10.4 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -422,23 +422,23 @@ test place-10.4 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {value for "-y" missing}
-    
 
-test place-11.1 {PlaceObjCmd, slaves command} -setup {
+
+test place-11.1 {PlaceObjCmd, content command} -setup {
     destroy .foo
 } -body {
     frame .foo
-    place slaves .foo
+    place content .foo
 } -cleanup {
     destroy .foo
 } -result {}
-test place-11.2 {PlaceObjCmd, slaves command} -setup {
+test place-11.2 {PlaceObjCmd, content command} -setup {
     destroy .foo .bar
 } -body {
     frame .foo
     frame .bar
     place .bar -in .foo
-    place slaves .foo
+    place content .foo
 } -cleanup {
     destroy .foo .bar
 } -result [list .bar]
@@ -500,7 +500,7 @@ test place-14.1 {memory leak testing} -constraints memory -setup {
         return $res
     }
 } -body {
-    # Test all manners of forgetting a slave
+    # Test all manners of forgetting content
     frame .f
     frame .f.f
     stress {