From 5803c2ef0654a55ef4fbcc12fc8c413d398ad1b4 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Wed, 20 Jun 2018 14:37:55 -0400 Subject: [PATCH] Refactor how we fetch external data. Prior to this, a custom cmake script (girder.cmake) was used via a direct URL for each external data file. After this change, we use cmake's build-in ExternalData module. This continues to get all external data files listed and automatically untar any .tgz files. External data file references have been moved from testing/test-data to tests/external-data. Eventually I'd like there to be only one of the tests and testing directories, as having two makes things confusing. This also deletes some abandoned cmake scripts and removes some unused data files. As a benefit, data files are now obtained by sha512, which should guarantee that we have the correct file, even if it changes. Before, the download url was used. This makes it so that we only need one entry in the repo per data file instead of two. The only downside is that ExternalData emits a -hash-stamp file in the download directory. --- CMakeLists.txt | 44 ++++-- cmake/configure-js-coverage-test.cmake | 13 -- cmake/configure-js-unit-test.cmake | 5 - cmake/girder.cmake | 127 ------------------ testing/test-data/AdderallCities2015.csv.md5 | 1 - testing/test-data/AdderallCities2015.csv.url | 1 - testing/test-data/base-images.tgz.md5 | 1 - testing/test-data/base-images.tgz.url | 1 - testing/test-data/blue.jpg.md5 | 1 - testing/test-data/blue.jpg.url | 1 - testing/test-data/cities.csv.md5 | 1 - testing/test-data/cities.csv.url | 1 - testing/test-data/countries.json.md5 | 1 - testing/test-data/countries.json.url | 1 - testing/test-data/earthquakes-video.webm.md5 | 1 - testing/test-data/earthquakes-video.webm.url | 1 - testing/test-data/earthquakes.json.md5 | 1 - testing/test-data/earthquakes.json.url | 1 - testing/test-data/grid.jpg.md5 | 1 - testing/test-data/grid.jpg.url | 1 - testing/test-data/hurricanes.json.md5 | 1 - testing/test-data/hurricanes.json.url | 1 - testing/test-data/land_polygons.json.md5 | 1 - testing/test-data/land_polygons.json.url | 1 - .../test-data/land_shallow_topo_2048.png.md5 | 1 - .../test-data/land_shallow_topo_2048.png.url | 1 - testing/test-data/oahu-dense.json.md5 | 1 - testing/test-data/oahu-dense.json.url | 1 - testing/test-data/oahu-medium.json.md5 | 1 - testing/test-data/oahu-medium.json.url | 1 - testing/test-data/oahu.json.md5 | 1 - testing/test-data/oahu.json.url | 1 - testing/test-data/red.jpg.md5 | 1 - testing/test-data/red.jpg.url | 1 - testing/test-data/roads.json.md5 | 1 - testing/test-data/roads.json.url | 1 - testing/test-data/sample.json.md5 | 1 - testing/test-data/sample.json.url | 1 - testing/test-data/spark.png.md5 | 1 - testing/test-data/spark.png.url | 1 - testing/test-data/temperature_data.tsv.md5 | 1 - testing/test-data/temperature_data.tsv.url | 1 - testing/test-data/tilefancy.png.md5 | 1 - testing/test-data/tilefancy.png.url | 1 - testing/test-data/tiles.tgz.md5 | 1 - testing/test-data/tiles.tgz.url | 1 - testing/test-data/vtkCube.dat.md5 | 1 - testing/test-data/vtkCube.dat.url | 1 - testing/test-data/vtkSceneMetadata.json.md5 | 1 - testing/test-data/vtkSceneMetadata.json.url | 1 - testing/test-data/white.jpg.md5 | 1 - testing/test-data/white.jpg.url | 1 - .../AdderallCities2015.csv.sha512 | 1 + tests/external-data/base-images.tgz.sha512 | 1 + tests/external-data/blue.jpg.sha512 | 1 + tests/external-data/cities.csv.sha512 | 1 + .../earthquakes-video.webm.sha512 | 1 + tests/external-data/earthquakes.json.sha512 | 1 + tests/external-data/grid.jpg.sha512 | 1 + tests/external-data/hurricanes.json.sha512 | 1 + tests/external-data/land_polygons.json.sha512 | 1 + .../land_shallow_topo_2048.png.sha512 | 1 + tests/external-data/oahu-dense.json.sha512 | 1 + tests/external-data/oahu-medium.json.sha512 | 1 + tests/external-data/oahu.json.sha512 | 1 + tests/external-data/red.jpg.sha512 | 1 + tests/external-data/roads.json.sha512 | 1 + tests/external-data/sample.json.sha512 | 1 + .../external-data/temperature_data.tsv.sha512 | 1 + tests/external-data/tilefancy.png.sha512 | 1 + tests/external-data/tiles.tgz.sha512 | 1 + tests/external-data/white.jpg.sha512 | 1 + 72 files changed, 51 insertions(+), 206 deletions(-) delete mode 100644 cmake/configure-js-coverage-test.cmake delete mode 100644 cmake/configure-js-unit-test.cmake delete mode 100644 cmake/girder.cmake delete mode 100644 testing/test-data/AdderallCities2015.csv.md5 delete mode 100644 testing/test-data/AdderallCities2015.csv.url delete mode 100644 testing/test-data/base-images.tgz.md5 delete mode 100644 testing/test-data/base-images.tgz.url delete mode 100644 testing/test-data/blue.jpg.md5 delete mode 100644 testing/test-data/blue.jpg.url delete mode 100644 testing/test-data/cities.csv.md5 delete mode 100644 testing/test-data/cities.csv.url delete mode 100644 testing/test-data/countries.json.md5 delete mode 100644 testing/test-data/countries.json.url delete mode 100644 testing/test-data/earthquakes-video.webm.md5 delete mode 100644 testing/test-data/earthquakes-video.webm.url delete mode 100644 testing/test-data/earthquakes.json.md5 delete mode 100644 testing/test-data/earthquakes.json.url delete mode 100644 testing/test-data/grid.jpg.md5 delete mode 100644 testing/test-data/grid.jpg.url delete mode 100644 testing/test-data/hurricanes.json.md5 delete mode 100644 testing/test-data/hurricanes.json.url delete mode 100644 testing/test-data/land_polygons.json.md5 delete mode 100644 testing/test-data/land_polygons.json.url delete mode 100644 testing/test-data/land_shallow_topo_2048.png.md5 delete mode 100644 testing/test-data/land_shallow_topo_2048.png.url delete mode 100644 testing/test-data/oahu-dense.json.md5 delete mode 100644 testing/test-data/oahu-dense.json.url delete mode 100644 testing/test-data/oahu-medium.json.md5 delete mode 100644 testing/test-data/oahu-medium.json.url delete mode 100644 testing/test-data/oahu.json.md5 delete mode 100644 testing/test-data/oahu.json.url delete mode 100644 testing/test-data/red.jpg.md5 delete mode 100644 testing/test-data/red.jpg.url delete mode 100644 testing/test-data/roads.json.md5 delete mode 100644 testing/test-data/roads.json.url delete mode 100644 testing/test-data/sample.json.md5 delete mode 100644 testing/test-data/sample.json.url delete mode 100644 testing/test-data/spark.png.md5 delete mode 100644 testing/test-data/spark.png.url delete mode 100644 testing/test-data/temperature_data.tsv.md5 delete mode 100644 testing/test-data/temperature_data.tsv.url delete mode 100644 testing/test-data/tilefancy.png.md5 delete mode 100644 testing/test-data/tilefancy.png.url delete mode 100644 testing/test-data/tiles.tgz.md5 delete mode 100644 testing/test-data/tiles.tgz.url delete mode 100644 testing/test-data/vtkCube.dat.md5 delete mode 100644 testing/test-data/vtkCube.dat.url delete mode 100644 testing/test-data/vtkSceneMetadata.json.md5 delete mode 100644 testing/test-data/vtkSceneMetadata.json.url delete mode 100644 testing/test-data/white.jpg.md5 delete mode 100644 testing/test-data/white.jpg.url create mode 100644 tests/external-data/AdderallCities2015.csv.sha512 create mode 100644 tests/external-data/base-images.tgz.sha512 create mode 100644 tests/external-data/blue.jpg.sha512 create mode 100644 tests/external-data/cities.csv.sha512 create mode 100644 tests/external-data/earthquakes-video.webm.sha512 create mode 100644 tests/external-data/earthquakes.json.sha512 create mode 100644 tests/external-data/grid.jpg.sha512 create mode 100644 tests/external-data/hurricanes.json.sha512 create mode 100644 tests/external-data/land_polygons.json.sha512 create mode 100644 tests/external-data/land_shallow_topo_2048.png.sha512 create mode 100644 tests/external-data/oahu-dense.json.sha512 create mode 100644 tests/external-data/oahu-medium.json.sha512 create mode 100644 tests/external-data/oahu.json.sha512 create mode 100644 tests/external-data/red.jpg.sha512 create mode 100644 tests/external-data/roads.json.sha512 create mode 100644 tests/external-data/sample.json.sha512 create mode 100644 tests/external-data/temperature_data.tsv.sha512 create mode 100644 tests/external-data/tilefancy.png.sha512 create mode 100644 tests/external-data/tiles.tgz.sha512 create mode 100644 tests/external-data/white.jpg.sha512 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e201cad47..ca6684df73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,13 +41,6 @@ function(add_geojs_test test_name) set_property(TEST "notes-report" APPEND PROPERTY DEPENDS "${test_name}") endfunction() -# set variables for girder.cmake -set(Girder_KEY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/testing/test-data") -set(Girder_DATA_DIR "${GEOJS_DEPLOY_DIR}/data") -include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/girder.cmake) - -add_download_target() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testing/test-runners/geojs_test_runner.py.in ${CMAKE_CURRENT_BINARY_DIR}/test/geojs_test_runner.py ) @@ -73,12 +66,37 @@ add_test( ) set_property(TEST "notes-report" APPEND PROPERTY DEPENDS "notes-reset") -add_custom_target( - data_files - ALL - DEPENDS ${Girder_DOWNLOAD_FILES} -) -add_test(NAME get_data_files COMMAND "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target data_files) +# Use ExternalData to download all referenced files in tests/external-data +include(ExternalData) +set(ExternalData_URL_TEMPLATES "https://data.kitware.com/api/v1/file/hashsum/%(algo)/%(hash)/download") +set(ExternalData_BINARY_ROOT "${GEOJS_DEPLOY_DIR}/data") +set(ExternalData_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/tests/external-data") +# Get a list of files to download based on the name *.sha512 +file(GLOB data_files_list "${ExternalData_SOURCE_ROOT}/*.sha512") +# Obtain the files using ExternalData +foreach(data_file ${data_files_list}) + string(REGEX REPLACE "^(.*)\\.sha512$" "\\1" base_file "${data_file}") + ExternalData_Expand_Arguments(data_files tmp DATA{${base_file}}) +endforeach() +# Add a target to get the files +ExternalData_Add_Target(data_files) +# For any file that is a .tgz file, expand it after we get it +foreach(data_file ${data_files_list}) + string(REGEX REPLACE "^(.*)\\.sha512$" "\\1" base_file "${data_file}") + get_filename_component(base_file "${base_file}" NAME) + get_filename_component(base_fileext "${base_file}" EXT) + if("${base_fileext}" STREQUAL ".tgz") + get_filename_component(base_filename "${base_file}" NAME_WE) + add_custom_command( + TARGET data_files POST_BUILD + DEPENDS "${ExternalData_BINARY_ROOT}/${base_file}" + COMMAND ${CMAKE_COMMAND} -E make_directory "${ExternalData_BINARY_ROOT}/${base_filename}" + COMMAND ${CMAKE_COMMAND} -E chdir "${ExternalData_BINARY_ROOT}/${base_filename}" tar zxf "${ExternalData_BINARY_ROOT}/${base_file}" + ) + endif() +endforeach() +# Create a test that gets this target +add_test(NAME get_data_files COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target data_files) if(HEADLESS_TESTS) add_test( diff --git a/cmake/configure-js-coverage-test.cmake b/cmake/configure-js-coverage-test.cmake deleted file mode 100644 index 90d08666e7..0000000000 --- a/cmake/configure-js-coverage-test.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(alljs ${CMAKE_BINARY_DIR}/test-cases/js-unit-tests/all-js-unit-tests.js) - -file(WRITE ${alljs} "") -foreach(f IN LISTS JS_UNIT_TEST_CASES) - file(READ "${f}" js) - file(APPEND ${alljs} "${js}") -endforeach() - -file(READ ${alljs} TEST_SOURCE) -configure_file( - ${SOURCE_DIR}/testing/test-runners/coverage-runner.html.in - ${DEPLOY_DIR}/test/js-coverage/geojs-coverage.html -) diff --git a/cmake/configure-js-unit-test.cmake b/cmake/configure-js-unit-test.cmake deleted file mode 100644 index fdbd121040..0000000000 --- a/cmake/configure-js-unit-test.cmake +++ /dev/null @@ -1,5 +0,0 @@ -file(READ "${SOURCE_FILE}" TEST_SOURCE) -configure_file( - ${SOURCE_DIR}/testing/test-runners/jasmine-runner.html.in - ${TEST_HTML} -) diff --git a/cmake/girder.cmake b/cmake/girder.cmake deleted file mode 100644 index f2bdeec5c6..0000000000 --- a/cmake/girder.cmake +++ /dev/null @@ -1,127 +0,0 @@ -# - Configure a project for downloading test data from a Girder server -# Include this module in the top CMakeLists.txt file of a project to -# enable downloading test data from Girder. Requires CTest module. -# project(MyProject) -# ... -# include(CTest) -# include(Girder3) -# -# To use this module, set the following variable in your script: -# Girder_REST_URL - URL of the Girder server's REST API -# Other optional variables: -# Girder_DATA_DIR - Where to place downloaded files -# - Defaults to PROJECT_BINARY_DIR/Girder_Data -# Girder_KEY_DIR - Where the key files are located -# - Defaults to PROJECT_SOURCE_DIR/Girder_Keys -# Girder_DOWNLOAD_TIMEOUT - Timeout for download stage (default 0) -# ---------------------- Authentication ------------------------- -# For authenticated access, you must also have the following variables set -# Girder_USER - The email of the user to authenticate as -# Girder_DEFAULT_API_KEY - The user's Default api key -# -#============================================================================= -# Copyright 2010 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= - -function(add_download_target) - - set(fetch_scripts_dir "${CMAKE_CURRENT_BINARY_DIR}/Girder_FetchScripts") - file(MAKE_DIRECTORY "${fetch_scripts_dir}") - - if(NOT DEFINED Girder_DOWNLOAD_TIMEOUT) - set(Girder_DOWNLOAD_TIMEOUT_STR "") - else(NOT DEFINED Girder_DOWNLOAD_TIMEOUT) - set(Girder_DOWNLOAD_TIMEOUT_STR "TIMEOUT ${Girder_DOWNLOAD_TIMEOUT}") - endif(NOT DEFINED Girder_DOWNLOAD_TIMEOUT) - - file(GLOB urlfiles "${Girder_KEY_DIR}/*.url") - - set(downloadFiles "") - - foreach(urlfile ${urlfiles}) - _process_urlfile(${urlfile} 1) - endforeach() - - set(Girder_DOWNLOAD_FILES "${downloadFiles}" PARENT_SCOPE) -endfunction(add_download_target) - -# Helper macro to write the download scripts for Girder.*{} arguments -macro(_process_urlfile urlFile extractTgz) - - - # Split up the checksum extension from the real filename - string(REGEX REPLACE "\\.[^\\.]*$" "" base_file "${urlFile}") - get_filename_component(base_filename "${base_file}" NAME) - get_filename_component(base_fileext "${base_file}" EXT) - string(REGEX REPLACE "\\.url$" ".md5" keyFile "${urlFile}") - set(checksum "X") - - # Resolve file location - if(EXISTS "${keyFile}") - - # Obtain the checksum - file(READ "${keyFile}" checksum) - string(STRIP ${checksum} checksum) - - endif(EXISTS "${keyFile}") - - file(READ "${urlFile}" url) - string(STRIP ${url} url) - - # Write the test script file for downloading - if(UNIX) - set(cmake_symlink create_symlink) - else() - set(cmake_symlink copy) # Windows has no symlinks; copy instead. - endif() - file(WRITE "${fetch_scripts_dir}/fetch_${checksum}_${base_filename}.cmake" - -# Start file content -"message(STATUS \"Data is here: ${url}\") -file(DOWNLOAD \"${url}\" \"${Girder_DATA_DIR}/${base_filename}\" ${Girder_DOWNLOAD_TIMEOUT_STR} STATUS status) -list(GET status 0 exitCode) -list(GET status 1 errMsg) -if(NOT exitCode EQUAL 0) - file(REMOVE \"${Girder_DATA_DIR}/${base_filename}\") - message(FATAL_ERROR \"Error downloading ${base_filename}: \${errMsg}\") -endif(NOT exitCode EQUAL 0) - -execute_process(COMMAND \"${CMAKE_COMMAND}\" -E md5sum \"${Girder_DATA_DIR}/${base_filename}\" OUTPUT_VARIABLE output) -string(SUBSTRING \${output} 0 32 computedChecksum) - -if((NOT ${checksum} STREQUAL X) AND (NOT computedChecksum STREQUAL ${checksum})) - file(READ \"${Girder_DATA_DIR}/${base_filename}\" serverResponse) - file(REMOVE \"${Girder_DATA_DIR}/${base_filename}\") - message(FATAL_ERROR \"Error: Computed checksum (\${computedChecksum}) did not match expected (${checksum}). Server response: \${serverResponse}\") -endif((NOT ${checksum} STREQUAL X) AND (NOT computedChecksum STREQUAL ${checksum})) -") -# End file content - -if("${base_fileext}" STREQUAL ".tgz") - file(APPEND "${fetch_scripts_dir}/fetch_${checksum}_${base_filename}.cmake" - # Start file content - "# Extract the contents of the tgz - get_filename_component(dirName \"${base_filename}\" NAME_WE) - file(MAKE_DIRECTORY \"${Girder_DATA_DIR}/\${dirName}\") - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E tar xzf \"${Girder_DATA_DIR}/${base_filename}\" - WORKING_DIRECTORY \"${Girder_DATA_DIR}/\${dirName}\") - " - # End file content - ) -endif() - - add_custom_command(OUTPUT "${Girder_DATA_DIR}/${base_filename}" - COMMAND ${CMAKE_COMMAND} -P "${fetch_scripts_dir}/fetch_${checksum}_${base_filename}.cmake" - DEPENDS "${urlfile}" - COMMENT "Downloading ${base_filename}" - ) - - list(APPEND downloadFiles "${Girder_DATA_DIR}/${base_filename}") -endmacro(_process_urlfile) diff --git a/testing/test-data/AdderallCities2015.csv.md5 b/testing/test-data/AdderallCities2015.csv.md5 deleted file mode 100644 index 6ae14cdcfe..0000000000 --- a/testing/test-data/AdderallCities2015.csv.md5 +++ /dev/null @@ -1 +0,0 @@ -6f92a0e2346c48aad2c7cd5e7aa0005f \ No newline at end of file diff --git a/testing/test-data/AdderallCities2015.csv.url b/testing/test-data/AdderallCities2015.csv.url deleted file mode 100644 index b2c213d895..0000000000 --- a/testing/test-data/AdderallCities2015.csv.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/57360bda8d777f68be8f3eac/download diff --git a/testing/test-data/base-images.tgz.md5 b/testing/test-data/base-images.tgz.md5 deleted file mode 100644 index 7735d4198f..0000000000 --- a/testing/test-data/base-images.tgz.md5 +++ /dev/null @@ -1 +0,0 @@ -24a2ffe0807138fe13c33ddeccb2b426 \ No newline at end of file diff --git a/testing/test-data/base-images.tgz.url b/testing/test-data/base-images.tgz.url deleted file mode 100644 index d0c36ceb1a..0000000000 --- a/testing/test-data/base-images.tgz.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/5af1fcff8d777f0685797d19/download \ No newline at end of file diff --git a/testing/test-data/blue.jpg.md5 b/testing/test-data/blue.jpg.md5 deleted file mode 100644 index 408ff03700..0000000000 --- a/testing/test-data/blue.jpg.md5 +++ /dev/null @@ -1 +0,0 @@ -06c5939e998ed30a736fd98b382f5fd2 diff --git a/testing/test-data/blue.jpg.url b/testing/test-data/blue.jpg.url deleted file mode 100644 index 1f542c1b9a..0000000000 --- a/testing/test-data/blue.jpg.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/562e5edf8d777f7522dbeed0/download diff --git a/testing/test-data/cities.csv.md5 b/testing/test-data/cities.csv.md5 deleted file mode 100644 index 46f546065a..0000000000 --- a/testing/test-data/cities.csv.md5 +++ /dev/null @@ -1 +0,0 @@ -612e05ae9ec9d1950ae945d64151df22 \ No newline at end of file diff --git a/testing/test-data/cities.csv.url b/testing/test-data/cities.csv.url deleted file mode 100644 index d832a22c09..0000000000 --- a/testing/test-data/cities.csv.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89508d777f7bfaadd3d7/download diff --git a/testing/test-data/countries.json.md5 b/testing/test-data/countries.json.md5 deleted file mode 100644 index 09f96c454e..0000000000 --- a/testing/test-data/countries.json.md5 +++ /dev/null @@ -1 +0,0 @@ -e9b71be9fa834c7ae473862fff77f894 \ No newline at end of file diff --git a/testing/test-data/countries.json.url b/testing/test-data/countries.json.url deleted file mode 100644 index 6b285ed921..0000000000 --- a/testing/test-data/countries.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89518d777f7bfaadd3da/download diff --git a/testing/test-data/earthquakes-video.webm.md5 b/testing/test-data/earthquakes-video.webm.md5 deleted file mode 100644 index 275095ad91..0000000000 --- a/testing/test-data/earthquakes-video.webm.md5 +++ /dev/null @@ -1 +0,0 @@ -44c731584651c5f3eb22b1d67b05f6c6 diff --git a/testing/test-data/earthquakes-video.webm.url b/testing/test-data/earthquakes-video.webm.url deleted file mode 100644 index bae5bbccec..0000000000 --- a/testing/test-data/earthquakes-video.webm.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/59fc667c8d777f31ac648c51/download diff --git a/testing/test-data/earthquakes.json.md5 b/testing/test-data/earthquakes.json.md5 deleted file mode 100644 index 0d74c5552d..0000000000 --- a/testing/test-data/earthquakes.json.md5 +++ /dev/null @@ -1 +0,0 @@ -9247895af38e2faa36474fe72e02967e \ No newline at end of file diff --git a/testing/test-data/earthquakes.json.url b/testing/test-data/earthquakes.json.url deleted file mode 100644 index 7ef66001f7..0000000000 --- a/testing/test-data/earthquakes.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/57360a968d777f68be8f3ea9/download diff --git a/testing/test-data/grid.jpg.md5 b/testing/test-data/grid.jpg.md5 deleted file mode 100644 index 0cf5be51ba..0000000000 --- a/testing/test-data/grid.jpg.md5 +++ /dev/null @@ -1 +0,0 @@ -26e86857de2e8c4c4fc808dfd6b12e95 \ No newline at end of file diff --git a/testing/test-data/grid.jpg.url b/testing/test-data/grid.jpg.url deleted file mode 100644 index bcce632edf..0000000000 --- a/testing/test-data/grid.jpg.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89518d777f7bfaadd3dd/download diff --git a/testing/test-data/hurricanes.json.md5 b/testing/test-data/hurricanes.json.md5 deleted file mode 100644 index ff4bc170b2..0000000000 --- a/testing/test-data/hurricanes.json.md5 +++ /dev/null @@ -1 +0,0 @@ -7cf587e135cbfe6310ef8f1137d5cd54 \ No newline at end of file diff --git a/testing/test-data/hurricanes.json.url b/testing/test-data/hurricanes.json.url deleted file mode 100644 index cda3be5811..0000000000 --- a/testing/test-data/hurricanes.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89518d777f7bfaadd3e0/download diff --git a/testing/test-data/land_polygons.json.md5 b/testing/test-data/land_polygons.json.md5 deleted file mode 100644 index 2a98efdc0a..0000000000 --- a/testing/test-data/land_polygons.json.md5 +++ /dev/null @@ -1 +0,0 @@ -f88d833b7614754e914ef56de76d889c \ No newline at end of file diff --git a/testing/test-data/land_polygons.json.url b/testing/test-data/land_polygons.json.url deleted file mode 100644 index 450484bd8e..0000000000 --- a/testing/test-data/land_polygons.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/5762bd868d777f68be8f4017/download diff --git a/testing/test-data/land_shallow_topo_2048.png.md5 b/testing/test-data/land_shallow_topo_2048.png.md5 deleted file mode 100644 index e0f66e8d27..0000000000 --- a/testing/test-data/land_shallow_topo_2048.png.md5 +++ /dev/null @@ -1 +0,0 @@ -438667f9d98cfc407a723fe8817957f1 \ No newline at end of file diff --git a/testing/test-data/land_shallow_topo_2048.png.url b/testing/test-data/land_shallow_topo_2048.png.url deleted file mode 100644 index b64474044d..0000000000 --- a/testing/test-data/land_shallow_topo_2048.png.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89518d777f7bfaadd3e3/download diff --git a/testing/test-data/oahu-dense.json.md5 b/testing/test-data/oahu-dense.json.md5 deleted file mode 100644 index 848c89863a..0000000000 --- a/testing/test-data/oahu-dense.json.md5 +++ /dev/null @@ -1 +0,0 @@ -1d9e59c3fb22b8d2e4320bef30036703 \ No newline at end of file diff --git a/testing/test-data/oahu-dense.json.url b/testing/test-data/oahu-dense.json.url deleted file mode 100644 index 9ee9af859b..0000000000 --- a/testing/test-data/oahu-dense.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd3e6/download diff --git a/testing/test-data/oahu-medium.json.md5 b/testing/test-data/oahu-medium.json.md5 deleted file mode 100644 index 1068442d41..0000000000 --- a/testing/test-data/oahu-medium.json.md5 +++ /dev/null @@ -1 +0,0 @@ -1f7c4324577dcc314dad02e48f6077b0 \ No newline at end of file diff --git a/testing/test-data/oahu-medium.json.url b/testing/test-data/oahu-medium.json.url deleted file mode 100644 index c8fad67ac7..0000000000 --- a/testing/test-data/oahu-medium.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/5b16c6918d777f15ebe1ffe7/download diff --git a/testing/test-data/oahu.json.md5 b/testing/test-data/oahu.json.md5 deleted file mode 100644 index 172634f6bc..0000000000 --- a/testing/test-data/oahu.json.md5 +++ /dev/null @@ -1 +0,0 @@ -51954a3683e8d2bdc2f03ec0b3b55bdc \ No newline at end of file diff --git a/testing/test-data/oahu.json.url b/testing/test-data/oahu.json.url deleted file mode 100644 index 7aa0963bf4..0000000000 --- a/testing/test-data/oahu.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd3e9/download diff --git a/testing/test-data/red.jpg.md5 b/testing/test-data/red.jpg.md5 deleted file mode 100644 index 71cbfb27da..0000000000 --- a/testing/test-data/red.jpg.md5 +++ /dev/null @@ -1 +0,0 @@ -b83521e095bc1d0fe2bb7b1292daba2c diff --git a/testing/test-data/red.jpg.url b/testing/test-data/red.jpg.url deleted file mode 100644 index ba170765a2..0000000000 --- a/testing/test-data/red.jpg.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/562e5ee98d777f7522dbeed3/download \ No newline at end of file diff --git a/testing/test-data/roads.json.md5 b/testing/test-data/roads.json.md5 deleted file mode 100644 index f0630746ef..0000000000 --- a/testing/test-data/roads.json.md5 +++ /dev/null @@ -1 +0,0 @@ -7327760ce067f055bb54abf7d25038ae diff --git a/testing/test-data/roads.json.url b/testing/test-data/roads.json.url deleted file mode 100644 index 1ded2bd301..0000000000 --- a/testing/test-data/roads.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/583343428d777f4bd537dded/download diff --git a/testing/test-data/sample.json.md5 b/testing/test-data/sample.json.md5 deleted file mode 100644 index d507d1a729..0000000000 --- a/testing/test-data/sample.json.md5 +++ /dev/null @@ -1 +0,0 @@ -4de4f2fdfda807fe52bdbbc254dedffa \ No newline at end of file diff --git a/testing/test-data/sample.json.url b/testing/test-data/sample.json.url deleted file mode 100644 index ba94efe388..0000000000 --- a/testing/test-data/sample.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd3ec/download diff --git a/testing/test-data/spark.png.md5 b/testing/test-data/spark.png.md5 deleted file mode 100644 index 678b0b49d5..0000000000 --- a/testing/test-data/spark.png.md5 +++ /dev/null @@ -1 +0,0 @@ -f8287538c40d9ddad473298d55a257df \ No newline at end of file diff --git a/testing/test-data/spark.png.url b/testing/test-data/spark.png.url deleted file mode 100644 index ef41d44307..0000000000 --- a/testing/test-data/spark.png.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd3ef/download diff --git a/testing/test-data/temperature_data.tsv.md5 b/testing/test-data/temperature_data.tsv.md5 deleted file mode 100644 index 9c913f3721..0000000000 --- a/testing/test-data/temperature_data.tsv.md5 +++ /dev/null @@ -1 +0,0 @@ -d42411447bcaab4b306345d018a42952 diff --git a/testing/test-data/temperature_data.tsv.url b/testing/test-data/temperature_data.tsv.url deleted file mode 100644 index 9428b9356b..0000000000 --- a/testing/test-data/temperature_data.tsv.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd3f2/download diff --git a/testing/test-data/tilefancy.png.md5 b/testing/test-data/tilefancy.png.md5 deleted file mode 100644 index 940ecb9e9c..0000000000 --- a/testing/test-data/tilefancy.png.md5 +++ /dev/null @@ -1 +0,0 @@ -52316da74f71cc8ef4d18a4016fc8f61 \ No newline at end of file diff --git a/testing/test-data/tilefancy.png.url b/testing/test-data/tilefancy.png.url deleted file mode 100644 index 232a966863..0000000000 --- a/testing/test-data/tilefancy.png.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd3f5/download diff --git a/testing/test-data/tiles.tgz.md5 b/testing/test-data/tiles.tgz.md5 deleted file mode 100644 index a0da2d8b27..0000000000 --- a/testing/test-data/tiles.tgz.md5 +++ /dev/null @@ -1 +0,0 @@ -910b4894cc906dc3762dc9e314fd4025 diff --git a/testing/test-data/tiles.tgz.url b/testing/test-data/tiles.tgz.url deleted file mode 100644 index ac4e8d8f97..0000000000 --- a/testing/test-data/tiles.tgz.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/586d1e958d777f05f44a5c72/download diff --git a/testing/test-data/vtkCube.dat.md5 b/testing/test-data/vtkCube.dat.md5 deleted file mode 100644 index c67e38043c..0000000000 --- a/testing/test-data/vtkCube.dat.md5 +++ /dev/null @@ -1 +0,0 @@ -270c382b6e42434a52e0af84a30198a6 \ No newline at end of file diff --git a/testing/test-data/vtkCube.dat.url b/testing/test-data/vtkCube.dat.url deleted file mode 100644 index dd3e4ed3e6..0000000000 --- a/testing/test-data/vtkCube.dat.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd3fe/download diff --git a/testing/test-data/vtkSceneMetadata.json.md5 b/testing/test-data/vtkSceneMetadata.json.md5 deleted file mode 100644 index 15d162428f..0000000000 --- a/testing/test-data/vtkSceneMetadata.json.md5 +++ /dev/null @@ -1 +0,0 @@ -eb22667d87b0d15e19856975b0a12a57 \ No newline at end of file diff --git a/testing/test-data/vtkSceneMetadata.json.url b/testing/test-data/vtkSceneMetadata.json.url deleted file mode 100644 index 3d85aeddd6..0000000000 --- a/testing/test-data/vtkSceneMetadata.json.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd401/download diff --git a/testing/test-data/white.jpg.md5 b/testing/test-data/white.jpg.md5 deleted file mode 100644 index 684a164f57..0000000000 --- a/testing/test-data/white.jpg.md5 +++ /dev/null @@ -1 +0,0 @@ -cbe43849e5db0eae8cb6f429493c8cc1 \ No newline at end of file diff --git a/testing/test-data/white.jpg.url b/testing/test-data/white.jpg.url deleted file mode 100644 index 04f9fee18a..0000000000 --- a/testing/test-data/white.jpg.url +++ /dev/null @@ -1 +0,0 @@ -https://data.kitware.com/api/v1/file/560a89528d777f7bfaadd404/download diff --git a/tests/external-data/AdderallCities2015.csv.sha512 b/tests/external-data/AdderallCities2015.csv.sha512 new file mode 100644 index 0000000000..446210cd7b --- /dev/null +++ b/tests/external-data/AdderallCities2015.csv.sha512 @@ -0,0 +1 @@ +c3e984482cc6db1193a6dca2a55396a2baad8541a5c8c679f33750b76f766f40a119ec3e63abbabcd095d752c3df8ce21bf24cbe629502121f24ba90b4b0674c diff --git a/tests/external-data/base-images.tgz.sha512 b/tests/external-data/base-images.tgz.sha512 new file mode 100644 index 0000000000..71ab5a393b --- /dev/null +++ b/tests/external-data/base-images.tgz.sha512 @@ -0,0 +1 @@ +d7c9ac0d2324d047ee687fa0c1f857b24b03beae3cb84060d7507c53aca2b8a184abdcb6161ceb2cb238219b8235cfab75f61d9a1a2ff9fcf521b3f96c5f6c84 diff --git a/tests/external-data/blue.jpg.sha512 b/tests/external-data/blue.jpg.sha512 new file mode 100644 index 0000000000..bed718281d --- /dev/null +++ b/tests/external-data/blue.jpg.sha512 @@ -0,0 +1 @@ +867b1f3c568289efc7d0dba97d827a2bc4d83a7465cebcb3b5aec7bac6a38cf70d037d1814402bc97ad1f2f6737cfb5ce97db0a4fb53a716e77fd3ba57a7ab3b diff --git a/tests/external-data/cities.csv.sha512 b/tests/external-data/cities.csv.sha512 new file mode 100644 index 0000000000..d28b11f729 --- /dev/null +++ b/tests/external-data/cities.csv.sha512 @@ -0,0 +1 @@ +5a665e5feda24f28e5cf4ed0801b67e73bbcf3ea781b2e50d11284214e67b25b68e6a1c48da46e5e4d4d0c54c2ec18f88d292224b4541fb279396cf7b94beac9 diff --git a/tests/external-data/earthquakes-video.webm.sha512 b/tests/external-data/earthquakes-video.webm.sha512 new file mode 100644 index 0000000000..e82e4f4ef4 --- /dev/null +++ b/tests/external-data/earthquakes-video.webm.sha512 @@ -0,0 +1 @@ +834a9d05f5fb00145e529fa4b217398db0df188c69d751f3869128b6e9c92d3000f85378752c56d9d9b5fa0870437dd9bdfeb5d62f6c87c2c03a7f1a20ee8523 diff --git a/tests/external-data/earthquakes.json.sha512 b/tests/external-data/earthquakes.json.sha512 new file mode 100644 index 0000000000..1445b31595 --- /dev/null +++ b/tests/external-data/earthquakes.json.sha512 @@ -0,0 +1 @@ +f098b6437411384b552419b4a36264c1bb3fed816ccfe9545145175e0b92a0b7ad5ebdcb9dddd0a12a90499143ffa471c02f6e049be5b973db607ff066892500 diff --git a/tests/external-data/grid.jpg.sha512 b/tests/external-data/grid.jpg.sha512 new file mode 100644 index 0000000000..18d0de61d7 --- /dev/null +++ b/tests/external-data/grid.jpg.sha512 @@ -0,0 +1 @@ +60d201a14c7d31e7881301e6784e0372ddf27f26e5e4eafba9ba39158dfd050e3683faaa660fcde47e6c994dd3ee64c5a5231474ca75090053ef9207fedd9029 diff --git a/tests/external-data/hurricanes.json.sha512 b/tests/external-data/hurricanes.json.sha512 new file mode 100644 index 0000000000..ad01826d5a --- /dev/null +++ b/tests/external-data/hurricanes.json.sha512 @@ -0,0 +1 @@ +012f15036bfc9ac3abb81a2a61e2c7b602ef3d8f7bd3b3f0fb66972ee69034730655f69febb2df5d657f22cd2b1e69170f6568bcbb03d7ebdecdfbafb80cc3b7 diff --git a/tests/external-data/land_polygons.json.sha512 b/tests/external-data/land_polygons.json.sha512 new file mode 100644 index 0000000000..d326bce343 --- /dev/null +++ b/tests/external-data/land_polygons.json.sha512 @@ -0,0 +1 @@ +30a828392d58678599130e0dca6d7f27e7e07e4e5b5d7f7a37871eb395d53d97b76134c0a07e805fbdfac0f42e6d3ca6e287c9727815a9dc711d541b1c8f68a1 diff --git a/tests/external-data/land_shallow_topo_2048.png.sha512 b/tests/external-data/land_shallow_topo_2048.png.sha512 new file mode 100644 index 0000000000..0ff7e03d11 --- /dev/null +++ b/tests/external-data/land_shallow_topo_2048.png.sha512 @@ -0,0 +1 @@ +8a8330dba5bacdb511038ad0f6ee5a764a40aa7a8868a445749f653ae5d85d8317684ac706e7a9f049590170df6bc3fefc2912d52124d1b3b17aa43c529ff2a8 diff --git a/tests/external-data/oahu-dense.json.sha512 b/tests/external-data/oahu-dense.json.sha512 new file mode 100644 index 0000000000..7000b03856 --- /dev/null +++ b/tests/external-data/oahu-dense.json.sha512 @@ -0,0 +1 @@ +692a44ec4a18b16d1530403a9a2bf286ff2ef7d45fa58f555c278f91a0fa708b5626a3f38955e06a11cdc06a1009e859328687c1f32a2169e0c8ef1b518418c1 diff --git a/tests/external-data/oahu-medium.json.sha512 b/tests/external-data/oahu-medium.json.sha512 new file mode 100644 index 0000000000..9b710e2ef7 --- /dev/null +++ b/tests/external-data/oahu-medium.json.sha512 @@ -0,0 +1 @@ +83375c5c2678b11d8de7f59fd8e2f9b889d3ec20f4a81279d996711bfc0942bd9dcdce149cbca995930459c26b3bf58be60569687085adf361ff805436b75aab diff --git a/tests/external-data/oahu.json.sha512 b/tests/external-data/oahu.json.sha512 new file mode 100644 index 0000000000..0f433a70fd --- /dev/null +++ b/tests/external-data/oahu.json.sha512 @@ -0,0 +1 @@ +e44282c44fa95f0b40c2135ee94ff40a755771f3b4bf9acda0eef0048cd0fb29b3a71352e2eecdca6cfc35fafde96ffb1a9658c9fee2346071808a9123c26cb5 diff --git a/tests/external-data/red.jpg.sha512 b/tests/external-data/red.jpg.sha512 new file mode 100644 index 0000000000..0473d8afa1 --- /dev/null +++ b/tests/external-data/red.jpg.sha512 @@ -0,0 +1 @@ +70884f5c3d1747633412dcf64d4886d985b49f508b68eb9f3874b2fdcfad38e7623f4a7c7355baa1656503f46e2e091576a19ded9fad7c7c65387c313206d2e6 diff --git a/tests/external-data/roads.json.sha512 b/tests/external-data/roads.json.sha512 new file mode 100644 index 0000000000..2786b0419c --- /dev/null +++ b/tests/external-data/roads.json.sha512 @@ -0,0 +1 @@ +ae8d8b99c3fab73798ddcc246ea53b1bc8d598414d00df4ce697373a343fbf7ffed4dbae5f07a997ac7731b5f86140686b8425b99bd5818b8c9ec68e7c4d3315 diff --git a/tests/external-data/sample.json.sha512 b/tests/external-data/sample.json.sha512 new file mode 100644 index 0000000000..698a9e739c --- /dev/null +++ b/tests/external-data/sample.json.sha512 @@ -0,0 +1 @@ +5d4b00559f17fac607eafe4a9bb933386ebd572fbe545e6138b8eafbbf510074a8ae398c7df0420a017218af83b18cc322633b77007b63a27dfea7a50db70244 diff --git a/tests/external-data/temperature_data.tsv.sha512 b/tests/external-data/temperature_data.tsv.sha512 new file mode 100644 index 0000000000..a506f1f17f --- /dev/null +++ b/tests/external-data/temperature_data.tsv.sha512 @@ -0,0 +1 @@ +bde5cdad7c4518694393de83da938bcf5d485b41116b51f0fce4b462737992d2973f076c577040fa816873b196c6397244aa03736fc7750a0eea0ba5cbcc48e4 diff --git a/tests/external-data/tilefancy.png.sha512 b/tests/external-data/tilefancy.png.sha512 new file mode 100644 index 0000000000..dc074aa7e7 --- /dev/null +++ b/tests/external-data/tilefancy.png.sha512 @@ -0,0 +1 @@ +455effa59d421cbb73c6def815813063f1c649363de4007fa0de00cc2e0f24cba745c046266e5a83fc43b121a648017d509d7bf03c30fbee1448817e3f849683 diff --git a/tests/external-data/tiles.tgz.sha512 b/tests/external-data/tiles.tgz.sha512 new file mode 100644 index 0000000000..7985124d27 --- /dev/null +++ b/tests/external-data/tiles.tgz.sha512 @@ -0,0 +1 @@ +30defdfd28f6773c78f31b64b728d42630583b4e2b74c7098d75e6887bf5d8a6bea08a85669ad969058ac2c98dc45d5512684c62227403e7fcf57ea4dc1675f5 diff --git a/tests/external-data/white.jpg.sha512 b/tests/external-data/white.jpg.sha512 new file mode 100644 index 0000000000..cb660aecc0 --- /dev/null +++ b/tests/external-data/white.jpg.sha512 @@ -0,0 +1 @@ +ea7a9d7ff76775e742572f89e90cce1248ec99c33b2f486e0fa1d19ab461b87dff324533ecb186a3db14e40a3826da97b5d66566360a201228f60140b0e89942