Remove extra_test.sh from ci (#638)

resolves se-sic/VaRA#853

Author: Sinerum

.github/workflows/ci.yml

@@ -48,9 +48,8 @@ jobs:
         coverage run -p -m pytest varats varats-core tests
         rm -rf benchbuild
 
-    - name: Run integration tests
+    - name: Combine Coverage
       run: |
-        ./run_extra_tests.sh
         coverage combine -a --rcfile=.coveragerc
         coverage xml
     - name: Upload coverage report

run_extra_tests.sh

@@ -185,6 +185,88 @@ def test_vara_cs_gen_specific(self):
         )
         self.assertEqual(len(case_study.revisions), 2)
 
+    @run_in_test_environment()
+    def test_vara_cs_gen_release(self):
+        """Test gen select_release."""
+        runner = CliRunner()
+        Path(vara_cfg()["paper_config"]["folder"].value + "/" +
+             "test_gen").mkdir()
+        vara_cfg()["paper_config"]["current_config"] = "test_gen"
+        result = runner.invoke(
+            driver_casestudy.main,
+            ['gen', '-p', 'gravity', 'select_release', 'major']
+        )
+        self.assertEqual(0, result.exit_code, result.exception)
+
+    @run_in_test_environment(
+        UnitTestFixtures.create_file_fixture(
+            TEST_INPUTS_DIR / "paper_configs/test_casestudy_status",
+            Path("paper_configs/test_ext")
+        )
+    )
+    def test_vara_cs_gen_to_extend(self):
+        """Test the extend-functionality of vara-cs gen."""
+        runner = CliRunner()
+        vara_cfg()["paper_config"]["current_config"] = "test_ext"
+        save_config()
+        load_paper_config()
+        old_commit = 'ef364d3abc5647111c5424ea0d83a567e184a23b'
+        new_commit = '6c6da57ae2aa962aabde6892442227063d87e88c'
+        result = runner.invoke(
+            driver_casestudy.main,
+            ['gen', '-p', 'xz', 'select_specific', new_commit]
+        )
+        self.assertEqual(0, result.exit_code, result.exception)
+        case_study_path = Path(
+            vara_cfg()["paper_config"]["folder"].value +
+            "/test_ext/xz_0.case_study"
+        )
+        self.assertTrue(case_study_path.exists())
+        case_study = load_case_study_from_file(case_study_path)
+        self.assertTrue(
+            case_study.revisions.__contains__(FullCommitHash(old_commit))
+        )
+        self.assertTrue(
+            case_study.revisions.__contains__(FullCommitHash(new_commit))
+        )
+        self.assertEqual(1, case_study.num_stages)
+
+    @run_in_test_environment(
+        UnitTestFixtures.create_file_fixture(
+            TEST_INPUTS_DIR / "paper_configs/test_casestudy_status",
+            Path("paper_configs/test_ext")
+        )
+    )
+    def test_vara_cs_gen_to_extend_new_stage(self):
+        """Test the extend-functionality of vara-cs gen."""
+        runner = CliRunner()
+        vara_cfg()["paper_config"]["current_config"] = "test_ext"
+        save_config()
+        load_paper_config()
+        old_commit = 'ef364d3abc5647111c5424ea0d83a567e184a23b'
+        new_commit = '6c6da57ae2aa962aabde6892442227063d87e88c'
+        result = runner.invoke(
+            driver_casestudy.main, [
+                'gen', '-p', 'xz', '--new-stage', '--merge-stage', 'test',
+                'select_specific', new_commit
+            ]
+        )
+        self.assertEqual(0, result.exit_code, result.exception)
+        case_study_path = Path(
+            vara_cfg()["paper_config"]["folder"].value +
+            "/test_ext/xz_0.case_study"
+        )
+        self.assertTrue(case_study_path.exists())
+        case_study = load_case_study_from_file(case_study_path)
+        self.assertTrue(
+            case_study.revisions.__contains__(FullCommitHash(old_commit))
+        )
+        self.assertTrue(
+            case_study.revisions.__contains__(FullCommitHash(new_commit))
+        )
+        self.assertEqual(2, case_study.num_stages)
+        self.assertEqual('test', case_study.stages[1].name)
+
     @run_in_test_environment(
         UnitTestFixtures.create_file_fixture(
             TEST_INPUTS_DIR / "paper_configs/test_casestudy_status",

tests/tools/test_driver_casestudy.py

@@ -192,7 +192,7 @@ def __casestudy_gen(
             "You need to create a paper config first"
             " using vara-pc create"
         )
-        return
+        raise click.Abort()
     ctx.obj['path'] = Path(
         vara_cfg()["paper_config"]["folder"].value
     ) / (paper_config + f"/{project}_{version}.case_study")
@@ -245,7 +245,10 @@ def set_merge_stage(stage: CSStage) -> None:
             ctx.obj['merge_stage'] = stage_index
 
         else:
-            ctx.obj['merge_stage'] = max(case_study.num_stages, 0)
+            if new_stage:
+                ctx.obj['merge_stage'] = max(case_study.num_stages, 0)
+            else:
+                ctx.obj['merge_stage'] = max(case_study.num_stages - 1, 0)
     ctx.obj['case_study'] = case_study