From 823361ae077de4d5b416ae54eeb851475ede8a6d Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Wed, 18 Mar 2020 23:38:53 +0100
Subject: [PATCH] [refactor] refactor folder for r packages unitary tests

---
 test/{test_unitary => test_unitary_r_packages}/__init__.py    | 0
 .../test_spatial_extreme}/__init__.py                         | 0
 .../test_spatial_extreme/test_fitmaxstab}/__init__.py         | 0
 .../test_fitmaxstab/test_fitmaxstab_with_margin.py            | 4 ++--
 .../test_fitmaxstab/test_fitmaxstab_without_margin.py         | 4 ++--
 .../test_spatial_extreme/test_rmaxstab/__init__.py            | 0
 .../test_rmaxstab/test_rmaxstab_with_margin.py                | 4 ++--
 .../test_rmaxstab/test_rmaxstab_without_margin.py             | 2 +-
 .../test_unitary_abstract.py                                  | 0
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename test/{test_unitary => test_unitary_r_packages}/__init__.py (100%)
 rename test/{test_unitary/test_fitmaxstab => test_unitary_r_packages/test_spatial_extreme}/__init__.py (100%)
 rename test/{test_unitary/test_rmaxstab => test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab}/__init__.py (100%)
 rename test/{test_unitary => test_unitary_r_packages/test_spatial_extreme}/test_fitmaxstab/test_fitmaxstab_with_margin.py (94%)
 rename test/{test_unitary => test_unitary_r_packages/test_spatial_extreme}/test_fitmaxstab/test_fitmaxstab_without_margin.py (86%)
 create mode 100644 test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/__init__.py
 rename test/{test_unitary => test_unitary_r_packages/test_spatial_extreme}/test_rmaxstab/test_rmaxstab_with_margin.py (94%)
 rename test/{test_unitary => test_unitary_r_packages/test_spatial_extreme}/test_rmaxstab/test_rmaxstab_without_margin.py (95%)
 rename test/{test_unitary => test_unitary_r_packages}/test_unitary_abstract.py (100%)

diff --git a/test/test_unitary/__init__.py b/test/test_unitary_r_packages/__init__.py
similarity index 100%
rename from test/test_unitary/__init__.py
rename to test/test_unitary_r_packages/__init__.py
diff --git a/test/test_unitary/test_fitmaxstab/__init__.py b/test/test_unitary_r_packages/test_spatial_extreme/__init__.py
similarity index 100%
rename from test/test_unitary/test_fitmaxstab/__init__.py
rename to test/test_unitary_r_packages/test_spatial_extreme/__init__.py
diff --git a/test/test_unitary/test_rmaxstab/__init__.py b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/__init__.py
similarity index 100%
rename from test/test_unitary/test_rmaxstab/__init__.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/__init__.py
diff --git a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_with_margin.py
similarity index 94%
rename from test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_with_margin.py
index a1ce0df0..a435d09f 100644
--- a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py
+++ b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_with_margin.py
@@ -7,8 +7,8 @@ from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model impo
 from extreme_fit.model.max_stable_model.abstract_max_stable_model import CovarianceFunction
 from extreme_fit.model.max_stable_model.max_stable_models import Schlather
 from extreme_fit.model.utils import r
-from test.test_unitary.test_rmaxstab.test_rmaxstab_with_margin import TestRMaxStabWithMarginConstant
-from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
+from test.test_unitary_r_packages.test_spatial_extreme.test_rmaxstab.test_rmaxstab_with_margin import TestRMaxStabWithMarginConstant
+from test.test_unitary_r_packages.test_unitary_abstract import TestUnitaryAbstract
 
 
 class TestMaxStableFitWithConstantMargin(TestUnitaryAbstract):
diff --git a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_without_margin.py
similarity index 86%
rename from test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_without_margin.py
index d1877adb..b428d7a7 100644
--- a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py
+++ b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_without_margin.py
@@ -5,8 +5,8 @@ from extreme_fit.model.max_stable_model.abstract_max_stable_model import Covaria
 from extreme_fit.model.max_stable_model.max_stable_models import Schlather
 from extreme_fit.model.utils import r
 from spatio_temporal_dataset.dataset.simulation_dataset import MaxStableDataset
-from test.test_unitary.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
-from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
+from test.test_unitary_r_packages.test_spatial_extreme.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
+from test.test_unitary_r_packages.test_unitary_abstract import TestUnitaryAbstract
 
 
 class TestMaxStableFitWithoutMargin(TestUnitaryAbstract):
diff --git a/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/__init__.py b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_with_margin.py
similarity index 94%
rename from test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_with_margin.py
index c1570bd6..df02dd5a 100644
--- a/test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py
+++ b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_with_margin.py
@@ -7,8 +7,8 @@ from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model impo
 from extreme_fit.model.utils import r
 from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset
-from test.test_unitary.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
-from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
+from test.test_unitary_r_packages.test_spatial_extreme.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
+from test.test_unitary_r_packages.test_unitary_abstract import TestUnitaryAbstract
 
 
 class TestRMaxStabWithMarginConstant(TestUnitaryAbstract):
diff --git a/test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_without_margin.py
similarity index 95%
rename from test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_without_margin.py
index 42bc01e2..5e32c740 100644
--- a/test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py
+++ b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_without_margin.py
@@ -10,7 +10,7 @@ from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoo
 from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \
     AbstractSpatialCoordinates
 from spatio_temporal_dataset.spatio_temporal_observations.annual_maxima_observations import MaxStableAnnualMaxima
-from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
+from test.test_unitary_r_packages.test_unitary_abstract import TestUnitaryAbstract
 
 
 class TestRMaxStab(TestUnitaryAbstract):
diff --git a/test/test_unitary/test_unitary_abstract.py b/test/test_unitary_r_packages/test_unitary_abstract.py
similarity index 100%
rename from test/test_unitary/test_unitary_abstract.py
rename to test/test_unitary_r_packages/test_unitary_abstract.py
-- 
GitLab