Tests refactoring

Author: IgorChvyrov-sm

tests/unit/orkes/test_async_authorization_client.py

@@ -694,7 +694,7 @@ async def test_get_user_validated(mocker, authorization_client, conductor_user_a
         "encryptedIdDisplayValue": USER_ID,
     }
     mock.return_value = user_dict
-    user = await authorization_client.get_user_validated(USER_ID)
+    user = await authorization_client.get_user(USER_ID)
     mock.assert_called_with(id=USER_ID)
     assert user.name == USER_NAME
     assert user.id == USER_ID
@@ -731,7 +731,7 @@ async def test_create_application_validated(mocker, authorization_client, extend
         "updatedBy": USER_ID,
     }
     mock.return_value = app_dict
-    app = await authorization_client.create_application_validated(extended_conductor_application_adapter)
+    app = await authorization_client.create_application(extended_conductor_application_adapter)
     mock.assert_called_with(create_or_update_application_request=extended_conductor_application_adapter)
     assert app.name == APP_NAME
     assert app.id == APP_ID
@@ -749,7 +749,7 @@ async def test_update_application_validated(mocker, authorization_client, extend
         "updatedBy": USER_ID,
     }
     mock.return_value = app_dict
-    app = await authorization_client.update_application_validated(APP_ID, extended_conductor_application_adapter)
+    app = await authorization_client.update_application(APP_ID, extended_conductor_application_adapter)
     mock.assert_called_with(id=APP_ID, create_or_update_application_request=extended_conductor_application_adapter)
     assert app.name == APP_NAME
     assert app.id == APP_ID
@@ -767,7 +767,7 @@ async def test_get_application_validated(mocker, authorization_client, extended_
         "updatedBy": USER_ID,
     }
     mock.return_value = app_dict
-    app = await authorization_client.get_application_validated(APP_ID)
+    app = await authorization_client.get_application(APP_ID)
     mock.assert_called_with(id=APP_ID)
     assert app.name == APP_NAME
     assert app.id == APP_ID
@@ -798,7 +798,7 @@ async def test_get_group_validated(mocker, authorization_client, group_adapter):
         "roles": [{"name": "USER", "permissions": []}],
     }
     mock.return_value = group_dict
-    group = await authorization_client.get_group_validated(GROUP_ID)
+    group = await authorization_client.get_group(GROUP_ID)
     mock.assert_called_with(id=GROUP_ID)
     assert group.description == GROUP_NAME
     assert group.id == GROUP_ID
@@ -899,7 +899,7 @@ async def test_upsert_user_validated(mocker, authorization_client, conductor_use
     mock = mocker.patch.object(authorization_client, "create_user_validated")
     upsert_req = UpsertUserRequestAdapter(name=USER_NAME, roles=["ADMIN"])
     mock.return_value = conductor_user_adapter
-    user = await authorization_client.upsert_user_validated(USER_ID, upsert_req)
+    user = await authorization_client.upsert_user(USER_ID, upsert_req)
     mock.assert_called_with(USER_ID, upsert_req)
     assert user == conductor_user_adapter
 

tests/unit/orkes/test_authorization_client.py

@@ -206,7 +206,7 @@ def test_update_application(mocker, authorization_client, conductor_application)
         "createTime": 1699236095031,
         "updateTime": 1699236095031,
     }
-    app = authorization_client.update_application(APP_ID, updateReq)
+    app = authorization_client.update_application(updateReq, APP_ID)
     assert app == conductor_application
     mock.assert_called_with(id=APP_ID, body=updateReq)
 
@@ -304,7 +304,7 @@ def test_upsert_user(mocker, authorization_client, conductor_user, roles):
     mock = mocker.patch.object(UserResourceApi, "upsert_user")
     upsertReq = UpsertUserRequest(USER_NAME, ["ADMIN"])
     mock.return_value = conductor_user.to_dict()
-    user = authorization_client.upsert_user(USER_ID, upsertReq)
+    user = authorization_client.upsert_user(upsertReq, USER_ID)
     mock.assert_called_with(id=USER_ID, upsert_user_request=upsertReq)
     assert user.name == USER_NAME
     assert user.id == USER_ID
@@ -317,7 +317,7 @@ def test_upsert_user_with_empty_string(mocker, authorization_client, conductor_u
     mock = mocker.patch.object(UserResourceApi, "upsert_user")
     upsert_req = UpsertUserRequest(USER_NAME, ["ADMIN"])
     mock.return_value = conductor_user.to_dict()
-    authorization_client.upsert_user("", upsert_req)
+    authorization_client.upsert_user(upsert_req,"")
     mock.assert_called_with(id=None, body=upsert_req)
 
 
@@ -373,7 +373,7 @@ def test_upsert_group(mocker, authorization_client, conductor_group, group_roles
     mock = mocker.patch.object(GroupResourceApi, "upsert_group")
     upsertReq = UpsertGroupRequest(GROUP_NAME, ["USER"])
     mock.return_value = conductor_group.to_dict()
-    group = authorization_client.upsert_group(GROUP_ID, upsertReq)
+    group = authorization_client.upsert_group(upsertReq, GROUP_ID)
     mock.assert_called_with(id=GROUP_ID, body=upsertReq)
     assert group == conductor_group
     assert group.description == GROUP_NAME