Pulling changes from trunkcore_zip_vfs

1 files changed, 339 insertions, 5 deletions

diff --git a/tests/winDialog.test b/tests/winDialog.test
index b7847a5..c53b6d7 100644
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -255,7 +255,7 @@ test winDialog-5.5 {GetFileName: Tcl_GetIndexFromObj() == TCL_OK} -constraints {
     set y [then {
         Click cancel
     }]
-    # Note this also tests fix for 
+    # Note this also tests fix for
     # http://core.tcl.tk/tk/tktview/4a0451f5291b3c9168cc560747dae9264e1d2ef6
     # $x is expected to be empty
     append x $y
@@ -265,6 +265,7 @@ test winDialog-5.6 {GetFileName: valid option, but missing value} -constraints {
 } -body {
     tk_getOpenFile -initialdir bar -title
 } -returnCodes error -result {value for "-title" missing}
+
 test winDialog-5.7 {GetFileName: extension begins with .} -constraints {
     nt testwinevent
 } -body {
@@ -281,6 +282,145 @@ test winDialog-5.7 {GetFileName: extension begins with .} -constraints {
 } -cleanup {
     unset msg
 } -result bar.foo
+
+test winDialog-5.7.1 {GetFileName: extension {} } -constraints {
+    nt testwinevent
+} -body {
+    start {set x [tk_getSaveFile -defaultextension {} -title Save]}
+    set msg {}
+    then {
+	if {[catch {SetText [vista? 0x47C 0x3e9] bar} msg]} {
+	    Click cancel
+	} else {
+	    Click ok
+	}
+    }
+    set x "[file tail $x]$msg"
+} -cleanup {
+    unset msg
+} -result bar
+
+test winDialog-5.7.2 {GetFileName: extension {} Bug 47af31bd3ac6fbbb33cde1a5bab1e756ff2a6e00 } -constraints {
+    nt testwinevent
+} -body {
+    start {set x [tk_getSaveFile -filetypes {{All *}} -defaultextension {} -title Save]}
+    set msg {}
+    then {
+	if {[catch {SetText [vista? 0x47C 0x3e9] bar} msg]} {
+	    Click cancel
+	} else {
+	    Click ok
+	}
+    }
+    set x "[file tail $x]$msg"
+} -cleanup {
+    unset msg
+} -result bar
+
+test winDialog-5.7.3 {GetFileName: extension {} Bug 47af31bd3ac6fbbb33cde1a5bab1e756ff2a6e00 } -constraints {
+    nt testwinevent
+} -body {
+    start {set x [tk_getSaveFile -filetypes {{All *}} -defaultextension {} -title Save]}
+    set msg {}
+    then {
+	if {[catch {SetText [vista? 0x47C 0x3e9] bar.c} msg]} {
+	    Click cancel
+	} else {
+	    Click ok
+	}
+    }
+    set x "[file tail $x]$msg"
+} -cleanup {
+    unset msg
+} -result bar.c
+
+test winDialog-5.7.4 {GetFileName: extension {} } -constraints {
+    nt testwinevent
+} -body {
+    # Although the docs do not explicitly mention, -filetypes seems to
+    # override -defaultextension
+    start {set x [tk_getSaveFile -filetypes {{C .c} {Tcl .tcl}} -defaultextension {foo} -title Save]}
+    set msg {}
+    then {
+	if {[catch {SetText [vista? 0x47C 0x3e9] bar} msg]} {
+	    Click cancel
+	} else {
+	    Click ok
+	}
+    }
+    set x "[file tail $x]$msg"
+} -cleanup {
+    unset msg
+} -result bar.c
+
+test winDialog-5.7.5 {GetFileName: extension {} } -constraints {
+    nt testwinevent
+} -body {
+    # Although the docs do not explicitly mention, -filetypes seems to
+    # override -defaultextension
+    start {set x [tk_getSaveFile -filetypes {{C .c} {Tcl .tcl}} -defaultextension {} -title Save]}
+    set msg {}
+    then {
+	if {[catch {SetText [vista? 0x47C 0x3e9] bar} msg]} {
+	    Click cancel
+	} else {
+	    Click ok
+	}
+    }
+    set x "[file tail $x]$msg"
+} -cleanup {
+    unset msg
+} -result bar.c
+
+
+test winDialog-5.7.6 {GetFileName: All/extension } -constraints {
+    nt testwinevent
+} -body {
+    # In 8.6.4 this combination resulted in bar.ext.ext which is bad
+    start {set x [tk_getSaveFile -filetypes {{All *}} -defaultextension {ext} -title Save]}
+    set msg {}
+    then {
+	if {[catch {SetText [vista? 0x47C 0x3e9] bar} msg]} {
+	    Click cancel
+	} else {
+	    Click ok
+	}
+    }
+    set x "[file tail $x]$msg"
+} -cleanup {
+    unset msg
+} -result bar.ext
+
+test winDialog-5.7.7 {tk_getOpenFile: -defaultextension} -constraints {
+    nt testwinevent
+} -body {
+    unset -nocomplain x
+    tcltest::makeFile "" "5 7 7.ext" [initialdir]
+    start {set x [tk_getOpenFile \
+                      -defaultextension ext \
+                      -initialdir [file nativename [initialdir]] \
+                      -initialfile "5 7 7" -title Foo]}
+    then {
+        Click ok
+    }
+    return $x
+} -result [file join [initialdir] "5 7 7.ext"]
+
+test winDialog-5.7.8 {tk_getOpenFile: -defaultextension} -constraints {
+    nt testwinevent
+} -body {
+    unset -nocomplain x
+    tcltest::makeFile "" "5 7 8.ext" [initialdir]
+    start {set x [tk_getOpenFile \
+                      -defaultextension ext \
+                      -initialdir [file nativename [initialdir]] \
+                      -initialfile "5 7 8.ext" -title Foo]}
+    then {
+        Click ok
+    }
+    return $x
+} -result [file join [initialdir] "5 7 8.ext"]
+
 test winDialog-5.8 {GetFileName: extension doesn't begin with .} -constraints {
     nt testwinevent
 } -body {
@@ -301,7 +441,7 @@ test winDialog-5.9 {GetFileName: file types} -constraints {
     nt testwinevent
 } -body {
     #        case FILE_TYPES:
-    
+
     start {tk_getSaveFile -filetypes {{"foo files" .foo FOOF}} -title Foo}
     # XXX - currently disabled for vista style dialogs because the file
     # types control has no control ID and we don't have a mechanism to
@@ -339,6 +479,7 @@ test winDialog-5.11 {GetFileName: initial directory} -constraints {
     }
     return $x
 } -result [file join [initialdir] "12x 455"]
+
 test winDialog-5.12 {GetFileName: initial directory: Tcl_TranslateFilename()} -constraints {
     nt
 } -body {
@@ -346,6 +487,199 @@ test winDialog-5.12 {GetFileName: initial directory: Tcl_TranslateFilename()} -c
 
     tk_getOpenFile -initialdir ~12x/455
 } -returnCodes error -result {user "12x" doesn't exist}
+
+test winDialog-5.12.1 {tk_getSaveFile: initial directory: ~} -constraints {
+    nt testwinevent
+} -body {
+    unset -nocomplain x
+    start {set x [tk_getSaveFile \
+                      -initialdir ~ \
+                      -initialfile "5 12 1" -title Foo]}
+    then {
+        Click ok
+    }
+    return $x
+} -result [file normalize [file join ~ "5 12 1"]]
+
+test winDialog-5.12.2 {tk_getSaveFile: initial directory: ~user} -constraints {
+    nt testwinevent
+} -body {
+
+    # Note: this test will fail on Tcl versions 8.6.4 and earlier due
+    # to a bug in file normalize for names of the form ~xxx that
+    # returns the wrong dir on Windows.  In particular (in Win8 at
+    # least) it returned /users/Default instead of /users/USERNAME...
+
+    unset -nocomplain x
+    start {set x [tk_getSaveFile \
+                      -initialdir ~$::tcl_platform(user) \
+                      -initialfile "5 12 2" -title Foo]}
+    then {
+        Click ok
+    }
+    return $x
+} -result [file normalize [file join ~$::tcl_platform(user) "5 12 2"]]
+
+test winDialog-5.12.3 {tk_getSaveFile: initial directory: .} -constraints {
+    nt testwinevent
+} -body {
+    # Windows remembers dirs from previous selections so use
+    # a subdir for this test, not [initialdir] itself
+    set newdir [tcltest::makeDirectory "5 12 3"]
+    set cur [pwd]
+    try {
+        cd $newdir
+        unset -nocomplain x
+        start {set x [tk_getSaveFile \
+                          -initialdir . \
+                          -initialfile "testfile" -title Foo]}
+        then {
+            Click ok
+        }
+    } finally {
+        cd $cur
+    }
+    string equal $x [file join $newdir testfile]
+} -result 1
+
+test winDialog-5.12.4 {tk_getSaveFile: initial directory: unicode} -constraints {
+    nt testwinevent
+} -body {
+    set dir [tcltest::makeDirectory "\u0167\u00e9\u015d\u0167"]
+    unset -nocomplain x
+    start {set x [tk_getSaveFile \
+                      -initialdir $dir \
+                      -initialfile "testfile" -title Foo]}
+    then {
+        Click ok
+    }
+    string equal $x [file join $dir testfile]
+} -result 1
+
+test winDialog-5.12.5 {tk_getSaveFile: initial directory: nativename} -constraints {
+    nt testwinevent
+} -body {
+    unset -nocomplain x
+    start {set x [tk_getSaveFile \
+                      -initialdir [file nativename [initialdir]] \
+                      -initialfile "5 12 5" -title Foo]}
+    then {
+        Click ok
+    }
+    return $x
+} -result [file join [initialdir] "5 12 5"]
+
+test winDialog-5.12.6 {tk_getSaveFile: initial directory: relative} -constraints {
+    nt testwinevent
+} -body {
+    # Windows remembers dirs from previous selections so use
+    # a subdir for this test, not [initialdir] itself
+    set dir [tcltest::makeDirectory "5 12 6"]
+    set cur [pwd]
+    try {
+        cd [file dirname $dir]
+        unset -nocomplain x
+        start {set x [tk_getSaveFile \
+                          -initialdir "5 12 6" \
+                          -initialfile "testfile" -title Foo]}
+        then {
+            Click ok
+        }
+    } finally {
+        cd $cur
+    }
+    string equal $x [file join $dir testfile]
+} -result 1
+
+test winDialog-5.12.7 {tk_getOpenFile: initial directory: ~} -constraints {
+    nt testwinevent
+} -body {
+    set fn [file tail [lindex [glob -types f ~/*] 0]]
+    unset -nocomplain x
+    start {set x [tk_getOpenFile \
+                      -initialdir ~ \
+                      -initialfile $fn -title Foo]}
+    then {
+        Click ok
+    }
+    string equal $x [file normalize [file join ~ $fn]]
+} -result 1
+
+test winDialog-5.12.8 {tk_getOpenFile: initial directory: .} -constraints {
+    nt testwinevent
+} -body {
+    # Windows remembers dirs from previous selections so use
+    # a subdir for this test, not [initialdir] itself
+    set newdir [tcltest::makeDirectory "5 12 8"]
+    set path [tcltest::makeFile "" "testfile" $newdir]
+    set cur [pwd]
+    try {
+        cd $newdir
+        unset -nocomplain x
+        start {set x [tk_getOpenFile \
+                          -initialdir . \
+                          -initialfile "testfile" -title Foo]}
+        then {
+            Click ok
+        }
+    } finally {
+        cd $cur
+    }
+    string equal $x $path
+} -result 1
+
+test winDialog-5.12.9 {tk_getOpenFile: initial directory: unicode} -constraints {
+    nt testwinevent
+} -body {
+    set dir [tcltest::makeDirectory "\u0167\u00e9\u015d\u0167"]
+    set path [tcltest::makeFile "" testfile $dir]
+    unset -nocomplain x
+    start {set x [tk_getOpenFile \
+                      -initialdir $dir \
+                      -initialfile "testfile" -title Foo]}
+    then {
+        Click ok
+    }
+    string equal $x $path
+} -result 1
+
+test winDialog-5.12.10 {tk_getOpenFile: initial directory: nativename} -constraints {
+    nt testwinevent
+} -body {
+    unset -nocomplain x
+    tcltest::makeFile "" "5 12 10" [initialdir]
+    start {set x [tk_getOpenFile \
+                      -initialdir [file nativename [initialdir]] \
+                      -initialfile "5 12 10" -title Foo]}
+    then {
+        Click ok
+    }
+    return $x
+} -result [file join [initialdir] "5 12 10"]
+
+test winDialog-5.12.11 {tk_getOpenFile: initial directory: relative} -constraints {
+    nt testwinevent
+} -body {
+    # Windows remembers dirs from previous selections so use
+    # a subdir for this test, not [initialdir] itself
+    set dir [tcltest::makeDirectory "5 12 11"]
+    set path [tcltest::makeFile "" testfile $dir]
+    set cur [pwd]
+    try {
+        cd [file dirname $dir]
+        unset -nocomplain x
+        start {set x [tk_getOpenFile \
+                          -initialdir [file tail $dir] \
+                          -initialfile "testfile" -title Foo]}
+        then {
+            Click ok
+        }
+    } finally {
+        cd $cur
+    }
+    string equal $x $path
+} -result 1
+
 test winDialog-5.13 {GetFileName: initial file} -constraints {
     nt testwinevent
 } -body {
@@ -397,7 +731,7 @@ test winDialog-5.17 {GetFileName: title} -constraints {
     nt testwinevent
 } -body {
 #        case FILE_TITLE:
-   
+
     start {tk_getOpenFile -title Narf}
     then {
         Click cancel
@@ -460,7 +794,7 @@ test winDialog-5.21 {GetFileName: call GetOpenFileName} -constraints {
     nt testwinevent english
 } -body {
 #        winCode = GetOpenFileName(&ofn);
-   
+
     start {tk_getOpenFile -title Open}
     then {
         set x [GetText ok]
@@ -593,7 +927,7 @@ test winDialog-9.8 {Tk_ChooseDirectoryObjCmd: initial directory: Tcl_TranslateFi
 } -body {
 #        if (Tcl_TranslateFileName(interp, string,
 #            &utfDirString) == NULL)
-   
+
     tk_chooseDirectory -initialdir ~12x/455
 } -returnCodes error -result {user "12x" doesn't exist}