Skip to content
Snippets Groups Projects
Commit c062e324 authored by Christof Kaufmann's avatar Christof Kaufmann
Browse files

test: Rename test/ directory to tests/

This is in preparation to python unittest module, which prefers tests/
to test/.
parent d63b2792
Branches
No related tags found
No related merge requests found
Showing
with 44 additions and 44 deletions
......@@ -50,7 +50,7 @@ endif("${isSystemDir}" STREQUAL "-1")
# --------------------------------------------------------------------------------------------------
include_directories(include)
include_directories(test)
include_directories(tests)
set(SOURCES_LIB
src/image.cpp
......@@ -150,7 +150,7 @@ if(OPENMP_CXX_FOUND OR OPENMP_FOUND)
add_definitions(-DWITH_OMP)
set(SOURCES_TEST
${SOURCES_TEST}
test/parallelizer_test.cpp
tests/parallelizer_test.cpp
)
endif()
......@@ -172,7 +172,7 @@ set(TARGETS ${TARGETS} "spdlog::spdlog")
# Output directories
# --------------------------------------------------------------------------------------------------
# for all targets except testimagefusion, testimagefusion outputs will be overwritten in test/CMakeLists.txt
# for all targets except testimagefusion, testimagefusion outputs will be overwritten in tests/CMakeLists.txt
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
......@@ -211,7 +211,7 @@ endif()
if(Boost_UNIT_TEST_FRAMEWORK_FOUND AND CMAKE_PROJECT_NAME STREQUAL imagefusion)
# message("Found Boost unit_test_framework: ${Boost_INCLUDE_DIRS}, ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
enable_testing()
add_subdirectory(test)
add_subdirectory(tests)
endif()
# lib target
......@@ -417,6 +417,6 @@ endif()
# if you add a header file run "cmake .." in build again to update QTCreator
file(GLOB_RECURSE HeaderFiles "include/*.h")
file(GLOB_RECURSE TestHeaderFiles "test/*.h")
file(GLOB_RECURSE TestHeaderFiles "tests/*.h")
file(GLOB_RECURSE TestHeaderFiles "utils/*.h")
add_custom_target(headers SOURCES ${HeaderFiles} ${TestHeaderFiles})
......@@ -927,7 +927,7 @@ EXCLUDE_SYMLINKS = NO
# certain files from those directories.
#
# Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories for example use the pattern */test/*
# exclude all test directories for example use the pattern */tests/*
EXCLUDE_PATTERNS =
......@@ -938,7 +938,7 @@ EXCLUDE_PATTERNS =
# AClass::ANamespace, ANamespace::*Test
#
# Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories use the pattern */test/*
# exclude all test directories use the pattern */tests/*
EXCLUDE_SYMBOLS = spstfm_impl_detail \
starfm_impl_detail \
......
......@@ -927,7 +927,7 @@ EXCLUDE_SYMLINKS = NO
# certain files from those directories.
#
# Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories for example use the pattern */test/*
# exclude all test directories for example use the pattern */tests/*
EXCLUDE_PATTERNS =
......@@ -938,7 +938,7 @@ EXCLUDE_PATTERNS =
# AClass::ANamespace, ANamespace::*Test
#
# Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories use the pattern */test/*
# exclude all test directories use the pattern */tests/*
EXCLUDE_SYMBOLS =
......
......@@ -90,7 +90,7 @@ public:
* buffer.copyValuesFrom(df.outputImage());
* @endcode
* An example for a data fusor that respects the output image is shown in
* test/parallelizer_test.cpp.
* tests/parallelizer_test.cpp.
*
* Note, on successive predictions the output image might (and should) be reused by the data
* fusor. If you only make a shared copy the memory contents might get overwritten at the next
......
......@@ -512,12 +512,12 @@ struct AveragingFunctor {
* import imagefusion
*
* # load images
* h1 = imagefusion.read_image('../../test/images/tesla-set/LC08_L1TP_193023_20191014.tif')
* h4 = imagefusion.read_image('../../test/images/tesla-set/LC08_L1TP_193023_20200407.tif')
* l1 = imagefusion.read_image('../../test/images/tesla-set/MOD09GA.A2019287.h18v03.006.tif')
* l2 = imagefusion.read_image('../../test/images/tesla-set/MYD09GA.A2020036.h18v03.006.tif')
* l3 = imagefusion.read_image('../../test/images/tesla-set/MYD09GA.A2020084.h18v03.006.tif')
* l4 = imagefusion.read_image('../../test/images/tesla-set/MYD09GA.A2020098.h18v03.006.tif')
* h1 = imagefusion.read_image('../../tests/images/tesla-set/LC08_L1TP_193023_20191014.tif')
* h4 = imagefusion.read_image('../../tests/images/tesla-set/LC08_L1TP_193023_20200407.tif')
* l1 = imagefusion.read_image('../../tests/images/tesla-set/MOD09GA.A2019287.h18v03.006.tif')
* l2 = imagefusion.read_image('../../tests/images/tesla-set/MYD09GA.A2020036.h18v03.006.tif')
* l3 = imagefusion.read_image('../../tests/images/tesla-set/MYD09GA.A2020084.h18v03.006.tif')
* l4 = imagefusion.read_image('../../tests/images/tesla-set/MYD09GA.A2020098.h18v03.006.tif')
* # if you want to have Geo Infos, use:
* # img, gi = imagefusion.read_geo_image('filename.tif')
*
......
......@@ -130,9 +130,9 @@ outputs:
test:
script: run_py_test.py
source_files:
- test/images/artificial-set1/shapes_h1.png
- test/images/artificial-set1/shapes_noise_l1.png
- test/images/artificial-set1/shapes_noise_l2.png
- tests/images/artificial-set1/shapes_h1.png
- tests/images/artificial-set1/shapes_noise_l1.png
- tests/images/artificial-set1/shapes_noise_l2.png
imports:
- imagefusion
......
import imagefusion
h1 = imagefusion.read_image('test/images/artificial-set1/shapes_h1.png')
l1 = imagefusion.read_image('test/images/artificial-set1/shapes_noise_l1.png')
l2 = imagefusion.read_image('test/images/artificial-set1/shapes_noise_l2.png')
h1 = imagefusion.read_image('tests/images/artificial-set1/shapes_h1.png')
l1 = imagefusion.read_image('tests/images/artificial-set1/shapes_noise_l1.png')
l2 = imagefusion.read_image('tests/images/artificial-set1/shapes_noise_l2.png')
high = {1: h1}
low = {1: l1, 2: l2}
......
......@@ -2,11 +2,11 @@
import imagefusion
# load images
h1 = imagefusion.read_image('../../test/images/artificial-set1/shapes_h1.png')
h3 = imagefusion.read_image('../../test/images/artificial-set1/shapes_h3.png')
l1 = imagefusion.read_image('../../test/images/artificial-set1/shapes_noise_l1.png')
l2 = imagefusion.read_image('../../test/images/artificial-set1/shapes_noise_l2.png')
l3 = imagefusion.read_image('../../test/images/artificial-set1/shapes_noise_l3.png')
h1 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_h1.png')
h3 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_h3.png')
l1 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_noise_l1.png')
l2 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_noise_l2.png')
l3 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_noise_l3.png')
w = h1.shape[2]
h = h1.shape[1]
......
......@@ -2,11 +2,11 @@
import imagefusion
# load images
h1 = imagefusion.read_image('../../test/images/artificial-set1/shapes_h1.png')
h3 = imagefusion.read_image('../../test/images/artificial-set1/shapes_h3.png')
l1 = imagefusion.read_image('../../test/images/artificial-set1/shapes_noise_l1.png')
l2 = imagefusion.read_image('../../test/images/artificial-set1/shapes_noise_l2.png')
l3 = imagefusion.read_image('../../test/images/artificial-set1/shapes_noise_l3.png')
h1 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_h1.png')
h3 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_h3.png')
l1 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_noise_l1.png')
l2 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_noise_l2.png')
l3 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_noise_l3.png')
w = h1.shape[2]
h = h1.shape[1]
......
......@@ -2,13 +2,13 @@
import imagefusion
# load images and geo information
h1 = imagefusion.read_image('../../test/images/tesla-set/LC08_L1TP_193023_20191014.tif')
h4 = imagefusion.read_image('../../test/images/tesla-set/LC08_L1TP_193023_20200407.tif')
l1 = imagefusion.read_image('../../test/images/tesla-set/MOD09GA.A2019287.h18v03.006.tif')
l2 = imagefusion.read_image('../../test/images/tesla-set/MYD09GA.A2020036.h18v03.006.tif')
l3 = imagefusion.read_image('../../test/images/tesla-set/MYD09GA.A2020084.h18v03.006.tif')
l4 = imagefusion.read_image('../../test/images/tesla-set/MYD09GA.A2020098.h18v03.006.tif')
gi = imagefusion.GeoInfo('../../test/images/tesla-set/LC08_L1TP_193023_20191014.tif')
h1 = imagefusion.read_image('../../tests/images/tesla-set/LC08_L1TP_193023_20191014.tif')
h4 = imagefusion.read_image('../../tests/images/tesla-set/LC08_L1TP_193023_20200407.tif')
l1 = imagefusion.read_image('../../tests/images/tesla-set/MOD09GA.A2019287.h18v03.006.tif')
l2 = imagefusion.read_image('../../tests/images/tesla-set/MYD09GA.A2020036.h18v03.006.tif')
l3 = imagefusion.read_image('../../tests/images/tesla-set/MYD09GA.A2020084.h18v03.006.tif')
l4 = imagefusion.read_image('../../tests/images/tesla-set/MYD09GA.A2020098.h18v03.006.tif')
gi = imagefusion.GeoInfo('../../tests/images/tesla-set/LC08_L1TP_193023_20191014.tif')
# organize images by date and resolution
high = {1: h1, 4: h4}
......
......@@ -2,9 +2,9 @@
import imagefusion
# load images
h1 = imagefusion.read_image('../../test/images/artificial-set1/shapes_h1.png')
l1 = imagefusion.read_image('../../test/images/artificial-set1/shapes_noise_l1.png')
l2 = imagefusion.read_image('../../test/images/artificial-set1/shapes_noise_l2.png')
h1 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_h1.png')
l1 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_noise_l1.png')
l2 = imagefusion.read_image('../../tests/images/artificial-set1/shapes_noise_l2.png')
w = h1.shape[2]
h = h1.shape[1]
......
......@@ -30,7 +30,7 @@ set_target_properties(testimagefusion
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/test"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests"
)
target_link_libraries(testimagefusion imagefusion::imagefusion ${LIBS} ${TARGETS} Boost::unit_test_framework ${TEST_LINK_FLAGS})
......
File moved
File moved
File moved
File moved
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment