diff --git a/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs b/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs index 5748fb7eff..8a6eb5c02a 100644 --- a/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs @@ -9,8 +9,10 @@ namespace Umbraco.Core.Models.Rdbms [ExplicitColumns] internal class RelationTypeDto { + public const int NodeIdSeed = 3; + [Column("id")] - [PrimaryKeyColumn(IdentitySeed = 3)] + [PrimaryKeyColumn(IdentitySeed = NodeIdSeed)] public int Id { get; set; } [Column("dual")] diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs index 6b71158ec6..f32d0e57f9 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -376,7 +376,7 @@ namespace Umbraco.Tests.Persistence.Repositories Func creator = () => new DataTypeDefinitionRepository( unitOfWork, NullCacheProvider.Current, - CacheHelper.CreateDisabledCacheHelper(), + cache, Mock.Of(), new ContentTypeRepository(unitOfWork, NullCacheProvider.Current, Mock.Of(), new TemplateRepository(unitOfWork, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of()))); @@ -415,7 +415,7 @@ namespace Umbraco.Tests.Persistence.Repositories Func creator = () => new DataTypeDefinitionRepository( unitOfWork, NullCacheProvider.Current, - CacheHelper.CreateDisabledCacheHelper(), + cache, Mock.Of(), new ContentTypeRepository(unitOfWork, NullCacheProvider.Current, Mock.Of(), new TemplateRepository(unitOfWork, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of()))); diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs index 290fef4122..c899e915fb 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs @@ -232,9 +232,9 @@ namespace Umbraco.Tests.Persistence.Repositories RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) { - + // Act - var query = Query.Builder.Where(x => x.RelationTypeId == 2); + var query = Query.Builder.Where(x => x.RelationTypeId == RelationTypeDto.NodeIdSeed); var relations = repository.GetByQuery(query); // Assert diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs index 7d52b1c6cc..3925aa1616 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Caching; using Umbraco.Core.Persistence.Querying; @@ -125,7 +126,7 @@ namespace Umbraco.Tests.Persistence.Repositories { // Act - var relationType = repository.Get(2); + var relationType = repository.Get(RelationTypeDto.NodeIdSeed); // Assert Assert.That(relationType, Is.Not.Null); @@ -151,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories Assert.That(relationTypes, Is.Not.Null); Assert.That(relationTypes.Any(), Is.True); Assert.That(relationTypes.Any(x => x == null), Is.False); - Assert.That(relationTypes.Count(), Is.EqualTo(3)); + Assert.That(relationTypes.Count(), Is.EqualTo(4)); } } @@ -208,7 +209,7 @@ namespace Umbraco.Tests.Persistence.Repositories int count = repository.Count(query); // Assert - Assert.That(count, Is.EqualTo(3)); + Assert.That(count, Is.EqualTo(4)); } }