From 58a1bc0a8fcd80ad1fecad0f69c2c2572ece48b7 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Sat, 4 Apr 2020 09:25:50 +0200 Subject: [PATCH] Migrated stylesheet and template tests into new project and builder pattern. --- .../Umbraco.Infrastructure.csproj | 3 + .../Builders/StylesheetBuilder.cs | 34 +++++ .../Builders/TemplateBuilder.cs | 116 ++++++++++++++++++ .../Models/StylesheetTests.cs | 69 +++++++---- .../Models/TemplateTests.cs | 78 ++++++++++++ .../Builders/StylesheetBuilderTests.cs | 29 +++++ .../Builders/TemplateBuilderTests.cs | 55 +++++++++ src/Umbraco.Tests/Models/TemplateTests.cs | 81 ------------ src/Umbraco.Tests/Umbraco.Tests.csproj | 2 - 9 files changed, 357 insertions(+), 110 deletions(-) create mode 100644 src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs create mode 100644 src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Models/StylesheetTests.cs (59%) create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/TemplateTests.cs create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs delete mode 100644 src/Umbraco.Tests/Models/TemplateTests.cs diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 432033d966..a3f8953ac3 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -76,6 +76,9 @@ <_Parameter1>Umbraco.Tests.Integration + + <_Parameter1>Umbraco.Tests.Common + diff --git a/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs b/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs new file mode 100644 index 0000000000..ed871b9c31 --- /dev/null +++ b/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs @@ -0,0 +1,34 @@ +using Umbraco.Core.Models; + +namespace Umbraco.Tests.Common.Builders +{ + public class StylesheetBuilder + : BuilderBase + { + private string _path; + private string _content; + + public StylesheetBuilder WithPath(string path) + { + _path = path; + return this; + } + + public StylesheetBuilder WithContent(string content) + { + _content = content; + return this; + } + + public override Stylesheet Build() + { + var path = _path ?? string.Empty; + var content = _content ?? string.Empty; + + return new Stylesheet(path) + { + Content = content, + }; + } + } +} diff --git a/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs new file mode 100644 index 0000000000..72e8028ebc --- /dev/null +++ b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs @@ -0,0 +1,116 @@ +using System; +using Umbraco.Core.Models; +using Umbraco.Core.Strings; +using Umbraco.Tests.Common.Builders.Extensions; +using Umbraco.Tests.Common.Builders.Interfaces; + +namespace Umbraco.Tests.Common.Builders +{ + public class TemplateBuilder + : BuilderBase