From 08457a774fdbe480d01a161a79e4028acd6e5fb3 Mon Sep 17 00:00:00 2001 From: christophkloeffel Date: Sat, 12 Oct 2024 03:25:07 +0200 Subject: [PATCH] testing --- documentation/example_report.html | 146 +++++++++--------- integration-tests/projects/basic/Makefile | 1 + .../projects/basic/report.reference_output | 54 +++---- integration-tests/projects/filter/Makefile | 1 + .../projects/filter/report.reference_output | 26 ++-- 5 files changed, 115 insertions(+), 113 deletions(-) diff --git a/documentation/example_report.html b/documentation/example_report.html index c8238ccd..e3300bf5 100644 --- a/documentation/example_report.html +++ b/documentation/example_report.html @@ -260,17 +260,17 @@

Coverage

Tracing policy

- + LOBSTER Tracing Policy - + n_419cfc02b324dc7d8faefa90ed608fb0 - -System Requirements + +System Requirements @@ -278,46 +278,46 @@

Tracing policy

n_9d273bd32c1fceb91b7d6a4d40e98bdd - -Software Requirements + +Software Requirements n_419cfc02b324dc7d8faefa90ed608fb0->n_9d273bd32c1fceb91b7d6a4d40e98bdd - - + + n_ca0dbad92a874b2f69b549293387925e -Code +Code n_9d273bd32c1fceb91b7d6a4d40e98bdd->n_ca0dbad92a874b2f69b549293387925e - - + + n_840c3e13412933b0e3f7394f4c7fecb0 - -Verification Test + +Verification Test n_9d273bd32c1fceb91b7d6a4d40e98bdd->n_840c3e13412933b0e3f7394f4c7fecb0 - - + + @@ -347,7 +347,7 @@

System Requirements

Codebeamer https://potato.kitten, tracker 12345
-
codebeamer Functional requirement LOBSTER demo
+
! codebeamer Functional requirement LOBSTER demo
Source: cb item 666 'LOBSTER demo' @@ -378,10 +378,10 @@

Software Requirements

integration-tests/projects/basic/potato.trlc
-
TRLC Tagged_requirement example.req_implication
+
TRLC Tagged_requirement example.req_implication
text: provide a utility function for logical implication
@@ -403,10 +403,10 @@
integration-tests/projects/basic/potato.trlc
-
TRLC Tagged_requirement example.req_xor
+
! TRLC Tagged_requirement example.req_xor
text: provide a utility function for logical exclusive or
@@ -415,8 +415,8 @@
integration-tests/projects/basic/potato.trlc
Traces to:
Derived from: @@ -434,10 +434,10 @@
integration-tests/projects/basic/potato.trlc
-
TRLC Tagged_requirement example.req_nand
+
TRLC Tagged_requirement example.req_nand
text: provide a utility function for logical negated and

extra_text: potato
@@ -460,10 +460,10 @@
integration-tests/projects/basic/potato.trlc
-
TRLC Requirement example.req_nor
+
! TRLC Requirement example.req_nor
provide a utility function for logical negated or
@@ -472,8 +472,8 @@
integration-tests/projects/basic/potato.trlc
Traces to:
Issues: @@ -487,10 +487,10 @@
integration-tests/projects/basic/potato.trlc
-
TRLC Requirement example.req_implies
+
TRLC Requirement example.req_implies
provide a utility function for logical implication
@@ -507,10 +507,10 @@
integration-tests/projects/basic/potato.trlc
-
TRLC Linked_requirement example.req_important
+
! TRLC Linked_requirement example.req_important
this is important
@@ -536,10 +536,10 @@

Code

