[Tclresource-commits] Extras/Tests DeleteCmd.test,1.1,1.2

[Bernard D. <bde...@us...>]

Update of /cvsroot/tclresource/Extras/Tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18513

Modified Files:
	DeleteCmd.test 
Log Message:
6 tests

Index: DeleteCmd.test
===================================================================
RCS file: /cvsroot/tclresource/Extras/Tests/DeleteCmd.test,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DeleteCmd.test	6 Sep 2004 07:01:45 -0000	1.1
+++ DeleteCmd.test	6 Sep 2004 20:58:49 -0000	1.2
@@ -22,23 +22,68 @@
 namespace eval ::resource::test {
 	namespace import ::tcltest::*
 
-	test ResourceDelete-1-1 {} -setup {
-	} -body {
-	} -cleanup {
-	} -result ""
-		
-	test ResourceDelete-1-2 {} -setup {
-	} -body {
-	} -cleanup {
-	} -result ""
+	# Common code for setup
+	variable SETUP {
+		set fname [file join [file dir [info script]] Forks TempFork.rsrc]
+		set rid [resource open $fname w+]
+	}
+
+	# Common code for cleanup
+	variable CLEANUP {
+		resource close $rid
+		if {[file exists $fname]} {
+			file delete $fname
+		} 
+	}
+
+	test ResourceDelete-1-1 {Delete a resource specified by ID} -setup $SETUP -body {
+		resource write -id 128 -file $rid TEXT "Hello1"
+		resource write -id 129 -file $rid TEXT "Hello2"
+		set len1 [llength [resource list -ids TEXT $rid]]
+		resource delete -id 129 -file $rid TEXT
+		set len2 [llength [resource list -ids TEXT $rid]]
+		set res [expr {$len1 - $len2}]
+	} -cleanup $CLEANUP -result 1
 		
-	test ResourceDelete-1-3 {} -setup {
-	} -body {
-	} -cleanup {
-	} -result ""
+	test ResourceDelete-1-2 {Delete a resource specified by name} -setup $SETUP -body {
+		resource write -name "Hello1" -file $rid TEXT "Hello1"
+		resource write -name "Hello2" -file $rid TEXT "Hello2"
+		set len1 [llength [resource list -ids TEXT $rid]]
+		resource delete -name "Hello2" -file $rid TEXT
+		set len2 [llength [resource list -ids TEXT $rid]]
+		set res [expr {$len1 - $len2}]
+	} -cleanup $CLEANUP -result 1
 		
-# Cleanup
-::tcltest::cleanupTests
+	test ResourceDelete-1-3 {Invoke non-correlated ID and name } -setup $SETUP -body {
+		resource write -id 128 -name "Hello1" -file $rid TEXT "Hello1"
+		resource write -id 129 -name "Hello2" -file $rid TEXT "Hello2"
+		resource delete -id 128 -name "Hello2" -file $rid TEXT
+	} -cleanup $CLEANUP -returnCodes error -match glob \
+	  -result "-id and -name values do not point to the same resource"
+
+	test ResourceDelete-1-4 {Delete a non-existing resource by -id} -setup $SETUP -body {
+		resource write -id 128 -name "Hello1" -file $rid TEXT "Hello1"
+		resource write -id 129 -name "Hello2" -file $rid TEXT "Hello2"
+		resource delete -id 130 -file $rid TEXT
+	} -cleanup $CLEANUP -returnCodes error -match glob \
+	  -result "resource not found"
+
+	test ResourceDelete-1-5 {Delete a non-existing resource by -id} -setup $SETUP -body {
+		resource write -id 128 -name "Hello1" -file $rid TEXT "Hello1"
+		resource write -id 129 -name "Hello2" -file $rid TEXT "Hello2"
+		resource delete -name "Hello3" -file $rid TEXT
+	} -cleanup $CLEANUP -returnCodes error -match glob \
+	  -result "resource not found"
+
+	test ResourceDelete-1-6 {Delete without -id or -name} -setup $SETUP -body {
+		resource write -id 128 -name "Hello1" -file $rid TEXT "Hello1"
+		resource write -id 129 -name "Hello2" -file $rid TEXT "Hello2"
+		resource delete TEXT
+	} -cleanup $CLEANUP -returnCodes error -match glob \
+	  -result "you must specify either -id or -name or both"
+
+	# Cleanup
+	::tcltest::cleanupTests
 }
 
 namespace delete ::resource::test