cli - typer hint fixes. added unit tests

Author: gabis-precog

rsocket/cli/command.py

@@ -91,7 +91,7 @@ async def transport_from_uri(uri: RSocketUri,
 
 def build_composite_metadata(auth_simple: Optional[str],
                              route_value: Optional[str],
-                             auth_bearer: Optional[str]):
+                             auth_bearer: Optional[str]) -> List:
     composite_items = []
 
     if route_value is not None:
@@ -289,7 +289,7 @@ def parse_headers(http_headers):
     return None
 
 
-def normalize_metadata_mime_type(composite_items, metadata_mime_type):
+def normalize_metadata_mime_type(composite_items: List, metadata_mime_type):
     if len(composite_items) > 0:
         metadata_mime_type = WellKnownMimeTypes.MESSAGE_RSOCKET_COMPOSITE_METADATA
 

rsocket/rsocket_client.py

@@ -25,8 +25,8 @@ def __init__(self,
                  honor_lease=False,
                  lease_publisher: Optional[Publisher] = None,
                  request_queue_size: int = 0,
-                 data_encoding: Union[bytes, WellKnownMimeTypes] = WellKnownMimeTypes.APPLICATION_JSON,
-                 metadata_encoding: Union[bytes, WellKnownMimeTypes] = WellKnownMimeTypes.APPLICATION_JSON,
+                 data_encoding: Union[str, bytes, WellKnownMimeTypes] = WellKnownMimeTypes.APPLICATION_JSON,
+                 metadata_encoding: Union[str, bytes, WellKnownMimeTypes] = WellKnownMimeTypes.APPLICATION_JSON,
                  keep_alive_period: timedelta = timedelta(milliseconds=500),
                  max_lifetime_period: timedelta = timedelta(minutes=10),
                  setup_payload: Optional[Payload] = None,

tests/rsocket/test_cli_command.py

@@ -5,8 +5,10 @@
 import pytest
 
 from rsocket.cli.command import parse_uri, build_composite_metadata, create_request_payload, get_metadata_value, \
-    create_setup_payload, normalize_data, normalize_limit_rate, RequestType, get_request_type, parse_headers
+    create_setup_payload, normalize_data, normalize_limit_rate, RequestType, get_request_type, parse_headers, \
+    normalize_metadata_mime_type
 from rsocket.extensions.helpers import route, authenticate_simple, authenticate_bearer
+from rsocket.extensions.mimetypes import WellKnownMimeTypes
 from rsocket.frame import MAX_REQUEST_N
 from tests.rsocket.helpers import create_data
 
@@ -147,3 +149,13 @@ def test_parse_headers(headers, expected):
     actual = parse_headers(headers)
 
     assert actual == expected
+
+
+@pytest.mark.parametrize('composite_items, metadata_mime_type, expected', (
+        ([], 'application/json', 'application/json'),
+        ([route('path')], 'application/json', WellKnownMimeTypes.MESSAGE_RSOCKET_COMPOSITE_METADATA),
+))
+def test_normalize_metadata_mime_type(composite_items, metadata_mime_type, expected):
+    actual = normalize_metadata_mime_type(composite_items, metadata_mime_type)
+
+    assert actual == expected