diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b552420f614540e44a5a3bb9dabdf2ec6ad15c84..a275531e8c5f7e54832bd5ff46d8b7e63032b551 100755
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -29,10 +29,6 @@ set(UNIT_TEST ${LIS_DATA_ROOT}/UnitTest)
set(OUTPUT_TEST ${CMAKE_BINARY_DIR}/Testing/Temporary)
if(JENKINS_BUILD MATCHES "true")
-
- # ########################################
- # Unit tests
- # ########################################
set(OUTPUT_TEST_UNITEST ${OUTPUT_TEST}/unitest)
add_test(NAME cloud_extraction_unitest
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cloud_extraction_test.py
@@ -365,123 +361,6 @@ if(JENKINS_BUILD MATCHES "true")
-i ${DATA_TEST}/S2-SMALL-ZIP/SENTINEL2A_20160217-111843-605_L2A_T29RNQ_D_V1-0.zip
-o "${OUTPUT_TEST}/s2-small-zip"
)
- # ----------------------------------
- # Synthesis from 1.7 snow product
- # ----------------------------------
- add_test(NAME synthesis_from_l2A_S2_20180101
- COMMAND ${PYTHON_EXECUTABLE}
- ${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
- -i ${DATA_TEST}/L2A_PRODUCTS/SENTINEL2A_20180101-105435-457_L2A_T31TCH_C_V2-2
- -d "/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
- -t "/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
- -w "/datalake/static_aux/MASQUES/eu_hydro/raster/20m/31TCH/eu_hydro_20m_31TCH.tif"
- -o ${OUTPUT_TEST}/SNOW_PRODUCTS/SENTINEL2A_20180101-105435-457_L2A_T31TCH_C_V2-2
- )
-
- add_test(NAME synthesis_from_l2A_S2_20180131
- COMMAND ${PYTHON_EXECUTABLE}
- ${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
- -i ${DATA_TEST}/L2A_PRODUCTS/SENTINEL2A_20180131-105416-437_L2A_T31TCH_C_V2-2
- -d "/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
- -t "/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
- -w "/datalake/static_aux/MASQUES/eu_hydro/raster/20m/31TCH/eu_hydro_20m_31TCH.tif"
- -o ${OUTPUT_TEST}/SNOW_PRODUCTS/SENTINEL2A_20180131-105416-437_L2A_T31TCH_C_V2-2
- )
-
- add_test(NAME synthesis_from_l2A_L8_20180115
- COMMAND ${PYTHON_EXECUTABLE}
- ${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
- -i ${DATA_TEST}/L2A_PRODUCTS/LANDSAT8-OLITIRS-XS_20180115-103629-617_L2A_T31TCH_D_V1-9
- -d "/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
- -t "/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
- -o ${OUTPUT_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180115-103629-617_L2A_T31TCH_D_V1-9
- -l "DEBUG"
- )
-
- add_test(NAME synthesis_from_l2A_L8_20180131
- COMMAND ${PYTHON_EXECUTABLE}
- ${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
- -i ${DATA_TEST}/L2A_PRODUCTS/LANDSAT8-OLITIRS-XS_20180131-103619-890_L2A_T31TCH_D_V1-9
- -d "/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
- -t "/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
- -o ${OUTPUT_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180131-103619-890_L2A_T31TCH_D_V1-9
- -l "DEBUG"
- )
-
- add_test(NAME snow_synthesis_from_last_version_test
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/let_it_snow_synthesis.py
- -i ${OUTPUT_TEST}/SNOW_PRODUCTS/SENTINEL2A_20180101-105435-457_L2A_T31TCH_C_V2-2
- -i ${OUTPUT_TEST}/SNOW_PRODUCTS/SENTINEL2A_20180131-105416-437_L2A_T31TCH_C_V2-2
- -d ${OUTPUT_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180115-103629-617_L2A_T31TCH_D_V1-9
- -d ${OUTPUT_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180131-103619-890_L2A_T31TCH_D_V1-9
- -c ${DATA_TEST}/SYNTHESIS/synthesis_configuration.json
- -j ${DATA_TEST}/SYNTHESIS/synthesis_launch.json
- -o ${OUTPUT_TEST}/SNOW_SYNTHESIS_FROM_LAST_VERSION
- -l "DEBUG"
- )
- set_tests_properties(snow_synthesis_from_last_version_test PROPERTIES DEPENDS synthesis_from_l2A_L8_20180131)
- set_tests_properties(snow_synthesis_from_last_version_test PROPERTIES DEPENDS synthesis_from_l2A_L8_20180115)
- set_tests_properties(snow_synthesis_from_last_version_test PROPERTIES DEPENDS synthesis_from_l2A_S2_20180131)
- set_tests_properties(snow_synthesis_from_last_version_test PROPERTIES DEPENDS synthesis_from_l2A_S2_20180101)
-
- # ----------------------------------
- # Synthesis with zip files
- # ----------------------------------
- add_test(NAME snow_synthesis_with_zip
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/let_it_snow_synthesis.py
- -t T31TCH
- -i ${DATA_TEST}/SNOW_PRODUCTS/SENTINEL2A_20170910-104212-297_L2B-SNOW_T31TCH_D_V1-7
- -i ${DATA_TEST}/SNOW_PRODUCTS/SENTINEL2A_20170913-105335-667_L2B-SNOW_T31TCH_D_V1-7
- -d ${DATA_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20170916-104232-708_L2B-SNOW_T31TCH_D_V1-6
- -d ${DATA_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20171002-104239-944_L2B-SNOW_T31TCH_D_V1-6
- -b 01/09/2017
- -e 31/10/2017
- -m 10
- -l INFO
- -c ${DATA_TEST}/SYNTHESIS/synthesis_configuration.json
- -o ${OUTPUT_TEST}/SNOW_SYNTHESIS_WITH_ZIP
- )
-
- # ---------------------------------------
- # Synthesis with Copernicus snow products
- # ---------------------------------------
- add_test(NAME snow_synthesis_with_cosims_snow_products
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/let_it_snow_synthesis.py
- -t T31TCH
- -i ${DATA_TEST}/SNOW_PRODUCTS/FSC_20200308T104911_S2A_T31TCH_V100_1
- -i ${DATA_TEST}/SNOW_PRODUCTS/FSC_20200321T105909_S2A_T31TCH_V100_1
- -i ${DATA_TEST}/SNOW_PRODUCTS/FSC_20200326T105910_S2B_T31TCH_V100_1
- -i ${DATA_TEST}/SNOW_PRODUCTS/FSC_20200328T104911_S2A_T31TCH_V100_1
- -i ${DATA_TEST}/SNOW_PRODUCTS/FSC_20200405T105909_S2B_T31TCH_V100_1
- -b 01/03/2020
- -e 10/04/2020
- -m 2
- -l INFO
- -c ${DATA_TEST}/SYNTHESIS/synthesis_cosims_configuration.json
- -o ${OUTPUT_TEST}/SNOW_SYNTHESIS_WITH_COSIMS_SNOW_PRODUCTS
- )
-
- # ----------------------------------
- # Synthesis with H2 snow products
- # ----------------------------------
- add_test(NAME snow_synthesis_with_h2_snow_products
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/let_it_snow_synthesis.py
- -t T32TLQ
- -i ${DATA_TEST}/SNOW_PRODUCTS/LIS_S2-SNOW-FSC_T32TLQ_20220203T103832_2-0_14
- -i ${DATA_TEST}/SNOW_PRODUCTS/LIS_S2-SNOW-FSC_T32TLQ_20220205T102830_2-0_01
- -i ${DATA_TEST}/SNOW_PRODUCTS/LIS_S2-SNOW-FSC_T32TLQ_20220208T103827_2-0_01
- -i ${DATA_TEST}/SNOW_PRODUCTS/LIS_S2-SNOW-FSC_T32TLQ_20220210T102834_2-0_02
- -b 21/01/2022
- -e 19/02/2022
- -m 2
- -l INFO
- -c ${DATA_TEST}/SYNTHESIS/synthesis_h2_configuration.json
- -o ${OUTPUT_TEST}/SNOW_SYNTHESIS_WITH_H2_SNOW_PRODUCTS
- )
ADD_EXECUTABLE(histo_utils_snowline_internal_test histo_utils_snowline_internal_test.cxx)
TARGET_LINK_LIBRARIES(histo_utils_snowline_internal_test histo_utils)
@@ -545,6 +424,9 @@ if(JENKINS_BUILD MATCHES "true")
0
)
else()
+ # ########################################
+ # Unit tests
+ # ########################################
set(OUTPUT_TEST_UNITEST ${OUTPUT_TEST}/unitest)
add_test(NAME cloud_extraction_unitest
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cloud_extraction_test.py
@@ -877,6 +759,86 @@ else()
-i ${DATA_TEST}/S2-SMALL-ZIP/SENTINEL2A_20160217-111843-605_L2A_T29RNQ_D_V1-0.zip
-o "${OUTPUT_TEST}/s2-small-zip"
)
+ # ----------------------------------
+ # Synthesis from 1.7 snow product
+ # ----------------------------------
+ add_test(NAME synthesis_from_l2A_S2_20180101
+ COMMAND ${PYTHON_EXECUTABLE}
+ ${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
+ -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
+ -i ${DATA_TEST}/L2A_PRODUCTS/SENTINEL2A_20180101-105435-457_L2A_T31TCH_C_V2-2
+ -d "/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
+ -t "/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
+ -w "/datalake/static_aux/MASQUES/eu_hydro/raster/20m/31TCH/eu_hydro_20m_31TCH.tif"
+ -o ${OUTPUT_TEST}/SNOW_PRODUCTS/SENTINEL2A_20180101-105435-457_L2A_T31TCH_C_V2-2
+ )
+
+ add_test(NAME synthesis_from_l2A_S2_20180131
+ COMMAND ${PYTHON_EXECUTABLE}
+ ${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
+ -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
+ -i ${DATA_TEST}/L2A_PRODUCTS/SENTINEL2A_20180131-105416-437_L2A_T31TCH_C_V2-2
+ -d "/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
+ -t "/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
+ -w "/datalake/static_aux/MASQUES/eu_hydro/raster/20m/31TCH/eu_hydro_20m_31TCH.tif"
+ -o ${OUTPUT_TEST}/SNOW_PRODUCTS/SENTINEL2A_20180131-105416-437_L2A_T31TCH_C_V2-2
+ )
+
+ add_test(NAME synthesis_from_l2A_L8_20180115
+ COMMAND ${PYTHON_EXECUTABLE}
+ ${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
+ -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
+ -i ${DATA_TEST}/L2A_PRODUCTS/LANDSAT8-OLITIRS-XS_20180115-103629-617_L2A_T31TCH_D_V1-9
+ -d "/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
+ -t "/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
+ -o ${OUTPUT_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180115-103629-617_L2A_T31TCH_D_V1-9
+ -l "DEBUG"
+ )
+
+ add_test(NAME synthesis_from_l2A_L8_20180131
+ COMMAND ${PYTHON_EXECUTABLE}
+ ${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
+ -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
+ -i ${DATA_TEST}/L2A_PRODUCTS/LANDSAT8-OLITIRS-XS_20180131-103619-890_L2A_T31TCH_D_V1-9
+ -d "/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
+ -t "/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
+ -o ${OUTPUT_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180131-103619-890_L2A_T31TCH_D_V1-9
+ -l "DEBUG"
+ )
+
+ add_test(NAME snow_synthesis_from_last_version_test
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/let_it_snow_synthesis.py
+ -i ${OUTPUT_TEST}/SNOW_PRODUCTS/SENTINEL2A_20180101-105435-457_L2A_T31TCH_C_V2-2
+ -i ${OUTPUT_TEST}/SNOW_PRODUCTS/SENTINEL2A_20180131-105416-437_L2A_T31TCH_C_V2-2
+ -d ${OUTPUT_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180115-103629-617_L2A_T31TCH_D_V1-9
+ -d ${OUTPUT_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180131-103619-890_L2A_T31TCH_D_V1-9
+ -c ${DATA_TEST}/SYNTHESIS/synthesis_configuration.json
+ -j ${DATA_TEST}/SYNTHESIS/synthesis_launch.json
+ -o ${OUTPUT_TEST}/SNOW_SYNTHESIS_FROM_LAST_VERSION
+ -l "DEBUG"
+ )
+ set_tests_properties(snow_synthesis_from_last_version_test PROPERTIES DEPENDS synthesis_from_l2A_L8_20180131)
+ set_tests_properties(snow_synthesis_from_last_version_test PROPERTIES DEPENDS synthesis_from_l2A_L8_20180115)
+ set_tests_properties(snow_synthesis_from_last_version_test PROPERTIES DEPENDS synthesis_from_l2A_S2_20180131)
+ set_tests_properties(snow_synthesis_from_last_version_test PROPERTIES DEPENDS synthesis_from_l2A_S2_20180101)
+
+ # ----------------------------------
+ # Synthesis with zip files
+ # ----------------------------------
+ add_test(NAME snow_synthesis_with_zip
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/let_it_snow_synthesis.py
+ -t T31TCH
+ -i ${DATA_TEST}/SNOW_PRODUCTS/SENTINEL2A_20170910-104212-297_L2B-SNOW_T31TCH_D_V1-7
+ -i ${DATA_TEST}/SNOW_PRODUCTS/SENTINEL2A_20170913-105335-667_L2B-SNOW_T31TCH_D_V1-7
+ -d ${DATA_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20170916-104232-708_L2B-SNOW_T31TCH_D_V1-6
+ -d ${DATA_TEST}/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20171002-104239-944_L2B-SNOW_T31TCH_D_V1-6
+ -b 01/09/2017
+ -e 31/10/2017
+ -m 10
+ -l INFO
+ -c ${DATA_TEST}/SYNTHESIS/synthesis_configuration.json
+ -o ${OUTPUT_TEST}/SNOW_SYNTHESIS_WITH_ZIP
+ )
# ---------------------------------------
# Synthesis with Copernicus snow products
@@ -897,6 +859,24 @@ else()
-o ${OUTPUT_TEST}/SNOW_SYNTHESIS_WITH_COSIMS_SNOW_PRODUCTS
)
+ # ----------------------------------
+ # Synthesis with H2 snow products
+ # ----------------------------------
+ add_test(NAME snow_synthesis_with_h2_snow_products
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/let_it_snow_synthesis.py
+ -t T32TLQ
+ -i ${DATA_TEST}/SNOW_PRODUCTS/LIS_S2-SNOW-FSC_T32TLQ_20220203T103832_2-0_14
+ -i ${DATA_TEST}/SNOW_PRODUCTS/LIS_S2-SNOW-FSC_T32TLQ_20220205T102830_2-0_01
+ -i ${DATA_TEST}/SNOW_PRODUCTS/LIS_S2-SNOW-FSC_T32TLQ_20220208T103827_2-0_01
+ -i ${DATA_TEST}/SNOW_PRODUCTS/LIS_S2-SNOW-FSC_T32TLQ_20220210T102834_2-0_02
+ -b 21/01/2022
+ -e 19/02/2022
+ -m 2
+ -l INFO
+ -c ${DATA_TEST}/SYNTHESIS/synthesis_h2_configuration.json
+ -o ${OUTPUT_TEST}/SNOW_SYNTHESIS_WITH_H2_SNOW_PRODUCTS
+ )
+
ADD_EXECUTABLE(histo_utils_snowline_internal_test histo_utils_snowline_internal_test.cxx)
TARGET_LINK_LIBRARIES(histo_utils_snowline_internal_test histo_utils)