Revert "Demo tests: removed curr folder duplication for more maintain…

…ability"

This reverts commit 8875517.

demo/scenarios/test.sh

@@ -1,19 +1,18 @@
 #!/usr/bin/env bash
-CURR_FOLDER="./demo/scenarios"
 
 # Remove everything from temp stores to avoid outdated data.
-rm -r ${CURR_FOLDER}/store/models
-mkdir -p ${CURR_FOLDER}/store/models
+rm -r ./store/models
+mkdir -p ./store/models
 
-poetry run pytest --nbmake ${CURR_FOLDER}/1_requirements.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2_evidence.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2a_evidence_fairness.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2b_evidence_robustness.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2c_evidence_performance.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2d_evidence_interpretability.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2e_evidence_accuracy.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2f_evidence_interoperability.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2g_evidence_resilience.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/2h_evidence_monitorability.ipynb	
-poetry run pytest --nbmake ${CURR_FOLDER}/2i_evidence_performance_time.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/3_report.ipynb
+poetry run pytest --nbmake ./demo/scenarios/1_requirements.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2_evidence.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2a_evidence_fairness.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2b_evidence_robustness.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2c_evidence_performance.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2d_evidence_interpretability.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2e_evidence_accuracy.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2f_evidence_interoperability.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2g_evidence_resilience.ipynb
+poetry run pytest --nbmake ./demo/scenarios/2h_evidence_monitorability.ipynb	
+poetry run pytest --nbmake ./demo/scenarios/2i_evidence_performance_time.ipynb
+poetry run pytest --nbmake ./demo/scenarios/3_report.ipynb

demo/simple/test.sh

@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
-CURR_FOLDER="./demo/simple"
 
 # Remove everything from temp stores to avoid outdated data.
-rm -r ${CURR_FOLDER}/store/models
-mkdir -p ${CURR_FOLDER}/store/models
+rm -r ./store/models
+mkdir -p ./store/models
 
-poetry run pytest --nbmake ${CURR_FOLDER}/negotiation.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/requirements.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/evidence.ipynb
-poetry run pytest --nbmake ${CURR_FOLDER}/report.ipynb
+poetry run pytest --nbmake ./demo/simple/negotiation.ipynb
+poetry run pytest --nbmake ./demo/simple/requirements.ipynb
+poetry run pytest --nbmake ./demo/simple/evidence.ipynb
+poetry run pytest --nbmake ./demo/simple/report.ipynb