FIT: refactor tests structure

.github/workflows/build_and_test_on_every_pr.yml

@@ -53,4 +53,4 @@ jobs:
             done < ci/showcase_targets_run.txt
         - name: Feature Integration Tests
           run: |
-            bazel test --config bl-x86_64-linux //feature_integration_tests/python_test_cases:fit
+            bazel test --config bl-x86_64-linux //feature_integration_tests/test_cases:fit

MODULE.bazel

@@ -37,7 +37,7 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_depen
 pip.parse(
     hub_name = "pip_score_venv_test",
     python_version = PYTHON_VERSION,
-    requirements_lock = "//feature_integration_tests/python_test_cases:requirements.txt.lock",
+    requirements_lock = "//feature_integration_tests/test_cases:requirements.txt.lock",
 )
 
 use_repo(pip, "pip_score_venv_test")

feature_integration_tests/README.md

@@ -4,15 +4,16 @@ This directory contains Feature Integration Tests for the S-CORE project. It inc
 
 ## Structure
 
-- `python_test_cases/` — Python-based integration test cases
+- `test_cases/` — Python-based integration test cases
   - `conftest.py` — Pytest configuration and fixtures
   - `fit_scenario.py` — Base scenario class
   - `requirements.txt` — Python dependencies
   - `BUILD` — Bazel build and test definitions
   - `tests/` — Test cases (e.g., orchestration with persistency)
-- `rust_test_scenarios/` — Rust-based integration test scenarios
-  - `src/` — Rust source code for test scenarios
-  - `BUILD` — Bazel build definitions
+- `test_scenarios/` — Location of test scenarios
+  - `rust/` — Rust-based integration test scenarios
+    - `src/` — Rust source code for test scenarios
+    - `BUILD` — Bazel build definitions
 
 ## Running Tests
 
@@ -21,25 +22,25 @@ This directory contains Feature Integration Tests for the S-CORE project. It inc
 Python tests are managed with Bazel and Pytest. To run the main test target:
 
 ```sh
-bazel test //feature_integration_tests/python_test_cases:fit
+bazel test //feature_integration_tests/test_cases:fit
 ```
 
 ### Rust Test Scenarios
 
-Rust test scenarios are defined in `rust_test_scenarios/src/scenarios`. Build and run them using Bazel:
+Rust test scenarios are defined in `test_scenarios/rust/src/scenarios`. Build and run them using Bazel:
 
 ```sh
-bazel build //feature_integration_tests/rust_test_scenarios
+bazel build //feature_integration_tests/test_scenarios/rust:rust_test_scenarios
 ```
 
 ```sh
-bazel run //feature_integration_tests/rust_test_scenarios -- --list-scenarios
+bazel run //feature_integration_tests/test_scenarios/rust:rust_test_scenarios -- --list-scenarios
 ```
 
 ## Updating Python Requirements
 
 To update Python dependencies:
 
 ```sh
-bazel run //feature_integration_tests/python_test_cases:requirements.update
+bazel run //feature_integration_tests/test_cases:requirements.update
 ```

feature_integration_tests/python_test_cases/BUILD → feature_integration_tests/test_cases/BUILD

@@ -31,11 +31,11 @@ score_py_pytest(
     srcs = glob(["tests/**/*.py"]) + ["conftest.py", "fit_scenario.py", "test_properties.py"],
     args = [
         "--traces=all",
-        "--rust-target-path=$(rootpath //feature_integration_tests/rust_test_scenarios)",
+        "--rust-target-path=$(rootpath //feature_integration_tests/test_scenarios/rust:rust_test_scenarios)",
     ],
     data = [
         ":python_tc_venv",
-        "//feature_integration_tests/rust_test_scenarios",
+        "//feature_integration_tests/test_scenarios/rust:rust_test_scenarios",
     ],
     env = {
         "RUST_BACKTRACE": "1",

feature_integration_tests/python_test_cases/conftest.py → feature_integration_tests/test_cases/conftest.py

@@ -64,20 +64,3 @@ def pytest_sessionstart(session):
 
     except Exception as e:
         pytest.exit(str(e), returncode=1)
-
-
-def pytest_collection_modifyitems(items: list[pytest.Function]):
-    markers_to_process = (
-        "PartiallyVerifies",
-        "FullyVerifies",
-        "Description",
-        "TestType",
-        "DerivationTechnique",
-    )
-    for item in items:
-        # Add custom markers info to XML report
-        for marker in item.iter_markers():
-            if marker.name not in markers_to_process:
-                continue
-
-            item.user_properties.append((marker.name, marker.args[0]))

feature_integration_tests/test_cases/pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+addopts = -v
+testpaths = tests

feature_integration_tests/rust_test_scenarios/BUILD → feature_integration_tests/test_scenarios/rust/BUILD

@@ -16,7 +16,7 @@ load("@rules_rust//rust:defs.bzl", "rust_binary")
 rust_binary(
     name = "rust_test_scenarios",
     srcs = glob(["src/**/*.rs"]),
-    visibility = ["//feature_integration_tests/python_test_cases:__pkg__"],
+    visibility = ["//feature_integration_tests/test_cases:__pkg__"],
     tags = [
         "manual",
     ],
@@ -31,4 +31,4 @@ rust_binary(
         "@score_crates//:serde",
         "@score_crates//:serde_json",
     ],
-)
+)

feature_showcase/rust/orchestration_persistency/main.rs

@@ -138,11 +138,10 @@ fn detect_object_component_design() -> Result<Design, CommonErrors> {
 
 fn main() {
     // Setup any logging framework you want to use.
-    let logger = LogAndTraceBuilder::new()
+    let _logger = LogAndTraceBuilder::new()
         .global_log_level(logging_tracing::Level::INFO)
         .enable_logging(true)
         .build();
-    // logger.init_log_trace();
 
     // Create runtime
     let (builder, _engine_id) = kyron::runtime::RuntimeBuilder::new().with_engine(