NetCore: Reorganised integration tests into project grouped folders and namespaces (#9208)
* Reorganised integration tests into folders and classes grouping by project. * Updated namespaces and file locations from PR comments. * Fix merge conflict * Cleared content type service events looking to resolve failing integration test on build server. Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
This commit is contained in:
Andy Butland
@@ -0,0 +1,284 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Logging.Abstractions;
|
||||
using NUnit.Framework;
|
||||
using Umbraco.Composing;
|
||||
using Umbraco.Core.Logging;
|
||||
using Umbraco.Core.Models;
|
||||
using Umbraco.Core.Persistence.Repositories;
|
||||
using Umbraco.Core.Persistence.Repositories.Implement;
|
||||
using Umbraco.Core.Services;
|
||||
using Umbraco.Tests.Common.Builders;
|
||||
using Umbraco.Tests.Integration.Testing;
|
||||
using Umbraco.Tests.TestHelpers.Stubs;
|
||||
using Umbraco.Tests.Testing;
|
||||
|
||||
namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
|
||||
{
|
||||
[TestFixture]
|
||||
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
||||
public class ContentServicePerformanceTest : UmbracoIntegrationTest
|
||||
{
|
||||
protected DocumentRepository DocumentRepository => (DocumentRepository)GetRequiredService<IDocumentRepository>();
|
||||
protected IFileService FileService => GetRequiredService<IFileService>();
|
||||
protected IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
|
||||
protected IContentService ContentService => GetRequiredService<IContentService>();
|
||||
|
||||
protected IContentType ContentType { get; set; }
|
||||
|
||||
[SetUp]
|
||||
public void SetUpData()
|
||||
{
|
||||
CreateTestData();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Profiler()
|
||||
{
|
||||
Assert.IsInstanceOf<TestProfiler>(GetRequiredService<IProfiler>());
|
||||
}
|
||||
|
||||
private static IProfilingLogger GetTestProfilingLogger()
|
||||
{
|
||||
|
||||
var profiler = new TestProfiler();
|
||||
return new ProfilingLogger(new NullLogger<ProfilingLogger>(), profiler);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Retrieving_All_Content_In_Site()
|
||||
{
|
||||
//NOTE: Doing this the old 1 by 1 way and based on the results of the ContentServicePerformanceTest.Retrieving_All_Content_In_Site
|
||||
// the old way takes 143795ms, the new above way takes:
|
||||
// 14249ms
|
||||
//
|
||||
// ... NOPE, made some new changes, it is now....
|
||||
// 5290ms !!!!!!
|
||||
//
|
||||
// that is a 96% savings of processing and sql calls!
|
||||
//
|
||||
// ... NOPE, made even more nice changes, it is now...
|
||||
// 4452ms !!!!!!!
|
||||
|
||||
var template = TemplateBuilder.CreateTextPageTemplate();
|
||||
FileService.SaveTemplate(template);
|
||||
|
||||
var contentType1 = ContentTypeBuilder.CreateTextPageContentType("test1", "test1", defaultTemplateId: template.Id);
|
||||
var contentType2 = ContentTypeBuilder.CreateTextPageContentType("test2", "test2", defaultTemplateId: template.Id);
|
||||
var contentType3 = ContentTypeBuilder.CreateTextPageContentType("test3", "test3", defaultTemplateId: template.Id);
|
||||
ContentTypeService.Save(new[] { contentType1, contentType2, contentType3 });
|
||||
contentType1.AllowedContentTypes = new[]
|
||||
{
|
||||
new ContentTypeSort(new Lazy<int>(() => contentType2.Id), 0, contentType2.Alias),
|
||||
new ContentTypeSort(new Lazy<int>(() => contentType3.Id), 1, contentType3.Alias)
|
||||
};
|
||||
contentType2.AllowedContentTypes = new[]
|
||||
{
|
||||
new ContentTypeSort(new Lazy<int>(() => contentType1.Id), 0, contentType1.Alias),
|
||||
new ContentTypeSort(new Lazy<int>(() => contentType3.Id), 1, contentType3.Alias)
|
||||
};
|
||||
contentType3.AllowedContentTypes = new[]
|
||||
{
|
||||
new ContentTypeSort(new Lazy<int>(() => contentType1.Id), 0, contentType1.Alias),
|
||||
new ContentTypeSort(new Lazy<int>(() => contentType2.Id), 1, contentType2.Alias)
|
||||
};
|
||||
ContentTypeService.Save(new[] { contentType1, contentType2, contentType3 });
|
||||
|
||||
var roots = ContentBuilder.CreateTextpageContent(contentType1, -1, 10);
|
||||
ContentService.Save(roots);
|
||||
foreach (var root in roots)
|
||||
{
|
||||
var item1 = ContentBuilder.CreateTextpageContent(contentType1, root.Id, 10);
|
||||
var item2 = ContentBuilder.CreateTextpageContent(contentType2, root.Id, 10);
|
||||
var item3 = ContentBuilder.CreateTextpageContent(contentType3, root.Id, 10);
|
||||
|
||||
ContentService.Save(item1.Concat(item2).Concat(item3));
|
||||
}
|
||||
|
||||
var total = new List<IContent>();
|
||||
|
||||
using (GetTestProfilingLogger().TraceDuration<ContentServicePerformanceTest>("Getting all content in site"))
|
||||
{
|
||||
TestProfiler.Enable();
|
||||
total.AddRange(ContentService.GetRootContent());
|
||||
foreach (var content in total.ToArray())
|
||||
{
|
||||
total.AddRange(ContentService.GetPagedDescendants(content.Id, 0, int.MaxValue, out var _));
|
||||
}
|
||||
TestProfiler.Disable();
|
||||
Current.Logger.LogInformation("Returned {Total} items", total.Count);
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Creating_100_Items()
|
||||
{
|
||||
// Arrange
|
||||
var contentType = ContentTypeService.Get(ContentType.Id);
|
||||
var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
|
||||
|
||||
// Act
|
||||
Stopwatch watch = Stopwatch.StartNew();
|
||||
ContentService.Save(pages, 0);
|
||||
watch.Stop();
|
||||
var elapsed = watch.ElapsedMilliseconds;
|
||||
|
||||
Debug.Print("100 content items saved in {0} ms", elapsed);
|
||||
|
||||
// Assert
|
||||
Assert.That(pages.Any(x => x.HasIdentity == false), Is.False);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Creating_1000_Items()
|
||||
{
|
||||
// Arrange
|
||||
var contentType = ContentTypeService.Get(ContentType.Id);
|
||||
var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
|
||||
|
||||
// Act
|
||||
Stopwatch watch = Stopwatch.StartNew();
|
||||
ContentService.Save(pages, 0);
|
||||
watch.Stop();
|
||||
var elapsed = watch.ElapsedMilliseconds;
|
||||
|
||||
Debug.Print("100 content items saved in {0} ms", elapsed);
|
||||
|
||||
// Assert
|
||||
Assert.That(pages.Any(x => x.HasIdentity == false), Is.False);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Getting_100_Uncached_Items()
|
||||
{
|
||||
// Arrange
|
||||
var contentType = ContentTypeService.Get(ContentType.Id);
|
||||
var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
|
||||
ContentService.Save(pages, 0);
|
||||
|
||||
var provider = ScopeProvider;
|
||||
using (var scope = provider.CreateScope())
|
||||
{
|
||||
var repository = DocumentRepository;
|
||||
|
||||
// Act
|
||||
Stopwatch watch = Stopwatch.StartNew();
|
||||
var contents = repository.GetMany();
|
||||
watch.Stop();
|
||||
var elapsed = watch.ElapsedMilliseconds;
|
||||
|
||||
Debug.Print("100 content items retrieved in {0} ms without caching", elapsed);
|
||||
|
||||
// Assert
|
||||
Assert.That(contents.Any(x => x.HasIdentity == false), Is.False);
|
||||
Assert.That(contents.Any(x => x == null), Is.False);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Getting_1000_Uncached_Items()
|
||||
{
|
||||
// Arrange
|
||||
var contentType = ContentTypeService.Get(ContentType.Id);
|
||||
var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
|
||||
ContentService.Save(pages, 0);
|
||||
|
||||
using (var scope = ScopeProvider.CreateScope())
|
||||
{
|
||||
var repository = DocumentRepository;
|
||||
|
||||
// Act
|
||||
Stopwatch watch = Stopwatch.StartNew();
|
||||
var contents = repository.GetMany();
|
||||
watch.Stop();
|
||||
var elapsed = watch.ElapsedMilliseconds;
|
||||
|
||||
Debug.Print("1000 content items retrieved in {0} ms without caching", elapsed);
|
||||
|
||||
// Assert
|
||||
//Assert.That(contents.Any(x => x.HasIdentity == false), Is.False);
|
||||
//Assert.That(contents.Any(x => x == null), Is.False);
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Getting_100_Cached_Items()
|
||||
{
|
||||
// Arrange
|
||||
var contentType = ContentTypeService.Get(ContentType.Id);
|
||||
var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
|
||||
ContentService.Save(pages, 0);
|
||||
|
||||
using (var scope = ScopeProvider.CreateScope())
|
||||
{
|
||||
var repository = DocumentRepository;
|
||||
|
||||
// Act
|
||||
var contents = repository.GetMany();
|
||||
|
||||
Stopwatch watch = Stopwatch.StartNew();
|
||||
var contentsCached = repository.GetMany();
|
||||
watch.Stop();
|
||||
var elapsed = watch.ElapsedMilliseconds;
|
||||
|
||||
Debug.Print("100 content items retrieved in {0} ms with caching", elapsed);
|
||||
|
||||
// Assert
|
||||
Assert.That(contentsCached.Any(x => x.HasIdentity == false), Is.False);
|
||||
Assert.That(contentsCached.Any(x => x == null), Is.False);
|
||||
Assert.That(contentsCached.Count(), Is.EqualTo(contents.Count()));
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Getting_1000_Cached_Items()
|
||||
{
|
||||
// Arrange
|
||||
var contentType = ContentTypeService.Get(ContentType.Id);
|
||||
var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
|
||||
ContentService.Save(pages, 0);
|
||||
|
||||
using (var scope = ScopeProvider.CreateScope())
|
||||
{
|
||||
var repository = DocumentRepository;
|
||||
|
||||
// Act
|
||||
var contents = repository.GetMany();
|
||||
|
||||
Stopwatch watch = Stopwatch.StartNew();
|
||||
var contentsCached = repository.GetMany();
|
||||
watch.Stop();
|
||||
var elapsed = watch.ElapsedMilliseconds;
|
||||
|
||||
Debug.Print("1000 content items retrieved in {0} ms with caching", elapsed);
|
||||
|
||||
// Assert
|
||||
//Assert.That(contentsCached.Any(x => x.HasIdentity == false), Is.False);
|
||||
//Assert.That(contentsCached.Any(x => x == null), Is.False);
|
||||
//Assert.That(contentsCached.Count(), Is.EqualTo(contents.Count()));
|
||||
}
|
||||
}
|
||||
|
||||
[TearDown]
|
||||
public override void TearDown()
|
||||
{
|
||||
base.TearDown();
|
||||
}
|
||||
|
||||
public void CreateTestData()
|
||||
{
|
||||
|
||||
var template = TemplateBuilder.CreateTextPageTemplate();
|
||||
FileService.SaveTemplate(template);
|
||||
|
||||
//Create and Save ContentType "textpage" -> ContentType.Id
|
||||
ContentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
|
||||
ContentTypeService.Save(ContentType);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user