From 25a79bc2fa8b53e6abab682af33410f17febd049 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 23 Jun 2017 11:43:58 +1000 Subject: [PATCH] fixing tests --- .../Models/UserExtensionsTests.cs | 2 +- .../Controllers/ContentControllerUnitTests.cs | 26 +++++++++---------- ...terAllowedOutgoingContentAttributeTests.cs | 2 +- .../Controllers/MediaControllerUnitTests.cs | 14 +++++----- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Umbraco.Tests/Models/UserExtensionsTests.cs b/src/Umbraco.Tests/Models/UserExtensionsTests.cs index c6f9c55ead..653b8d5a27 100644 --- a/src/Umbraco.Tests/Models/UserExtensionsTests.cs +++ b/src/Umbraco.Tests/Models/UserExtensionsTests.cs @@ -17,7 +17,7 @@ namespace Umbraco.Tests.Models public void Determines_Path_Based_Access_To_Content(int userId, string contentPath, bool outcome) { var userMock = new Mock(); - userMock.Setup(u => u.StartContentIds).Returns(new[]{ userId }); + userMock.Setup(u => u.AllStartContentIds).Returns(new[]{ userId }); var user = userMock.Object; var contentMock = new Mock(); contentMock.Setup(c => c.Path).Returns(contentPath); diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs index ae735be64e..f4480ca636 100644 --- a/src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs +++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs @@ -18,7 +18,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; var contentMock = new Mock(); contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; var contentMock = new Mock(); contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); @@ -63,7 +63,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartContentIds).Returns(new[]{ 9876 }); + userMock.Setup(u => u.AllStartContentIds).Returns(new[]{ 9876 }); var user = userMock.Object; var contentMock = new Mock(); contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); @@ -89,7 +89,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; var contentMock = new Mock(); contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); @@ -118,7 +118,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; var contentMock = new Mock(); contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); @@ -147,7 +147,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; //act @@ -163,7 +163,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; //act @@ -179,7 +179,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartContentIds).Returns(new []{ 1234 }); + userMock.Setup(u => u.AllStartContentIds).Returns(new []{ 1234 }); var user = userMock.Object; //act @@ -195,7 +195,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartContentIds).Returns(new []{ 1234 }); + userMock.Setup(u => u.AllStartContentIds).Returns(new []{ 1234 }); var user = userMock.Object; //act @@ -211,7 +211,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; var userServiceMock = new Mock(); @@ -235,7 +235,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; var userServiceMock = new Mock(); @@ -259,7 +259,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; var userServiceMock = new Mock(); @@ -283,7 +283,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartContentIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartContentIds).Returns(new int[0]); var user = userMock.Object; var userServiceMock = new Mock(); diff --git a/src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs b/src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs index b93d503d3d..8e84dcf030 100644 --- a/src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs +++ b/src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs @@ -83,7 +83,7 @@ namespace Umbraco.Tests.Web.Controllers var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartContentIds).Returns(new []{ 5 }); + userMock.Setup(u => u.AllStartContentIds).Returns(new []{ 5 }); var user = userMock.Object; att.FilterBasedOnStartNode(list, user); diff --git a/src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs b/src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs index 7923920fe7..9cb0578fc9 100644 --- a/src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs +++ b/src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs @@ -18,7 +18,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartMediaIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartMediaIds).Returns(new int[0]); var user = userMock.Object; var mediaMock = new Mock(); mediaMock.Setup(m => m.Path).Returns("-1,1234,5678"); @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartMediaIds).Returns(new int[0]); + userMock.Setup(u => u.AllStartMediaIds).Returns(new int[0]); var user = userMock.Object; var mediaMock = new Mock(); mediaMock.Setup(m => m.Path).Returns("-1,1234,5678"); @@ -59,7 +59,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(9); - userMock.Setup(u => u.StartMediaIds).Returns(new[]{ 9876 }); + userMock.Setup(u => u.AllStartMediaIds).Returns(new[]{ 9876 }); var user = userMock.Object; var mediaMock = new Mock(); mediaMock.Setup(m => m.Path).Returns("-1,1234,5678"); @@ -81,7 +81,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartMediaIds).Returns(new int[]{}); + userMock.Setup(u => u.AllStartMediaIds).Returns(new int[]{}); var user = userMock.Object; //act @@ -97,7 +97,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartMediaIds).Returns(new[]{ 1234 }); + userMock.Setup(u => u.AllStartMediaIds).Returns(new[]{ 1234 }); var user = userMock.Object; //act @@ -113,7 +113,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartMediaIds).Returns(new int[]{}); + userMock.Setup(u => u.AllStartMediaIds).Returns(new int[]{}); var user = userMock.Object; //act @@ -129,7 +129,7 @@ namespace Umbraco.Tests.Web.Controllers //arrange var userMock = new Mock(); userMock.Setup(u => u.Id).Returns(0); - userMock.Setup(u => u.StartMediaIds).Returns(new[]{ 1234 }); + userMock.Setup(u => u.AllStartMediaIds).Returns(new[]{ 1234 }); var user = userMock.Object; //act