From 56b85d53e89fe89f7ea4416c45677e8f4630bc4e Mon Sep 17 00:00:00 2001 From: hobbs Date: Thu, 6 Sep 2001 23:04:30 +0000 Subject: * tests/ioUtil.test: changed to make better use of constraints and remove knownBug constraints that weren't valid. --- tests/ioUtil.test | 168 ++++++++++++++++++++++++++---------------------------- 1 file changed, 81 insertions(+), 87 deletions(-) diff --git a/tests/ioUtil.test b/tests/ioUtil.test index 02927fc..c4b7889 100644 --- a/tests/ioUtil.test +++ b/tests/ioUtil.test @@ -8,31 +8,34 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: ioUtil.test,v 1.9 2001/08/22 15:46:53 dgp Exp $ +# RCS: @(#) $Id: ioUtil.test,v 1.10 2001/09/06 23:04:30 hobbs Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest namespace import -force ::tcltest::* } +set ::tcltest::testConstraints(testopenfilechannelproc) \ + [llength [info commands testopenfilechannelproc]] +set ::tcltest::testConstraints(testaccessproc) \ + [llength [info commands testaccessproc]] +set ::tcltest::testConstraints(teststatproc) \ + [llength [info commands teststatproc]] + set unsetScript { catch {unset testStat1(size)} catch {unset testStat2(size)} catch {unset testStat3(size)} } -test ioUtil-1.1 {TclStat: Check that none of the test procs are there.} {knownBug} { +test ioUtil-1.1 {TclStat: Check that none of the test procs are there.} {} { catch {file stat testStat1%.fil testStat1} err1 catch {file stat testStat2%.fil testStat2} err2 catch {file stat testStat3%.fil testStat3} err3 list $err1 $err2 $err3 -} {{couldn't stat "testStat1%.fil": no such file or directory} {couldn't stat "testStat2%.fil": no such file or directory} {couldn't stat "testStat3%.fil": no such file or directory}} +} {{could not read "testStat1%.fil": no such file or directory} {could not read "testStat2%.fil": no such file or directory} {could not read "testStat3%.fil": no such file or directory}} -if {[info commands teststatproc] == {}} { - puts "This application hasn't been compiled with the \"teststatproc\"" - puts "command, so I can't test Tcl_Stat_* etc." -} else { -test ioUtil-1.2 {TclStatInsertProc: Insert the 3 test TclStat_ procedures.} { +test ioUtil-1.2 {TclStatInsertProc: Insert the 3 test TclStat_ procedures.} {teststatproc} { catch {teststatproc insert TclpStat} err1 teststatproc insert TestStatProc1 teststatproc insert TestStatProc2 @@ -40,7 +43,7 @@ test ioUtil-1.2 {TclStatInsertProc: Insert the 3 test TclStat_ procedures.} { set err1 } {bad arg "insert": must be TestStatProc1, TestStatProc2, or TestStatProc3} -test ioUtil-1.3 {TclStat: Use "file stat ?" to invoke each procedure.} {knownBug} { +test ioUtil-1.3 {TclStat: Use "file stat ?" to invoke each procedure.} {teststatproc} { file stat testStat2%.fil testStat2 file stat testStat1%.fil testStat1 file stat testStat3%.fil testStat3 @@ -55,7 +58,7 @@ test ioUtil-1.4 {TclStatDeleteProc: "TclpStat" function should not be deletedabl set err2 } {"TclpStat": could not be deleteed} -test ioUtil-1.5 {TclStatDeleteProc: Delete the 2nd TclStat procedure.} {knownBug} { +test ioUtil-1.5 {TclStatDeleteProc: Delete the 2nd TclStat procedure.} {teststatproc} { # Delete the 2nd procedure and test that it longer exists but that # the others do actually return a result. @@ -65,11 +68,11 @@ test ioUtil-1.5 {TclStatDeleteProc: Delete the 2nd TclStat procedure.} {knownBug file stat testStat3%.fil testStat3 list $testStat1(size) $err3 $testStat3(size) -} {1234 {couldn't stat "testStat2%.fil": no such file or directory} 3456} +} {1234 {could not read "testStat2%.fil": no such file or directory} 3456} eval $unsetScript -test ioUtil-1.6 {TclStatDeleteProc: Delete the 1st TclStat procedure.} {knownBug} { +test ioUtil-1.6 {TclStatDeleteProc: Delete the 1st TclStat procedure.} {teststatproc} { # Next delete the 1st procedure and test that only the 3rd procedure # is the only one that exists. @@ -79,11 +82,11 @@ test ioUtil-1.6 {TclStatDeleteProc: Delete the 1st TclStat procedure.} {knownBug file stat testStat3%.fil testStat3 list $err4 $err5 $testStat3(size) -} {{couldn't stat "testStat1%.fil": no such file or directory} {couldn't stat "testStat2%.fil": no such file or directory} 3456} +} {{could not read "testStat1%.fil": no such file or directory} {could not read "testStat2%.fil": no such file or directory} 3456} eval $unsetScript -test ioUtil-1.7 {TclStatDeleteProc: Delete the 3rd procedure & verify all are gone.} {knownBug} { +test ioUtil-1.7 {TclStatDeleteProc: Delete the 3rd procedure & verify all are gone.} {teststatproc} { # Finally delete the 3rd procedure and check that none of the # procedures exist. @@ -93,11 +96,11 @@ test ioUtil-1.7 {TclStatDeleteProc: Delete the 3rd procedure & verify all are go catch {file stat testStat3%.fil testStat3} err8 list $err6 $err7 $err8 -} {{couldn't stat "testStat1%.fil": no such file or directory} {couldn't stat "testStat2%.fil": no such file or directory} {couldn't stat "testStat3%.fil": no such file or directory}} +} {{could not read "testStat1%.fil": no such file or directory} {could not read "testStat2%.fil": no such file or directory} {could not read "testStat3%.fil": no such file or directory}} eval $unsetScript -test ioUtil-1.8 {TclStatDeleteProc: Verify that all procs have been deleted.} {knownBug} { +test ioUtil-1.8 {TclStatDeleteProc: Verify that all procs have been deleted.} {teststatproc} { # Attempt to delete all the Stat procs. again to ensure they no longer # exist and an error is returned. @@ -107,23 +110,17 @@ test ioUtil-1.8 {TclStatDeleteProc: Verify that all procs have been deleted.} {k list $err9 $err10 $err11 } {{"TestStatProc1": could not be deleteed} {"TestStatProc2": could not be deleteed} {"TestStatProc3": could not be deleteed}} -} eval $unsetScript - -test access-1.1 {TclAccess: Check that none of the test procs are there.} { +test ioUtil-1.1 {TclAccess: Check that none of the test procs are there.} { catch {file exists testAccess1%.fil} err1 catch {file exists testAccess2%.fil} err2 catch {file exists testAccess3%.fil} err3 list $err1 $err2 $err3 } {0 0 0} -if {[info commands testaccessproc] == {}} { - puts "This application hasn't been compiled with the \"testaccessproc\"" - puts "command, so I can't test Tcl_Access_* etc." -} else { -test ioUtil-1.2 {TclAccessInsertProc: Insert the 3 test TclAccess_ procedures.} { +test ioUtil-1.2 {TclAccessInsertProc: Insert the 3 test TclAccess_ procedures.} {testaccessproc} { catch {testaccessproc insert TclpAccess} err1 testaccessproc insert TestAccessProc1 testaccessproc insert TestAccessProc2 @@ -131,11 +128,10 @@ test ioUtil-1.2 {TclAccessInsertProc: Insert the 3 test TclAccess_ procedures.} set err1 } {bad arg "insert": must be TestAccessProc1, TestAccessProc2, or TestAccessProc3} -test ioUtil-2.3 {TclAccess: Use "file access ?" to invoke each procedure.} { - list \ - [file exists testAccess2%.fil] \ - [file exists testAccess1%.fil] \ - [file exists testAccess3%.fil] +test ioUtil-2.3 {TclAccess: Use "file access ?" to invoke each procedure.} {testaccessproc} { + list [file exists testAccess2%.fil] \ + [file exists testAccess1%.fil] \ + [file exists testAccess3%.fil] } {1 1 1} test ioUtil-2.4 {TclAccessDeleteProc: "TclpAccess" function should not be deletedable.} { @@ -143,9 +139,9 @@ test ioUtil-2.4 {TclAccessDeleteProc: "TclpAccess" function should not be delete set err2 } {"TclpAccess": could not be deleteed} -test accesst-1.5 {TclAccessDeleteProc: Delete the 2nd TclAccess procedure.} { +test ioUtil-2.5 {TclAccessDeleteProc: Delete the 2nd TclAccess procedure.} {testaccessproc} { # Delete the 2nd procedure and test that it longer exists but that - # the others do actually return a result. + # the others do actually return a result. testaccessproc delete TestAccessProc2 set res1 [file exists testAccess1%.fil] @@ -155,7 +151,7 @@ test accesst-1.5 {TclAccessDeleteProc: Delete the 2nd TclAccess procedure.} { list $res1 $err3 $res2 } {1 0 1} -test ioUtil-2.6 {TclAccessDeleteProc: Delete the 1st TclAccess procedure.} { +test ioUtil-2.6 {TclAccessDeleteProc: Delete the 1st TclAccess procedure.} {testaccessproc} { # Next delete the 1st procedure and test that only the 3rd procedure # is the only one that exists. @@ -167,7 +163,7 @@ test ioUtil-2.6 {TclAccessDeleteProc: Delete the 1st TclAccess procedure.} { list $err4 $err5 $res3 } {0 0 1} -test ioUtil-2.7 {TclAccessDeleteProc: Delete the 3rd procedure & verify all are gone.} { +test ioUtil-2.7 {TclAccessDeleteProc: Delete the 3rd procedure & verify all are gone.} {testaccessproc} { # Finally delete the 3rd procedure and check that none of the # procedures exist. @@ -179,7 +175,7 @@ test ioUtil-2.7 {TclAccessDeleteProc: Delete the 3rd procedure & verify all are list $err6 $err7 $err8 } {0 0 0} -test ioUtil-2.8 {TclAccessDeleteProc: Verify that all procs have been deleted.} { +test ioUtil-2.8 {TclAccessDeleteProc: Verify that all procs have been deleted.} {testaccessproc} { # Attempt to delete all the Access procs. again to ensure they no longer # exist and an error is returned. @@ -189,9 +185,9 @@ test ioUtil-2.8 {TclAccessDeleteProc: Verify that all procs have been deleted.} list $err9 $err10 $err11 } {{"TestAccessProc1": could not be deleteed} {"TestAccessProc2": could not be deleteed} {"TestAccessProc3": could not be deleteed}} -} -test ioUtil-3.1 {TclOpenFileChannel: Check that none of the test procs are there.} { +test ioUtil-3.1 {TclOpenFileChannel: Check that none of the test procs are there.} {testopenfilechannelproc} { + catch {eval [list file delete -force] [glob *testOpenFileChannel*]} catch {file exists testOpenFileChannel1%.fil} err1 catch {file exists testOpenFileChannel2%.fil} err2 catch {file exists testOpenFileChannel3%.fil} err3 @@ -201,11 +197,7 @@ test ioUtil-3.1 {TclOpenFileChannel: Check that none of the test procs are there list $err1 $err2 $err3 $err4 $err5 $err6 } {0 0 0 0 0 0} -if {[info commands testopenfilechannelproc] == {}} { - puts "This application hasn't been compiled with the \"testopenfilechannelproc\"" - puts "command, so I can't test Tcl_OpenFileChannelInsert" -} else { -test ioUtil-3.2 {TclOpenFileChannelInsertProc: Insert the 3 test TclOpenFileChannel_ procedures.} { +test ioUtil-3.2 {TclOpenFileChannelInsertProc: Insert the 3 test TclOpenFileChannel_ procedures.} {testopenfilechannelproc} { catch {testopenfilechannelproc insert TclpOpenFileChannel} err1 testopenfilechannelproc insert TestOpenFileChannelProc1 testopenfilechannelproc insert TestOpenFileChannelProc2 @@ -213,89 +205,92 @@ test ioUtil-3.2 {TclOpenFileChannelInsertProc: Insert the 3 test TclOpenFileChan set err1 } {bad arg "insert": must be TestOpenFileChannelProc1, TestOpenFileChannelProc2, or TestOpenFileChannelProc3} -test ioUtil-3.3 {TclOpenFileChannel: Use "file openfilechannel ?" to invoke each procedure.} { - close [open __testOpenFileChannel1%__.fil w] - close [open __testOpenFileChannel2%__.fil w] - close [open __testOpenFileChannel3%__.fil w] +test ioUtil-3.3 {TclOpenFileChannel: Use "file openfilechannel ?" to invoke each procedure.} {testopenfilechannelproc} { + close [open __testOpenFileChannel1%__.fil w] + close [open __testOpenFileChannel2%__.fil w] + close [open __testOpenFileChannel3%__.fil w] - catch { - close [open testOpenFileChannel1%.fil r] - close [open testOpenFileChannel2%.fil r] - close [open testOpenFileChannel3%.fil r] - } err + catch { + close [open testOpenFileChannel1%.fil r] + close [open testOpenFileChannel2%.fil r] + close [open testOpenFileChannel3%.fil r] + } err - file delete __testOpenFileChannel1%__.fil - file delete __testOpenFileChannel2%__.fil - file delete __testOpenFileChannel3%__.fil + file delete __testOpenFileChannel1%__.fil + file delete __testOpenFileChannel2%__.fil + file delete __testOpenFileChannel3%__.fil - set err + set err } {} -test ioUtil-3.4 {TclOpenFileChannelDeleteProc: "TclpOpenFileChannel" function should not be deletedable.} { +test ioUtil-3.4 {TclOpenFileChannelDeleteProc: "TclpOpenFileChannel" function should not be deletedable.} {testopenfilechannelproc} { catch {testopenfilechannelproc delete TclpOpenFileChannel} err2 set err2 } {"TclpOpenFileChannel": could not be deleteed} -test openfilechannelt-1.5 {TclOpenFileChannelDeleteProc: Delete the 2nd TclOpenFileChannel procedure.} { +test openfilechannelt-1.5 {TclOpenFileChannelDeleteProc: Delete the 2nd TclOpenFileChannel procedure.} {testopenfilechannelproc} { # Delete the 2nd procedure and test that it longer exists but that # the others do actually return a result. testopenfilechannelproc delete TestOpenFileChannelProc2 - close [open __testOpenFileChannel1%__.fil w] - close [open __testOpenFileChannel3%__.fil w] + close [open __testOpenFileChannel1%__.fil w] + close [open __testOpenFileChannel3%__.fil w] - catch { - close [open testOpenFileChannel1%.fil r] - catch {close [open testOpenFileChannel2%.fil r]} msg1 - close [open testOpenFileChannel3%.fil r] - } err3 + catch { + close [open testOpenFileChannel1%.fil r] + catch {close [open testOpenFileChannel2%.fil r]} msg1 + close [open testOpenFileChannel3%.fil r] + } err3 - file delete __testOpenFileChannel1%__.fil - file delete __testOpenFileChannel3%__.fil + file delete __testOpenFileChannel1%__.fil + file delete __testOpenFileChannel3%__.fil list $err3 $msg1 -} [list {} {couldn't open "testOpenFileChannel2%.fil": no such file or directory}] +} {{} {couldn't open "testOpenFileChannel2%.fil": no such file or directory}} -test ioUtil-3.6 {TclOpenFileChannelDeleteProc: Delete the 1st TclOpenFileChannel procedure.} { +test ioUtil-3.6 {TclOpenFileChannelDeleteProc: Delete the 1st TclOpenFileChannel procedure.} {testopenfilechannelproc} { # Next delete the 1st procedure and test that only the 3rd procedure # is the only one that exists. testopenfilechannelproc delete TestOpenFileChannelProc1 - close [open __testOpenFileChannel3%__.fil w] + close [open __testOpenFileChannel3%__.fil w] - catch { - catch {close [open testOpenFileChannel1%.fil r]} msg2 - catch {close [open testOpenFileChannel2%.fil r]} msg3 - close [open testOpenFileChannel3%.fil r] - } err4 + catch { + catch {close [open testOpenFileChannel1%.fil r]} msg2 + catch {close [open testOpenFileChannel2%.fil r]} msg3 + close [open testOpenFileChannel3%.fil r] + } err4 - file delete __testOpenFileChannel3%__.fil + file delete __testOpenFileChannel3%__.fil list $err4 $msg2 $msg3 -} [list {} {couldn't open "testOpenFileChannel1%.fil": no such file or directory} \ +} [list {} \ + {couldn't open "testOpenFileChannel1%.fil": no such file or directory}\ {couldn't open "testOpenFileChannel2%.fil": no such file or directory}] -test ioUtil-3.7 {TclOpenFileChannelDeleteProc: Delete the 3rd procedure & verify all are gone.} { +test ioUtil-3.7 {TclOpenFileChannelDeleteProc: Delete the 3rd procedure & verify all are gone.} {testopenfilechannelproc} { # Finally delete the 3rd procedure and check that none of the # procedures exist. testopenfilechannelproc delete TestOpenFileChannelProc3 - catch { - catch {close [open testOpenFileChannel1%.fil r]} msg4 - catch {close [open testOpenFileChannel2%.fil r]} msg5 - catch {close [open testOpenFileChannel3%.fil r]} msg6 - } err5 + catch { + catch {close [open testOpenFileChannel1%.fil r]} msg4 + catch {close [open testOpenFileChannel2%.fil r]} msg5 + catch {close [open testOpenFileChannel3%.fil r]} msg6 + } err5 list $err5 $msg4 $msg5 $msg6 -} [list 1 {couldn't open "testOpenFileChannel1%.fil": no such file or directory} \ - {couldn't open "testOpenFileChannel2%.fil": no such file or directory} \ +} [list 1 \ + {couldn't open "testOpenFileChannel1%.fil": no such file or directory}\ + {couldn't open "testOpenFileChannel2%.fil": no such file or directory}\ {couldn't open "testOpenFileChannel3%.fil": no such file or directory}] -test ioUtil-3.8 {TclOpenFileChannelDeleteProc: Verify that all procs have been deleted.} { - # Attempt to delete all the OpenFileChannel procs. again to ensure they no longer - # exist and an error is returned. +test ioUtil-3.8 {TclOpenFileChannelDeleteProc: Verify that all procs have been deleted.} {testopenfilechannelproc} { + + # Attempt to delete all the OpenFileChannel procs. again to ensure they no + # longer exist and an error is returned. catch {testopenfilechannelproc delete TestOpenFileChannelProc1} err9 catch {testopenfilechannelproc delete TestOpenFileChannelProc2} err10 @@ -303,7 +298,6 @@ test ioUtil-3.8 {TclOpenFileChannelDeleteProc: Verify that all procs have been d list $err9 $err10 $err11 } {{"TestOpenFileChannelProc1": could not be deleteed} {"TestOpenFileChannelProc2": could not be deleteed} {"TestOpenFileChannelProc3": could not be deleteed}} -} # cleanup ::tcltest::cleanupTests -- cgit v0.12