[py]: Tweak unit tests for VA, allow values to be passed when instantiating a VirtualAuthenticator instance

symonk · symonk · commit 4abc122503ed · 2022-12-10T18:54:12.000Z
diff --git a/py/selenium/webdriver/common/virtual_authenticator.py b/py/selenium/webdriver/common/virtual_authenticator.py
@@ -45,18 +45,26 @@ class VirtualAuthenticatorOptions:
     Protocol = Protocol
     Transport = Transport
 
-    def __init__(self) -> None:
+    def __init__(
+        self,
+        protocol: str = Protocol.CTAP2,
+        transport: str = Transport.USB,
+        has_resident_key: bool = False,
+        has_user_verification: bool = False,
+        is_user_consenting: bool = True,
+        is_user_verified: bool = False,
+    ) -> None:
         """Constructor.
 
         Initialize VirtualAuthenticatorOptions object.
         """
 
-        self.protocol: str = Protocol.CTAP2
-        self.transport: str = Transport.USB
-        self.has_resident_key: bool = False
-        self.has_user_verification: bool = False
-        self.is_user_consenting: bool = True
-        self.is_user_verified: bool = False
+        self.protocol: str = protocol
+        self.transport: str = transport
+        self.has_resident_key: bool = has_resident_key
+        self.has_user_verification: bool = has_user_verification
+        self.is_user_consenting: bool = is_user_consenting
+        self.is_user_verified: bool = is_user_verified
 
     def to_dict(self) -> typing.Dict[str, typing.Union[str, bool]]:
         return {
diff --git a/py/test/unit/selenium/webdriver/virtual_authenticator/virtual_authenticator_options_tests.py b/py/test/unit/selenium/webdriver/virtual_authenticator/virtual_authenticator_options_tests.py
@@ -25,64 +25,22 @@ def options():
     return VirtualAuthenticatorOptions()
 
 
-def test_set_transport(options):
-    options.transport = VirtualAuthenticatorOptions.Transport.USB
-    assert options.transport == VirtualAuthenticatorOptions.Transport.USB.value
-
-
-def test_get_transport(options):
-    options._transport = VirtualAuthenticatorOptions.Transport.NFC
-    assert options.transport == VirtualAuthenticatorOptions.Transport.NFC.value
-
-
-def test_set_protocol(options):
-    options.protocol = VirtualAuthenticatorOptions.Protocol.U2F
-    assert options.protocol == VirtualAuthenticatorOptions.Protocol.U2F.value
-
-
-def test_get_protocol(options):
-    options._protocol = VirtualAuthenticatorOptions.Protocol.CTAP2
-    assert options.protocol == VirtualAuthenticatorOptions.Protocol.CTAP2.value
-
-
-def test_set_has_resident_key(options):
-    options.has_resident_key = True
-    assert options.has_resident_key is True
-
-
-def test_get_has_resident_key(options):
-    options._has_resident_key = False
-    assert options.has_resident_key is False
-
-
-def test_set_has_user_verification(options):
-    options.has_user_verification = True
-    assert options.has_user_verification is True
-
-
-def test_get_has_user_verification(options):
-    options._has_user_verification = False
-    assert options.has_user_verification is False
-
-
-def test_set_is_user_consenting(options):
-    options.is_user_consenting = True
-    assert options.is_user_consenting is True
-
-
-def test_get_is_user_consenting(options):
-    options._is_user_consenting = False
-    assert options.is_user_consenting is False
-
-
-def test_set_is_user_verified(options):
-    options.is_user_verified = True
-    assert options.is_user_verified is True
-
-
-def test_get_is_user_verified(options):
-    options._is_user_verified = False
-    assert options.is_user_verified is False
+def test_bespoke_options_for_virtual_authenticator():
+    va = VirtualAuthenticatorOptions(
+        protocol="ctap1/u2f",
+        transport="ble",
+        has_resident_key=True,
+        has_user_verification=True,
+        is_user_consenting=False,
+        is_user_verified=True
+    ).to_dict() == {
+        "protocol": "ctap1/u2f",
+        "transport": "ble",
+        "hasResidentKey": True,
+        "hasUserVerification": True,
+        "isUserConsenting": False,
+        "isUserVerified": True
+    }
 
 
 def test_to_dict_with_defaults(options):
