Refactor all GMP tests

Drop obsolete tests and adjust tests for enum imports.

tests/protocols/gmpv208/__init__.py

@@ -2,11 +2,3 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
-
-from gvm.protocols.gmpv208 import Gmp
-
-from .. import GmpTestCase
-
-
-class Gmpv208TestCase(GmpTestCase):
-    gmp_class = Gmp

tests/protocols/gmpv208/entities/alerts/test_create_alert.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import AlertCondition, AlertEvent, AlertMethod
+from gvm.protocols.gmp.requests import AlertCondition, AlertEvent, AlertMethod
 
 
 class GmpCreateAlertTestMixin:

tests/protocols/gmpv208/entities/alerts/test_modify_alert.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import AlertCondition, AlertEvent, AlertMethod
+from gvm.protocols.gmp.requests import AlertCondition, AlertEvent, AlertMethod
 
 
 class GmpModifyAlertTestMixin:

tests/protocols/gmpv208/entities/alerts/test_trigger_alert.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import RequiredArgument
-from gvm.protocols.gmpv208.entities.report_formats import ReportFormatType
+from gvm.protocols.gmp.requests import ReportFormatType
 
 
 class GmpTriggerAlertTestMixin:

tests/protocols/gmpv208/entities/audits/test_create_audit.py

@@ -6,7 +6,7 @@
 from collections import OrderedDict
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import HostsOrdering
+from gvm.protocols.gmp.requests import HostsOrdering
 
 
 class GmpCreateAuditTestMixin:

tests/protocols/gmpv208/entities/audits/test_modify_audit.py

@@ -6,7 +6,7 @@
 from collections import OrderedDict
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import HostsOrdering
+from gvm.protocols.gmp.requests import HostsOrdering
 
 
 class GmpModifyAuditTestMixin:

tests/protocols/gmpv208/entities/credentials/test_create_credential.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import (
+from gvm.protocols.gmp.requests import (
     CredentialType,
     SnmpAuthAlgorithm,
     SnmpPrivacyAlgorithm,

tests/protocols/gmpv208/entities/credentials/test_get_credential.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import CredentialFormat
+from gvm.protocols.gmp.requests import CredentialFormat
 
 
 class GmpGetCredentialTestMixin:

tests/protocols/gmpv208/entities/credentials/test_modify_credential.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import SnmpAuthAlgorithm, SnmpPrivacyAlgorithm
+from gvm.protocols.gmp.requests import SnmpAuthAlgorithm, SnmpPrivacyAlgorithm
 
 
 class GmpModifyCredentialTestMixin:

tests/protocols/gmpv208/entities/filters/test_create_filter.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import FilterType
+from gvm.protocols.gmp.requests import FilterType
 
 
 class GmpCreateFilterTestMixin:

tests/protocols/gmpv208/entities/filters/test_modify_filter.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import FilterType
+from gvm.protocols.gmp.requests import FilterType
 
 
 class GmpModifyFilterTestMixin:

tests/protocols/gmpv208/entities/notes/test_create_note.py

@@ -6,7 +6,6 @@
 from decimal import Decimal
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import SeverityLevel
 
 
 class GmpCreateNoteTestMixin:
@@ -118,24 +117,6 @@ def test_create_note_with_severity(self):
             b"</create_note>"
         )
 
-    def test_create_note_with_threat(self):
-        self.gmp.create_note("foo", nvt_oid="oid1", threat=SeverityLevel.HIGH)
-
-        self.connection.send.has_been_called_with(
-            b"<create_note>"
-            b"<text>foo</text>"
-            b'<nvt oid="oid1"/>'
-            b"<threat>High</threat>"
-            b"</create_note>"
-        )
-
-    def test_create_note_invalid_threat(self):
-        with self.assertRaises(InvalidArgument):
-            self.gmp.create_note("foo", nvt_oid="oid1", threat="")
-
-        with self.assertRaises(InvalidArgument):
-            self.gmp.create_note("foo", nvt_oid="oid1", threat="foo")
-
     def test_create_note_with_days_active(self):
         self.gmp.create_note("foo", nvt_oid="oid1", days_active=0)
 

tests/protocols/gmpv208/entities/notes/test_modify_note.py

@@ -6,7 +6,6 @@
 from decimal import Decimal
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import SeverityLevel
 
 
 class GmpModifyNoteTestMixin:
@@ -142,25 +141,6 @@ def test_modify_note_with_severity(self):
             b"</modify_note>"
         )
 
