rebase to main, solving conflicts

bmw-software-engineering · Nov 8, 2024 · 9e9d5dc · 9e9d5dc
1 parent 23eb0f6
commit 9e9d5dc
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -88,7 +88,7 @@ full-release:
 coverage:
 	coverage combine -q
 	coverage html --rcfile=coverage.cfg
-	coverage report --rcfile=coverage.cfg --fail-under=64
+	coverage report --rcfile=coverage.cfg --fail-under=72
 
 test: system-tests unit-tests
 	make coverage
@@ -128,10 +128,10 @@ requirements.lobster: lobster/tools/trlc/requirements.trlc \
 code.lobster: $(wildcard lobster/tools/trlc/*.py)
 	lobster-python --out code.lobster lobster/tools/trlc
 
-unit-tests.lobster: $(wildcard test-unit/lobster-trlc/*.py)
-	lobster-python --activity --out unit-tests.lobster test-unit/lobster-trlc
+unit-tests.lobster: $(wildcard tests-unit/lobster-trlc/*.py)
+	lobster-python --activity --out unit-tests.lobster tests-unit/lobster-trlc
 
-system-tests.lobster: $(wildcard test-system/*/*.rsl) \
-                      $(wildcard test-system/*/*.trlc) \
-                      $(wildcard test-system/*/tracing)
-	python3 test-system/lobster-trlc/lobster-trlc-system-test.py
+system-tests.lobster: $(wildcard tests-system/*/*.rsl) \
+                      $(wildcard tests-system/*/*.trlc) \
+                      $(wildcard tests-system/*/tracing)
+	python3 tests-system/lobster-trlc/lobster-trlc-system-test.py
diff --git a/documentation/example_report.html b/documentation/example_report.html
@@ -472,8 +472,8 @@ <h5>tests-integration/projects/basic/potato.trlc</h5>
 <div>Traces to:
 <ul>
 <li>TRLC Linked_requirement <a href='#item-fbfa01aa359da14836c3fe53cd7363bfb1ffb782'>example.req_important</a></li>
-<li>Python Method <a href='#item-40f9403e943ba8922eff8382a64552eaee96b05d'>nor.Example</a></li>
-<li>Python Method <a href='#item-71acdb8dec7433006b51349a696a9e3b11a3c7d6'>nor.Example</a></li>
+<li>Python Method <a href='#item-44aca84976176f453e178bdd3323e7e9813dcebe'>nor.Example.helper_function</a></li>
+<li>Python Method <a href='#item-4fe151cfc168f08ff6bc308291ecbee34309b652'>nor.Example.nor</a></li>
 </ul>
 </div>
 <div>Issues:
@@ -666,9 +666,9 @@ <h5>tests-integration/projects/basic/nor.py</h5>
 </div>
 </div>
 <!-- end item -->
-<!-- begin item python nor.Example -->
-<div class="item-ok" id="item-40f9403e943ba8922eff8382a64552eaee96b05d">
-<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> Python Method nor.Example</div>
+<!-- begin item python nor.Example.helper_function -->
+<div class="item-ok" id="item-44aca84976176f453e178bdd3323e7e9813dcebe">
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> Python Method nor.Example.helper_function</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
 <a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/nor.py#L13" target="_blank">tests-integration/projects/basic/nor.py:13</a>
@@ -682,9 +682,9 @@ <h5>tests-integration/projects/basic/nor.py</h5>
 </div>
 </div>
 <!-- end item -->
-<!-- begin item python nor.Example-1 -->
-<div class="item-ok" id="item-71acdb8dec7433006b51349a696a9e3b11a3c7d6">
-<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> Python Method nor.Example</div>
+<!-- begin item python nor.Example.nor -->
+<div class="item-ok" id="item-4fe151cfc168f08ff6bc308291ecbee34309b652">
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> Python Method nor.Example.nor</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
 <a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/nor.py#L17" target="_blank">tests-integration/projects/basic/nor.py:17</a>

diff --git a/lobster/report.py b/lobster/report.py
@@ -118,6 +118,7 @@ def write_report(self, filename):
 
         with open(filename, "w", encoding="UTF-8") as fd:
             json.dump(report, fd, indent=2)
+            fd.write("\n")
 
     def load_report(self, filename):
         assert isinstance(filename, str)

diff --git a/tests-integration/projects/basic/Makefile b/tests-integration/projects/basic/Makefile
@@ -14,6 +14,7 @@ html_report.html: cppcode.lobster gtests.lobster mcode.lobster system-requiremen
 	@lobster-online-report
 	@cp report.lobster report.reference_output
 	@lobster-html-report
+	@cp lobster_report.html ../../../documentation/example_report.html
 	@lobster-ci-report | tee ci_report.reference_output
 
 cppcode.lobster: foo.h foo.cpp

diff --git a/tests-integration/projects/filter/report.reference_output b/tests-integration/projects/filter/report.reference_output
@@ -435,4 +435,4 @@
     }
   },
   "matrix": []
-}
+}
diff --git a/.../lobster-trlc/lobster-trlc-system-test.py → .../lobster-trlc/lobster-trlc-system-test.py b/.../lobster-trlc/lobster-trlc-system-test.py → .../lobster-trlc/lobster-trlc-system-test.py
diff --git a/...tem/lobster-trlc/rbt-output-file/.gitkeep → ...tem/lobster-trlc/rbt-output-file/.gitkeep b/...tem/lobster-trlc/rbt-output-file/.gitkeep → ...tem/lobster-trlc/rbt-output-file/.gitkeep
-Original file line number
+Diff line change
@@ Expand Up / @@ -435,4 +435,4 @@ @@
         }
       },
       "matrix": []
-    }
+    }