organize test imports

Author: mythz

servicestack/__init__.py

@@ -60,6 +60,7 @@
     'WebServiceExceptionType',
     'to_json',
     'from_json',
+    'to_dict',
     'convert',
     'qsvalue',
     'resolve_httpmethod',
@@ -107,7 +108,7 @@
     StringsResponse, AuditBase
 
 from .clients import TypeConverters, JsonServiceClient, WebServiceException, \
-    WebServiceExceptionType, to_json, from_json, convert, qsvalue, \
+    WebServiceExceptionType, to_json, from_json, to_dict, convert, qsvalue, \
     resolve_httpmethod
 
 from .utils import \

servicestack/clients.py

@@ -120,9 +120,11 @@ def nameof(instance):
 
 
 def qsvalue(arg):
-    if not arg:
+    if arg is None:
         return ""
     arg_type = type(arg)
+    if arg_type == bool:
+        return f"{arg}".lower()
     if is_list(arg_type):
         return "[" + ','.join([qsvalue(x) for x in arg]) + "]"
     if is_dict(arg_type):
@@ -138,6 +140,7 @@ def append_querystring(url: str, args: dict[str, Any]):
     if args:
         for key in args:
             val = args[key]
+            # print("append_querystring", key, val)
             if val is None:
                 continue
             url += '&' if '?' in url else '?'
@@ -155,14 +158,17 @@ def _empty(x):
     return x is None or x == {} or x == []
 
 
-def _asdict(obj: Any):
+def to_dict(obj: Any):
     if obj is None:
         return {}
     if is_dataclass(obj):
         d = asdict(obj)
         to = {}
         for k, v in d.items():
-            to[camelcase(k)] = v
+            use_key = camelcase(k)
+            if use_key[-1] == '_':
+                use_key = use_key[0:-1]
+            to[use_key] = v
     else:
         to = obj.__dict__
     return clean_any(to)
@@ -188,7 +194,7 @@ def clean_any(d):
 
 def _json_encoder(obj: Any):
     if is_dataclass(obj):
-        return _asdict(obj)
+        return to_dict(obj)
     if hasattr(obj, '__dict__'):
         return vars(obj)
     if isinstance(obj, datetime):
@@ -548,7 +554,7 @@ def refresh_token_cookie(self):
     def create_url_from_dto(self, method: str, request: Any):
         url = urljoin(self.reply_base_url, nameof(request))
         if not has_request_body(method):
-            url = append_querystring(url, _asdict(request))
+            url = append_querystring(url, to_dict(request))
         return url
 
     def get(self, request: IReturn[T], args: Dict[str, Any] = None) -> T:
@@ -781,7 +787,7 @@ def create_request(self, info: SendContext):
                 body_not_request_dto = info.request and info.body
                 if body_not_request_dto:
                     url = urljoin(self.reply_base_url, nameof(info.request))
-                    url = append_querystring(url, _asdict(info.request))
+                    url = append_querystring(url, to_dict(info.request))
                 else:
                     url = self.create_url_from_dto(info.method, body)
 

tests/test_client_auth.py

@@ -2,12 +2,11 @@
 """
 
 import unittest
-import dataclasses
-import json
-from .dtos import *
-from datetime import datetime, timedelta, timezone
-from servicestack import JsonServiceClient, WebServiceException, to_json
+from datetime import datetime
+
+from servicestack import WebServiceException
 from .config import *
+from .dtos import *
 
 
 def create_jwt(**args) -> CreateJwt:

tests/test_enum_serialization.py

@@ -3,15 +3,10 @@
 
 import unittest
 
-import requests
-from dataclasses_json import config, dataclass_json, Undefined
-
-from .dtos import *
-from datetime import datetime, timedelta, timezone
-from servicestack import JsonServiceClient, WebServiceException, to_json, convert
-from .config import create_test_client
+from servicestack import to_json, convert
 from servicestack.utils import *
 from tests.dtos import HelloWithEnum
+from .dtos import *
 
 
 class TestEnumSerialization(unittest.TestCase):

tests/test_jsonserviceclient.py

@@ -1,13 +1,8 @@
 """JsonServiceClient Tests
 """
-import operator
 import unittest
-from dataclasses_json import dataclass_json, LetterCase, Undefined, config
-import dataclasses
-
-import requests
-from dataclasses_json import config, dataclass_json, Undefined
 
+from servicestack.clients import append_querystring
 from servicestack.utils import *
 from tests.config import *
 from .dtos import *
@@ -33,3 +28,9 @@ def test_does_serialize_dates_correctly_via_get_request(self):
         request = EchoTypes(date_time=datetime.datetime(2015, 1, 1, tzinfo=timezone.utc))
         response: EchoTypes = client.get(request)
         self.assertEqual(response.date_time, request.date_time)
+
+    def test_should_generate_default_value(self):
+        client = create_test_client()
+        request = HelloTypes(bool_=False, int_=0)
+        request_url = append_querystring(TEST_URL, to_dict(request))
+        self.assertEqual(request_url, TEST_URL + "?bool=false&int=0")