From 45fa192c951f24293fc8a243796e4a34bcd37750 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 12 Feb 2014 17:25:45 +1100 Subject: [PATCH] Fixes some unit tests --- .../Persistence/BaseTableByTableTest.cs | 3 +-- src/Umbraco.Tests/PluginManagerTests.cs | 2 +- src/Umbraco.Tests/Services/UserServiceTests.cs | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs b/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs index bb0ac581bc..0ea233fc70 100644 --- a/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs +++ b/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs @@ -25,8 +25,7 @@ namespace Umbraco.Tests.Persistence string path = TestHelper.CurrentAssemblyDirectory; AppDomain.CurrentDomain.SetData("DataDirectory", path); - RepositoryResolver.Current = new RepositoryResolver( - new RepositoryFactory()); + RepositoryResolver.Current = new RepositoryResolver(new RepositoryFactory(true)); //disable cache var cacheHelper = CacheHelper.CreateDisabledCacheHelper(); diff --git a/src/Umbraco.Tests/PluginManagerTests.cs b/src/Umbraco.Tests/PluginManagerTests.cs index bebfc7f5ef..8840fa0e08 100644 --- a/src/Umbraco.Tests/PluginManagerTests.cs +++ b/src/Umbraco.Tests/PluginManagerTests.cs @@ -271,7 +271,7 @@ namespace Umbraco.Tests public void Resolves_Assigned_Mappers() { var foundTypes1 = PluginManager.Current.ResolveAssignedMapperTypes(); - Assert.AreEqual(19, foundTypes1.Count()); + Assert.AreEqual(20, foundTypes1.Count()); } [Test] diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs index 0ebaf58e7e..2f350b94de 100644 --- a/src/Umbraco.Tests/Services/UserServiceTests.cs +++ b/src/Umbraco.Tests/Services/UserServiceTests.cs @@ -99,13 +99,27 @@ namespace Umbraco.Tests.Services ServiceContext.UserService.SaveUserType(userType); var user = ServiceContext.UserService.CreateMemberWithIdentity("JohnDoe", "john@umbraco.io", "12345", userType); - ServiceContext.UserService.Delete(user); + ServiceContext.UserService.Delete(user, true); var deleted = ServiceContext.UserService.GetById(user.Id); // Assert Assert.That(deleted, Is.Null); } + [Test] + public void Disables_User_Instead_Of_Deleting_If_Flag_Not_Set() + { + var userType = MockedUserType.CreateUserType(); + ServiceContext.UserService.SaveUserType(userType); + var user = ServiceContext.UserService.CreateMemberWithIdentity("JohnDoe", "john@umbraco.io", "12345", userType); + + ServiceContext.UserService.Delete(user); + var deleted = ServiceContext.UserService.GetById(user.Id); + + // Assert + Assert.That(deleted, Is.Not.Null); + } + [Test] public void Exists_By_Username() {