diff --git a/qc_baselib/configuration.py b/qc_baselib/configuration.py index 72dad7b..71e8b3a 100644 --- a/qc_baselib/configuration.py +++ b/qc_baselib/configuration.py @@ -106,7 +106,7 @@ def get_config_param(self, param_name: str) -> Union[str, int, float, None]: def get_checker_bundle_param( self, checker_bundle_name: str, param_name: str ) -> Union[str, int, float, None]: - bundle = self._get_checker_bundle(application=checker_bundle_name) + bundle = self._get_checker_bundle(checker_bundle_name=checker_bundle_name) if bundle is None or len(bundle.params) == 0: return None @@ -124,7 +124,7 @@ def get_checker_bundle_param( def get_checker_param( self, checker_bundle_name: str, checker_id: str, param_name: str ) -> Union[str, int, float, None]: - bundle = self._get_checker_bundle(application=checker_bundle_name) + bundle = self._get_checker_bundle(checker_bundle_name=checker_bundle_name) if bundle is None: return None @@ -206,7 +206,7 @@ def register_checker( "Adding check to empty configuration. Initialize the config registering first a checker bundle." ) else: - bundle = self._get_checker_bundle(application=checker_bundle_name) + bundle = self._get_checker_bundle(checker_bundle_name=checker_bundle_name) if bundle is None: raise RuntimeError( diff --git a/qc_baselib/result.py b/qc_baselib/result.py index 161b078..be11185 100644 --- a/qc_baselib/result.py +++ b/qc_baselib/result.py @@ -253,7 +253,7 @@ def add_xml_location( def get_result_version(self) -> str: return self._report_results.version - def get_checker_checker_bundle_names(self) -> List[str]: + def get_checker_bundle_names(self) -> List[str]: bundles_names = [] for bundle in self._report_results.checker_bundles: diff --git a/tests/test_configuration.py b/tests/test_configuration.py index 5b2d35a..306ce10 100644 --- a/tests/test_configuration.py +++ b/tests/test_configuration.py @@ -70,7 +70,7 @@ def test_register_checker_to_bundle() -> None: config = Configuration() config.register_checker_bundle("TestCheckerBundle") - config.register_checker_to_bundle( + config.register_checker( "TestCheckerBundle", "TestChecker", min_level=1, max_level=3 ) @@ -98,7 +98,7 @@ def test_set_checker_param() -> None: config = Configuration() config.register_checker_bundle("TestCheckerBundle") - config.register_checker_to_bundle( + config.register_checker( "TestCheckerBundle", "TestChecker", min_level=1, max_level=3 ) @@ -131,9 +131,9 @@ def test_config_write() -> None: config.set_config_param(name="testConfigParamInt", value=1) config.set_config_param(name="testConfigParamFloat", value=2.0) - config.register_checker_bundle(application="TestCheckerBundle") - config.register_checker_to_bundle( - application="TestCheckerBundle", + config.register_checker_bundle(checker_bundle_name="TestCheckerBundle") + config.register_checker( + checker_bundle_name="TestCheckerBundle", checker_id="TestChecker", min_level=1, max_level=3, @@ -141,13 +141,13 @@ def test_config_write() -> None: # Creating using named arguments config.set_checker_param( - application="TestCheckerBundle", + checker_bundle_name="TestCheckerBundle", checker_id="TestChecker", name="testCbParamStr", value="testValue", ) config.set_checker_param( - application="TestCheckerBundle", + checker_bundle_name="TestCheckerBundle", checker_id="TestChecker", name="testCbParamInt", value=1, diff --git a/tests/test_results.py b/tests/test_result.py similarity index 76% rename from tests/test_results.py rename to tests/test_result.py index ec02f71..6a242e6 100644 --- a/tests/test_results.py +++ b/tests/test_result.py @@ -33,23 +33,23 @@ def test_result_write() -> None: summary="Tested example checkers", ) - result.register_checker_to_bundle( - bundle_name="TestBundle", + result.register_checker( + checker_bundle_name="TestBundle", checker_id="TestChecker", description="Test checker", summary="Executed evaluation", ) - result.register_issue_to_checker( - bundle_name="TestBundle", + result.register_issue( + checker_bundle_name="TestBundle", checker_id="TestChecker", issue_id=0, description="Issue found at odr", level=IssueSeverity.INFORMATION, ) - result.add_file_location_to_issue( - bundle_name="TestBundle", + result.add_file_location( + checker_bundle_name="TestBundle", checker_id="TestChecker", issue_id=0, row=1, @@ -57,8 +57,8 @@ def test_result_write() -> None: file_type="odr", description="Location for issue", ) - result.add_xml_location_to_issue( - bundle_name="TestBundle", + result.add_xml_location( + checker_bundle_name="TestBundle", checker_id="TestChecker", issue_id=0, xpath="/foo/test/path", @@ -80,34 +80,34 @@ def test_result_write() -> None: def test_result_bundles_load(loaded_result: Result): - bundles_names = loaded_result.get_checker_bundles_names() + bundles_names = loaded_result.get_checker_bundle_names() assert len(bundles_names) == 1 - bundles = loaded_result.get_bundles_results() + bundles = loaded_result.get_checker_bundle_results() assert len(bundles) == 1 assert bundles[0].name == "DemoCheckerBundle" def test_result_checkers_load(loaded_result: Result): - bundle_checkers = loaded_result.get_checker_bundle_checkers_result( - bundle_name="DemoCheckerBundle" + bundle_checkers = loaded_result.get_checker_results( + checker_bundle_name="DemoCheckerBundle" ) assert len(bundle_checkers) == 1 assert bundle_checkers[0].checker_id == "exampleChecker" - example_checker_results = loaded_result.get_checker_result_from_bundle( - bundle_name="DemoCheckerBundle", checker_id="exampleChecker" + example_checker_results = loaded_result.get_checker_result( + checker_bundle_name="DemoCheckerBundle", checker_id="exampleChecker" ) assert example_checker_results.checker_id == "exampleChecker" def test_result_issues_load(loaded_result: Result): - issues = loaded_result.get_issues_from_checker( - bundle_name="DemoCheckerBundle", checker_id="exampleChecker" + issues = loaded_result.get_issues( + checker_bundle_name="DemoCheckerBundle", checker_id="exampleChecker" ) assert issues[0].description == "This is an information from the demo usecase"