7 files changed, 26 insertions, 253 deletions
diff --git a/Tests/CMakeTests/CMakeLists.txt b/Tests/CMakeTests/CMakeLists.txt
index bd2dd7e..16e631b 100644
--- a/Tests/CMakeTests/CMakeLists.txt
+++ b/Tests/CMakeTests/CMakeLists.txt
@@ -32,16 +32,6 @@ AddCMakeTest(ProcessorCount "-DKWSYS_TEST_EXE=$<TARGET_FILE:cmsysTestsCxx>")
 AddCMakeTest(PushCheckState "")
 AddCMakeTest(While "")
 
-AddCMakeTest(FileDownload "")
-set_tests_properties(CMake.FileDownload PROPERTIES
-  PASS_REGULAR_EXPRESSION "file already exists with expected MD5 sum"
-  FAIL_REGULAR_EXPRESSION "Unexpected status|incorrectly interpreted"
-  )
-AddCMakeTest(FileDownloadBadHash "")
-set_property(TEST CMake.FileDownloadBadHash PROPERTY
-  WILL_FAIL TRUE
-  )
-
 AddCMakeTest(FileUpload "")
 
 set(EndStuff_PreArgs
diff --git a/Tests/CMakeTests/FileDownloadBadHashTest.cmake.in b/Tests/CMakeTests/FileDownloadBadHashTest.cmake.in
deleted file mode 100644
index 64b45ed..0000000
--- a/Tests/CMakeTests/FileDownloadBadHashTest.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-if(NOT "@CMAKE_CURRENT_SOURCE_DIR@" MATCHES "^/")
-  set(slash /)
-endif()
-set(url "file://${slash}@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png")
-set(dir "@CMAKE_CURRENT_BINARY_DIR@/downloads")
-
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT 2
-  STATUS status
-  EXPECTED_HASH SHA1=5555555555555555555555555555555555555555
-  )
diff --git a/Tests/CMakeTests/FileDownloadTest.cmake.in b/Tests/CMakeTests/FileDownloadTest.cmake.in
deleted file mode 100644
index 255909d..0000000
--- a/Tests/CMakeTests/FileDownloadTest.cmake.in
+++ /dev/null
@@ -1,229 +0,0 @@
-# We do not contact any real URLs, but do try a bogus one.
-# Remove any proxy configuration that may change behavior.
-unset(ENV{http_proxy})
-unset(ENV{https_proxy})
-
-set(timeout 4)
-
-if(NOT "@CMAKE_CURRENT_SOURCE_DIR@" MATCHES "^/")
-  set(slash /)
-endif()
-set(url "file://${slash}@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png")
-set(dir "@CMAKE_CURRENT_BINARY_DIR@/downloads")
-
-# Beware Windows asynchronous file/directory removal, rename and then
-# remove the renamed dir so we can be certain the dir isn't there when
-# we get to the file() commands below
-if(EXISTS "${dir}")
-  file(RENAME ${dir} "${dir}_beingRemoved")
-  file(REMOVE_RECURSE "${dir}_beingRemoved")
-endif()
-
-function(__reportIfWrongStatus statusPair expectedStatusCode)
-  list(GET statusPair 0 statusCode)
-  if(NOT statusCode EQUAL expectedStatusCode)
-    message(SEND_ERROR
-            "Unexpected status: ${statusCode}, expected: ${expectedStatusCode}")
-  endif()
-endfunction()
-
-message(STATUS "FileDownload:1")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file1.png
-  TIMEOUT ${timeout}
-  STATUS status
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:2")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file2.png
-  TIMEOUT ${timeout}
-  STATUS status
-  SHOW_PROGRESS
-  )
-__reportIfWrongStatus("${status}" 0)
-
-# Two calls in a row, exactly the same arguments.
-# Since downloaded file should exist already for 2nd call,
-# the 2nd call will short-circuit and return early...
-#
-if(EXISTS ${dir}/file3.png)
-  file(REMOVE ${dir}/file3.png)
-endif()
-
-message(STATUS "FileDownload:3")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT ${timeout}
-  STATUS status
-  EXPECTED_MD5 dbd330d52f4dbd60115d4191904ded92
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:4")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT ${timeout}
-  STATUS status
-  EXPECTED_HASH SHA1=67eee17f79d9ac557284fc0b8ad19f25723fb578
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:5")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT ${timeout}
-  STATUS status
-  EXPECTED_HASH SHA224=ba283726bbb602776818b463943189afd91836cb7ee5dd6e2c7b5ae4
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:6")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT ${timeout}
-  STATUS status
-  EXPECTED_HASH SHA256=cf3334b1275071e1da6e8c396ccb72cf1b2388d8c937526f3af26230affb9423
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:7")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT ${timeout}
-  STATUS status
-  EXPECTED_HASH SHA384=43a5d13978d97c660db44481aee0604cb4ff6ca0775cd5c2cd68cd8000e107e507c4caf6c228941231041e282ffb8950
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:8")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT ${timeout}
-  STATUS status
-  EXPECTED_HASH SHA512=6984e0909a1018030ccaa418e3be1654223cdccff0fe6adc745f9aea7e377f178be53b9fc7d54a6f81c2b62ef9ddcd38ba1978fedf4c5e7139baaf355eefad5b
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:9")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT ${timeout}
-  STATUS status
-  EXPECTED_HASH MD5=dbd330d52f4dbd60115d4191904ded92
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:10")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file3.png
-  TIMEOUT ${timeout}
-  STATUS status
-  EXPECTED_MD5 dbd330d52f4dbd60115d4191904ded92
-  )
-__reportIfWrongStatus("${status}" 0)
-# Print status because we check its message too
-message(STATUS "${status}")
-
-# do not use proxy for lookup of invalid site (DNS failure by proxy looks
-# different than DNS failure without proxy)
-set(ENV{no_proxy} "$ENV{no_proxy},badhostname.invalid")
-message(STATUS "FileDownload:11")
-file(DOWNLOAD
-  badhostname.invalid
-  ${dir}/file11.png
-  TIMEOUT 30
-  STATUS status
-  )
-message(STATUS "${status}")
-__reportIfWrongStatus("${status}" 6) # 6 corresponds to an unresolvable host name
-
-message(STATUS "FileDownload:12")
-set(absFile "@CMAKE_CURRENT_BINARY_DIR@/file12.png")
-if(EXISTS "${absFile}")
-  file(RENAME ${absFile} "${absFile}_beingRemoved")
-  file(REMOVE "${absFile}_beingRemoved")
-endif()
-file(DOWNLOAD
-  ${url}
-  file12.png
-  TIMEOUT ${timeout}
-  EXPECTED_MD5 dbd330d52f4dbd60115d4191904ded92
-  STATUS status
-  )
-__reportIfWrongStatus("${status}" 0)
-if(NOT EXISTS file12.png)
-  message(SEND_ERROR "file12.png not downloaded: ${status}")
-endif()
-
-message(STATUS "FileDownload:13")
-file(DOWNLOAD
-  ${url}
-  TIMEOUT ${timeout}
-  STATUS status
-  )
-__reportIfWrongStatus("${status}" 0)
-if(EXISTS TIMEOUT)
-  file(REMOVE TIMEOUT)
-  message(SEND_ERROR "TIMEOUT argument was incorrectly interpreted as a filename")
-endif()
-message(STATUS "${status}")
-
-message(STATUS "FileDownload:14")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file14.bin
-  TIMEOUT ${timeout}
-  STATUS status
-  RANGE_START 0
-  EXPECTED_MD5 dbd330d52f4dbd60115d4191904ded92
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:15")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file15.bin
-  TIMEOUT ${timeout}
-  STATUS status
-  RANGE_END 50
-  EXPECTED_MD5 8592e5665b839b5d23825dc84c135b61
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:16")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file16.bin
-  TIMEOUT ${timeout}
-  STATUS status
-  RANGE_START 10
-  RANGE_END 50
-  EXPECTED_MD5 36cd52681e6c6c8fef85fcd9e86fc30d
-  )
-__reportIfWrongStatus("${status}" 0)
-
-message(STATUS "FileDownload:17")
-file(DOWNLOAD
-  ${url}
-  ${dir}/file17.bin
-  TIMEOUT ${timeout}
-  STATUS status
-  RANGE_START 0
-  RANGE_END 50
-  RANGE_START 60
-  RANGE_END 100
-  EXPECTED_MD5 c5c9e74e82d493dd901eecccd659cebc
-  )
-__reportIfWrongStatus("${status}" 0)
diff --git a/Tests/CMakeTests/FileDownloadInput.png b/Tests/CMakeTests/FileUploadInput.png
index 9ab565a..9ab565a 100644
--- a/Tests/CMakeTests/FileDownloadInput.png
+++ b/Tests/CMakeTests/FileUploadInput.png
diff --git a/Tests/CMakeTests/FileUploadTest.cmake.in b/Tests/CMakeTests/FileUploadTest.cmake.in
index 0e6f080..7725041 100644
--- a/Tests/CMakeTests/FileUploadTest.cmake.in
+++ b/Tests/CMakeTests/FileUploadTest.cmake.in
@@ -9,7 +9,7 @@ endif()
 
 file(MAKE_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/uploads")
 
-set(filename "@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png")
+set(filename "@CMAKE_CURRENT_SOURCE_DIR@/FileUploadInput.png")
 if(NOT "@CMAKE_CURRENT_BINARY_DIR@" MATCHES "^/")
   set(slash /)
 endif()
diff --git a/Tests/CMakeTests/String-TIMESTAMP-TimeZone.cmake b/Tests/CMakeTests/String-TIMESTAMP-TimeZone.cmake
new file mode 100644
index 0000000..eb2eb42
--- /dev/null
+++ b/Tests/CMakeTests/String-TIMESTAMP-TimeZone.cmake
@@ -0,0 +1,22 @@
+string(TIMESTAMP output "%z")
+
+STRING(LENGTH output output_length)
+
+message("~${output}~")
+
+set(expected_output_length 6)
+
+if(NOT(${output_length} EQUAL ${expected_output_length}))
+    message(FATAL_ERROR "expected ${expected_output_length} entries in output with all specifiers; found ${output_length}")
+endif()
+
+string(SUBSTRING ${output} 0 1 output0)
+string(SUBSTRING ${output} 4 1 output4)
+
+if(NOT((${output0} STREQUAL "-") OR (${output0} STREQUAL "+")))
+    message(FATAL_ERROR "expected output[0] equ '+' or '-'; found: '${output0}'")
+endif()
+
+if(NOT((${output4} STREQUAL "0") OR (${output4} STREQUAL "5")))
+    message(FATAL_ERROR "expected output[4] equ '0' or '5'; found: '${output4}'")
+endif()
diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in
index 154afa7..5f8b111 100644
--- a/Tests/CMakeTests/StringTest.cmake.in
+++ b/Tests/CMakeTests/StringTest.cmake.in
@@ -44,6 +44,8 @@ set(TIMESTAMP-IncompleteSpecifier-RESULT 0)
 set(TIMESTAMP-IncompleteSpecifier-STDERR "~foobar%~")
 set(TIMESTAMP-AllSpecifiers-RESULT 0)
 set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~")
+set(TIMESTAMP-TimeZone-RESULT 0)
+set(TIMESTAMP-TimeZone-STDERR "~[-,+][0-9][0-9][0-9][0-9]~")
 set(TIMESTAMP-MonthWeekNames-RESULT 0)
 set(TIMESTAMP-MonthWeekNames-STDERR "~[^%]+;[^%]+~")
 set(TIMESTAMP-UnixTime-RESULT 0)
@@ -75,6 +77,7 @@ check_cmake_test(String
   TIMESTAMP-IncompleteSpecifier
   TIMESTAMP-AllSpecifiers
   TIMESTAMP-MonthWeekNames
+  TIMESTAMP-TimeZone
   TIMESTAMP-UnixTime
   )