From ea40f190a7c1f71b0f92399c9bb08aeaf1eec362 Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@irstea.fr>
Date: Sat, 19 Feb 2022 12:39:27 +0100
Subject: [PATCH] ADD: tests
---
scenes/drs.py | 3 +--
scenes/raster_manips.py | 2 +-
scenes/spot.py | 2 +-
test/drs_import.py | 2 +-
test/drs_search.py | 3 +--
test/drs_stack.py | 4 +---
test/imagery_test.py | 15 +++++++--------
7 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/scenes/drs.py b/scenes/drs.py
index e9c23b0..8fad14e 100644
--- a/scenes/drs.py
+++ b/scenes/drs.py
@@ -1,9 +1,8 @@
"""
A set of utils to deal with DRS products
"""
-import scenes.spot as spot
import tqdm
-import scenes.utils as utils
+from scenes import spot, utils
def find_all_dimaps(pth):
diff --git a/scenes/raster_manips.py b/scenes/raster_manips.py
index 7b1be60..7218037 100644
--- a/scenes/raster_manips.py
+++ b/scenes/raster_manips.py
@@ -2,7 +2,7 @@
Raster manipulation
"""
import osr
-import scenes.utils as utils
+from scenes import utils
import pyotb
diff --git a/scenes/spot.py b/scenes/spot.py
index 7508afb..aa9be9a 100644
--- a/scenes/spot.py
+++ b/scenes/spot.py
@@ -4,7 +4,7 @@ Spot 6/7 root_scene class
import datetime
import xml.etree.ElementTree as ET
import gdal
-import scenes.utils as utils
+from scenes import utils
import pyotb
diff --git a/test/drs_import.py b/test/drs_import.py
index 5980f69..1cfad67 100644
--- a/test/drs_import.py
+++ b/test/drs_import.py
@@ -1,5 +1,5 @@
import argparse
-import scenes.drs as drs
+from scenes import drs
# Arguments
parser = argparse.ArgumentParser(description="Test",)
diff --git a/test/drs_search.py b/test/drs_search.py
index eba59c2..a076d4f 100644
--- a/test/drs_search.py
+++ b/test/drs_search.py
@@ -1,8 +1,7 @@
import argparse
import scenes.indexation as indexation
import gdal
-import scenes.utils as utils
-import scenes.drs as drs
+from scenes import utils, drs
# Arguments
parser = argparse.ArgumentParser(description="Test",)
diff --git a/test/drs_stack.py b/test/drs_stack.py
index 7dff596..7e65e7e 100644
--- a/test/drs_stack.py
+++ b/test/drs_stack.py
@@ -1,9 +1,7 @@
import argparse
-import scenes.indexation as indexation
import gdal
-import scenes.utils as utils
-import scenes.drs as drs
import pyotb
+from scenes import utils, drs, indexation
# Arguments
parser = argparse.ArgumentParser(description="Test",)
diff --git a/test/imagery_test.py b/test/imagery_test.py
index 2a88ed6..2df8f48 100644
--- a/test/imagery_test.py
+++ b/test/imagery_test.py
@@ -1,19 +1,18 @@
# -*- coding: utf-8 -*-
import scenes_test_base
-import scenes.spot as spot
+from scenes import spot
class ImageryTest(scenes_test_base.ScenesTestBase):
def clip_from_img(self):
- dimap_xs = "input/ROI_1_Bundle_Ortho_GSD2015/PROD_SPOT6_001/VOL_SPOT6_001_A/IMG_SPOT6_MS_001_A/" \
- "DIM_SPOT6_MS_201503261014386_ORT_SPOT6_20170524_1422391k0ha487979cy_1.XML"
- dimap_pan = "input/ROI_1_Bundle_Ortho_GSD2015/PROD_SPOT6_001/VOL_SPOT6_001_A/IMG_SPOT6_P_001_A/" \
- "DIM_SPOT6_P_201503261014386_ORT_SPOT6_20170524_1422391k0ha487979cy_1.XML"
+ dimap_xs = self.get_path("input/ROI_1_Bundle_Ortho_GSD2015/PROD_SPOT6_001/VOL_SPOT6_001_A/IMG_SPOT6_MS_001_A/"
+ "DIM_SPOT6_MS_201503261014386_ORT_SPOT6_20170524_1422391k0ha487979cy_1.XML")
+ dimap_pan = self.get_path("input/ROI_1_Bundle_Ortho_GSD2015/PROD_SPOT6_001/VOL_SPOT6_001_A/IMG_SPOT6_P_001_A/"
+ "DIM_SPOT6_P_201503261014386_ORT_SPOT6_20170524_1422391k0ha487979cy_1.XML")
- spot_scene = spot.Scene(dimap_file_xs=self.get_path(dimap_xs),
- dimap_file_pan=self.get_path(dimap_pan))
+ spot_scene = spot.Scene(dimap_file_xs=dimap_xs, dimap_file_pan=dimap_pan)
imagery = spot_scene.get_imagery()
xs = imagery.get_xs()
- # self.compare_images("/tmp/dem_prepare.tif", "decloud_data/baseline/PREPARE/DEM_PREPARE/T31TEJ.tif")
+ self.compare_images(xs, dimap_xs)
--
GitLab