Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON Formatter for Result file (C++ and Python versions). Adds py Text report and py GithubCI report #191

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
360d2cc
Adds optional Json Format Report module
MatteoRagni Sep 25, 2024
65e1e54
Adds optional Json Format Report module
MatteoRagni Sep 25, 2024
038d151
Merge remote-tracking branch 'MatteoRagni/antemotion-mr/json-format' …
MatteoRagni Sep 26, 2024
9654bcd
Adds optional Json Format Report module
MatteoRagni Sep 25, 2024
a18be8d
Merge remote-tracking branch 'MatteoRagni/antemotion-mr/json-format' …
MatteoRagni Sep 26, 2024
14046b5
Adds JSON report tool (Python version)
MatteoRagni Sep 30, 2024
dc09b86
Optional to avoid automatic download of deps
MatteoRagni Oct 1, 2024
531e6c9
Base report class and application classes
MatteoRagni Oct 1, 2024
c9774df
Fixing mistype in CmakeFile preventing build
MatteoRagni Oct 1, 2024
f2ac6d6
Just for fun, adding GithubCI formatter
MatteoRagni Oct 1, 2024
9b17fb0
Removing build date, that will be removed in v1.0.0-rc1
MatteoRagni Oct 2, 2024
73a4419
Completing text reporter, fixing issue on parameter automatic parsing
MatteoRagni Oct 4, 2024
5d8c60a
Merge branch 'main' into antemotion-mr/json-format
MatteoRagni Oct 8, 2024
ef43499
Aligning report module with the new framework module directory structure
MatteoRagni Oct 8, 2024
69bb58d
Resolving reviews, testing required
MatteoRagni Oct 8, 2024
7eb784e
Framework definitions for python report modules
MatteoRagni Oct 30, 2024
c682cdb
Add quotation to all windows paths to handle spaces in manifests (#193)
hoangtungdinh Oct 4, 2024
3d1c574
Update esmini doc and add quotation to windows path in manifests (#192)
hoangtungdinh Oct 7, 2024
0519ec7
Update windows build instructions (#197)
romanodanilo Oct 7, 2024
c15bd32
Update documentation and version
hoangtungdinh Oct 8, 2024
6f3850b
Add PyPi README for qc_framework
hoangtungdinh Oct 8, 2024
3256f94
Build demo pipeline every week on Sunday at 2am
hoangtungdinh Oct 16, 2024
e493da9
Update xerces url
hoangtungdinh Oct 16, 2024
a612c32
Enforce rule uid in Cpp baselib and example checker bundle
hoangtungdinh Oct 10, 2024
657155b
Merging staged modifications to run the python report in unit tests
MatteoRagni Oct 30, 2024
35d840c
Restoring fix on windows manifest for tests
MatteoRagni Oct 30, 2024
81c5850
Unit test passes using current implementation of qc-baselib-py
MatteoRagni Oct 30, 2024
8df5556
Merge branch 'main' into antemotion-mr/json-format
MatteoRagni Oct 30, 2024
c9ea3f6
Including documentation for report utilities
MatteoRagni Oct 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,9 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

# VSCode
.vscode

# Runtime Test error stream
runtime_test.err
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 17)

option(ASAM_QC_ENABLE_FETCH_CONTENT
"Allow usage of fetch content. If OFF, alla packages should be available via find_package" ON)
option(ASAM_QC_JSON_REPORT_FORMAT_ENABLE
"Compile Report Format JSON utility. Requires nlohmann-json as dependency" OFF)

file(STRINGS version QC4OPENX_VERSION LIMIT_COUNT 1)
project(qc4openx VERSION ${QC4OPENX_VERSION})

Expand Down
3 changes: 2 additions & 1 deletion demo_pipeline/manifests/framework_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"/app/demo_pipeline/manifests/osc_manifest.json",
"/app/demo_pipeline/manifests/odr_manifest.json",
"/app/demo_pipeline/manifests/result_pooling.json",
"/app/demo_pipeline/manifests/text_report.json"
"/app/demo_pipeline/manifests/text_report.json",
"/app/demo_pipeline/manifests/framework_report_manifest.json"
]
}
22 changes: 22 additions & 0 deletions demo_pipeline/manifests/framework_report_manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"module": [
{
"name": "qc-report-json",
"exec_type": "executable",
"module_type": "report_module",
"exec_command": "cd $ASAM_QC_FRAMEWORK_WORKING_DIR && qc_report_json --from-configuration $ASAM_QC_FRAMEWORK_CONFIG_FILE"
},
{
"name": "qc-report-text",
"exec_type": "executable",
"module_type": "report_module",
"exec_command": "cd $ASAM_QC_FRAMEWORK_WORKING_DIR && qc_report_text --from-configuration $ASAM_QC_FRAMEWORK_CONFIG_FILE"
},
{
"name": "qc-report-github-ci",
"exec_type": "executable",
"module_type": "report_module",
"exec_command": "cd $ASAM_QC_FRAMEWORK_WORKING_DIR && python -m qc_report_github_ci --from-configuration $ASAM_QC_FRAMEWORK_CONFIG_FILE"
}
]
}
7 changes: 3 additions & 4 deletions demo_pipeline/templates/otx_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
<Checker checkerId="check_asam_otx_state_machine_chk_006_distinguished_initial_and_completed_state" maxLevel="1" minLevel="3" />
</CheckerBundle>

<ReportModule application="TextReport">
<Param name="strInputFile" value="Result.xqar" />
<Param name="strReportFile" value="Report.txt" />
<ReportModule application="qc-report-text">
<Param name="InputFile" value="Result.xqar" />
<Param name="OutputFile" value="Report.txt" />
</ReportModule>

</Config>
7 changes: 3 additions & 4 deletions demo_pipeline/templates/xodr_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
<Checker checkerId="check_asam_xodr_lane_smoothness_contact_point_no_horizontal_gaps" maxLevel="1" minLevel="3" />
</CheckerBundle>

<ReportModule application="TextReport">
<Param name="strInputFile" value="Result.xqar" />
<Param name="strReportFile" value="Report.txt" />
<ReportModule application="qc-report-text">
<Param name="InputFile" value="Result.xqar" />
<Param name="OutputFile" value="Report.txt" />
</ReportModule>

</Config>
7 changes: 3 additions & 4 deletions demo_pipeline/templates/xosc_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
<Checker checkerId="check_asam_xosc_positive_duration_in_phase" maxLevel="1" minLevel="3" />
</CheckerBundle>

<ReportModule application="TextReport">
<Param name="strInputFile" value="Result.xqar" />
<Param name="strReportFile" value="Report.txt" />
<ReportModule application="qc-report-text">
<Param name="InputFile" value="Result.xqar" />
<Param name="OutputFile" value="Report.txt" />
</ReportModule>

</Config>
Loading
Loading