yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v15/dev' into v16/dev

Browse Source
This commit is contained in:
Jacob Overgaard
2025-04-01 10:31:59 +02:00
parent 00ec63a966 8c1dfe5431
commit 7b4bfbb28e
100 changed files with 2065 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs
View File

@@ -225,20 +225,22 @@ internal sealed class RelationRepositoryTest : UmbracoIntegrationTest
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
var relatedContentRelType =
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
var relatedMemberRelType =
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMemberAlias);
parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 11, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 11, out totalRecords, [relatedContentRelType.Id, relatedMediaRelType.Id, relatedMemberRelType.Id]).ToList();
Assert.AreEqual(6, totalRecords);
Assert.AreEqual(6, parents.Count);
parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 1, 11, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 1, 11, out totalRecords, [relatedContentRelType.Id, relatedMediaRelType.Id, relatedMemberRelType.Id]).ToList();
Assert.AreEqual(6, totalRecords);
Assert.AreEqual(0, parents.Count);
parents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 0, 6, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
parents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 0, 6, out totalRecords, [relatedContentRelType.Id, relatedMediaRelType.Id, relatedMemberRelType.Id]).ToList();
Assert.AreEqual(3, totalRecords);
Assert.AreEqual(3, parents.Count);
parents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 1, 6, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
parents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 1, 6, out totalRecords, [relatedContentRelType.Id, relatedMediaRelType.Id, relatedMemberRelType.Id]).ToList();
Assert.AreEqual(3, totalRecords);
Assert.AreEqual(0, parents.Count);
}
@@ -281,15 +283,15 @@ internal sealed class RelationRepositoryTest : UmbracoIntegrationTest
var repository = CreateRepository(ScopeProvider, out _);
// Get parent entities for child id
var parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 6, out var totalRecords)
var parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 9, out var totalRecords)
.ToList();
Assert.AreEqual(6, totalRecords);
Assert.AreEqual(6, parents.Count);
Assert.AreEqual(9, totalRecords);
Assert.AreEqual(9, parents.Count);
// Add the next page
parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 1, 6, out totalRecords));
Assert.AreEqual(6, totalRecords);
Assert.AreEqual(6, parents.Count);
parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 1, 9, out totalRecords));
Assert.AreEqual(9, totalRecords);
Assert.AreEqual(9, parents.Count);
var contentEntities = parents.OfType<IDocumentEntitySlim>().ToList();
var mediaEntities = parents.OfType<IMediaEntitySlim>().ToList();
@@ -297,7 +299,7 @@ internal sealed class RelationRepositoryTest : UmbracoIntegrationTest
Assert.AreEqual(3, contentEntities.Count);
Assert.AreEqual(3, mediaEntities.Count);
Assert.AreEqual(0, memberEntities.Count);
Assert.AreEqual(3, memberEntities.Count);
// only of a certain type
parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Media.GetGuid()));
@@ -307,20 +309,22 @@ internal sealed class RelationRepositoryTest : UmbracoIntegrationTest
Assert.AreEqual(3, totalRecords);
parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Member.GetGuid()));
Assert.AreEqual(0, totalRecords);
Assert.AreEqual(3, totalRecords);
// Test getting relations of specified relation types
var relatedMediaRelType =
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
var relatedContentRelType =
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
var relatedMemberRelType =
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMemberAlias);
parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 6, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
Assert.AreEqual(3, totalRecords);
Assert.AreEqual(3, parents.Count);
parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 6, out totalRecords, [relatedContentRelType.Id, relatedMediaRelType.Id, relatedMemberRelType.Id]).ToList();
Assert.AreEqual(6, totalRecords);
Assert.AreEqual(6, parents.Count);
parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 1, 6, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
Assert.AreEqual(3, totalRecords);
parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 1, 6, out totalRecords, [relatedContentRelType.Id, relatedMediaRelType.Id, relatedMemberRelType.Id]).ToList();
Assert.AreEqual(6, totalRecords);
Assert.AreEqual(0, parents.Count);
}
}
@@ -368,6 +372,8 @@ internal sealed class RelationRepositoryTest : UmbracoIntegrationTest
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
var relatedContentRelType =
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
var relatedMemberRelType =
RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMemberAlias);
// Relate content to media
foreach (var content in createdContent)
@@ -387,6 +393,15 @@ internal sealed class RelationRepositoryTest : UmbracoIntegrationTest
}
}
// Relate content to member
foreach (var content in createdContent)
{
foreach (var member in createdMembers)
{
RelationService.Relate(content.Id, member.Id, relatedMemberRelType);
}
}
// Relate members to media
foreach (var member in createdMembers)
{

6
tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs
View File

@@ -100,7 +100,7 @@ internal sealed class RelationTypeRepositoryTest : UmbracoIntegrationTest
var repository = CreateRepository(provider);
// Act
var relationType = repository.Get(8) as IRelationTypeWithIsDependency;
var relationType = repository.Get(9) as IRelationTypeWithIsDependency;
// Assert
Assert.That(relationType, Is.Not.Null);
@@ -130,7 +130,7 @@ internal sealed class RelationTypeRepositoryTest : UmbracoIntegrationTest
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(8));
Assert.That(relationTypes.Count(), Is.EqualTo(9));
}
}
@@ -165,7 +165,7 @@ internal sealed class RelationTypeRepositoryTest : UmbracoIntegrationTest
// Act
var exists = repository.Exists(3);
var doesntExist = repository.Exists(9);
var doesntExist = repository.Exists(99);
// Assert
Assert.That(exists, Is.True);