From 611f3a04b64377cee361456dcbb01389288a17a3 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 26 Sep 2013 10:00:01 +1000 Subject: [PATCH] Fixes api controller tests --- .../ContentControllerUnitTests.cs | 72 +++++++++++-------- ...terAllowedOutgoingContentAttributeTests.cs | 17 +++-- .../WebApiEditors/MediaControllerUnitTests.cs | 20 +++--- 3 files changed, 63 insertions(+), 46 deletions(-) diff --git a/src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs b/src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs index eed4aa4552..679a55897a 100644 --- a/src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs +++ b/src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs @@ -16,11 +16,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors public void Does_Not_Throw_Exception_When_Access_Allowed_By_Path() { //arrange - var user = new Mock().Object; - user.Id = 9; - user.StartContentId = -1; - var content = new Mock().Object; - content.Path = "-1,1234,5678"; + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + var contentMock = new Mock(); + contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); + var content = contentMock.Object; var contentServiceMock = new Mock(); contentServiceMock.Setup(x => x.GetById(1234)).Returns(content); var contentService = contentServiceMock.Object; @@ -40,11 +42,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors public void Throws_Exception_When_No_Content_Found() { //arrange - var user = new Mock().Object; - user.Id = 9; - user.StartContentId = -1; - var content = new Mock().Object; - content.Path = "-1,1234,5678"; + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + var contentMock = new Mock(); + contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); + var content = contentMock.Object; var contentServiceMock = new Mock(); contentServiceMock.Setup(x => x.GetById(0)).Returns(content); var contentService = contentServiceMock.Object; @@ -61,11 +65,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors public void Throws_Exception_When_No_Access_By_Path() { //arrange - var user = new Mock().Object; - user.Id = 9; - user.StartContentId = 9876; - var content = new Mock().Object; - content.Path = "-1,1234,5678"; + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartContentId).Returns(9876); + var user = userMock.Object; + var contentMock = new Mock(); + contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); + var content = contentMock.Object; var contentServiceMock = new Mock(); contentServiceMock.Setup(x => x.GetById(1234)).Returns(content); var contentService = contentServiceMock.Object; @@ -85,11 +91,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors public void Throws_Exception_When_No_Access_By_Permission() { //arrange - var user = new Mock().Object; - user.Id = 9; - user.StartContentId = -1; - var content = new Mock().Object; - content.Path = "-1,1234,5678"; + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + var contentMock = new Mock(); + contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); + var content = contentMock.Object; var contentServiceMock = new Mock(); contentServiceMock.Setup(x => x.GetById(1234)).Returns(content); var contentService = contentServiceMock.Object; @@ -112,11 +120,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors public void Does_Not_Throw_Exception_When_Access_Allowed_By_Permission() { //arrange - var user = new Mock().Object; - user.Id = 9; - user.StartContentId = -1; - var content = new Mock().Object; - content.Path = "-1,1234,5678"; + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + var contentMock = new Mock(); + contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); + var content = contentMock.Object; var contentServiceMock = new Mock(); contentServiceMock.Setup(x => x.GetById(1234)).Returns(content); var contentService = contentServiceMock.Object; @@ -139,11 +149,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors public void Does_Not_Throw_Exception_When_No_Permissions_Assigned() { //arrange - var user = new Mock().Object; - user.Id = 9; - user.StartContentId = -1; - var content = new Mock().Object; - content.Path = "-1,1234,5678"; + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + var contentMock = new Mock(); + contentMock.Setup(c => c.Path).Returns("-1,1234,5678"); + var content = contentMock.Object; var contentServiceMock = new Mock(); contentServiceMock.Setup(x => x.GetById(1234)).Returns(content); var contentService = contentServiceMock.Object; diff --git a/src/Umbraco.Tests/Controllers/WebApiEditors/FilterAllowedOutgoingContentAttributeTests.cs b/src/Umbraco.Tests/Controllers/WebApiEditors/FilterAllowedOutgoingContentAttributeTests.cs index cc2d95e94c..c47fd76b30 100644 --- a/src/Umbraco.Tests/Controllers/WebApiEditors/FilterAllowedOutgoingContentAttributeTests.cs +++ b/src/Umbraco.Tests/Controllers/WebApiEditors/FilterAllowedOutgoingContentAttributeTests.cs @@ -80,9 +80,11 @@ namespace Umbraco.Tests.Controllers.WebApiEditors path += i.ToInvariantString(); list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = i, Path = path }); } - var user = new Mock().Object; - user.Id = 9; - user.StartContentId = 5; + + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartContentId).Returns(5); + var user = userMock.Object; att.FilterBasedOnStartNode(list, user); @@ -100,9 +102,12 @@ namespace Umbraco.Tests.Controllers.WebApiEditors list.Add(new ContentItemBasic{Id = i, Name = "Test" + i, ParentId = -1}); } var ids = list.Select(x => (int)x.Id).ToArray(); - var user = new Mock().Object; - user.Id = 9; - user.StartContentId = -1; + + var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartContentId).Returns(-1); + var user = userMock.Object; + var userServiceMock = new Mock(); //we're only assigning 3 nodes browse permissions so that is what we expect as a result var permissions = new List diff --git a/src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs b/src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs index 71709fff0a..0a81bc1b4b 100644 --- a/src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs +++ b/src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs @@ -17,12 +17,12 @@ namespace Umbraco.Tests.Controllers.WebApiEditors { //arrange var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartMediaId).Returns(-1); var user = userMock.Object; - user.Id = 9; - user.StartMediaId = -1; var mediaMock = new Mock(); + mediaMock.Setup(m => m.Path).Returns("-1,1234,5678"); var media = mediaMock.Object; - media.Path = "-1,1234,5678"; var mediaServiceMock = new Mock(); mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media); var mediaService = mediaServiceMock.Object; @@ -39,12 +39,12 @@ namespace Umbraco.Tests.Controllers.WebApiEditors { //arrange var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartMediaId).Returns(-1); var user = userMock.Object; - user.Id = 9; - user.StartMediaId = -1; var mediaMock = new Mock(); + mediaMock.Setup(m => m.Path).Returns("-1,1234,5678"); var media = mediaMock.Object; - media.Path = "-1,1234,5678"; var mediaServiceMock = new Mock(); mediaServiceMock.Setup(x => x.GetById(0)).Returns(media); var mediaService = mediaServiceMock.Object; @@ -58,14 +58,14 @@ namespace Umbraco.Tests.Controllers.WebApiEditors { //arrange var userMock = new Mock(); + userMock.Setup(u => u.Id).Returns(9); + userMock.Setup(u => u.StartMediaId).Returns(9876); var user = userMock.Object; - user.Id = 9; - user.StartMediaId = 9876; var mediaMock = new Mock(); + mediaMock.Setup(m => m.Path).Returns("-1,1234,5678"); var media = mediaMock.Object; - media.Path = "-1,1234,5678"; var mediaServiceMock = new Mock(); - mediaServiceMock.Setup(x => x.GetById(0)).Returns(media); + mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media); var mediaService = mediaServiceMock.Object; //act