Improved service extension test coverage

tests/feature_server_extension_mixin.py

@@ -16,6 +16,9 @@
 # Local imports
 from .helpers import TRUEISH_TEST_PARAMS
 
+# import additional fixtures
+from .extension_base import *
+
 
 @pytest.mark.parametrize(
     ('attribute', 'expected_value', 'exception'),

tests/jpip_server_extension_mixin.py

@@ -13,6 +13,9 @@
 # Third-party imports
 import pytest
 
+# import additional fixtures
+from .extension_base import *
+
 
 @pytest.mark.parametrize(
     ('attribute', 'expected_value', 'exception'),

tests/kml_server_extension_mixin.py

@@ -16,6 +16,9 @@
 # Local imports
 from agsconfig.services.kml_server_extension import KmlServerExtension as kml
 
+# import additional fixtures
+from .extension_base import *
+
 
 @pytest.mark.parametrize(
     ('attribute', 'expectedValue', 'exception'),

tests/na_server_extension_mixin.py

@@ -16,8 +16,5 @@
 # Fixture imports
 from .helpers import TRUEISH_TEST_PARAMS
 
-
-@pytest.mark.parametrize(("enabled", "expected"), TRUEISH_TEST_PARAMS)
-def test_na_enabled(service_config, enabled, expected):
-    service_config.na_server.enabled = enabled
-    assert service_config.na_server.enabled == expected
+# import additional fixtures
+from .extension_base import *

tests/wcs_server_extension_mixin.py

@@ -13,6 +13,7 @@
 import pytest
 
 from .custom_get_capabilities_mixin import *
+from .extension_base import *
 from .ogc_metadata_extension_mixin import *
 
 

tests/wfs_server_extension_mixin.py

@@ -21,6 +21,7 @@
 
 # Addition test fixtures to mix in
 from .custom_get_capabilities_mixin import *
+from .extension_base import *
 from .ogc_metadata_extension_mixin import *
 
 

tests/wms_server_extension_mixin.py

@@ -16,6 +16,7 @@
 from agsconfig.services.wms_server_extension import WMSServerExtension as wms
 
 from .custom_get_capabilities_mixin import *
+from .extension_base import *
 from .ogc_metadata_extension_mixin import *
 
 

tests/wps_server_extension_mixin.py

@@ -12,6 +12,7 @@
 from agsconfig.services.wps_server_extension import WPSServerExtension as wps
 
 from .custom_get_capabilities_mixin import *
+from .extension_base import *
 from .ogc_metadata_extension_mixin import *
 
 
@@ -27,13 +28,12 @@ def service_extension(service_config):
         ('britney_spears', 'should cause an', AttributeError),  # because she isn't a member
         ('app_schema_prefix', 'TestProject_TestService', None),
         ('contact_instructions', None, None),
-        ('enabled', False, None),
         ('hours_of_service', None, None),
         ('name', 'WPS', None),
         ('provider_site', None, None),
         ('role', None, None),
-        ('service_type', None, None),
-        ('service_type_version', None, None)
+        ('service_type_version', None, None),
+        ('service_type', None, None)
     ]
 )
 def test_wps_getters(service_extension, attribute, expected_value, exception):
@@ -50,14 +50,12 @@ def test_wps_getters(service_extension, attribute, expected_value, exception):
         ('britney_spears', 'should cause a', None, TypeError),  # because she isn't a member
         ('app_schema_prefix', 'prefix', 'prefix', None),
         ('contact_instructions', 'instructions', 'instructions', None),
-        ('enabled', True, True, None),
-        ('enabled', 'x', None, ValueError),
         ('hours_of_service', 'hours', 'hours', None),
         ('name', 'name', 'name', None),
         ('provider_site', 'site', 'site', None),
         ('role', 'role', 'role', None),
-        ('service_type', 'type', 'type', None),
-        ('service_type_version', 'version', 'version', None)
+        ('service_type_version', 'version', 'version', None),
+        ('service_type', 'type', 'type', None)
     ]
 )
 def test_wps_setters(service_extension, attribute, new_value, expected_value, exception):