Commit 0702fb26 authored by Ondřej Borýsek's avatar Ondřej Borýsek
Browse files

Extract finding_modification_set_fids

parent dc8b3396

tests/test_finding_grouping.py

+8 −7
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ class FindingHelper: 
        assert imported_fids == expected_fids

        return ps



    @staticmethod

    def finding_modification_set_fids(orig: dict, finding_order_id: int, fids: List[str]) -> dict:

        orig['fid'] = fids[finding_order_id]

        orig['name'] = fids[finding_order_id]

        return orig





@pytest.mark.skipif(not PWNDOC_DANGER_OVERRIDE, reason="PWNDOC_DANGER_OVERRIDE must be allowed to enable testing of interaction with PwnDoc")

@pytest.mark.dependency(depends=["test_connectivity"])
@@ -81,11 +87,6 @@ class TestGroupingAndAliasing: 
        input_partial_fids = FindingHelper.full_fids_to_partial_fids(input_fids)

        FindingHelper.run_evaluation(client, test_name, input_partial_fids, expected_fids)



    @classmethod

    def finding_modification_set_fids(cls, orig: dict, finding_order_id: int, fids: List[str]) -> dict:

        orig['fid'] = fids[finding_order_id]

        orig['name'] = fids[finding_order_id]

        return orig



    def test_pwndoc_grouping_two_imports(self, client):

        # This tests whether a broken grouping will trigger visual warning.  # todo: does it?
@@ -94,7 +95,7 @@ class TestGroupingAndAliasing: 
        folder_name = PwnDocCommunication.setup_fake_scan2report_import(

            'tests/test_files/scan2report_results/single-finding-result',

            2,

            self.finding_modification_set_fids,

            FindingHelper.finding_modification_set_fids,

            {'fids': full_fids}

        )

        ps: ProcessingSettings = ProcessingSettings.load_from_folder_name(folder_name)
@@ -109,7 +110,7 @@ class TestGroupingAndAliasing: 
        folder_name = PwnDocCommunication.setup_fake_scan2report_import(

            'tests/test_files/scan2report_results/single-finding-result',

            2,

            self.finding_modification_set_fids,

            FindingHelper.finding_modification_set_fids,

            {'fids': full_fids}

        )

        ps: ProcessingSettings = ProcessingSettings.load_from_folder_name(folder_name)