naviserver-commits

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5911/tests

Modified Files:
	ns_env.test 
Log Message:
        * nsd/tclcmds.c:
        * nsd/tclenv.c:
        * tests/ns_env.test: Untabify and reformat code, convert to Tcl
        objects.  Fix bugs with -nocomplain switch and unset
        command. (Bug# 1333280)


Index: ns_env.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/ns_env.test,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ns_env.test	20 Oct 2005 17:02:45 -0000	1.1
--- ns_env.test	22 Oct 2005 12:50:39 -0000	1.2
***************
*** 8,63 ****
  eval ::tcltest::configure $argv
  
  test ns_env-1.1 {basic syntax} -body {
       ns_env
! } -returnCodes error -result {wrong # args:  should be "ns_env command ?args ...?"}
  
  test ns_env-1.2 {basic syntax} -body {
!      ns_env 123
! } -returnCodes error -result {unknown command "123": should be exists, names, get, set, or unset}
  
  test ns_env-1.3 {basic syntax} -body {
       ns_env get
! } -returnCodes error -result {wrong # args:  should be "ns_env get ?-nocomplain? name"}
  
  
! test ns_env-2.1 {basic operation: set, exists} -setup {
!      ns_env set foo bar
! } -body {
!      ns_env exists foo
  } -cleanup {
!      ns_env unset foo
  } -result 1
  
! test ns_env-2.2 {basic operation: set, get} -setup {
!      ns_env set foo bar
! } -body {
!      ns_env get foo
  } -cleanup {
!      ns_env unset foo
! } -result "bar"
  
! test ns_env-2.3 {basic operation: unset} -setup {
!      ns_env set foo bar
! } -body {
!      ns_env unset foo
!      ns_env exists foo
  } -result 0
  
! test ns_env-2.4 {basic operation: names} -setup {
!      ns_env set zhzhzhzh bar
! } -body {
!      expr {[lsearch -exact [ns_env names] "zhzhzhzh"]>-1}
  } -result 1
  
! test ns_env-2.5 {basic operation: get -nocomplain} -body {
!      # note that this throws an error but the test case
!      # tests the implied behaviour
!      ns_env get -nocomplain NXNXNXNX
  } -result ""
  
- test ns_env-2.6 {basic operation: get} -body {
-      # note that the test case expects the implied behaviour
-      ns_env get NXNXNXNX
- } -returnCodes error -result {no such environment variable: NXNXNXNX}
  
  
--- 8,78 ----
  eval ::tcltest::configure $argv
  
+ 
+ 
  test ns_env-1.1 {basic syntax} -body {
       ns_env
! } -returnCodes error -result {wrong # args: should be "ns_env command ?args ...?"}
  
  test ns_env-1.2 {basic syntax} -body {
!      ns_env ?
! } -returnCodes error -result {bad command "?": must be exists, names, get, set, or unset}
  
  test ns_env-1.3 {basic syntax} -body {
+      ns_env exists
+ } -returnCodes error -result {wrong # args: should be "ns_env exists name"}
+ 
+ test ns_env-1.4 {basic syntax} -body {
       ns_env get
! } -returnCodes error -result {wrong # args: should be "ns_env get ?-nocomplain? name"}
  
+ test ns_env-1.5 {basic syntax} -body {
+      ns_env set
+ } -returnCodes error -result {wrong # args: should be "ns_env set name value"}
  
! test ns_env-1.6 {basic syntax} -body {
!      ns_env unset
! } -returnCodes error -result {wrong # args: should be "ns_env unset ?-nocomplain? name"}
! 
! 
! 
! test ns_env-2.1 {names} -body {
!     ns_env set NSTEST X
!     expr {[lsearch -exact [ns_env names] NSTEST] > -1}
  } -cleanup {
!     ns_env unset NSTEST
  } -result 1
  
! test ns_env-2.2 {set, get} -body {
!     ns_env set NSTEST X
!     ns_env get NSTEST
  } -cleanup {
!     ns_env unset NSTEST
! } -result X
  
! test ns_env-2.5 {unset} -body {
!     ns_env set NSTEST X
!     ns_env unset NSTEST
!     ns_env exists NSTEST
  } -result 0
  
! test ns_env-2.3 {exists, yes} -body {
!     ns_env set NSTEST X
!     ns_env exists NSTEST
! } -cleanup {
!     ns_env unset NSTEST
  } -result 1
  
! test ns_env-2.4 {exists, no} -body {
!     ns_env exists NSTEST_NOEXIST
! } -result 0
! 
! test ns_env-2.6 {get non existing variable} -body {
!     ns_env get NSTEST_NOEXIST
! } -returnCodes error -result {no such environment variable}
! 
! test ns_env-2.7 {get non existing variable without complaint} -body {
!     ns_env get -nocomplain NSTEST_NOEXIST
  } -result ""