From 232a2fe22c7b15cba29a1a2b569eeee6f86951b0 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Fri, 27 Jan 2023 14:30:29 +0000
Subject: [PATCH] repackaging integration tests
---
.../configs/chart/CHART_CONFIG_EAST_AFRICA_PINE.json | 6 +++---
.../configs/chart/CHART_CONFIG_ETHIOPIA_PINE.json | 12 ++++++------
.../plotting/configs/sys/SYS_CONFIG_PINE.json | 2 +-
.../configs/config_EastAfrica_mapspam2017.json | 12 ++++++------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_EAST_AFRICA_PINE.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_EAST_AFRICA_PINE.json
index 7c9c14f..1ce8c23 100644
--- a/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_EAST_AFRICA_PINE.json
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_EAST_AFRICA_PINE.json
@@ -2,14 +2,14 @@
"IMAGE_WIDTH": 1500,
"IMAGE_HEIGHT": 2000,
"COUNTRY_EXTENTS": [21, 60, -5, 36],
- "MAP_TILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/east_africa/east_africa_map_tile.tif",
+ "MAP_TILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/east_africa/east_africa_map_tile.tif",
"SCALEBAR_LAT": "2",
"SCALEBAR_TEXT": "200km",
"RASTER_ALPHA": 0.7,
"LEGEND_ALPHA": 0.4,
"TITLE_FONT_SIZE": 25,
- "COUNTRY_LANDPOINTS_FILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/east_africa/small_east_africa_points.txt",
- "COUNTRY_LOGO_FILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/images/logos_EastAfrica_plotting.png",
+ "COUNTRY_LANDPOINTS_FILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/east_africa/small_east_africa_points.txt",
+ "COUNTRY_LOGO_FILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/images/logos_EastAfrica_plotting.png",
"COUNTRY_STRING": "eastafrica",
"PLACES_TO_PLOT": ["CAPITAL","LARGE"],
"PLACES_TO_RIGHT_ALIGN": ["Beirut", "Tel Aviv-Yafo"],
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_ETHIOPIA_PINE.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_ETHIOPIA_PINE.json
index d9d4ec1..da64d7a 100644
--- a/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_ETHIOPIA_PINE.json
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/chart/CHART_CONFIG_ETHIOPIA_PINE.json
@@ -1,17 +1,17 @@
{
"IMAGE_WIDTH": 1700,
"IMAGE_HEIGHT": 1275,
- "COUNTRY_ADMIN_2_SHAPE_FILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/admin_shape/eth_admbnda_adm0_csa_bofedb_itos_2021.shp",
- "COUNTRY_ADMIN_1_SHAPE_FILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/admin_shape/eth_admbnda_adm0_csa_bofedb_itos_2021.shp",
- "COUNTRY_SHAPE_FILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/admin_shape/eth_admbnda_adm0_csa_bofedb_itos_2021.shp",
+ "COUNTRY_ADMIN_2_SHAPE_FILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/admin_shape/eth_admbnda_adm0_csa_bofedb_itos_2021.shp",
+ "COUNTRY_ADMIN_1_SHAPE_FILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/admin_shape/eth_admbnda_adm0_csa_bofedb_itos_2021.shp",
+ "COUNTRY_SHAPE_FILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/admin_shape/eth_admbnda_adm0_csa_bofedb_itos_2021.shp",
"COUNTRY_EXTENTS": [31.99, 53.02, 3.19, 14.85],
- "MAP_TILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/ethiopia_map_tile.tif",
+ "MAP_TILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/ethiopia_map_tile.tif",
"SCALEBAR_LAT": "3.7",
"SCALEBAR_TEXT": "400km",
"LEGEND_ALPHA": 0,
"TITLE_FONT_SIZE": 30,
- "COUNTRY_LANDPOINTS_FILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/small_ethiopia_points.txt",
- "COUNTRY_LOGO_FILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/images/logos_Ethiopia_plotting.png",
+ "COUNTRY_LANDPOINTS_FILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/ethiopia/small_ethiopia_points.txt",
+ "COUNTRY_LOGO_FILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/images/logos_Ethiopia_plotting.png",
"COUNTRY_STRING": "ethiopia",
"PLACES_TO_PLOT": ["CAPITAL","LARGE","MEDIUM"],
"PLACES_TO_EXCLUDE": ["Bandarbeyla","Al Hudaydah"],
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/sys/SYS_CONFIG_PINE.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/sys/SYS_CONFIG_PINE.json
index c0b666c..28b4094 100644
--- a/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/sys/SYS_CONFIG_PINE.json
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/plotting/configs/sys/SYS_CONFIG_PINE.json
@@ -1,3 +1,3 @@
{
- "PLACES_SHAPE_FILE": "../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/common/places_shape/small_places.shp"
+ "PLACES_SHAPE_FILE": "../../test_data/test_deployment/regions/EastAfrica/resources/plotting/assets/gis_data/common/places_shape/small_places.shp"
}
\ No newline at end of file
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/source_gen/configs/config_EastAfrica_mapspam2017.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/source_gen/configs/config_EastAfrica_mapspam2017.json
index b219b46..1360f7f 100644
--- a/tests/test_data/test_deployment/regions/EastAfrica/resources/source_gen/configs/config_EastAfrica_mapspam2017.json
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/source_gen/configs/config_EastAfrica_mapspam2017.json
@@ -1,14 +1,14 @@
{
"config_name" : "EastAfrica",
- "region_file" : "../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/boundaries/EastAfrica_regions_small.shp",
+ "region_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/boundaries/EastAfrica_regions_small.shp",
"wheat_source_name" : "MAPSPAM2017",
- "wheat_file" : "../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/spam2017V1r1_SSA_gr_H_WHEA_A.tif",
- "wheat_file_rescaled" : "../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/preprocessed/spam2017V1r1_SSA_gr_H_WHEA_A_rescaled_oneliner.tif",
- "cluster_poly_file_no_wheat" : "../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/boundaries/EastAfrica_clusters.shp",
- "cluster_poly_file" : "../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/preprocessed/EastAfrica_clusters_with_wheat_ha_MAPSPAM2017.shp",
+ "wheat_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/spam2017V1r1_SSA_gr_H_WHEA_A.tif",
+ "wheat_file_rescaled" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/preprocessed/spam2017V1r1_SSA_gr_H_WHEA_A_rescaled_oneliner.tif",
+ "cluster_poly_file_no_wheat" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/boundaries/EastAfrica_clusters.shp",
+ "cluster_poly_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/preprocessed/EastAfrica_clusters_with_wheat_ha_MAPSPAM2017.shp",
"surveyor_name_col" : "surveyor_infromation-surveyor_name",
"id_col" : "id",
"region_id_col" : "REGION_ID",
- "wheat_stages_file" : "../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/approx_growth_timing_cleaned.csv"
+ "wheat_stages_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/approx_growth_timing_cleaned.csv"
}
--
GitLab