From 715e03d1c57a74faa486d3c0c200a7dcf3e6329a Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 3 May 2016 10:54:16 +0200 Subject: [PATCH] U4-6147 - fix tests --- .../Repositories/DomainRepositoryTest.cs | 10 +++++----- .../Repositories/MacroRepositoryTest.cs | 2 +- .../Repositories/MemberRepositoryTest.cs | 4 ++-- .../Repositories/PublicAccessRepositoryTest.cs | 10 +++++----- .../Repositories/RelationRepositoryTest.cs | 2 +- .../Repositories/RelationTypeRepositoryTest.cs | 2 +- .../ServerRegistrationRepositoryTest.cs | 2 +- .../Persistence/Repositories/TaskRepositoryTest.cs | 14 +++++++------- .../Persistence/Repositories/UserRepositoryTest.cs | 4 ++-- src/Umbraco.Tests/Services/MacroServiceTests.cs | 8 ++++---- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs index ed0f607020..33aa1069f6 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs @@ -46,7 +46,7 @@ namespace Umbraco.Tests.Persistence.Repositories contentTypeRepo.AddOrUpdate(ct); var content = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 }; contentRepo.AddOrUpdate(content); - unitOfWork.Flush(); + unitOfWork.Complete(); return content.Id; } } @@ -177,7 +177,7 @@ namespace Umbraco.Tests.Persistence.Repositories domain = repo.Get(domain.Id); - Assert.IsNull(domain); + Assert.IsNull(domain); } } @@ -411,7 +411,7 @@ namespace Umbraco.Tests.Persistence.Repositories var lang = langRepo.GetByIsoCode("en-AU"); contentItems.Add(contentRepo.Get(contentId)); - + //more test data (3 content items total) for (int i = 0; i < 2; i++) { @@ -420,7 +420,7 @@ namespace Umbraco.Tests.Persistence.Repositories unitOfWork.Flush(); contentItems.Add(c); } - + for (int i = 0; i < 10; i++) { var domain = (IDomain)new UmbracoDomain((i % 2 == 0) ? "test " + i + ".com" : ("*" + i)) @@ -434,7 +434,7 @@ namespace Umbraco.Tests.Persistence.Repositories var all1 = repo.GetAssignedDomains(contentItems[0].Id, true); Assert.AreEqual(5, all1.Count()); - + var all2 = repo.GetAssignedDomains(contentItems[1].Id, true); Assert.AreEqual(5, all2.Count()); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs index a81d0658db..f6583e7c94 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs @@ -447,7 +447,7 @@ namespace Umbraco.Tests.Persistence.Repositories repository.AddOrUpdate(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml")); repository.AddOrUpdate(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml")); repository.AddOrUpdate(new Macro("test3", "Tet3", "~/usercontrol/test3.ascx", "MyAssembly3", "test3.xslt", "~/views/macropartials/test3.cshtml")); - unitOfWork.Flush(); + unitOfWork.Complete(); } } diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index 3ce3c8038d..da0ba7de40 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -363,7 +363,7 @@ namespace Umbraco.Tests.Persistence.Repositories var member = MockedMember.CreateSimpleMember(memberType, name ?? "Johnny Hefty", email ?? "johnny@example.com", password ?? "123", username ?? "hefty", key); repository.AddOrUpdate(member); - unitOfWork.Flush(); + unitOfWork.Complete(); return member; } @@ -380,7 +380,7 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType = MockedContentTypes.CreateSimpleMemberType(alias); memberTypeRepository.AddOrUpdate(memberType); - unitOfWork.Flush(); + unitOfWork.Complete(); return memberType; } } diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs index f44435beb3..4e04a655d0 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs @@ -156,7 +156,7 @@ namespace Umbraco.Tests.Persistence.Repositories repo.AddOrUpdate(entry); unitOfWork.Flush(); - //re-get + //re-get entry = repo.Get(entry.Key); entry.Rules.First().RuleValue = "blah"; @@ -165,7 +165,7 @@ namespace Umbraco.Tests.Persistence.Repositories unitOfWork.Flush(); - //re-get + //re-get entry = repo.Get(entry.Key); Assert.AreEqual("blah", entry.Rules.First().RuleValue); @@ -194,7 +194,7 @@ namespace Umbraco.Tests.Persistence.Repositories repo.AddOrUpdate(entry); unitOfWork.Flush(); - //re-get + //re-get entry = repo.Get(entry.Key); Assert.IsNotNull(entry); @@ -230,7 +230,7 @@ namespace Umbraco.Tests.Persistence.Repositories }, }); repo.AddOrUpdate(entry2); - + unitOfWork.Flush(); var found = repo.GetAll().ToArray(); @@ -304,7 +304,7 @@ namespace Umbraco.Tests.Persistence.Repositories repo.AddOrUpdate(c); result.Add(c); } - unitOfWork.Flush(); + unitOfWork.Complete(); return result; } diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs index 179f95a50f..721b4e3485 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs @@ -293,7 +293,7 @@ namespace Umbraco.Tests.Persistence.Repositories var relation2 = new Relation(textpage.Id, subpage2.Id, relateContent) { Comment = string.Empty }; relationRepository.AddOrUpdate(relation); relationRepository.AddOrUpdate(relation2); - unitOfWork.Flush(); + unitOfWork.Complete(); } } } diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs index f8986d9a7f..14cd5d83de 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs @@ -240,7 +240,7 @@ namespace Umbraco.Tests.Persistence.Repositories repository.AddOrUpdate(relateContent);//Id 2 repository.AddOrUpdate(relateContentType);//Id 3 - unitOfWork.Flush(); + unitOfWork.Complete(); } } } diff --git a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs index 6364c29f96..eedb392c7f 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs @@ -261,7 +261,7 @@ namespace Umbraco.Tests.Persistence.Repositories repository.AddOrUpdate(new ServerRegistration("http://localhost", "COMPUTER1", DateTime.Now) { IsActive = true }); repository.AddOrUpdate(new ServerRegistration("http://www.mydomain.com", "COMPUTER2", DateTime.Now)); repository.AddOrUpdate(new ServerRegistration("https://www.another.domain.com", "Computer3", DateTime.Now)); - unitOfWork.Flush(); + unitOfWork.Complete(); } } diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs index 806df9a847..242986bab0 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs @@ -71,7 +71,7 @@ namespace Umbraco.Tests.Persistence.Repositories Assert.AreEqual(0, found.First().OwnerUserId); Assert.AreEqual(true, found.First().HasIdentity); Assert.AreEqual(true, found.First().TaskType.HasIdentity); - } + } } [Test] @@ -94,7 +94,7 @@ namespace Umbraco.Tests.Persistence.Repositories repo.AddOrUpdate(task); unitOfWork.Flush(); - //re-get + //re-get task = repo.Get(task.Id); task.Comment = "blah"; @@ -103,12 +103,12 @@ namespace Umbraco.Tests.Persistence.Repositories repo.AddOrUpdate(task); unitOfWork.Flush(); - //re-get + //re-get task = repo.Get(task.Id); Assert.AreEqual(true, task.Closed); Assert.AreEqual("blah", task.Comment); - } + } } [Test] @@ -131,7 +131,7 @@ namespace Umbraco.Tests.Persistence.Repositories repo.AddOrUpdate(task); unitOfWork.Flush(); - //re-get + //re-get task = repo.Get(task.Id); Assert.IsNotNull(task); @@ -218,9 +218,9 @@ namespace Umbraco.Tests.Persistence.Repositories EntityId = entityId, OwnerUserId = 0 }); - unitOfWork.Flush(); } - + + unitOfWork.Complete(); } } } diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs index 1375ba2330..6293b19332 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs @@ -537,7 +537,7 @@ namespace Umbraco.Tests.Persistence.Repositories repository.AddOrUpdate(user1); repository.AddOrUpdate(user2); repository.AddOrUpdate(user3); - unitOfWork.Flush(); + unitOfWork.Complete(); return new IUser[] { user1, user2, user3 }; } @@ -549,7 +549,7 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver); var userType = MockedUserType.CreateUserType(); repository.AddOrUpdate(userType); - unitOfWork.Flush(); + unitOfWork.Complete(); return userType; } } diff --git a/src/Umbraco.Tests/Services/MacroServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs index c8fd1676b8..b1a0c763da 100644 --- a/src/Umbraco.Tests/Services/MacroServiceTests.cs +++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs @@ -22,7 +22,7 @@ namespace Umbraco.Tests.Services } public override void CreateTestData() - { + { base.CreateTestData(); var provider = new NPocoUnitOfWorkProvider(Logger); @@ -33,7 +33,7 @@ namespace Umbraco.Tests.Services repository.AddOrUpdate(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml")); repository.AddOrUpdate(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml")); repository.AddOrUpdate(new Macro("test3", "Tet3", "~/usercontrol/test3.ascx", "MyAssembly3", "test3.xslt", "~/views/macropartials/test3.cshtml")); - unitOfWork.Flush(); + unitOfWork.Complete(); } } @@ -48,7 +48,7 @@ namespace Umbraco.Tests.Services { // Arrange var macroService = ServiceContext.MacroService; - + // Act var macro = macroService.GetByAlias("test1"); @@ -189,7 +189,7 @@ namespace Umbraco.Tests.Services { var macroService = ServiceContext.MacroService; var macro = new Macro("test", "Test", scriptPath: "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234); - + //adds some properties macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1")); macro.Properties.Add(new MacroProperty("blah2", "Blah2", 0, "blah2"));