Some test fixes

Author: bdukes

Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/PurgePageUnitTests.cs

@@ -10,6 +10,7 @@ namespace Dnn.PersonaBar.Pages.Tests
 
     using DotNetNuke.Entities.Portals;
     using DotNetNuke.Entities.Tabs;
+    using DotNetNuke.Services.Localization;
     using DotNetNuke.Tests.Utilities.Fakes;
 
     using Microsoft.Extensions.DependencyInjection;
@@ -33,6 +34,8 @@ public void RunBeforeAnyTest()
             this.contentVerifierMock = new Mock<IContentVerifier>();
             this.portalControllerMock = new Mock<IPortalController>();
 
+            LocalizationProvider.SetTestableInstance(Mock.Of<ILocalizationProvider>());
+
             this.serviceProvider = FakeServiceProvider.Setup(
                 services =>
                 {
@@ -47,6 +50,7 @@ public void RunBeforeAnyTest()
         public void TearDown()
         {
             this.serviceProvider.Dispose();
+            LocalizationProvider.ClearInstance();
         }
 
         [Test]
@@ -64,7 +68,7 @@ public void Call_PurgePage_WithValidCommand_ShouldReturnSuccessResponse()
             this.tabControllerMock.Setup(t => t.GetTab(tabId, testPortalId)).Returns(tab);
             this.contentVerifierMock.Setup(p => p.IsContentExistsForRequestedPortal(testPortalId, portalSettings, It.IsAny<bool>())).Returns(true);
 
-            IConsoleCommand purgeCommand = new PurgePage(this.tabControllerMock.Object, this.recycleBinControllerMock.Object, this.contentVerifierMock.Object);
+            var purgeCommand = new PurgePage(this.tabControllerMock.Object, this.recycleBinControllerMock.Object, this.contentVerifierMock.Object);
 
             var args = new[] { "purge-page", tabId.ToString() };
             purgeCommand.Initialize(args, portalSettings, null, 0);
@@ -91,7 +95,7 @@ public void Call_PurgePage_WithValidCommandAndPageContentNotAllowed_ShouldReturn
             this.tabControllerMock.Setup(t => t.GetTab(tabId, portalId)).Returns(tab);
             this.contentVerifierMock.Setup(p => p.IsContentExistsForRequestedPortal(portalId, portalSettings, It.IsAny<bool>())).Returns(false);
 
-            IConsoleCommand purgeCommand = new PurgePage(this.tabControllerMock.Object, this.recycleBinControllerMock.Object, this.contentVerifierMock.Object);
+            var purgeCommand = new PurgePage(this.tabControllerMock.Object, this.recycleBinControllerMock.Object, this.contentVerifierMock.Object);
 
             var args = new[] { "purge-page", tabId.ToString() };
             purgeCommand.Initialize(args, portalSettings, null, 0);

Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/RestorePageUnitTests.cs

@@ -11,6 +11,7 @@ namespace Dnn.PersonaBar.Pages.Tests
 
     using DotNetNuke.Entities.Portals;
     using DotNetNuke.Entities.Tabs;
+    using DotNetNuke.Services.Localization;
     using DotNetNuke.Tests.Utilities.Fakes;
 
     using Microsoft.Extensions.DependencyInjection;
@@ -44,6 +45,8 @@ public void RunBeforeAnyTest()
             this.contentVerifierMock = new Mock<IContentVerifier>();
             this.portalControllerMock = new Mock<IPortalController>();
 
+            LocalizationProvider.SetTestableInstance(Mock.Of<ILocalizationProvider>());
+
             this.tabControllerMock.SetReturnsDefault(this.tab);
             this.contentVerifierMock.SetReturnsDefault(true);
             string message;
@@ -63,6 +66,7 @@ public void RunBeforeAnyTest()
         public void TearDown()
         {
             this.serviceProvider.Dispose();
+            LocalizationProvider.ClearInstance();
         }
 
         [Test]

Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Checks/CheckUserProfilePageTests.cs

@@ -10,8 +10,10 @@
     using Dnn.PersonaBar.Security.Components;
     using Dnn.PersonaBar.Security.Components.Checks;
 
+    using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Abstractions.Logging;
     using DotNetNuke.Abstractions.Portals;
+    using DotNetNuke.Abstractions.Security.Permissions;
     using DotNetNuke.Common;
     using DotNetNuke.ComponentModel;
     using DotNetNuke.Entities.Portals;
@@ -251,7 +253,7 @@ public void Execute_WhenNotPublicAndActivityFeedAndMyProfileValid_ReturnsCorrect
 
         private static void RegisterTestablePermissionProvider()
         {
-            var permissionProviderMock = new Mock<PermissionProvider>(Mock.Of<IEventLogger>());
+            var permissionProviderMock = new Mock<PermissionProvider>(Mock.Of<IEventLogger>(), Mock.Of<IPermissionDefinitionService>(), Mock.Of<IHostSettings>());
 
             permissionProviderMock.Setup(x => x.ImplicitRolesForPages(It.IsAny<int>()))
                 .Returns(new List<RoleInfo>());
@@ -280,7 +282,7 @@ private static Mock<IPagesController> SetupPagesControllerMock(
 
         private static PagePermissions BuildPermissionsData(bool allUsersCanView)
         {
-            var permissionsData = new PagePermissions(false);
+            var permissionsData = new PagePermissions(Mock.Of<IPermissionDefinitionService>(), false);
             if (allUsersCanView)
             {
                 permissionsData.RolePermissions =