integration-tests/projects/basic/exclusive_or.slx
-
Simulink Block exclusive_or
+
! Simulink Block exclusive_or
Issues: @@ -552,10 +552,10 @@
integration-tests/projects/basic/exclusive_or.slx
-
Simulink Block exclusive_or/My Exclusive Or
+
Simulink Block exclusive_or/My Exclusive Or
Derived from: @@ -568,10 +568,10 @@
integration-tests/projects/basic/exclusive_or.slx
-
MATLAB Function exclusive_or/MATLAB Function
+
! MATLAB Function exclusive_or/MATLAB Function
Issues: @@ -585,10 +585,10 @@
integration-tests/projects/basic/exclusive_or.slx
integration-tests/projects/basic/foo.cpp
-
C/C++ Function implication
+
C/C++ Function implication
Derived from: @@ -601,10 +601,10 @@
integration-tests/projects/basic/foo.cpp
-
C/C++ Function exclusive_or
+
! C/C++ Function exclusive_or
Issues: @@ -617,10 +617,10 @@
integration-tests/projects/basic/foo.cpp
-
C/C++ Function potato
+
! C/C++ Function potato
Issues: @@ -635,10 +635,10 @@
integration-tests/projects/basic/foo.cpp
integration-tests/projects/basic/nand.m
-
MATLAB Function nand
+
MATLAB Function nand
Derived from: @@ -652,10 +652,10 @@
integration-tests/projects/basic/nand.m
integration-tests/projects/basic/nor.py
-
Python Function nor.trlc_reference
+
Python Function nor.trlc_reference
Justifications: @@ -666,12 +666,12 @@
integration-tests/projects/basic/nor.py
- -
-
Python Method nor.Example.helper_function
+ +
+
Python Method nor.Example
Derived from: @@ -682,12 +682,12 @@
integration-tests/projects/basic/nor.py
- -
-
Python Method nor.Example.nor
+ +
+
Python Method nor.Example
Derived from: @@ -701,12 +701,12 @@
integration-tests/projects/basic/nor.py

Verification and Validation

Verification Test

