From a1d7d7e265c8b1d79f4f3b6b5e5af70a12499a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com> Date: Thu, 5 May 2022 14:18:46 +0200 Subject: [PATCH] rename --- integrationtests/{ => basic_example}/model.yml | 0 integrationtests/{ => basic_example}/test.py | 0 integrationtests/realworld_example/crawl.sh | 4 ++++ .../{ => realworld_example}/load_and_insert_json_models.py | 0 .../{ => realworld_example}/test_dataset_crawler.py | 0 .../{ => test_data/realworld_example}/data/35/.dataspace.json | 0 .../data/35/03_raw_data/001_dataset1/demo-dataset.csv | 0 .../data/35/03_raw_data/001_dataset1/metadata.json | 0 .../realworld_example}/data/35/03_raw_data/README_RawData.md | 0 .../data/35/03_raw_data/metadata-template.json | 0 .../data/35/04_data_processing/README_ProcessedData.md | 0 .../data/35/04_data_processing/metadata-template.json | 0 .../realworld_example}/data/35/05_results/README_Results.md | 0 .../{ => test_data/realworld_example}/data/35/README.md | 0 .../{ => test_data/realworld_example}/dataset_cfoods.yml | 2 +- .../realworld_example}/schema/dataset-inheritance.yml | 0 .../realworld_example}/schema/dataset.schema.json | 0 .../realworld_example}/schema/dataspace.schema.json | 0 .../realworld_example}/schema/zmt-organisation.yml | 0 19 files changed, 5 insertions(+), 1 deletion(-) rename integrationtests/{ => basic_example}/model.yml (100%) rename integrationtests/{ => basic_example}/test.py (100%) create mode 100755 integrationtests/realworld_example/crawl.sh rename integrationtests/{ => realworld_example}/load_and_insert_json_models.py (100%) rename integrationtests/{ => realworld_example}/test_dataset_crawler.py (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/.dataspace.json (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/03_raw_data/001_dataset1/demo-dataset.csv (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/03_raw_data/001_dataset1/metadata.json (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/03_raw_data/README_RawData.md (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/03_raw_data/metadata-template.json (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/04_data_processing/README_ProcessedData.md (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/04_data_processing/metadata-template.json (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/05_results/README_Results.md (100%) rename integrationtests/{ => test_data/realworld_example}/data/35/README.md (100%) rename integrationtests/{ => test_data/realworld_example}/dataset_cfoods.yml (99%) rename integrationtests/{ => test_data/realworld_example}/schema/dataset-inheritance.yml (100%) rename integrationtests/{ => test_data/realworld_example}/schema/dataset.schema.json (100%) rename integrationtests/{ => test_data/realworld_example}/schema/dataspace.schema.json (100%) rename integrationtests/{ => test_data/realworld_example}/schema/zmt-organisation.yml (100%) diff --git a/integrationtests/model.yml b/integrationtests/basic_example/model.yml similarity index 100% rename from integrationtests/model.yml rename to integrationtests/basic_example/model.yml diff --git a/integrationtests/test.py b/integrationtests/basic_example/test.py similarity index 100% rename from integrationtests/test.py rename to integrationtests/basic_example/test.py diff --git a/integrationtests/realworld_example/crawl.sh b/integrationtests/realworld_example/crawl.sh new file mode 100755 index 00000000..55a2a331 --- /dev/null +++ b/integrationtests/realworld_example/crawl.sh @@ -0,0 +1,4 @@ +#!/bin/bash +python -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/data +python load_and_insert_json_models.py +python test_dataset_crawler.py diff --git a/integrationtests/load_and_insert_json_models.py b/integrationtests/realworld_example/load_and_insert_json_models.py similarity index 100% rename from integrationtests/load_and_insert_json_models.py rename to integrationtests/realworld_example/load_and_insert_json_models.py diff --git a/integrationtests/test_dataset_crawler.py b/integrationtests/realworld_example/test_dataset_crawler.py similarity index 100% rename from integrationtests/test_dataset_crawler.py rename to integrationtests/realworld_example/test_dataset_crawler.py diff --git a/integrationtests/data/35/.dataspace.json b/integrationtests/test_data/realworld_example/data/35/.dataspace.json similarity index 100% rename from integrationtests/data/35/.dataspace.json rename to integrationtests/test_data/realworld_example/data/35/.dataspace.json diff --git a/integrationtests/data/35/03_raw_data/001_dataset1/demo-dataset.csv b/integrationtests/test_data/realworld_example/data/35/03_raw_data/001_dataset1/demo-dataset.csv similarity index 100% rename from integrationtests/data/35/03_raw_data/001_dataset1/demo-dataset.csv rename to integrationtests/test_data/realworld_example/data/35/03_raw_data/001_dataset1/demo-dataset.csv diff --git a/integrationtests/data/35/03_raw_data/001_dataset1/metadata.json b/integrationtests/test_data/realworld_example/data/35/03_raw_data/001_dataset1/metadata.json similarity index 100% rename from integrationtests/data/35/03_raw_data/001_dataset1/metadata.json rename to integrationtests/test_data/realworld_example/data/35/03_raw_data/001_dataset1/metadata.json diff --git a/integrationtests/data/35/03_raw_data/README_RawData.md b/integrationtests/test_data/realworld_example/data/35/03_raw_data/README_RawData.md similarity index 100% rename from integrationtests/data/35/03_raw_data/README_RawData.md rename to integrationtests/test_data/realworld_example/data/35/03_raw_data/README_RawData.md diff --git a/integrationtests/data/35/03_raw_data/metadata-template.json b/integrationtests/test_data/realworld_example/data/35/03_raw_data/metadata-template.json similarity index 100% rename from integrationtests/data/35/03_raw_data/metadata-template.json rename to integrationtests/test_data/realworld_example/data/35/03_raw_data/metadata-template.json diff --git a/integrationtests/data/35/04_data_processing/README_ProcessedData.md b/integrationtests/test_data/realworld_example/data/35/04_data_processing/README_ProcessedData.md similarity index 100% rename from integrationtests/data/35/04_data_processing/README_ProcessedData.md rename to integrationtests/test_data/realworld_example/data/35/04_data_processing/README_ProcessedData.md diff --git a/integrationtests/data/35/04_data_processing/metadata-template.json b/integrationtests/test_data/realworld_example/data/35/04_data_processing/metadata-template.json similarity index 100% rename from integrationtests/data/35/04_data_processing/metadata-template.json rename to integrationtests/test_data/realworld_example/data/35/04_data_processing/metadata-template.json diff --git a/integrationtests/data/35/05_results/README_Results.md b/integrationtests/test_data/realworld_example/data/35/05_results/README_Results.md similarity index 100% rename from integrationtests/data/35/05_results/README_Results.md rename to integrationtests/test_data/realworld_example/data/35/05_results/README_Results.md diff --git a/integrationtests/data/35/README.md b/integrationtests/test_data/realworld_example/data/35/README.md similarity index 100% rename from integrationtests/data/35/README.md rename to integrationtests/test_data/realworld_example/data/35/README.md diff --git a/integrationtests/dataset_cfoods.yml b/integrationtests/test_data/realworld_example/dataset_cfoods.yml similarity index 99% rename from integrationtests/dataset_cfoods.yml rename to integrationtests/test_data/realworld_example/dataset_cfoods.yml index 5b5e08a5..1589cba2 100644 --- a/integrationtests/dataset_cfoods.yml +++ b/integrationtests/test_data/realworld_example/dataset_cfoods.yml @@ -157,7 +157,7 @@ Data: match_value: "(?P<title>.*)" records: Dataset: - name: $title + title: $title authors_element: type: DictListElement match_name: "authors" diff --git a/integrationtests/schema/dataset-inheritance.yml b/integrationtests/test_data/realworld_example/schema/dataset-inheritance.yml similarity index 100% rename from integrationtests/schema/dataset-inheritance.yml rename to integrationtests/test_data/realworld_example/schema/dataset-inheritance.yml diff --git a/integrationtests/schema/dataset.schema.json b/integrationtests/test_data/realworld_example/schema/dataset.schema.json similarity index 100% rename from integrationtests/schema/dataset.schema.json rename to integrationtests/test_data/realworld_example/schema/dataset.schema.json diff --git a/integrationtests/schema/dataspace.schema.json b/integrationtests/test_data/realworld_example/schema/dataspace.schema.json similarity index 100% rename from integrationtests/schema/dataspace.schema.json rename to integrationtests/test_data/realworld_example/schema/dataspace.schema.json diff --git a/integrationtests/schema/zmt-organisation.yml b/integrationtests/test_data/realworld_example/schema/zmt-organisation.yml similarity index 100% rename from integrationtests/schema/zmt-organisation.yml rename to integrationtests/test_data/realworld_example/schema/zmt-organisation.yml -- GitLab