-    def test_modify_note_with_threat(self):
-        self.gmp.modify_note(
-            note_id="n1", text="foo", threat=SeverityLevel.HIGH
-        )
-
-        self.connection.send.has_been_called_with(
-            b'<modify_note note_id="n1">'
-            b"<text>foo</text>"
-            b"<threat>High</threat>"
-            b"</modify_note>"
-        )
-
-    def test_modify_note_invalid_threat(self):
-        with self.assertRaises(InvalidArgument):
-            self.gmp.modify_note(note_id="n1", text="foo", threat="")
-
-        with self.assertRaises(InvalidArgument):
-            self.gmp.modify_note(note_id="n1", text="foo", threat="foo")
-
     def test_modify_note_with_invalid_port(self):
         with self.assertRaises(InvalidArgument):
             self.gmp.modify_note(note_id="o1", text="foo", port="123")

tests/protocols/gmpv208/entities/overrides/test_create_override.py

@@ -6,7 +6,6 @@
 from decimal import Decimal
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import SeverityLevel
 
 
 class GmpCreateOverrideTestMixin:
@@ -151,46 +150,6 @@ def test_create_override_with_new_severity(self):
             b"</create_override>"
         )
 
-    def test_create_override_with_threat(self):
-        self.gmp.create_override(
-            "foo", nvt_oid="oid1", threat=SeverityLevel.HIGH
-        )
-
-        self.connection.send.has_been_called_with(
-            b"<create_override>"
-            b"<text>foo</text>"
-            b'<nvt oid="oid1"/>'
-            b"<threat>High</threat>"
-            b"</create_override>"
-        )
-
-    def test_create_override_invalid_threat(self):
-        with self.assertRaises(InvalidArgument):
-            self.gmp.create_override("foo", nvt_oid="oid1", threat="")
-
-        with self.assertRaises(InvalidArgument):
-            self.gmp.create_override("foo", nvt_oid="oid1", threat="foo")
-
-    def test_create_override_with_new_threat(self):
-        self.gmp.create_override(
-            "foo", nvt_oid="oid1", new_threat=SeverityLevel.HIGH
-        )
-
-        self.connection.send.has_been_called_with(
-            b"<create_override>"
-            b"<text>foo</text>"
-            b'<nvt oid="oid1"/>'
-            b"<new_threat>High</new_threat>"
-            b"</create_override>"
-        )
-
-    def test_create_override_invalid_new_threat(self):
-        with self.assertRaises(InvalidArgument):
-            self.gmp.create_override("foo", nvt_oid="oid1", new_threat="")
-
-        with self.assertRaises(InvalidArgument):
-            self.gmp.create_override("foo", nvt_oid="oid1", new_threat="foo")
-
     def test_create_override_with_days_active(self):
         self.gmp.create_override("foo", nvt_oid="oid1", days_active=0)
 

tests/protocols/gmpv208/entities/overrides/test_modify_override.py

@@ -6,7 +6,6 @@
 from decimal import Decimal
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import SeverityLevel
 
 
 class GmpModifyOverrideTestMixin:
@@ -180,48 +179,6 @@ def test_modify_override_with_new_severity(self):
             b"</modify_override>"
         )
 
