From 63e902ed1aef77f55501a5d3127e38cf6802ff61 Mon Sep 17 00:00:00 2001
From: Luc LAURENT <luc.laurent@cnam.fr>
Date: Sun, 6 Oct 2024 10:10:48 +0200
Subject: [PATCH] update workflows with new syntax and directory for tests

---
 .github/workflows/ci-mac-os.yml | 11 +++++++----
 .github/workflows/ci-ubuntu.yml | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-mac-os.yml b/.github/workflows/ci-mac-os.yml
index dde4f9f..7974e74 100644
--- a/.github/workflows/ci-mac-os.yml
+++ b/.github/workflows/ci-mac-os.yml
@@ -75,9 +75,12 @@ jobs:
         # add automultiplechoice.sty local copy to LaTeX PATH (for this step)
         # export TEXINPUTS=.:./tests/payload_test_amc2moodle/:$TEXINPUTS  (during tests, automultiplechoice.sty is copied in the temprorary test folder )
         python -m amc2moodle.tests.test_moodle2amc
+    - name: Test text parser
+      run: |
+        python -m amc2moodle.tests.test_utils_text
     - name: Test calculated questions parsers
       run: |
-        python -m amc2moodle.tests.test_utils
+        python -m amc2moodle.tests.test_utils_calculatedParser
             
     
     # Store output files
@@ -87,20 +90,20 @@ jobs:
       uses: actions/upload-artifact@main
       with:
         name: test_notikz_${{ matrix.python-version }}
-        path: test_notikz.xml    
+        path: output_tests/test_notikz.xml    
     
     - name: Archive XML test output of amc2moodle (with tikz)
       if: ${{ always() }}
       uses: actions/upload-artifact@main
       with:
         name: test_tikz_${{ matrix.python-version }}
-        path: test_tikz.xml
+        path: output_tests/test_tikz.xml
     # moodle2amc
     - name: Move latex output
       if: ${{ always() }}
       run: |
         mkdir moodle-bank-exemple-output
-        mv test_moodle-bank-exemple.* moodle-bank-exemple-output/
+        mv output_tests/test_moodle-bank-exemple.* moodle-bank-exemple-output/
         
     - name: Archive LaTeX test output (moodle2amc)
       if: ${{ always() }}
diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
index fed445a..97c949b 100644
--- a/.github/workflows/ci-ubuntu.yml
+++ b/.github/workflows/ci-ubuntu.yml
@@ -70,9 +70,12 @@ jobs:
         # add automultiplechoice.sty local copy to LaTeX PATH (for this step)
         # export TEXINPUTS=.:./tests/payload_test_amc2moodle/:$TEXINPUTS (during tests, automultiplechoice.sty is copied in the temprorary test folder )
         python -m amc2moodle.tests.test_moodle2amc
+    - name: Test text parser
+      run: |
+        python -m amc2moodle.tests.test_utils_text
     - name: Test calculated questions parsers
       run: |
-        python -m amc2moodle.tests.test_utils
+        python -m amc2moodle.tests.test_utils_calculatedParser
     
     # Store output files
     # amc2moodle
@@ -81,20 +84,20 @@ jobs:
       uses: actions/upload-artifact@main
       with:
         name: test_notikz_${{ matrix.python-version }}
-        path: test_notikz.xml    
+        path: output_tests/test_notikz.xml    
     
     - name: Archive XML test output of amc2moodle (with tikz)
       if: ${{ always() }}
       uses: actions/upload-artifact@main
       with:
         name: test_tikz_${{ matrix.python-version }}
-        path: test_tikz.xml
+        path: output_tests/test_tikz.xml
     # moodle2amc
     - name: Move latex output
       if: ${{ always() }}
       run: |
         mkdir moodle-bank-exemple-output
-        mv test_moodle-bank-exemple.* moodle-bank-exemple-output/
+        mv output_tests/test_moodle-bank-exemple.* moodle-bank-exemple-output/
 
     - name: Archive LaTeX test output (moodle2amc)
       if: ${{ always() }}