Fixing UtilApi and RoomMembershipApi tests.

Author: jforsell

test/SymphonyOSS.RestApiClient.Tests/RoomMembershipApiTest.cs

@@ -33,7 +33,7 @@ public void EnsureAddMemberToRoom_uses_retry_strategy()
             var roomId = "some_room";
             var userId = 123456789;
             _roomMembershipApi.AddMemberToRoom(roomId, userId);
-            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, long?, string, SuccessResponse>>(), roomId, userId, "sessionToken"));
+            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, UserId, string, SuccessResponse>>(), roomId, new UserId(userId), "sessionToken"));
         }
 
         [Fact]
@@ -42,7 +42,7 @@ public void EnsureRemoveMemberFromRoom_uses_retry_strategy()
             var roomId = "some_room";
             var userId = 123456789;
             _roomMembershipApi.RemoveMemberFromRoom(roomId, userId);
-            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, long?, string, SuccessResponse>>(), roomId, userId, "sessionToken"));
+            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, UserId, string, SuccessResponse>>(), roomId, new UserId(userId), "sessionToken"));
         }
 
         [Fact]
@@ -51,7 +51,7 @@ public void EnsurePromoteUserToRoomOwner_uses_retry_strategy()
             var roomId = "some_room";
             var userId = 123456789;
             _roomMembershipApi.PromoteUserToRoomOwner(roomId, userId);
-            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, long?, string, SuccessResponse>>(), roomId, userId, "sessionToken"));
+            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, UserId, string, SuccessResponse>>(), roomId, new UserId(userId), "sessionToken"));
         }
 
         [Fact]
@@ -60,15 +60,15 @@ public void EnsureDemoteRoomOwner_uses_retry_strategy()
             var roomId = "some_room";
             var userId = 123456789;
             _roomMembershipApi.DemoteRoomOwner(roomId, userId);
-            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, long?, string, SuccessResponse>>(), roomId, userId, "sessionToken"));
+            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, UserId, string, SuccessResponse>>(), roomId, new UserId(userId), "sessionToken"));
         }
 
         [Fact]
         public void EnsureGetRoomMembers_uses_retry_strategy()
         {
             var roomId = "some_room";
             _roomMembershipApi.GetRoomMembers(roomId);
-            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, string, SuccessResponse>>(), roomId, "sessionToken"));
+            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, string, MembershipList>>(), roomId, "sessionToken"));
         }
     }
 }

test/SymphonyOSS.RestApiClient.Tests/UtilApiTest.cs

@@ -22,6 +22,7 @@ public UtilApiTest()
         {
             var sessionManagerMock = new Mock<IAuthTokens>();
             sessionManagerMock.Setup(obj => obj.SessionToken).Returns("sessionToken");
+            sessionManagerMock.Setup(obj => obj.KeyManagerToken).Returns("keyManagerToken");
             var configuration = new Configuration();
             _apiExecutorMock = new Mock<IApiExecutor>();
             _utilApi = new UtilApi(sessionManagerMock.Object, configuration, _apiExecutorMock.Object);
@@ -32,15 +33,15 @@ public void EnsureEcho_uses_retry_strategy()
         {
             const string msg = "Hello!";
             _utilApi.Echo(msg);
-            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, string, string, SimpleMessage>>(), "sessionToken", "keyManagerToken", msg));
+            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, string, SimpleMessage, SimpleMessage>>(), "sessionToken", "keyManagerToken", new SimpleMessage(msg)));
         }
 
         [Fact]
         public void EnsureObsolete_uses_retry_strategy()
         {
             const string msg = "Obsolete!";
             _utilApi.Obsolete(msg);
-            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, string, string, SimpleMessage>>(), "sessionToken", "keyManagerToken", msg));
+            _apiExecutorMock.Verify(obj => obj.Execute(It.IsAny<Func<string, string, SimpleMessage, SimpleMessage>>(), "sessionToken", "keyManagerToken", new SimpleMessage(msg)));
         }
     }
 }