integration-tests/projects/basic/example.json
- -
-
JSON Test vector XOR Test 1
+ +
+
JSON Test vector example.json:XOR Test 1
Derived from: @@ -717,12 +717,12 @@
integration-tests/projects/basic/example.json
- -
-
JSON Test vector XOR Test 2
+ +
+
JSON Test vector example.json:XOR Test 2
Derived from: @@ -733,12 +733,12 @@
integration-tests/projects/basic/example.json
- -
-
JSON Test vector Potato Test 1
+ +
+
JSON Test vector example.json:Potato Test 1
Justifications: @@ -752,10 +752,10 @@
integration-tests/projects/basic/example.json
integration-tests/projects/basic/nand_test.m
-
MATLAB Test nand_test::test_1
+
MATLAB Test nand_test::test_1
Derived from: @@ -769,10 +769,10 @@
integration-tests/projects/basic/nand_test.m
integration-tests/projects/basic/test.cpp
-
GoogleTest Test ImplicationTest:BasicTest
+
GoogleTest Test ImplicationTest:BasicTest
Derived from: diff --git a/integration-tests/projects/basic/Makefile b/integration-tests/projects/basic/Makefile index 312ce306..908cfb6f 100644 --- a/integration-tests/projects/basic/Makefile +++ b/integration-tests/projects/basic/Makefile @@ -11,6 +11,7 @@ THIS_TEST_ESCAPED:=$(subst /,\\/,$(THIS_TEST)) html_report.html: cppcode.lobster gtests.lobster mcode.lobster system-requirements.lobster software-requirements.lobster lobster.conf pycode.lobster json.lobster @lobster-report + @lobster-online-report @cp report.lobster report.reference_output @lobster-html-report @cp lobster_report.html ../../../documentation/example_report.html diff --git a/integration-tests/projects/basic/report.reference_output b/integration-tests/projects/basic/report.reference_output index f728f25d..38e52c42 100644 --- a/integration-tests/projects/basic/report.reference_output +++ b/integration-tests/projects/basic/report.reference_output @@ -47,7 +47,7 @@ "tag": "req example.req_implication", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/potato.trlc", "line": 3 @@ -74,7 +74,7 @@ "tag": "req example.req_xor", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/potato.trlc", "line": 9 @@ -104,7 +104,7 @@ "tag": "req example.req_nand", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/potato.trlc", "line": 15 @@ -132,7 +132,7 @@ "tag": "req example.req_nor", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/potato.trlc", "line": 22 @@ -148,8 +148,8 @@ "ref_up": [], "ref_down": [ "req example.req_important", - "python nor.Example.helper_function", - "python nor.Example.nor" + "python nor.Example", + "python nor.Example-1" ], "tracing_status": "MISSING", "framework": "TRLC", @@ -161,7 +161,7 @@ "tag": "req example.req_implies", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/potato.trlc", "line": 27 @@ -185,7 +185,7 @@ "tag": "req example.req_important", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/potato.trlc", "line": 39 @@ -220,7 +220,7 @@ "tag": "cpp foo.cpp:implication:3", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/foo.cpp", "line": 3 @@ -242,7 +242,7 @@ "tag": "cpp foo.cpp:exclusive_or:9", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/foo.cpp", "line": 9 @@ -262,7 +262,7 @@ "tag": "cpp foo.cpp:potato:14", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/foo.cpp", "line": 14 @@ -283,7 +283,7 @@ "tag": "matlab nand", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/nand.m", "line": 1 @@ -305,7 +305,7 @@ "tag": "matlab exclusive_or/MATLAB Function", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/exclusive_or.slx", "line": 1 @@ -325,7 +325,7 @@ "tag": "simulink exclusive_or", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/exclusive_or.slx", "line": null @@ -345,7 +345,7 @@ "tag": "simulink exclusive_or/My_Exclusive_Or", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/exclusive_or.slx", "line": null @@ -367,7 +367,7 @@ "tag": "python nor.trlc_reference", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/nor.py", "line": 5 @@ -384,15 +384,15 @@ "kind": "Function" }, { - "tag": "python nor.Example.helper_function", + "tag": "python nor.Example", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/nor.py", "line": 13 }, - "name": "nor.Example.helper_function", + "name": "nor.Example", "messages": [], "just_up": [], "just_down": [], @@ -406,15 +406,15 @@ "kind": "Method" }, { - "tag": "python nor.Example.nor", + "tag": "python nor.Example-1", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/nor.py", "line": 17 }, - "name": "nor.Example.nor", + "name": "nor.Example", "messages": [], "just_up": [], "just_down": [], @@ -438,7 +438,7 @@ "tag": "gtest ImplicationTest:BasicTest", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/test.cpp", "line": 7 @@ -461,7 +461,7 @@ "tag": "matlab nand_test::test_1", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/nand_test.m", "line": 3 @@ -484,7 +484,7 @@ "tag": "json example.json:XOR Test 1", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/example.json", "line": null @@ -507,7 +507,7 @@ "tag": "json example.json:XOR Test 2", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/example.json", "line": null @@ -530,7 +530,7 @@ "tag": "json example.json:Potato Test 1", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/basic/example.json", "line": null diff --git a/integration-tests/projects/filter/Makefile b/integration-tests/projects/filter/Makefile index 925b679f..b8d46f0a 100644 --- a/integration-tests/projects/filter/Makefile +++ b/integration-tests/projects/filter/Makefile @@ -11,6 +11,7 @@ THIS_TEST_ESCAPED:=$(subst /,\\/,$(THIS_TEST)) html_report.html: cppcode.lobster requirements.lobster lobster.conf json.lobster @lobster-report + @lobster-online-report @cp report.lobster report.reference_output @lobster-html-report diff --git a/integration-tests/projects/filter/report.reference_output b/integration-tests/projects/filter/report.reference_output index 0085a7bd..45dd1038 100644 --- a/integration-tests/projects/filter/report.reference_output +++ b/integration-tests/projects/filter/report.reference_output @@ -11,7 +11,7 @@ "tag": "req sysreq_example.lobster_example", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/sysreq_example.trlc", "line": 4 @@ -36,7 +36,7 @@ "tag": "req sysreq_example.req_implication", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/sysreq_example.trlc", "line": 11 @@ -60,7 +60,7 @@ "tag": "req sysreq_example.req_xor", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/sysreq_example.trlc", "line": 19 @@ -91,7 +91,7 @@ "tag": "req softreq_example.req_implication", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/softreq_example.trlc", "line": 5 @@ -120,7 +120,7 @@ "tag": "req softreq_example.req_xor", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/softreq_example.trlc", "line": 17 @@ -158,7 +158,7 @@ "tag": "cpp foo.cpp:implication:3", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/foo.cpp", "line": 3 @@ -180,7 +180,7 @@ "tag": "cpp foo.cpp:exclusive_or:9", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/foo.cpp", "line": 9 @@ -209,7 +209,7 @@ "tag": "json test_example.json:Implication Test 1", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/test_example.json", "line": null @@ -232,7 +232,7 @@ "tag": "json test_example.json:Implication Test 2", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/test_example.json", "line": null @@ -255,7 +255,7 @@ "tag": "json test_example.json:XOR Test 1", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/test_example.json", "line": null @@ -278,7 +278,7 @@ "tag": "json test_example.json:XOR Test 2", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/test_example.json", "line": null @@ -301,7 +301,7 @@ "tag": "json test_example.json:XOR Test 3", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/test_example.json", "line": null @@ -324,7 +324,7 @@ "tag": "json test_example.json:XOR Test 4", "location": { "kind": "github", - "gh_root": "https://github.com/bmw-software-engineering/lobster", + "gh_root": "https://github.com/christophkloeffel/lobster", "commit": "main", "file": "integration-tests/projects/filter/test_example.json", "line": null