Add cucumber submodule for tests, remove Antares_Simulator_Tests_NR

.github/workflows/ubuntu.yml

@@ -146,9 +146,9 @@ jobs:
         run: |
           git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests
 
-      - name: Init submodule Antares_Simulator_Tests_NR
+      - name: Init submodule simulator-cucmber-tests
         run: |
-          git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests_NR
+          git submodule update --init --remote --recursive src/tests/cucumber/simulator-cucumber-tests
 
       - name: Run named mps tests
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' && !cancelled() }}

.github/workflows/windows-vcpkg.yml

@@ -114,9 +114,9 @@ jobs:
         run: |
           git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests
 
-      - name: Init submodule Antares_Simulator_Tests_NR
+      - name: Init submodule simulator-cucmber-tests
         run: |
-          git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests_NR
+          git submodule update --init --remote --recursive src/tests/cucumber/simulator-cucumber-tests
 
       - name: Enable git longpaths
         run: git config --system core.longpaths true

.gitmodules

@@ -5,6 +5,6 @@
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git
-[submodule "src/tests/resources/Antares_Simulator_Tests_NR"]
-	path = src/tests/resources/Antares_Simulator_Tests_NR
-	url = https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR.git
+[submodule "src/tests/cucumber/simulator-cucumber-tests"]
+	path = src/tests/cucumber/simulator-cucumber-tests
+	url = https://github.com/AntaresSimulatorTeam/simulator-cucumber-tests

src/tests/cucumber/features/medium_tests.feature

@@ -2,7 +2,7 @@ Feature: medium tests
 
   @fast @medium @incomplete
   Scenario: 035 Mixed Expansion - Smart grid model 2
-    Given the study path is "medium-tests/035 Mixed Expansion - Smart grid model 2"
+    Given the study path is "035 Mixed Expansion - Smart grid model 2"
     When I run antares simulator
     Then the simulation takes less than 15 seconds
     And the simulation succeeds

src/tests/cucumber/features/short_tests.feature

@@ -2,7 +2,7 @@ Feature: short tests
 
   @fast @short
   Scenario: 001 One node - passive
-    Given the study path is "short-tests/001 One node - passive"
+    Given the study path is "001 One node - passive"
     When I run antares simulator
     Then the simulation takes less than 5 seconds
     And the simulation succeeds
@@ -12,7 +12,7 @@ Feature: short tests
 
   @fast @short
   Scenario: 002 Thermal fleet - Base
-    Given the study path is "short-tests/002 Thermal fleet - Base"
+    Given the study path is "002 Thermal fleet - Base"
     When I run antares simulator
     Then the simulation takes less than 5 seconds
     And the simulation succeeds
@@ -24,7 +24,7 @@ Feature: short tests
 
   @fast @short
   Scenario: 003 Thermal fleet - Must-run
-    Given the study path is "short-tests/003 Thermal fleet - Must-run"
+    Given the study path is "003 Thermal fleet - Must-run"
     When I run antares simulator
     Then the simulation takes less than 5 seconds
     And the simulation succeeds
@@ -36,10 +36,10 @@ Feature: short tests
 
   @fast @short
   Scenario: 021 Four areas - DC law
-    Given the study path is "short-tests/021 Four areas - DC law"
+    Given the study path is "021 Four areas - DC law-simplified"
     When I run antares simulator
     Then the simulation takes less than 20 seconds
     And the simulation succeeds
     And the annual system cost is
-      | EXP       | STD       | MIN       | MAX       |
-      | 7.972e+10 | 2.258e+10 | 5.613e+10 | 1.082e+11 |
+      | EXP       | STD         | MIN         | MAX         |
+      | 6.5397e+10| 2.97462e+09 | 6.10076e+10 | 6.84837e+10 |

src/tests/cucumber/features/steps/steps.py

@@ -8,7 +8,7 @@
 
 @given('the study path is "{string}"')
 def study_path_is(context, string):
-    context.study_path = os.path.join("..", "resources", "Antares_Simulator_Tests_NR" , string.replace("/", os.sep))
+    context.study_path = os.path.join("simulator-cucumber-tests", string.replace("/", os.sep))
 
 @when('I run antares simulator')
 def run_antares(context):

src/tests/cucumber/readme.md

@@ -61,10 +61,7 @@ Workflow file: [here](../../../.github/workflows/cucumber-tests/action.yml)
 
 ## Under the hood
 ### Test files
-Tests are hosted in the [Antares_Simulator_Tests_NR submodule](https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR) 
-into the `src/test/resources` folder. Adding or modifying a study should thus change contents of this submodule.
+Tests are hosted in the [simulator-cucumber-tests submodule](https://github.com/AntaresSimulatorTeam/simulator-cucumber-tests) into the `src/test/cucmber` folder. Adding or modifying a study should thus change contents of this submodule.
 
 ### Code-behind
-All Gherkin steps have a code-behind definition called "step definitions". These are defined in the python files under 
-[features/steps](./features/steps) and use the [behave](https://behave.readthedocs.io/en/latest/) implementation of 
-cucumber. Feel free to add extra steps for your tests.
+All Gherkin steps have a code-behind definition called "step definitions". These are defined in the python files under [features/steps](./features/steps) and use the [behave](https://behave.readthedocs.io/en/latest/) implementation of cucumber. Feel free to add extra steps for your tests.