From 3598e768cb2936130411c718dfc28ae2d75fa0c7 Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Wed, 18 May 2022 09:23:39 +0200
Subject: [PATCH] MAINT: Tidy up integration test directory
---
.../use_case_simple_presentation}/DataAnalysis/results.md | 0
.../use_case_simple_presentation}/ExperimentalData/data.md | 0
.../extroot}/use_case_simple_presentation/cfood.yml | 0
.../extroot}/use_case_simple_presentation/identifiables.yml | 0
.../extroot}/use_case_simple_presentation/model.yml | 0
.../test_dataset_crawler.py => test_realworld_example.py} | 4 ++--
6 files changed, 2 insertions(+), 2 deletions(-)
rename integrationtests/{use_case_simple_presentation/extroot => test_data/extroot/use_case_simple_presentation}/DataAnalysis/results.md (100%)
rename integrationtests/{use_case_simple_presentation/extroot => test_data/extroot/use_case_simple_presentation}/ExperimentalData/data.md (100%)
rename integrationtests/{ => test_data/extroot}/use_case_simple_presentation/cfood.yml (100%)
rename integrationtests/{ => test_data/extroot}/use_case_simple_presentation/identifiables.yml (100%)
rename integrationtests/{ => test_data/extroot}/use_case_simple_presentation/model.yml (100%)
rename integrationtests/{realworld_example/test_dataset_crawler.py => test_realworld_example.py} (97%)
diff --git a/integrationtests/use_case_simple_presentation/extroot/DataAnalysis/results.md b/integrationtests/test_data/extroot/use_case_simple_presentation/DataAnalysis/results.md
similarity index 100%
rename from integrationtests/use_case_simple_presentation/extroot/DataAnalysis/results.md
rename to integrationtests/test_data/extroot/use_case_simple_presentation/DataAnalysis/results.md
diff --git a/integrationtests/use_case_simple_presentation/extroot/ExperimentalData/data.md b/integrationtests/test_data/extroot/use_case_simple_presentation/ExperimentalData/data.md
similarity index 100%
rename from integrationtests/use_case_simple_presentation/extroot/ExperimentalData/data.md
rename to integrationtests/test_data/extroot/use_case_simple_presentation/ExperimentalData/data.md
diff --git a/integrationtests/use_case_simple_presentation/cfood.yml b/integrationtests/test_data/extroot/use_case_simple_presentation/cfood.yml
similarity index 100%
rename from integrationtests/use_case_simple_presentation/cfood.yml
rename to integrationtests/test_data/extroot/use_case_simple_presentation/cfood.yml
diff --git a/integrationtests/use_case_simple_presentation/identifiables.yml b/integrationtests/test_data/extroot/use_case_simple_presentation/identifiables.yml
similarity index 100%
rename from integrationtests/use_case_simple_presentation/identifiables.yml
rename to integrationtests/test_data/extroot/use_case_simple_presentation/identifiables.yml
diff --git a/integrationtests/use_case_simple_presentation/model.yml b/integrationtests/test_data/extroot/use_case_simple_presentation/model.yml
similarity index 100%
rename from integrationtests/use_case_simple_presentation/model.yml
rename to integrationtests/test_data/extroot/use_case_simple_presentation/model.yml
diff --git a/integrationtests/realworld_example/test_dataset_crawler.py b/integrationtests/test_realworld_example.py
similarity index 97%
rename from integrationtests/realworld_example/test_dataset_crawler.py
rename to integrationtests/test_realworld_example.py
index d5a7d972..28a9469d 100644
--- a/integrationtests/realworld_example/test_dataset_crawler.py
+++ b/integrationtests/test_realworld_example.py
@@ -51,7 +51,7 @@ def rfp(*pathcomponents):
return os.path.join(os.path.dirname(__file__), *pathcomponents)
-DATADIR = rfp("..", "test_data", "extroot", "realworld_example")
+DATADIR = rfp("test_data", "extroot", "realworld_example")
@pytest.fixture
@@ -74,7 +74,7 @@ def usemodel():
@pytest.fixture
def clear_database():
- # TODO(fspreck): Remove once the corresponding avdvancedtools function can
+ # TODO(fspreck): Remove once the corresponding advancedtools function can
# be used.
ents = db.execute_query("FIND ENTITY WITH ID>99")
if ents:
--
GitLab