Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions qc_ositrace/checks/osirules/osirules_checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def rule_name_from_rule(rule: dict) -> str:
def flatten_rule(r):
items = []
for k, v in r.items():
items.append(k.lower())
items.append(k)
if v is None:
continue
if isinstance(v, dict):
Expand All @@ -39,7 +39,7 @@ def flatten_rule(r):
items.append(item)
else:
items.append(
v.replace(".", "_").lower()
v.replace(".", "_")
if isinstance(v, str)
else str(v).replace(".", "_")
)
Expand All @@ -66,7 +66,7 @@ def register_automatic_rule(
emanating_entity="asam.net",
standard="osi",
definition_setting=".".join([str(s) for s in rules_version]),
rule_full_name=f"osirules.{'.'.join(x.lower() for x in keys)}.{rulename}",
rule_full_name=f"osirules.{'.'.join(keys)}.{rulename}",
)
rule_osi3_type = f"osi3.{'.'.join(keys[:-1])}"
rule_map.setdefault(rule_osi3_type, {})
Expand Down
24 changes: 12 additions & 12 deletions tests/test_osirules_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,42 +67,42 @@ def test_osirules_expected_version(
"deserialization_version_is_set/deserialization_version_is_set_invalid.osi",
"SensorView",
"3.6.0",
"sensorview.version.is_set",
"SensorView.version.is_set",
0,
),
(
"deserialization_version_is_set/deserialization_version_is_set_invalid.osi",
"SensorView",
"3.7.0",
"sensorview.version.is_set",
"SensorView.version.is_set",
547,
),
(
"deserialization_expected_version/deserialization_expected_version_360.osi",
"SensorView",
"3.6.0",
"sensorview.mounting_position.is_set",
"SensorView.mounting_position.is_set",
0,
),
(
"deserialization_expected_version/deserialization_expected_version_360.osi",
"SensorView",
"3.7.0",
"sensorview.mounting_position.is_set",
"SensorView.mounting_position.is_set",
547,
),
(
"deserialization_expected_version/deserialization_expected_version_360.mcap",
"SensorView",
"3.6.0",
"sensorview.mounting_position.is_set",
"SensorView.mounting_position.is_set",
0,
),
(
"deserialization_expected_version/deserialization_expected_version_360.mcap",
"SensorView",
"3.7.0",
"sensorview.mounting_position.is_set",
"SensorView.mounting_position.is_set",
547,
),
],
Expand Down Expand Up @@ -133,42 +133,42 @@ def test_osirules_automatic_rules(
"deserialization_version_is_set/deserialization_version_is_set_invalid.osi",
"SensorView",
"3.6.0",
"sensorview.version.is_set",
"SensorView.version.is_set",
0,
),
(
"deserialization_expected_version/deserialization_expected_version_360.osi",
"SensorView",
"3.6.0",
"groundtruth.country_code.is_set",
"GroundTruth.country_code.is_set",
547,
),
(
"deserialization_expected_version/deserialization_expected_version_360.osi",
"SensorView",
"3.6.0",
"groundtruth.proj_string.is_set",
"GroundTruth.proj_string.is_set",
547,
),
(
"deserialization_expected_version/deserialization_expected_version_360.osi",
"SensorView",
"3.6.0",
"groundtruth.map_reference.is_set",
"GroundTruth.map_reference.is_set",
547,
),
(
"deserialization_expected_version/deserialization_expected_version_360.osi",
"SensorView",
"3.6.0",
"groundtruth.stationary_object.minimum_length_1",
"GroundTruth.stationary_object.minimum_length_1",
547,
),
(
"deserialization_expected_version/deserialization_expected_version_360.osi",
"SensorView",
"3.6.0",
"groundtruth.moving_object.maximum_length_1",
"GroundTruth.moving_object.maximum_length_1",
547,
),
],
Expand Down