diff --git a/.github/workflows/dots-CI.yml b/.github/workflows/dots-CI.yml index 970bdf5..75f9f1a 100644 --- a/.github/workflows/dots-CI.yml +++ b/.github/workflows/dots-CI.yml @@ -26,6 +26,7 @@ jobs: chmod +x ./bin/basexhttp && cp -r ../dots/ ./webapp/ && ./bin/basex ./webapp/dots/scripts/dots_db_init.xq + ./bin/basex -b dbName=encpos -b projectDirPath=./webapp/dots/tests/data_test/encpos ./webapp/dots/scripts/project_db_init.xq - name: Start BaseX backend run : | diff --git a/data_test/encpos/data/ENCPOS_1849/ENCPOS_1849_04.xml b/tests/data_test/encpos/data/ENCPOS_1849/ENCPOS_1849_04.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1849/ENCPOS_1849_04.xml rename to tests/data_test/encpos/data/ENCPOS_1849/ENCPOS_1849_04.xml diff --git a/data_test/encpos/data/ENCPOS_1849/ENCPOS_1849_08.xml b/tests/data_test/encpos/data/ENCPOS_1849/ENCPOS_1849_08.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1849/ENCPOS_1849_08.xml rename to tests/data_test/encpos/data/ENCPOS_1849/ENCPOS_1849_08.xml diff --git a/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_09.xml b/tests/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_09.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_09.xml rename to tests/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_09.xml diff --git a/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_12.xml b/tests/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_12.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_12.xml rename to tests/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_12.xml diff --git a/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_14.xml b/tests/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_14.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_14.xml rename to tests/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_14.xml diff --git a/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_25.xml b/tests/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_25.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_25.xml rename to tests/data_test/encpos/data/ENCPOS_1971/ENCPOS_1971_25.xml diff --git a/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_06.xml b/tests/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_06.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_06.xml rename to tests/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_06.xml diff --git a/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_09.xml b/tests/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_09.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_09.xml rename to tests/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_09.xml diff --git a/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_18.xml b/tests/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_18.xml similarity index 100% rename from data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_18.xml rename to tests/data_test/encpos/data/ENCPOS_1972/ENCPOS_1972_18.xml diff --git a/data_test/encpos/metadata/custom_collections.tsv b/tests/data_test/encpos/metadata/custom_collections.tsv similarity index 100% rename from data_test/encpos/metadata/custom_collections.tsv rename to tests/data_test/encpos/metadata/custom_collections.tsv diff --git a/data_test/encpos/metadata/default_collections_titles.tsv b/tests/data_test/encpos/metadata/default_collections_titles.tsv similarity index 100% rename from data_test/encpos/metadata/default_collections_titles.tsv rename to tests/data_test/encpos/metadata/default_collections_titles.tsv diff --git a/data_test/encpos/metadata/documents_metadata.tsv b/tests/data_test/encpos/metadata/documents_metadata.tsv similarity index 100% rename from data_test/encpos/metadata/documents_metadata.tsv rename to tests/data_test/encpos/metadata/documents_metadata.tsv diff --git a/data_test/encpos/metadata/dots_metadata_mapping.xml b/tests/data_test/encpos/metadata/dots_metadata_mapping.xml similarity index 100% rename from data_test/encpos/metadata/dots_metadata_mapping.xml rename to tests/data_test/encpos/metadata/dots_metadata_mapping.xml diff --git a/tests/launcher.xq b/tests/launcher.xq index 1964d40..696a0d4 100644 --- a/tests/launcher.xq +++ b/tests/launcher.xq @@ -10,9 +10,6 @@ import module namespace deployTest = "https://github.com/chartes/dots/deploiment "test init dots db...", (: create a specific function "checkDotsExists" in deploimentTests.xqm :) -(: if (db:exists("dots")) -then "* ✅ DoTS Db created with success" -else "* ❌ DoTS Db creation failed", :) (: Check if db dots exists :) (deployTest:check-boolean-response(db:exists($G:dots)), "* ✅ DoTS Db created with success"), @@ -21,7 +18,7 @@ else "* ❌ DoTS Db creation failed", :) (: Compare new default mapping dots with deult mapping dots model :) (deployTest:check-boolean-response(deployTest:testMetadataMapping()), "* ✅ DoTS Db default metadata mapping created with success"), -deployTest:checkTotalResources(deployTest:getNumberResources()), "* ✅", +deployTest:checkTotalResources(deployTest:getNumberResources()), "* ✅ total resources successfully counted", (: deployTest:check-boolean-response(deployTest:testDbSwitch()), deployTest:check-boolean-response(deployTest:testMetadataMapping()), :)