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

Merge origin/dev-v8 into dev-v8-ExamineV2

Browse Source
This commit is contained in:
Stephan
2016-05-17 13:21:47 +02:00
parent c25f12b1cd 04ae479476
commit edda877fd6
147 changed files with 4555 additions and 4810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
View File

@@ -45,10 +45,10 @@ namespace Umbraco.Tests.Persistence.Repositories
public void Rebuild_All_Xml_Structures()
{
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
var mediaType = mediaTypeRepository.Get(1032);
@@ -57,7 +57,7 @@ namespace Umbraco.Tests.Persistence.Repositories
var image = MockedMedia.CreateMediaImage(mediaType, -1);
repository.AddOrUpdate(image);
}
unitOfWork.Commit();
unitOfWork.Flush();
//delete all xml
unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
@@ -73,10 +73,10 @@ namespace Umbraco.Tests.Persistence.Repositories
public void Rebuild_All_Xml_Structures_For_Content_Type()
{
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
var imageMediaType = mediaTypeRepository.Get(1032);
var fileMediaType = mediaTypeRepository.Get(1033);
@@ -97,7 +97,7 @@ namespace Umbraco.Tests.Persistence.Repositories
var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
repository.AddOrUpdate(folder);
}
unitOfWork.Commit();
unitOfWork.Flush();
//delete all xml
unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
@@ -114,10 +114,10 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
var mediaType = mediaTypeRepository.Get(1032);
var image = MockedMedia.CreateMediaImage(mediaType, -1);
@@ -125,7 +125,7 @@ namespace Umbraco.Tests.Persistence.Repositories
// Act
mediaTypeRepository.AddOrUpdate(mediaType);
repository.AddOrUpdate(image);
unitOfWork.Commit();
unitOfWork.Flush();
// Assert
Assert.That(mediaType.HasIdentity, Is.True);
@@ -138,21 +138,21 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
var mediaType = mediaTypeRepository.Get(1032);
var file = MockedMedia.CreateMediaFile(mediaType, -1);
// Act
repository.AddOrUpdate(file);
unitOfWork.Commit();
unitOfWork.Flush();
var image = MockedMedia.CreateMediaImage(mediaType, -1);
repository.AddOrUpdate(image);
unitOfWork.Commit();
unitOfWork.Flush();
// Assert
Assert.That(file.HasIdentity, Is.True);
@@ -169,21 +169,21 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
var mediaType = mediaTypeRepository.Get(1032);
var file = MockedMedia.CreateMediaFile(mediaType, -1);
// Act
repository.AddOrUpdate(file);
unitOfWork.Commit();
unitOfWork.Flush();
var image = MockedMedia.CreateMediaImage(mediaType, -1);
repository.AddOrUpdate(image);
unitOfWork.Commit();
unitOfWork.Flush();
// Assert
Assert.That(file.HasIdentity, Is.True);
@@ -200,10 +200,10 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var media = repository.Get(NodeDto.NodeIdSeed + 1);
@@ -219,16 +219,16 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var content = repository.Get(NodeDto.NodeIdSeed + 2);
content.Name = "Test File Updated";
repository.AddOrUpdate(content);
unitOfWork.Commit();
unitOfWork.Flush();
var updatedContent = repository.Get(NodeDto.NodeIdSeed + 2);
@@ -243,15 +243,15 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var media = repository.Get(NodeDto.NodeIdSeed + 2);
repository.Delete(media);
unitOfWork.Commit();
unitOfWork.Flush();
var deleted = repository.Get(NodeDto.NodeIdSeed + 2);
var exists = repository.Exists(NodeDto.NodeIdSeed + 2);
@@ -267,10 +267,10 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var media = repository.Get(NodeDto.NodeIdSeed + 1);
@@ -294,10 +294,11 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
var result = repository.GetByQuery(query);
@@ -312,10 +313,11 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
long totalRecords;
@@ -333,10 +335,11 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
long totalRecords;
@@ -354,10 +357,11 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
long totalRecords;
@@ -375,10 +379,11 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
long totalRecords;
@@ -396,10 +401,11 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
long totalRecords;
@@ -417,10 +423,11 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
long totalRecords;
@@ -441,10 +448,11 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
long totalRecords;
@@ -465,10 +473,10 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var medias = repository.GetAll(NodeDto.NodeIdSeed + 1, NodeDto.NodeIdSeed + 2);
@@ -485,10 +493,10 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var medias = repository.GetAll();
@@ -505,10 +513,10 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
var exists = repository.Exists(NodeDto.NodeIdSeed + 1);
@@ -527,10 +535,10 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Arrange
var provider = CreateUowProvider();
var unitOfWork = provider.GetUnitOfWork();
MediaTypeRepository mediaTypeRepository;
using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
using (var unitOfWork = provider.CreateUnitOfWork())
{
MediaTypeRepository mediaTypeRepository;
var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
// Act
int level = 2;