diff --git a/Makefile b/Makefile index b7b0ad69..2e12e9d3 100644 --- a/Makefile +++ b/Makefile @@ -135,18 +135,25 @@ tracing-%: report.lobster-% report.lobster-%: lobster/tools/lobster.conf \ code.lobster-% \ unit-tests.lobster-% \ - requirements.lobster-% \ + system_requirements.lobster-% \ + software_requirements.lobster-% \ system-tests.lobster-% lobster-report \ --lobster-config=lobster/tools/lobster.conf \ --out=report.lobster lobster-online-report report.lobster -requirements.lobster-%: lobster/tools/requirements.rsl +system_requirements.lobster-%: lobster/tools/requirements.rsl $(eval TOOL_PATH := $(subst -,/,$*)) lobster-trlc lobster/tools/$(TOOL_PATH) lobster/tools/requirements.rsl \ - --config-file=lobster/tools/lobster-trlc.conf \ - --out requirements.lobster + --config-file=lobster/tools/lobster-trlc-system.conf \ + --out system_requirements.lobster + +software_requirements.lobster-%: lobster/tools/requirements.rsl + $(eval TOOL_PATH := $(subst -,/,$*)) + lobster-trlc lobster/tools/$(TOOL_PATH) lobster/tools/requirements.rsl \ + --config-file=lobster/tools/lobster-trlc-software.conf \ + --out software_requirements.lobster code.lobster-%: $(eval TOOL_PATH := $(subst -,/,$*)) diff --git a/lobster/tools/lobster-trlc-software.conf b/lobster/tools/lobster-trlc-software.conf new file mode 100644 index 00000000..f8ac4ed7 --- /dev/null +++ b/lobster/tools/lobster-trlc-software.conf @@ -0,0 +1,3 @@ +req.Software_Requirement { + description = description +} diff --git a/lobster/tools/lobster-trlc.conf b/lobster/tools/lobster-trlc-system.conf similarity index 100% rename from lobster/tools/lobster-trlc.conf rename to lobster/tools/lobster-trlc-system.conf diff --git a/lobster/tools/lobster.conf b/lobster/tools/lobster.conf index 3bbe1b1a..cef8c9dd 100644 --- a/lobster/tools/lobster.conf +++ b/lobster/tools/lobster.conf @@ -1,14 +1,23 @@ -requirements "Specification" { - source: "requirements.lobster"; +requirements "System Requirement" { + source: "system_requirements.lobster"; +} + +requirements "Software Requirement" { + source: "software_requirements.lobster"; + trace to: "System Requirement"; } implementation "Code" { source: "code.lobster"; - trace to: "Specification"; + trace to: "Software Requirement"; } -activity "Test" { +activity "System Test" { source: "system-tests.lobster"; + trace to: "System Requirement"; +} + +activity "Software Test" { source: "unit-tests.lobster"; - trace to: "Specification"; + trace to: "Software Requirement"; } diff --git a/tests-system/lobster-core/ci_report/rbt-output-file/.gitkeep b/tests-system/lobster-ci-report/rbt-output-file/.gitkeep similarity index 100% rename from tests-system/lobster-core/ci_report/rbt-output-file/.gitkeep rename to tests-system/lobster-ci-report/rbt-output-file/.gitkeep diff --git a/tests-system/lobster-core/html_report/selenium-test/test_html_report.html b/tests-system/lobster-core/html_report/selenium-test/test_html_report.html deleted file mode 100644 index 50050301..00000000 --- a/tests-system/lobster-core/html_report/selenium-test/test_html_report.html +++ /dev/null @@ -1,386 +0,0 @@ - - - -L.O.B.S.T.E.R. - - - -
-

L.O.B.S.T.E.R.

-
Lightweight Open BMW Software Traceability Evidence Report
-
- -
-

Overview

-
-
-
-

Coverage

- - - - - - - - - - - - - - - - - - - - - - - - -
CategoryRatioCoverageOK ItemsTotal Items
Requirements0.0% - -0.00% - -03
code0.0% - -0.00% - -03
-
-
-
-

Issues

-
- -
-

Detailed report

-
-

Requirements and Specification

-

Requirements

-
.\main.trlc
- -
-
TRLC Requirement vanillaEg.trlc
-
Source: - -.\main.trlc -
-
-
Treat Requirements Like Code
-
-
-
Issues: -
    -
  • missing reference to code
    • -
-
-
-
- - -
-
TRLC Requirement vanillaEg.lobster
-
Source: - -.\main.trlc -
-
-
Lightweight Open BMW Software Traceability Evidence Report
-
-
-
Issues: -
    -
  • missing reference to code
    • -
-
-
-
- -
Codebeamer https://codebeamer.company.net/, tracker 65426
- -
-
codebeamer Technical requirement traffic light detection
-
Source: - -cb item 17044 'traffic light detection' -
-
-Status: Valid -
-
-
Issues: -
    -
  • missing reference to code
    • -
-
-
-
- -

Implementation

-

code

-
.\Test_Setup\main.py
- -
-
Python Function main.greet_user
-
Source: - -.\Test_Setup\main.py -
-
-
Issues: -
    -
  • unknown tracing target req welcome.greet
    • -
  • missing up reference
    • -
-
-
-
- -
.\software.py
- -
-
Python Function software.hello
-
Source: - -.\software.py -
-
-
Issues: -
    -
  • missing up reference
    • -
-
-
-
- - -
-
Python Function software.hello1
-
Source: - -.\software.py -
-
-
Issues: -
    -
  • missing up reference
    • -
-
-
-
- -

Verification and Validation

-
-
- - - diff --git a/tests-system/lobster-core/online_report/rbt-output-file/.gitkeep b/tests-system/lobster-core/online_report/rbt-output-file/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/tests-system/lobster-core/html_report/rbt-output-file/.gitkeep b/tests-system/lobster-html-report/rbt-output-file/.gitkeep similarity index 100% rename from tests-system/lobster-core/html_report/rbt-output-file/.gitkeep rename to tests-system/lobster-html-report/rbt-output-file/.gitkeep diff --git a/tests-system/lobster-core/html_report/selenium-test/test_html_report.py b/tests-system/lobster-html-report/selenium-test/test_html_report.py similarity index 100% rename from tests-system/lobster-core/html_report/selenium-test/test_html_report.py rename to tests-system/lobster-html-report/selenium-test/test_html_report.py diff --git a/tests-system/lobster-online-report/rbt-valid-flow/valid-scenario/expected-output/expected-output.lobster b/tests-system/lobster-online-report/rbt-valid-flow/valid-scenario/expected-output/expected-output.lobster index 03740651..a057a1da 100644 --- a/tests-system/lobster-online-report/rbt-valid-flow/valid-scenario/expected-output/expected-output.lobster +++ b/tests-system/lobster-online-report/rbt-valid-flow/valid-scenario/expected-output/expected-output.lobster @@ -15,7 +15,7 @@ "commit": "main", "file": "tests-system/lobster-online-report/rbt-valid-flow/valid-scenario/input/basic.py", "line": 5, - "exec_commit_id": "6fa7eadf8b9841fedc7a74a6147247ac830fd2bf" + "exec_commit_id": "516d5994e4c6ef566f89b44f0c9b9e0a4741b4d5" }, "name": "basic.trlc_reference", "messages": [], @@ -36,7 +36,7 @@ "commit": "main", "file": "tests-system/lobster-online-report/rbt-valid-flow/valid-scenario/input/basic.py", "line": 13, - "exec_commit_id": "6fa7eadf8b9841fedc7a74a6147247ac830fd2bf" + "exec_commit_id": "516d5994e4c6ef566f89b44f0c9b9e0a4741b4d5" }, "name": "basic.Example.helper_function", "messages": [], @@ -55,7 +55,7 @@ "commit": "main", "file": "tests-system/lobster-online-report/rbt-valid-flow/valid-scenario/input/basic.py", "line": 17, - "exec_commit_id": "6fa7eadf8b9841fedc7a74a6147247ac830fd2bf" + "exec_commit_id": "516d5994e4c6ef566f89b44f0c9b9e0a4741b4d5" }, "name": "basic.Example.nor", "messages": [ diff --git a/tests-system/lobster-trlc-system-test.py b/tests-system/lobster-trlc-system-test.py index b133d8fd..6b4eeb27 100755 --- a/tests-system/lobster-trlc-system-test.py +++ b/tests-system/lobster-trlc-system-test.py @@ -26,7 +26,9 @@ from trlc.trlc import Source_Manager from trlc.errors import Message_Handler -TEST_DIR = "tests-system/lobster-" + sys.argv[1] +tool_name = (sys.argv[1].split("/")[1] if "core/" in sys.argv[1] + else sys.argv[1]).replace("_", "-") +TEST_DIR = f"tests-system/lobster-{tool_name}" TARGET = "system-tests.lobster" def process(testname, mapping):