1 files changed, 9 insertions, 27 deletions
diff --git a/tests/border.test b/tests/border.test
index e38502a..30aed91 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -6,14 +6,9 @@
 # All rights reserved.
 
 package require tcltest 2.1
-namespace import -force tcltest::configure
-namespace import -force tcltest::testsDirectory
-configure -testdir [file join [pwd] [file dirname [info script]]]
-configure -loadfile [file join [testsDirectory] constraints.tcl]
+eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-testConstraint testborder [llength [info commands testborder]]
-
 if {[testConstraint pseudocolor8]} {
     toplevel .t -visual {pseudocolor 8} -colormap new
     wm geom .t +0+0
@@ -129,31 +124,31 @@ test border-4.1 {FreeBorderObjProc} testborder {
 
 catch {destroy .b}
 button .b
-test get-2.1 {Tk_GetReliefFromObj} {
+test border-5.1 {Tk_GetReliefFromObj} {
     .b configure -relief flat
     .b cget -relief
 } {flat}
-test get-2.2 {Tk_GetReliefFromObj} {
+test border-5.2 {Tk_GetReliefFromObj} {
     .b configure -relief groove
     .b cget -relief
 } {groove}
-test get-2.3 {Tk_GetReliefFromObj} {
+test border-5.3 {Tk_GetReliefFromObj} {
     .b configure -relief raised
     .b cget -relief
 } {raised}
-test get-2.3 {Tk_GetReliefFromObj} {
+test border-5.4 {Tk_GetReliefFromObj} {
     .b configure -relief ridge
     .b cget -relief
 } {ridge}
-test get-2.3 {Tk_GetReliefFromObj} {
+test border-5.5 {Tk_GetReliefFromObj} {
     .b configure -relief solid
     .b cget -relief
 } {solid}
-test get-2.3 {Tk_GetReliefFromObj} {
+test border-5.6 {Tk_GetReliefFromObj} {
     .b configure -relief sunken
     .b cget -relief
 } {sunken}
-test get-2.4 {Tk_GetReliefFromObj - error} {
+test border-5.7 {Tk_GetReliefFromObj - error} {
     list [catch {.b configure -relief upanddown} msg] $msg
 } {1 {bad relief "upanddown": must be flat, groove, raised, ridge, solid, or sunken}}
 
@@ -162,18 +157,5 @@ if {[testConstraint pseudocolor8]} {
 }
 
 # cleanup
-::tcltest::cleanupTests
+cleanupTests
 return
-
-
-
-
-
-
-
-
-
-
-
-
-