From aaeff3d50f4c9c5dd98f6d0674cbc8ece569acec Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 26 Mar 2020 12:41:13 +0800 Subject: [PATCH] Fix broken unit tests. --- .../Messaging/MessagingControllerTests.cs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/MessagingControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/MessagingControllerTests.cs index 56f3cefab1a..04717495aab 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/MessagingControllerTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/MessagingControllerTests.cs @@ -14,8 +14,10 @@ using DotNetNuke.Entities.Portals; using DotNetNuke.Entities.Portals.Internal; using DotNetNuke.Entities.Users; +using DotNetNuke.Security.Permissions; using DotNetNuke.Security.Roles; using DotNetNuke.Services.Cache; +using DotNetNuke.Services.FileSystem; using DotNetNuke.Services.Localization; using DotNetNuke.Services.Social.Messaging.Data; using DotNetNuke.Services.Social.Messaging; @@ -49,6 +51,9 @@ public class MessagingControllerTests private Mock _mockRoleProvider; private Mock _mockCacheProvider; private Mock _mockLocalizationProvider; + private Mock _folderManager; + private Mock _fileManager; + private Mock _folderPermissionController; private DataTable _dtMessages; private DataTable _dtMessageAttachment; @@ -91,12 +96,21 @@ public void SetUp() DataService.RegisterInstance(_mockDataService.Object); + _folderManager = new Mock(); + _fileManager = new Mock(); + _folderPermissionController = new Mock(); + + FolderManager.RegisterInstance(_folderManager.Object); + FileManager.RegisterInstance(_fileManager.Object); + FolderPermissionController.SetTestableInstance(_folderPermissionController.Object); + SetupDataProvider(); SetupRoleProvider(); SetupDataTables(); SetupUsers(); SetupPortalSettings(); SetupCachingProvider(); + SetupFileControllers(); _mockInternalMessagingController.Setup(m => m.GetLastSentMessage(It.IsAny())).Returns((Message)null); } @@ -178,6 +192,13 @@ private void SetupRoleProvider() _mockRoleProvider.Setup(rp => rp.GetUserRoles(It.Is(u => u.UserID == Constants.UserID_FirstSocialGroupOwner), It.IsAny())).Returns(new List { userFirstSocialGroupOwner }); } + private void SetupFileControllers() + { + _folderManager.Setup(f => f.GetFolder(It.IsAny())).Returns(new FolderInfo()); + _fileManager.Setup(f => f.GetFile(It.IsAny())).Returns(new FileInfo()); + _folderPermissionController.Setup(f => f.CanViewFolder(It.IsAny())).Returns(true); + } + #endregion #region Constructor Tests @@ -768,6 +789,8 @@ public void MessagingController_CreateMessage_Calls_DataService_SaveSocialMessag [Test] public void MessagingController_CreateMessage_Calls_DataService_CreateSocialMessageRecipientsForRole_On_Passing_Role_ByAdmin() { + InternalMessagingController.SetTestableInstance(_mockInternalMessagingController.Object); + //Arrange var message = new Message { Subject = "subject", Body = "body" }; var role = new RoleInfo { RoleName = Constants.RoleName_RegisteredUsers, RoleID = Constants.RoleID_RegisteredUsers };