Made more use of defaults in builder based unit tests.

This commit is contained in:
Andy Butland
2020-04-28 12:06:01 +02:00
parent e561784057
commit 1f4030f910
23 changed files with 54 additions and 129 deletions
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.Common.Builders
var name = _name ?? Guid.NewGuid().ToString();
var creatorId = _creatorId ?? 1;
var level = _level ?? 1;
var path = _path ?? "-1";
var path = _path ?? $"-1,{id}";
var sortOrder = _sortOrder ?? 0;
var trashed = _trashed ?? false;
@@ -66,15 +66,15 @@ namespace Umbraco.Tests.Common.Builders
protected int GetLevel() => _level ?? 0;
protected string GetPath() => _path ?? string.Empty;
protected string GetPath() => _path ?? _path ?? $"-1,{GetId()}";
protected int GetSortOrder() => _sortOrder ?? 0;
protected string GetDescription() => _description ?? string.Empty;
protected string GetIcon() => _icon ?? string.Empty;
protected string GetIcon() => _icon ?? "icon-document";
protected string GetThumbnail() => _thumbnail ?? string.Empty;
protected string GetThumbnail() => _thumbnail ?? "folder.png";
protected int GetCreatorId() => _creatorId ?? 0;
@@ -61,7 +61,7 @@ namespace Umbraco.Tests.Common.Builders
var deleteDate = _deleteDate ?? null;
var name = _name ?? Guid.NewGuid().ToString();
var level = _level ?? 0;
var path = _path ?? string.Empty;
var path = _path ?? $"-1,{id}";
var creatorId = _creatorId ?? 1;
var databaseType = _databaseType ?? ValueStorageType.Ntext;
var sortOrder = _sortOrder ?? 0;
@@ -81,7 +81,7 @@ namespace Umbraco.Tests.Common.Builders
var name = _name ?? Guid.NewGuid().ToString();
var creatorId = _creatorId ?? 1;
var level = _level ?? 1;
var path = _path ?? "-1";
var path = _path ?? $"-1,{id}";
var sortOrder = _sortOrder ?? 0;
var parentId = _parentId ?? -1;
var icon = _contentTypeIcon ?? string.Empty;
@@ -11,28 +11,16 @@ namespace Umbraco.Tests.Common.Builders.Extensions
.WithId(10)
.WithAlias("textPage")
.WithName("Text Page")
.WithCreatorId(22)
.WithDescription("test")
.WithIsContainer(true)
.WithIcon("icon")
.WithThumbnail("thumb")
.WithSortOrder(5)
.WithLevel(3)
.WithPath("-1,4,10")
.WithPropertyTypeIdsIncrementingFrom(200)
.AddPropertyGroup()
.WithName("Content")
.WithSortOrder(1)
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("title")
.WithName("Title")
.WithSortOrder(1)
.WithDataTypeId(-88)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias("bodyText")
.WithName("Body text")
@@ -44,20 +32,14 @@ namespace Umbraco.Tests.Common.Builders.Extensions
.WithName("Meta")
.WithSortOrder(2)
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("keywords")
.WithName("Keywords")
.WithSortOrder(1)
.WithDataTypeId(-88)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("description")
.WithName("description")
.WithSortOrder(1)
.WithDataTypeId(-88)
.Done()
.Done()
.AddAllowedTemplate()
@@ -90,13 +72,8 @@ namespace Umbraco.Tests.Common.Builders.Extensions
.WithId(10)
.WithAlias(Constants.Conventions.MediaTypes.Image)
.WithName("Image")
.WithCreatorId(22)
.WithDescription("test")
.WithIcon("icon")
.WithThumbnail("thumb")
.WithSortOrder(5)
.WithLevel(3)
.WithPath("-1,4,10")
.WithIcon("icon-picture")
.WithPropertyTypeIdsIncrementingFrom(200)
.WithMediaPropertyGroup()
.Build();
@@ -108,26 +85,16 @@ namespace Umbraco.Tests.Common.Builders.Extensions
.WithId(10)
.WithAlias("memberType")
.WithName("Member type")
.WithCreatorId(22)
.WithDescription("test")
.WithIcon("icon")
.WithThumbnail("thumb")
.WithSortOrder(5)
.WithLevel(3)
.WithPath("-1,4,10")
.WithIcon("icon-user-female")
.WithPropertyTypeIdsIncrementingFrom(200)
.AddPropertyGroup()
.WithName("Content")
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("title")
.WithName("Title")
.WithSortOrder(1)
.WithDataTypeId(-88)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias("bodyText")
.WithName("Body text")
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.Common.Builders
var name = _name ?? Guid.NewGuid().ToString();
var creatorId = _creatorId ?? 1;
var level = _level ?? 1;
var path = _path ?? "-1";
var path = _path ?? $"-1,{id}";
var sortOrder = _sortOrder ?? 0;
var trashed = _trashed ?? false;
@@ -65,7 +65,7 @@ namespace Umbraco.Tests.Common.Builders
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias(Constants.Conventions.Media.Extension)
.WithName("File Extension")
.WithSortOrder(4)
.WithSortOrder(5)
.WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
.Done();
_propertyGroupBuilders.Add(builder);
@@ -88,7 +88,7 @@ namespace Umbraco.Tests.Common.Builders
var name = _name ?? Guid.NewGuid().ToString();
var creatorId = _creatorId ?? 1;
var level = _level ?? 1;
var path = _path ?? "-1";
var path = _path ?? $"-1,{id}";
var sortOrder = _sortOrder ?? 0;
var trashed = _trashed ?? false;
var username = _username ?? string.Empty;
@@ -30,7 +30,6 @@ namespace Umbraco.Tests.Common.Builders
var builder = new PropertyGroupBuilder<MemberTypeBuilder>(this)
.WithId(99)
.WithName(Constants.Conventions.Member.StandardPropertiesGroupName)
.WithSortOrder(1)
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextArea)
.WithValueStorageType(ValueStorageType.Ntext)
@@ -1,4 +1,5 @@
using System;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Strings;
using Umbraco.Tests.Common.Builders.Extensions;
@@ -91,14 +92,14 @@ namespace Umbraco.Tests.Common.Builders
{
var id = _id ?? 0;
var key = _key ?? Guid.NewGuid();
var propertyEditorAlias = _propertyEditorAlias ?? Guid.NewGuid().ToString().ToCamelCase();
var valueStorageType = _valueStorageType ?? ValueStorageType.Ntext;
var propertyEditorAlias = _propertyEditorAlias ?? Constants.PropertyEditors.Aliases.TextBox;
var valueStorageType = _valueStorageType ?? ValueStorageType.Nvarchar;
var name = _name ?? Guid.NewGuid().ToString();
var alias = _alias ?? name.ToCamelCase();
var createDate = _createDate ?? DateTime.Now;
var updateDate = _updateDate ?? DateTime.Now;
var sortOrder = _sortOrder ?? 0;
var dataTypeId = _dataTypeId ?? 0;
var dataTypeId = _dataTypeId ?? -88;
var description = _description ?? string.Empty;
var propertyGroupId = _propertyGroupId ?? null;
var mandatory = _mandatory ?? false;
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.Common.Builders
var alias = _alias ?? name.ToCamelCase();
var createDate = _createDate ?? DateTime.Now;
var updateDate = _updateDate ?? DateTime.Now;
var path = _path ?? string.Empty;
var path = _path ?? $"-1,{id}";
var content = _content;
var isMasterTemplate = _isMasterTemplate ?? false;
var masterTemplateAlias = _masterTemplateAlias ?? string.Empty;
@@ -98,7 +98,7 @@ namespace Umbraco.Tests.Common.Builders
var userCount = _userCount ?? 0;
var startContentId = _startContentId ?? -1;
var startMediaId = _startMediaId ?? -1;
var icon = _icon ?? string.Empty;
var icon = _icon ?? "icon-group";
var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
@@ -154,8 +154,6 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
var propertyTypeBuilder = new PropertyTypeBuilder();
var additionalPropertyType = propertyTypeBuilder
.WithPropertyEditorAlias("test")
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("blah")
.Build();
@@ -26,7 +26,6 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
.WithName("Test")
.WithParentId(5)
.WithSortOrder(6)
.WithPath("-1,23")
.WithLevel(7)
.WithContentTypeAlias("test1")
.WithContentTypeIcon("icon")
@@ -93,17 +93,12 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
.WithMembershipPropertyGroup()
.AddPropertyGroup()
.WithName("Content")
.WithSortOrder(1)
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("title")
.WithName("Title")
.WithSortOrder(1)
.WithDataTypeId(-88)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias("bodyText")
.WithName("Body text")
@@ -111,13 +106,10 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
.WithDataTypeId(-87)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("author")
.WithName("Author")
.WithDescription("Name of the author")
.WithSortOrder(3)
.WithDataTypeId(-88)
.Done()
.Done()
.Done()
@@ -125,13 +117,9 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
.WithName("Fred")
.WithLogin("fred", "raw pass")
.WithEmail("email@email.com")
.WithCreatorId(22)
.WithFailedPasswordAttempts(22)
.WithLevel(3)
.WithPath("-1, 4, 10")
.WithIsApproved(true)
.WithIsLockedOut(true)
.WithSortOrder(5)
.WithTrashed(false)
.AddMemberGroups()
.WithValue("Group 1")
@@ -65,15 +65,10 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
return _builder
.WithId(77)
.WithName("Group1")
.WithSortOrder(555)
.AddPropertyType()
.WithId(3)
.WithPropertyEditorAlias("TestPropertyEditor")
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("test")
.WithName("Test")
.WithSortOrder(9)
.WithDataTypeId(5)
.WithDescription("testing")
.WithPropertyGroupId(11)
.WithMandatory(true)
@@ -81,16 +76,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
.Done()
.AddPropertyType()
.WithId(4)
.WithPropertyEditorAlias("TestPropertyEditor2")
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("test2")
.WithName("Test2")
.WithSortOrder(10)
.WithDataTypeId(6)
.WithDescription("testing2")
.WithPropertyGroupId(12)
.WithMandatory(true)
.WithValidationRegExp("yyyy")
.WithName("Test2")
.Done()
.Build();
}
@@ -51,7 +51,6 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
.AddPropertyType()
.WithId(3)
.WithPropertyEditorAlias("TestPropertyEditor")
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("test")
.WithName("Test")
.WithSortOrder(9)
@@ -75,7 +75,6 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
return _builder
.WithId(3)
.WithPropertyEditorAlias("TestPropertyEditor")
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias("test")
.WithName("Test")
.WithSortOrder(9)
@@ -74,7 +74,6 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
.WithCreateDate(DateTime.Now)
.WithUpdateDate(DateTime.Now)
.WithKey(Guid.NewGuid())
.WithPath("-1,3")
.WithContent("blah")
.AsMasterTemplate("master", 88)
.Build();
@@ -64,15 +64,12 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
.WithName(testPropertyGroupName)
.WithSortOrder(1)
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias(testPropertyType1.Alias)
.WithName(testPropertyType1.Name)
.WithSortOrder(testPropertyType1.SortOrder)
.WithDataTypeId(testPropertyType1.DataTypeId)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias(testPropertyType2.Alias)
.WithName(testPropertyType2.Name)
@@ -64,15 +64,12 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
.WithName(testMemberTypePropertyGroupName)
.WithSortOrder(1)
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias(testPropertyType1.Alias)
.WithName(testPropertyType1.Name)
.WithSortOrder(testPropertyType1.SortOrder)
.WithDataTypeId(testPropertyType1.DataTypeId)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias(testPropertyType2.Alias)
.WithName(testPropertyType2.Name)
@@ -80,8 +77,6 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
.WithDataTypeId(testPropertyType2.DataTypeId)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias(testPropertyType3.Alias)
.WithName(testPropertyType3.Name)
.WithDescription(testPropertyType3.Description)
@@ -63,21 +63,18 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
.WithName(testPropertyGroupName)
.WithSortOrder(1)
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Nvarchar)
.WithAlias(testPropertyType1.Alias)
.WithName(testPropertyType1.Name)
.WithSortOrder(testPropertyType1.SortOrder)
.WithDataTypeId(testPropertyType1.DataTypeId)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias(testPropertyType2.Alias)
.WithName(testPropertyType2.Name)
.WithSortOrder(testPropertyType2.SortOrder)
.WithDataTypeId(testPropertyType2.DataTypeId)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias(testPropertyType2.Alias)
.WithName(testPropertyType2.Name)
.WithSortOrder(testPropertyType2.SortOrder)
.WithDataTypeId(testPropertyType2.DataTypeId)
.Done()
.Done()
.WithMemberCanEditProperty(testPropertyType1.Alias, true)
.WithMemberCanViewProperty(testPropertyType2.Alias, true)
@@ -13,44 +13,44 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
public void Is_Built_Correctly()
{
// Arrange
const int id = 3;
const string alias = "test";
const string name = "Test";
var key = Guid.NewGuid();
var createDate = DateTime.Now.AddHours(-1);
var updateDate = DateTime.Now;
const string path = "-1,3";
const string content = "blah";
const string masterTemplateAlias = "master";
const int masterTemplateId = 88;
const int testId = 3;
const string testAlias = "test";
const string testName = "Test";
var testKey = Guid.NewGuid();
var testCreateDate = DateTime.Now.AddHours(-1);
var testUpdateDate = DateTime.Now;
const string testPath = "-1,3";
const string testContent = "blah";
const string testMasterTemplateAlias = "master";
const int testMasterTemplateId = 88;
var builder = new TemplateBuilder();
// Act
var template = builder
.WithId(3)
.WithAlias(alias)
.WithName(name)
.WithCreateDate(createDate)
.WithUpdateDate(updateDate)
.WithKey(key)
.WithPath(path)
.WithContent(content)
.AsMasterTemplate(masterTemplateAlias, masterTemplateId)
.WithAlias(testAlias)
.WithName(testName)
.WithCreateDate(testCreateDate)
.WithUpdateDate(testUpdateDate)
.WithKey(testKey)
.WithPath(testPath)
.WithContent(testContent)
.AsMasterTemplate(testMasterTemplateAlias, testMasterTemplateId)
.Build();
// Assert
Assert.AreEqual(id, template.Id);
Assert.AreEqual(alias, template.Alias);
Assert.AreEqual(name, template.Name);
Assert.AreEqual(createDate, template.CreateDate);
Assert.AreEqual(updateDate, template.UpdateDate);
Assert.AreEqual(key, template.Key);
Assert.AreEqual(path, template.Path);
Assert.AreEqual(content, template.Content);
Assert.AreEqual(testId, template.Id);
Assert.AreEqual(testAlias, template.Alias);
Assert.AreEqual(testName, template.Name);
Assert.AreEqual(testCreateDate, template.CreateDate);
Assert.AreEqual(testUpdateDate, template.UpdateDate);
Assert.AreEqual(testKey, template.Key);
Assert.AreEqual(testPath, template.Path);
Assert.AreEqual(testContent, template.Content);
Assert.IsTrue(template.IsMasterTemplate);
Assert.AreEqual(masterTemplateAlias, template.MasterTemplateAlias);
Assert.AreEqual(masterTemplateId, ((Template)template).MasterTemplateId.Value);
Assert.AreEqual(testMasterTemplateAlias, template.MasterTemplateAlias);
Assert.AreEqual(testMasterTemplateId, ((Template)template).MasterTemplateId.Value);
}
}
}