-    def test_modify_override_with_threat(self):
-        self.gmp.modify_override(
-            override_id="o1", text="foo", threat=SeverityLevel.HIGH
-        )
-
-        self.connection.send.has_been_called_with(
-            b'<modify_override override_id="o1">'
-            b"<text>foo</text>"
-            b"<threat>High</threat>"
-            b"</modify_override>"
-        )
-
-    def test_modify_override_invalid_threat(self):
-        with self.assertRaises(InvalidArgument):
-            self.gmp.modify_override(override_id="o1", text="foo", threat="")
-
-        with self.assertRaises(InvalidArgument):
-            self.gmp.modify_override(override_id="o1", text="foo", threat="foo")
-
-    def test_modify_override_with_new_threat(self):
-        self.gmp.modify_override(
-            override_id="o1", text="foo", new_threat=SeverityLevel.HIGH
-        )
-
-        self.connection.send.has_been_called_with(
-            b'<modify_override override_id="o1">'
-            b"<text>foo</text>"
-            b"<new_threat>High</new_threat>"
-            b"</modify_override>"
-        )
-
-    def test_modify_override_invalid_new_threat(self):
-        with self.assertRaises(InvalidArgument):
-            self.gmp.modify_override(
-                override_id="o1", text="foo", new_threat=""
-            )
-
-        with self.assertRaises(InvalidArgument):
-            self.gmp.modify_override(
-                override_id="o1", text="foo", new_threat="foo"
-            )
-
     def test_modify_override_with_invalid_port(self):
         with self.assertRaises(InvalidArgument):
             self.gmp.modify_override(override_id="o1", text="foo", port="123")

tests/protocols/gmpv208/entities/permissions/test_create_permission.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import EntityType, PermissionSubjectType
+from gvm.protocols.gmp.requests import EntityType, PermissionSubjectType
 
 
 class GmpCreatePermissionTestMixin:

tests/protocols/gmpv208/entities/permissions/test_modify_permission.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import EntityType, PermissionSubjectType
+from gvm.protocols.gmp.requests import EntityType, PermissionSubjectType
 
 
 class GmpModifyPermissionTestMixin:

tests/protocols/gmpv208/entities/port_lists/test_create_port_range.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208.entities.port_lists import PortRangeType
+from gvm.protocols.gmp.requests import PortRangeType
 
 
 class GmpCreatePortRangeTestMixin:

tests/protocols/gmpv208/entities/report_formats/test_clone_report_format.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import RequiredArgument
-from gvm.protocols.gmpv208.entities.report_formats import ReportFormatType
+from gvm.protocols.gmp.requests import ReportFormatType
 
 
 class GmpCloneReportFormatTestMixin:

tests/protocols/gmpv208/entities/report_formats/test_delete_report_format.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import GvmError
-from gvm.protocols.gmpv208.entities.report_formats import ReportFormatType
+from gvm.protocols.gmp.requests import ReportFormatType
 
 
 class GmpDeleteReportFormatTestMixin:

tests/protocols/gmpv208/entities/report_formats/test_get_report_format.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import RequiredArgument
-from gvm.protocols.gmpv208.entities.report_formats import ReportFormatType
+from gvm.protocols.gmp.requests import ReportFormatType
 
 
 class GmpGetReportFormatTestMixin:

tests/protocols/gmpv208/entities/report_formats/test_modify_report_format.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import RequiredArgument
-from gvm.protocols.gmpv208.entities.report_formats import ReportFormatType
+from gvm.protocols.gmp.requests import ReportFormatType
 
 
 class GmpModifyReportFormatTestMixin:

tests/protocols/gmpv208/entities/report_formats/test_verify_report_format.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import GvmError
-from gvm.protocols.gmpv208.entities.report_formats import ReportFormatType
+from gvm.protocols.gmp.requests import ReportFormatType
 
 
 class GmpVerifyReportFormatTestMixin:

tests/protocols/gmpv208/entities/reports/test_get_report.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import RequiredArgument
-from gvm.protocols.gmpv208.entities.report_formats import ReportFormatType
+from gvm.protocols.gmp.requests import ReportFormatType
 
 
 class GmpGetReportTestMixin:

tests/protocols/gmpv208/entities/scanners/test_create_scanner.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import ScannerType
+from gvm.protocols.gmp.requests import ScannerType
 
 
 class GmpCreateScannerTestMixin:

tests/protocols/gmpv208/entities/scanners/test_modify_scanner.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import ScannerType
+from gvm.protocols.gmp.requests import ScannerType
 
 
 class GmpModifyScannerTestMixin:

tests/protocols/gmpv208/entities/secinfo/test_get_info.py

@@ -4,7 +4,7 @@
 #
 
 from gvm.errors import InvalidArgument, RequiredArgument
-from gvm.protocols.gmpv208 import InfoType
+from gvm.protocols.gmp.requests import InfoType
 
 
 class GmpGetInfoTestMixin: