From d3b8ac31c7e52c0a0b69ac4ca1ea9c035dd8d666 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 19 Nov 2013 15:36:30 +1100 Subject: [PATCH] Fixes up a bunch of failing tests with hard coded ids. Still need to fix a few more --- src/Umbraco.Core/Models/Rdbms/NodeDto.cs | 4 +- src/Umbraco.Tests/CodeFirst/CodeFirstTests.cs | 9 +- .../Repositories/ContentRepositoryTest.cs | 46 +++---- .../Repositories/ContentTypeRepositoryTest.cs | 37 +++--- .../Repositories/MediaRepositoryTest.cs | 31 ++--- .../Repositories/MediaTypeRepositoryTest.cs | 9 +- .../Repositories/RelationRepositoryTest.cs | 19 +-- .../Services/ContentServicePerformanceTest.cs | 13 +- .../Services/ContentServiceTests.cs | 113 +++++++++--------- .../Services/DataTypeServiceTests.cs | 3 +- 10 files changed, 147 insertions(+), 137 deletions(-) diff --git a/src/Umbraco.Core/Models/Rdbms/NodeDto.cs b/src/Umbraco.Core/Models/Rdbms/NodeDto.cs index d21343ffe6..a89879d8b5 100644 --- a/src/Umbraco.Core/Models/Rdbms/NodeDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/NodeDto.cs @@ -9,8 +9,10 @@ namespace Umbraco.Core.Models.Rdbms [ExplicitColumns] internal class NodeDto { + public const int NodeIdSeed = 1050; + [Column("id")] - [PrimaryKeyColumn(Name = "PK_structure", IdentitySeed = 1050)] + [PrimaryKeyColumn(Name = "PK_structure", IdentitySeed = NodeIdSeed)] public int NodeId { get; set; } [Column("trashed")] diff --git a/src/Umbraco.Tests/CodeFirst/CodeFirstTests.cs b/src/Umbraco.Tests/CodeFirst/CodeFirstTests.cs index a24e6a13c0..be500edf25 100644 --- a/src/Umbraco.Tests/CodeFirst/CodeFirstTests.cs +++ b/src/Umbraco.Tests/CodeFirst/CodeFirstTests.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.IO; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Serialization; using Umbraco.Tests.CodeFirst.Definitions; using Umbraco.Tests.CodeFirst.TestModels; @@ -41,7 +42,7 @@ namespace Umbraco.Tests.CodeFirst var mappedContentTypes = ContentTypeDefinitionFactory.RetrieveMappedContentTypes(); ServiceContext.ContentTypeService.Save(mappedContentTypes); - var model = ServiceContext.ContentTypeService.GetContentType(1046); + var model = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed + 1); Assert.That(model, Is.Not.Null); } @@ -147,8 +148,8 @@ namespace Umbraco.Tests.CodeFirst var mappedContentTypes = ContentTypeDefinitionFactory.RetrieveMappedContentTypes().ToList(); ServiceContext.ContentTypeService.Save(mappedContentTypes); - var type1 = ServiceContext.ContentTypeService.GetContentType(1045); - var type2 = ServiceContext.ContentTypeService.GetContentType(1046); + var type1 = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed); + var type2 = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed + 1); Assert.That(type1, Is.Not.Null); Assert.That(type2, Is.Not.Null); @@ -165,7 +166,7 @@ namespace Umbraco.Tests.CodeFirst var mappedContentTypes = ContentTypeDefinitionFactory.RetrieveMappedContentTypes().ToList(); ServiceContext.ContentTypeService.Save(mappedContentTypes); - var type1 = ServiceContext.ContentTypeService.GetContentType(1047); + var type1 = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed + 2); Assert.That(type1, Is.Not.Null); Assert.That(type1.PropertyGroups.Count(), Is.EqualTo(2)); diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs index 4b007c8978..367e3dbe77 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs @@ -225,7 +225,7 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { // Act - var content = repository.Get(1048); + var content = repository.Get(NodeDto.NodeIdSeed + 3); bool dirty = ((Content)content).IsDirty(); // Assert @@ -243,11 +243,11 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { // Act - var content = repository.Get(1047); + var content = repository.Get(NodeDto.NodeIdSeed + 2); content.Name = "About 2"; repository.AddOrUpdate(content); unitOfWork.Commit(); - var updatedContent = repository.Get(1047); + var updatedContent = repository.Get(NodeDto.NodeIdSeed + 2); // Assert Assert.That(updatedContent.Id, Is.EqualTo(content.Id)); @@ -265,8 +265,8 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { - var contentType = contentTypeRepository.Get(1045); - var content = new Content("Textpage 2 Child Node", 1048, contentType); + var contentType = contentTypeRepository.Get(NodeDto.NodeIdSeed); + var content = new Content("Textpage 2 Child Node", NodeDto.NodeIdSeed + 3, contentType); content.CreatorId = 0; content.WriterId = 0; @@ -296,17 +296,17 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { // Act - var content = repository.Get(1048); + var content = repository.Get(NodeDto.NodeIdSeed + 3); // Assert - Assert.That(content.Id, Is.EqualTo(1048)); + Assert.That(content.Id, Is.EqualTo(NodeDto.NodeIdSeed + 3)); Assert.That(content.CreateDate, Is.GreaterThan(DateTime.MinValue)); Assert.That(content.UpdateDate, Is.GreaterThan(DateTime.MinValue)); Assert.That(content.ParentId, Is.Not.EqualTo(0)); Assert.That(content.Name, Is.EqualTo("Text Page 2")); Assert.That(content.SortOrder, Is.EqualTo(1)); Assert.That(content.Version, Is.Not.EqualTo(Guid.Empty)); - Assert.That(content.ContentTypeId, Is.EqualTo(1045)); + Assert.That(content.ContentTypeId, Is.EqualTo(NodeDto.NodeIdSeed)); Assert.That(content.Path, Is.Not.Empty); Assert.That(content.Properties.Any(), Is.True); } @@ -340,7 +340,7 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { // Act - var contents = repository.GetAll(1047, 1048); + var contents = repository.GetAll(NodeDto.NodeIdSeed + 2, NodeDto.NodeIdSeed + 3); // Assert Assert.That(contents, Is.Not.Null); @@ -380,7 +380,7 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { // Act - var exists = repository.Exists(1046); + var exists = repository.Exists(NodeDto.NodeIdSeed + 1); // Assert Assert.That(exists, Is.True); @@ -418,9 +418,9 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { // Act - var textpage = repository.Get(1046); - var subpage = repository.Get(1047); - var trashed = repository.Get(1049); + var textpage = repository.Get(NodeDto.NodeIdSeed + 1); + var subpage = repository.Get(NodeDto.NodeIdSeed + 2); + var trashed = repository.Get(NodeDto.NodeIdSeed + 4); // Assert Assert.That(textpage.Key.ToString().ToUpper(), Is.EqualTo("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0")); @@ -444,7 +444,7 @@ namespace Umbraco.Tests.Persistence.Repositories // Assert Assert.That(content, Is.Not.Null); - Assert.That(content.Id, Is.EqualTo(1046)); + Assert.That(content.Id, Is.EqualTo(NodeDto.NodeIdSeed + 1)); } } @@ -458,7 +458,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { - var content = repository.Get(1047); + var content = repository.Get(NodeDto.NodeIdSeed + 2); // Act content.Language = "da-DK"; @@ -466,9 +466,9 @@ namespace Umbraco.Tests.Persistence.Repositories repository.AddOrUpdate(content); unitOfWork.Commit(); - var latest = repository.Get(1047); - var english = repository.GetByLanguage(1047, "en-US"); - var danish = repository.GetByLanguage(1047, "da-DK"); + var latest = repository.Get(NodeDto.NodeIdSeed + 2); + var english = repository.GetByLanguage(NodeDto.NodeIdSeed + 2, "en-US"); + var danish = repository.GetByLanguage(NodeDto.NodeIdSeed + 2, "da-DK"); // Assert Assert.That(latest.Name, Is.EqualTo("Tekst Side 1")); @@ -479,26 +479,26 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - //Create and Save ContentType "umbTextpage" -> 1045 + //Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed) ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage"); contentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"); ServiceContext.ContentTypeService.Save(contentType); - //Create and Save Content "Homepage" based on "umbTextpage" -> 1046 + //Create and Save Content "Homepage" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 1) Content textpage = MockedContent.CreateSimpleContent(contentType); textpage.Key = new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"); ServiceContext.ContentService.Save(textpage, 0); - //Create and Save Content "Text Page 1" based on "umbTextpage" -> 1047 + //Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 2) Content subpage = MockedContent.CreateSimpleContent(contentType, "Text Page 1", textpage.Id); subpage.Key = new Guid("FF11402B-7E53-4654-81A7-462AC2108059"); ServiceContext.ContentService.Save(subpage, 0); - //Create and Save Content "Text Page 1" based on "umbTextpage" -> 1048 + //Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 3) Content subpage2 = MockedContent.CreateSimpleContent(contentType, "Text Page 2", textpage.Id); ServiceContext.ContentService.Save(subpage2, 0); - //Create and Save Content "Text Page Deleted" based on "umbTextpage" -> 1049 + //Create and Save Content "Text Page Deleted" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 4) Content trashed = MockedContent.CreateSimpleContent(contentType, "Text Page Deleted", -20); trashed.Trashed = true; ServiceContext.ContentService.Save(trashed, 0); diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs index 0f5f506970..f25bcc4959 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Caching; using Umbraco.Core.Persistence.Repositories; @@ -94,7 +95,7 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork)) { // Act - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); contentType.Thumbnail = "Doc2.png"; contentType.PropertyGroups["Content"].PropertyTypes.Add(new PropertyType("test", DataTypeDatabaseType.Ntext) @@ -186,11 +187,11 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); // Assert Assert.That(contentType, Is.Not.Null); - Assert.That(contentType.Id, Is.EqualTo(1046)); + Assert.That(contentType.Id, Is.EqualTo(NodeDto.NodeIdSeed + 1)); } } @@ -226,7 +227,7 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var exists = repository.Exists(1045); + var exists = repository.Exists(NodeDto.NodeIdSeed); // Assert Assert.That(exists, Is.True); @@ -241,14 +242,14 @@ namespace Umbraco.Tests.Persistence.Repositories var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); // Act contentType.PropertyGroups["Meta"].PropertyTypes.Remove("metaDescription"); repository.AddOrUpdate(contentType); unitOfWork.Commit(); - var result = repository.Get(1046); + var result = repository.Get(NodeDto.NodeIdSeed + 1); // Assert Assert.That(result.PropertyTypes.Any(x => x.Alias == "metaDescription"), Is.False); @@ -267,7 +268,7 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var contentType = repository.Get(1045); + var contentType = repository.Get(NodeDto.NodeIdSeed); // Assert Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(3)); @@ -285,7 +286,7 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); // Assert Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(4)); @@ -301,7 +302,7 @@ namespace Umbraco.Tests.Persistence.Repositories var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); // Act var urlAlias = new PropertyType("test", DataTypeDatabaseType.Nvarchar) @@ -320,7 +321,7 @@ namespace Umbraco.Tests.Persistence.Repositories unitOfWork.Commit(); // Assert - var updated = repository.Get(1046); + var updated = repository.Get(NodeDto.NodeIdSeed + 1); Assert.That(addedPropertyType, Is.True); Assert.That(updated.PropertyGroups.Count(), Is.EqualTo(2)); Assert.That(updated.PropertyTypes.Count(), Is.EqualTo(5)); @@ -345,7 +346,7 @@ namespace Umbraco.Tests.Persistence.Repositories unitOfWork.Commit(); // Act - var contentType = repository.Get(1045); + var contentType = repository.Get(NodeDto.NodeIdSeed); contentType.AllowedContentTypes = new List { new ContentTypeSort @@ -365,7 +366,7 @@ namespace Umbraco.Tests.Persistence.Repositories unitOfWork.Commit(); //Assert - var updated = repository.Get(1045); + var updated = repository.Get(NodeDto.NodeIdSeed); Assert.That(updated.AllowedContentTypes.Any(), Is.True); Assert.That(updated.AllowedContentTypes.Any(x => x.Alias == subpageContentType.Alias), Is.True); @@ -382,7 +383,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository repository; using (var contentRepository = CreateRepository(unitOfWork, out repository)) { - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id); contentRepository.AddOrUpdate(subpage); @@ -409,7 +410,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository repository; using (var contentRepository = CreateRepository(unitOfWork, out repository)) { - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id); contentRepository.AddOrUpdate(subpage); @@ -437,7 +438,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository repository; using (var contentRepository = CreateRepository(unitOfWork, out repository)) { - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id); contentRepository.AddOrUpdate(subpage); @@ -473,7 +474,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository repository; using (var contentRepository = CreateRepository(unitOfWork, out repository)) { - var contentType = repository.Get(1046); + var contentType = repository.Get(NodeDto.NodeIdSeed + 1); var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id); contentRepository.AddOrUpdate(subpage); @@ -506,11 +507,11 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - //Create and Save ContentType "umbTextpage" -> 1045 + //Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed) ContentType simpleContentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage"); ServiceContext.ContentTypeService.Save(simpleContentType); - //Create and Save ContentType "textPage" -> 1046 + //Create and Save ContentType "textPage" -> (NodeDto.NodeIdSeed + 1) ContentType textpageContentType = MockedContentTypes.CreateTextpageContentType(); ServiceContext.ContentTypeService.Save(textpageContentType); } diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs index a038965ce2..704c964785 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Caching; using Umbraco.Core.Persistence.Querying; @@ -146,7 +147,7 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var media = repository.Get(1046); + var media = repository.Get(NodeDto.NodeIdSeed + 1); bool dirty = ((ICanBeDirty) media).IsDirty(); // Assert @@ -165,12 +166,12 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var content = repository.Get(1047); + var content = repository.Get(NodeDto.NodeIdSeed + 2); content.Name = "Test File Updated"; repository.AddOrUpdate(content); unitOfWork.Commit(); - var updatedContent = repository.Get(1047); + var updatedContent = repository.Get(NodeDto.NodeIdSeed + 2); // Assert Assert.That(updatedContent.Id, Is.EqualTo(content.Id)); @@ -189,12 +190,12 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var media = repository.Get(1047); + var media = repository.Get(NodeDto.NodeIdSeed + 2); repository.Delete(media); unitOfWork.Commit(); - var deleted = repository.Get(1047); - var exists = repository.Exists(1047); + var deleted = repository.Get(NodeDto.NodeIdSeed + 2); + var exists = repository.Exists(NodeDto.NodeIdSeed + 2); // Assert Assert.That(deleted, Is.Null); @@ -213,10 +214,10 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var media = repository.Get(1046); + var media = repository.Get(NodeDto.NodeIdSeed + 1); // Assert - Assert.That(media.Id, Is.EqualTo(1046)); + Assert.That(media.Id, Is.EqualTo(NodeDto.NodeIdSeed + 1)); Assert.That(media.CreateDate, Is.GreaterThan(DateTime.MinValue)); Assert.That(media.UpdateDate, Is.GreaterThan(DateTime.MinValue)); Assert.That(media.ParentId, Is.Not.EqualTo(0)); @@ -259,7 +260,7 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var medias = repository.GetAll(1046, 1047); + var medias = repository.GetAll(NodeDto.NodeIdSeed + 1, NodeDto.NodeIdSeed + 2); // Assert Assert.That(medias, Is.Not.Null); @@ -299,9 +300,9 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var exists = repository.Exists(1046); - var existsToo = repository.Exists(1046); - var doesntExists = repository.Exists(1050); + var exists = repository.Exists(NodeDto.NodeIdSeed + 1); + var existsToo = repository.Exists(NodeDto.NodeIdSeed + 1); + var doesntExists = repository.Exists(NodeDto.NodeIdSeed + 5); // Assert Assert.That(exists, Is.True); @@ -338,17 +339,17 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - //Create and Save folder-Media -> 1045 + //Create and Save folder-Media -> (NodeDto.NodeIdSeed) var folderMediaType = ServiceContext.ContentTypeService.GetMediaType(1031); var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1); ServiceContext.MediaService.Save(folder, 0); - //Create and Save image-Media -> 1046 + //Create and Save image-Media -> (NodeDto.NodeIdSeed + 1) var imageMediaType = ServiceContext.ContentTypeService.GetMediaType(1032); var image = MockedMedia.CreateMediaImage(imageMediaType, folder.Id); ServiceContext.MediaService.Save(image, 0); - //Create and Save file-Media -> 1047 + //Create and Save file-Media -> (NodeDto.NodeIdSeed + 2) var fileMediaType = ServiceContext.ContentTypeService.GetMediaType(1033); var file = MockedMedia.CreateMediaFile(fileMediaType, folder.Id); ServiceContext.MediaService.Save(file, 0); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index 5ca5e5d6f2..0adfecc73b 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -3,6 +3,7 @@ using System.Linq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Caching; using Umbraco.Core.Persistence.Repositories; @@ -76,7 +77,7 @@ namespace Umbraco.Tests.Persistence.Repositories unitOfWork.Commit(); // Act - var mediaType = repository.Get(1045); + var mediaType = repository.Get(NodeDto.NodeIdSeed); mediaType.Thumbnail = "Doc2.png"; mediaType.PropertyGroups["Media"].PropertyTypes.Add(new PropertyType("test", DataTypeDatabaseType.Ntext) @@ -197,12 +198,12 @@ namespace Umbraco.Tests.Persistence.Repositories unitOfWork.Commit(); // Act - var mediaTypeV2 = repository.Get(1045); + var mediaTypeV2 = repository.Get(NodeDto.NodeIdSeed); mediaTypeV2.PropertyGroups["Media"].PropertyTypes.Remove("title"); repository.AddOrUpdate(mediaTypeV2); unitOfWork.Commit(); - var mediaTypeV3 = repository.Get(1045); + var mediaTypeV3 = repository.Get(NodeDto.NodeIdSeed); // Assert Assert.That(mediaTypeV3.PropertyTypes.Any(x => x.Alias == "title"), Is.False); @@ -224,7 +225,7 @@ namespace Umbraco.Tests.Persistence.Repositories unitOfWork.Commit(); // Act - var contentType = repository.Get(1045); + var contentType = repository.Get(NodeDto.NodeIdSeed); // Assert Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(2)); diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs index ad8d001596..0a2bea9c65 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs @@ -3,6 +3,7 @@ using System.Linq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Caching; using Umbraco.Core.Persistence.Querying; @@ -59,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories // Act var relationType = repositoryType.Get(1); - var relation = new Relation(1047, 1048, relationType); + var relation = new Relation(NodeDto.NodeIdSeed + 2, NodeDto.NodeIdSeed + 3, relationType); repository.AddOrUpdate(relation); unitOfWork.Commit(); @@ -132,8 +133,8 @@ namespace Umbraco.Tests.Persistence.Repositories // Assert Assert.That(relation, Is.Not.Null); Assert.That(relation.HasIdentity, Is.True); - Assert.That(relation.ChildId, Is.EqualTo(1047)); - Assert.That(relation.ParentId, Is.EqualTo(1046)); + Assert.That(relation.ChildId, Is.EqualTo(NodeDto.NodeIdSeed + 2)); + Assert.That(relation.ParentId, Is.EqualTo(NodeDto.NodeIdSeed + 1)); Assert.That(relation.RelationType.Alias, Is.EqualTo("relateContentOnCopy")); } } @@ -211,7 +212,7 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var query = Query.Builder.Where(x => x.ParentId == 1046); + var query = Query.Builder.Where(x => x.ParentId == NodeDto.NodeIdSeed + 1); int count = repository.Count(query); // Assert @@ -251,7 +252,7 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork, out repositoryType)) { - var content = ServiceContext.ContentService.GetById(1047); + var content = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 2); ServiceContext.ContentService.Delete(content, 0); // Act @@ -284,19 +285,19 @@ namespace Umbraco.Tests.Persistence.Repositories relationTypeRepository.AddOrUpdate(relateContentType); unitOfWork.Commit(); - //Create and Save ContentType "umbTextpage" -> 1045 + //Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed) ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage"); ServiceContext.ContentTypeService.Save(contentType); - //Create and Save Content "Homepage" based on "umbTextpage" -> 1046 + //Create and Save Content "Homepage" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 1) Content textpage = MockedContent.CreateSimpleContent(contentType); ServiceContext.ContentService.Save(textpage, 0); - //Create and Save Content "Text Page 1" based on "umbTextpage" -> 1047 + //Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 2) Content subpage = MockedContent.CreateSimpleContent(contentType, "Text Page 1", textpage.Id); ServiceContext.ContentService.Save(subpage, 0); - //Create and Save Content "Text Page 1" based on "umbTextpage" -> 1048 + //Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 3) Content subpage2 = MockedContent.CreateSimpleContent(contentType, "Text Page 2", textpage.Id); ServiceContext.ContentService.Save(subpage2, 0); diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs index 38da2383f2..9dd3974f7b 100644 --- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs +++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Linq; using NUnit.Framework; using Umbraco.Core.Models; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.UnitOfWork; @@ -25,7 +26,7 @@ namespace Umbraco.Tests.Services public void Creating_100_Items() { // Arrange - var contentType = ServiceContext.ContentTypeService.GetContentType(1045); + var contentType = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed); var pages = MockedContent.CreateTextpageContent(contentType, -1, 100); // Act @@ -44,7 +45,7 @@ namespace Umbraco.Tests.Services public void Creating_1000_Items() { // Arrange - var contentType = ServiceContext.ContentTypeService.GetContentType(1045); + var contentType = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed); var pages = MockedContent.CreateTextpageContent(contentType, -1, 1000); // Act @@ -63,7 +64,7 @@ namespace Umbraco.Tests.Services public void Getting_100_Uncached_Items() { // Arrange - var contentType = ServiceContext.ContentTypeService.GetContentType(1045); + var contentType = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed); var pages = MockedContent.CreateTextpageContent(contentType, -1, 100); ServiceContext.ContentService.Save(pages, 0); @@ -88,7 +89,7 @@ namespace Umbraco.Tests.Services public void Getting_1000_Uncached_Items() { // Arrange - var contentType = ServiceContext.ContentTypeService.GetContentType(1045); + var contentType = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed); var pages = MockedContent.CreateTextpageContent(contentType, -1, 1000); ServiceContext.ContentService.Save(pages, 0); @@ -113,7 +114,7 @@ namespace Umbraco.Tests.Services public void Getting_100_Cached_Items() { // Arrange - var contentType = ServiceContext.ContentTypeService.GetContentType(1045); + var contentType = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed); var pages = MockedContent.CreateTextpageContent(contentType, -1, 100); ServiceContext.ContentService.Save(pages, 0); @@ -141,7 +142,7 @@ namespace Umbraco.Tests.Services public void Getting_1000_Cached_Items() { // Arrange - var contentType = ServiceContext.ContentTypeService.GetContentType(1045); + var contentType = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed); var pages = MockedContent.CreateTextpageContent(contentType, -1, 1000); ServiceContext.ContentService.Save(pages, 0); diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index fd5349a0a9..f27239b804 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading; using NUnit.Framework; using Umbraco.Core.Models; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.UnitOfWork; @@ -217,11 +218,11 @@ namespace Umbraco.Tests.Services var contentService = ServiceContext.ContentService; // Act - var content = contentService.GetById(1046); + var content = contentService.GetById(NodeDto.NodeIdSeed + 1); // Assert Assert.That(content, Is.Not.Null); - Assert.That(content.Id, Is.EqualTo(1046)); + Assert.That(content.Id, Is.EqualTo(NodeDto.NodeIdSeed + 1)); } [Test] @@ -235,7 +236,7 @@ namespace Umbraco.Tests.Services // Assert Assert.That(content, Is.Not.Null); - Assert.That(content.Id, Is.EqualTo(1046)); + Assert.That(content.Id, Is.EqualTo(NodeDto.NodeIdSeed + 1)); } [Test] @@ -260,7 +261,7 @@ namespace Umbraco.Tests.Services var contentService = ServiceContext.ContentService; // Act - var contents = contentService.GetChildren(1046); + var contents = contentService.GetChildren(NodeDto.NodeIdSeed + 1); // Assert Assert.That(contents, Is.Not.Null); @@ -277,7 +278,7 @@ namespace Umbraco.Tests.Services contentService.Save(hierarchy, 0); // Act - var contents = contentService.GetDescendants(1046); + var contents = contentService.GetDescendants(NodeDto.NodeIdSeed + 1); // Assert Assert.That(contents, Is.Not.Null); @@ -290,15 +291,15 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var parent = ServiceContext.ContentService.GetById(1046); + var parent = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 1); ServiceContext.ContentService.Publish(parent);//Publishing root, so Text Page 2 can be updated. - var subpage2 = contentService.GetById(1048); + var subpage2 = contentService.GetById(NodeDto.NodeIdSeed + 3); subpage2.Name = "Text Page 2 Updated"; subpage2.SetValue("author", "Jane Doe"); contentService.SaveAndPublish(subpage2, 0);//NOTE New versions are only added between publish-state-changed, so publishing to ensure addition version. // Act - var versions = contentService.GetVersions(1048); + var versions = contentService.GetVersions(NodeDto.NodeIdSeed + 3); // Assert Assert.That(versions.Any(), Is.True); @@ -325,9 +326,9 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var root = contentService.GetById(1046); + var root = contentService.GetById(NodeDto.NodeIdSeed + 1); contentService.SaveAndPublish(root); - var content = contentService.GetById(1048); + var content = contentService.GetById(NodeDto.NodeIdSeed + 3); content.ExpireDate = DateTime.Now.AddSeconds(1); contentService.SaveAndPublish(content); @@ -378,7 +379,7 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1046); + var content = contentService.GetById(NodeDto.NodeIdSeed + 1); bool published = contentService.Publish(content, 0); // Act @@ -404,24 +405,24 @@ namespace Umbraco.Tests.Services // Arrange var contentService = ServiceContext.ContentService; var published = contentService.RePublishAll(0); - var content = contentService.GetById(1046); + var content = contentService.GetById(NodeDto.NodeIdSeed + 1); // Act bool unpublished = contentService.UnPublish(content, 0); - var children = contentService.GetChildren(1046); + var children = contentService.GetChildren(NodeDto.NodeIdSeed + 1); // Assert Assert.That(published, Is.True);//Verify that everything was published - - //Verify that content with Id 1046 was unpublished + + //Verify that content with Id (NodeDto.NodeIdSeed + 1) was unpublished Assert.That(unpublished, Is.True); Assert.That(content.Published, Is.False); //Verify that all children was unpublished Assert.That(children.Any(x => x.Published), Is.False); - Assert.That(children.First(x => x.Id == 1047).Published, Is.False);//Released 5 mins ago, but should be unpublished - Assert.That(children.First(x => x.Id == 1047).ReleaseDate.HasValue, Is.False);//Verify that the release date has been removed - Assert.That(children.First(x => x.Id == 1048).Published, Is.False);//Expired 5 mins ago, so isn't be published + Assert.That(children.First(x => x.Id == NodeDto.NodeIdSeed + 2).Published, Is.False);//Released 5 mins ago, but should be unpublished + Assert.That(children.First(x => x.Id == NodeDto.NodeIdSeed + 2).ReleaseDate.HasValue, Is.False);//Verify that the release date has been removed + Assert.That(children.First(x => x.Id == NodeDto.NodeIdSeed + 3).Published, Is.False);//Expired 5 mins ago, so isn't be published } [Test] @@ -497,7 +498,7 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1046); + var content = contentService.GetById(NodeDto.NodeIdSeed + 1); // Act bool published = contentService.Publish(content, 0); @@ -516,12 +517,12 @@ namespace Umbraco.Tests.Services var contentType = MockedContentTypes.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", true); contentTypeService.Save(contentType); - Content content = MockedContent.CreateSimpleContent(contentType, "Invalid Content", 1046); + Content content = MockedContent.CreateSimpleContent(contentType, "Invalid Content", NodeDto.NodeIdSeed + 1); content.SetValue("author", string.Empty); contentService.Save(content, 0); // Act - var parent = contentService.GetById(1046); + var parent = contentService.GetById(NodeDto.NodeIdSeed + 1); bool parentPublished = contentService.Publish(parent, 0); bool published = contentService.Publish(content, 0); @@ -538,16 +539,16 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1046); + var content = contentService.GetById(NodeDto.NodeIdSeed + 1); // Act bool published = contentService.PublishWithChildren(content, 0); - var children = contentService.GetChildren(1046); + var children = contentService.GetChildren(NodeDto.NodeIdSeed + 1); // Assert Assert.That(published, Is.True);//Nothing was cancelled, so should be true Assert.That(content.Published, Is.True);//No restrictions, so should be published - Assert.That(children.First(x => x.Id == 1047).Published, Is.True);//Released 5 mins ago, so should be published + Assert.That(children.First(x => x.Id == NodeDto.NodeIdSeed + 2).Published, Is.True);//Released 5 mins ago, so should be published } [Test] @@ -555,11 +556,11 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1048); //This Content expired 5min ago + var content = contentService.GetById(NodeDto.NodeIdSeed + 3); //This Content expired 5min ago content.ExpireDate = DateTime.Now.AddMinutes(-5); contentService.Save(content); - var parent = contentService.GetById(1046); + var parent = contentService.GetById(NodeDto.NodeIdSeed + 1); bool parentPublished = contentService.Publish(parent, 0);//Publish root Home node to enable publishing of '1048' // Act @@ -576,11 +577,11 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1047); + var content = contentService.GetById(NodeDto.NodeIdSeed + 2); content.ReleaseDate = DateTime.Now.AddHours(2); contentService.Save(content, 0); - var parent = contentService.GetById(1046); + var parent = contentService.GetById(NodeDto.NodeIdSeed + 1); bool parentPublished = contentService.Publish(parent, 0);//Publish root Home node to enable publishing of '1048' // Act @@ -597,7 +598,7 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.CreateContent("Subpage with Unpublisehed Parent", 1046, "umbTextpage", 0); + var content = contentService.CreateContent("Subpage with Unpublisehed Parent", NodeDto.NodeIdSeed + 1, "umbTextpage", 0); contentService.Save(content, 0); // Act @@ -613,7 +614,7 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1049); + var content = contentService.GetById(NodeDto.NodeIdSeed + 4); // Act bool published = contentService.Publish(content, 0); @@ -646,9 +647,9 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var root = contentService.GetById(1046); + var root = contentService.GetById(NodeDto.NodeIdSeed + 1); var rootPublished = contentService.Publish(root); - var content = contentService.GetById(1048); + var content = contentService.GetById(NodeDto.NodeIdSeed + 3); content.Properties["title"].Value = content.Properties["title"].Value + " Published"; bool published = contentService.SaveAndPublish(content); @@ -679,7 +680,7 @@ namespace Umbraco.Tests.Services Assert.That(savedContentVersion.Properties["title"].Value, Contains.Substring("Saved")); //Ensure that the latest version of the content is the saved and not-yet-published one - var currentContent = contentService.GetById(1048); + var currentContent = contentService.GetById(NodeDto.NodeIdSeed + 3); Assert.That(currentContent.Published, Is.False); Assert.That(currentContent.Properties["title"].Value, Contains.Substring("Saved")); Assert.That(currentContent.Version, Is.EqualTo(savedVersion)); @@ -708,8 +709,8 @@ namespace Umbraco.Tests.Services var contentTypeService = ServiceContext.ContentTypeService; var contentType = contentTypeService.GetContentType("umbTextpage"); - Content subpage = MockedContent.CreateSimpleContent(contentType, "Text Subpage 1", 1047); - Content subpage2 = MockedContent.CreateSimpleContent(contentType, "Text Subpage 2", 1047); + Content subpage = MockedContent.CreateSimpleContent(contentType, "Text Subpage 1", NodeDto.NodeIdSeed + 2); + Content subpage2 = MockedContent.CreateSimpleContent(contentType, "Text Subpage 2", NodeDto.NodeIdSeed + 2); var list = new List {subpage, subpage2}; // Act @@ -759,11 +760,11 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1049); + var content = contentService.GetById(NodeDto.NodeIdSeed + 4); // Act contentService.Delete(content, 0); - var deleted = contentService.GetById(1049); + var deleted = contentService.GetById(NodeDto.NodeIdSeed + 4); // Assert Assert.That(deleted, Is.Null); @@ -774,7 +775,7 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1048); + var content = contentService.GetById(NodeDto.NodeIdSeed + 3); // Act contentService.MoveToRecycleBin(content, 0); @@ -790,10 +791,10 @@ namespace Umbraco.Tests.Services // Arrange var contentService = ServiceContext.ContentService; var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage"); - Content subsubpage = MockedContent.CreateSimpleContent(contentType, "Text Page 3", 1047); + Content subsubpage = MockedContent.CreateSimpleContent(contentType, "Text Page 3", NodeDto.NodeIdSeed + 2); contentService.Save(subsubpage, 0); - var content = contentService.GetById(1046); + var content = contentService.GetById(NodeDto.NodeIdSeed + 1); // Act contentService.MoveToRecycleBin(content, 0); @@ -831,13 +832,13 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1049); + var content = contentService.GetById(NodeDto.NodeIdSeed + 4); // Act - moving out of recycle bin - contentService.Move(content, 1046, 0); + contentService.Move(content, NodeDto.NodeIdSeed + 1, 0); // Assert - Assert.That(content.ParentId, Is.EqualTo(1046)); + Assert.That(content.ParentId, Is.EqualTo(NodeDto.NodeIdSeed + 1)); Assert.That(content.Trashed, Is.False); Assert.That(content.Published, Is.False); } @@ -847,11 +848,11 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var temp = contentService.GetById(1048); + var temp = contentService.GetById(NodeDto.NodeIdSeed + 3); // Act var copy = contentService.Copy(temp, temp.ParentId, false, 0); - var content = contentService.GetById(1048); + var content = contentService.GetById(NodeDto.NodeIdSeed + 3); // Assert Assert.That(copy, Is.Not.Null); @@ -895,9 +896,9 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var parent = ServiceContext.ContentService.GetById(1046); + var parent = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 1); ServiceContext.ContentService.Publish(parent);//Publishing root, so Text Page 2 can be updated. - var subpage2 = contentService.GetById(1048); + var subpage2 = contentService.GetById(NodeDto.NodeIdSeed + 3); var version = subpage2.Version; var nameBeforeRollback = subpage2.Name; subpage2.Name = "Text Page 2 Updated"; @@ -905,7 +906,7 @@ namespace Umbraco.Tests.Services contentService.SaveAndPublish(subpage2, 0);//Saving and publishing, so a new version is created // Act - var rollback = contentService.Rollback(1048, version, 0); + var rollback = contentService.Rollback(NodeDto.NodeIdSeed + 3, version, 0); // Assert Assert.That(rollback, Is.Not.Null); @@ -919,7 +920,7 @@ namespace Umbraco.Tests.Services { var unitOfWork = PetaPocoUnitOfWorkProvider.CreateUnitOfWork(); var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage"); - var root = ServiceContext.ContentService.GetById(1046); + var root = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 1); var c = new Lazy(() => MockedContent.CreateSimpleContent(contentType, "Hierarchy Simple Text Page", root.Id)); var c2 = new Lazy(() => MockedContent.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage", c.Value.Id)); @@ -947,14 +948,14 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1046); + var content = contentService.GetById(NodeDto.NodeIdSeed + 1); bool published = contentService.PublishWithChildren(content, 0); - var homepage = contentService.GetById(1046); + var homepage = contentService.GetById(NodeDto.NodeIdSeed + 1); homepage.Name = "Homepage"; ServiceContext.ContentService.Save(homepage); // Act - bool hasPublishedVersion = ServiceContext.ContentService.HasPublishedVersion(1046); + bool hasPublishedVersion = ServiceContext.ContentService.HasPublishedVersion(NodeDto.NodeIdSeed + 1); // Assert Assert.That(published, Is.True); @@ -1007,12 +1008,12 @@ namespace Umbraco.Tests.Services { // Arrange var contentService = ServiceContext.ContentService; - var content = contentService.GetById(1049); + var content = contentService.GetById(NodeDto.NodeIdSeed + 4); var version = content.Version; // Act - contentService.DeleteVersion(1049, version, true, 0); - var sut = contentService.GetById(1049); + contentService.DeleteVersion(NodeDto.NodeIdSeed + 4, version, true, 0); + var sut = contentService.GetById(NodeDto.NodeIdSeed + 4); // Assert Assert.That(sut.Version, Is.EqualTo(version)); @@ -1021,7 +1022,7 @@ namespace Umbraco.Tests.Services private IEnumerable CreateContentHierarchy() { var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage"); - var root = ServiceContext.ContentService.GetById(1046); + var root = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 1); var list = new List(); diff --git a/src/Umbraco.Tests/Services/DataTypeServiceTests.cs b/src/Umbraco.Tests/Services/DataTypeServiceTests.cs index 417fa45ade..21acc5c543 100644 --- a/src/Umbraco.Tests/Services/DataTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/DataTypeServiceTests.cs @@ -2,6 +2,7 @@ using System.Linq; using NUnit.Framework; using Umbraco.Core.Models; +using Umbraco.Core.Models.Rdbms; namespace Umbraco.Tests.Services { @@ -59,7 +60,7 @@ namespace Umbraco.Tests.Services Assert.That(deletedDefinition, Is.Null); //Further assertions against the ContentType that contains PropertyTypes based on the TextField - var contentType = ServiceContext.ContentTypeService.GetContentType(1045); + var contentType = ServiceContext.ContentTypeService.GetContentType(NodeDto.NodeIdSeed); Assert.That(contentType.Alias, Is.EqualTo("umbTextpage")); Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(1)); }