From 068100cc8e3348857c5a2a0c4ff2b19a36cfd619 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Thu, 16 Apr 2020 11:39:30 +0200 Subject: [PATCH] Removed resetting of unit test builders. --- .../Builders/BuilderBase.cs | 2 -- .../Builders/ConfigurationEditorBuilder.cs | 6 ---- .../Builders/DataEditorBuilder.cs | 8 ----- .../Builders/DataTypeBuilder.cs | 19 ------------ .../Builders/DataValueEditorBuilder.cs | 9 ------ .../Builders/DictionaryItemBuilder.cs | 12 -------- .../Builders/DictionaryTranslationBuilder.cs | 12 -------- .../Builders/EntitySlimBuilder.cs | 7 ----- .../Builders/GenericCollectionBuilder.cs | 14 ++------- .../Builders/GenericDictionaryBuilder.cs | 18 ++---------- .../Builders/GlobalSettingsBuilder.cs | 29 +------------------ .../Builders/LanguageBuilder.cs | 14 --------- .../Builders/MacroBuilder.cs | 16 ---------- .../Builders/MacroPropertyBuilder.cs | 15 +--------- .../Builders/MemberBuilder.cs | 25 ---------------- .../Builders/MemberGroupBuilder.cs | 11 ------- .../Builders/MemberTypeBuilder.cs | 16 ---------- .../Builders/PropertyBuilder.cs | 9 ------ .../Builders/PropertyGroupBuilder.cs | 12 -------- .../Builders/PropertyTypeBuilder.cs | 21 -------------- .../Builders/RelationBuilder.cs | 12 -------- .../Builders/RelationTypeBuilder.cs | 15 ---------- .../Builders/SmtpSettingsBuilder.cs | 9 ------ .../Builders/StylesheetBuilder.cs | 7 ----- .../Builders/TemplateBuilder.cs | 16 ---------- .../Builders/UserBuilder.cs | 26 ----------------- .../Builders/UserGroupBuilder.cs | 16 +--------- .../Models/PathValidationTests.cs | 9 +++++- 28 files changed, 16 insertions(+), 369 deletions(-) diff --git a/src/Umbraco.Tests.Common/Builders/BuilderBase.cs b/src/Umbraco.Tests.Common/Builders/BuilderBase.cs index 723581986c..d8fc048d1b 100644 --- a/src/Umbraco.Tests.Common/Builders/BuilderBase.cs +++ b/src/Umbraco.Tests.Common/Builders/BuilderBase.cs @@ -3,7 +3,5 @@ namespace Umbraco.Tests.Common.Builders public abstract class BuilderBase { public abstract T Build(); - - protected abstract void Reset(); } } diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs index 08cb9e07f5..f0761a983e 100644 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs @@ -21,16 +21,10 @@ namespace Umbraco.Tests.Common.Builders { var defaultConfiguration = _defaultConfiguration ?? new Dictionary(); - Reset(); return new ConfigurationEditor() { DefaultConfiguration = defaultConfiguration, }; } - - protected override void Reset() - { - _defaultConfiguration = null; - } } } diff --git a/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs b/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs index b1e33f53df..5e6b174f56 100644 --- a/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs @@ -37,7 +37,6 @@ namespace Umbraco.Tests.Common.Builders var explicitConfigurationEditor = _explicitConfigurationEditorBuilder.Build(); var explicitValueEditor = _explicitValueEditorBuilder.Build(); - Reset(); return new DataEditor( Mock.Of(), Mock.Of(), @@ -51,12 +50,5 @@ namespace Umbraco.Tests.Common.Builders ExplicitValueEditor = explicitValueEditor }; } - - protected override void Reset() - { - _defaultConfiguration = null; - _explicitConfigurationEditorBuilder = new ConfigurationEditorBuilder>(this); - _explicitValueEditorBuilder = new DataValueEditorBuilder>(this); - } } } diff --git a/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs index 582c7f58b5..cdf4a68d09 100644 --- a/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs @@ -66,7 +66,6 @@ namespace Umbraco.Tests.Common.Builders var databaseType = _databaseType ?? ValueStorageType.Ntext; var sortOrder = _sortOrder ?? 0; - Reset(); return new DataType(editor, parentId) { Id = id, @@ -84,24 +83,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _dataEditorBuilder = new DataEditorBuilder(this); - _id = null; - _parentId = null; - _key = null; - _createDate = null; - _updateDate = null; - _deleteDate = null; - _name = null; - _trashed = null; - _level = null; - _path = null; - _creatorId = null; - _databaseType = null; - _sortOrder = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs b/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs index 4c271d127c..ecc2649c02 100644 --- a/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs @@ -48,7 +48,6 @@ namespace Umbraco.Tests.Common.Builders var hideLabel = _hideLabel ?? false; var valueType = _valueType ?? Guid.NewGuid().ToString(); - Reset(); return new DataValueEditor( Mock.Of(), Mock.Of(), @@ -62,13 +61,5 @@ namespace Umbraco.Tests.Common.Builders ValueType = valueType, }; } - - protected override void Reset() - { - _configuration = null; - _view = null; - _hideLabel = null; - _valueType = null; - } } } diff --git a/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs index 17ccbcc3fb..206bccba80 100644 --- a/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs @@ -65,7 +65,6 @@ namespace Umbraco.Tests.Common.Builders var parentId = _parentId ?? null; var itemKey = _itemKey ?? Guid.NewGuid().ToString(); - Reset(); var result = new DictionaryItem(itemKey) { Translations = _translationBuilders.Select(x => x.Build()), @@ -79,17 +78,6 @@ namespace Umbraco.Tests.Common.Builders return result; } - protected override void Reset() - { - _createDate = null; - _deleteDate = null; - _id = null; - _itemKey = null; - _key = null; - _parentId = null; - _updateDate = null; - } - public DictionaryItemBuilder WithParentId(Guid parentId) { _parentId = parentId; diff --git a/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs b/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs index 6104b005cf..6742bf0d97 100644 --- a/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs @@ -52,20 +52,8 @@ namespace Umbraco.Tests.Common.Builders Id = id }; - Reset(); return result; } - - protected override void Reset() - { - _languageBuilder = new LanguageBuilder(this); - _createDate = null; - _deleteDate = null; - _id = null; - _key = null; - _updateDate = null; - _value = null; - } DateTime? IWithCreateDateBuilder.CreateDate { diff --git a/src/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs b/src/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs index f4649d6b49..844c765a9d 100644 --- a/src/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs @@ -16,7 +16,6 @@ namespace Umbraco.Tests.Common.Builders var id = _id ?? 1; var parentId = _parentId ?? -1; - Reset(); return new EntitySlim { Id = id, @@ -24,12 +23,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _id = null; - _parentId = null; - } - public EntitySlimBuilder WithNoParentId() { _parentId = 0; diff --git a/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs b/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs index 290fdfc45b..0c45f6a599 100644 --- a/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs @@ -6,31 +6,21 @@ namespace Umbraco.Tests.Common.Builders public class GenericCollectionBuilder : ChildBuilderBase> { - private IList _collection; + private readonly IList _collection; public GenericCollectionBuilder(TBuilder parentBuilder) : base(parentBuilder) { + _collection = new List(); } public override IEnumerable Build() { var collection = _collection?.ToList() ?? Enumerable.Empty(); - Reset(); return collection; } - protected override void Reset() - { - _collection = null; - } - public GenericCollectionBuilder WithValue(T value) { - if (_collection == null) - { - _collection = new List(); - } - _collection.Add(value); return this; } diff --git a/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs b/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs index 444bbb61d2..f4cb7c6a30 100644 --- a/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs @@ -5,34 +5,22 @@ namespace Umbraco.Tests.Common.Builders public class GenericDictionaryBuilder : ChildBuilderBase> { - private IDictionary _dictionary; + private readonly IDictionary _dictionary; public GenericDictionaryBuilder(TBuilder parentBuilder) : base(parentBuilder) { + _dictionary = new Dictionary(); } public override IDictionary Build() { - var dictionary = _dictionary == null + return _dictionary == null ? new Dictionary() : new Dictionary(_dictionary); - Reset(); - return dictionary; } - protected override void Reset() - { - _dictionary = null; - } - - public GenericDictionaryBuilder WithKeyValue(TKey key, TValue value) { - if (_dictionary == null) - { - _dictionary = new Dictionary(); - } - _dictionary.Add(key, value); return this; } diff --git a/src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs index 1fe1164eba..4a88d4a571 100644 --- a/src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs @@ -32,7 +32,7 @@ namespace Umbraco.Tests.Common.Builders private string _noNodesViewPath; private bool? _useHttps; private int? _versionCheckPeriod; - private SmtpSettingsBuilder> _smtpSettingsBuilder; + private readonly SmtpSettingsBuilder> _smtpSettingsBuilder; public GlobalSettingsBuilder(TParent parentBuilder) : base(parentBuilder) { @@ -191,7 +191,6 @@ namespace Umbraco.Tests.Common.Builders var mainDomLock = _mainDomLock ?? string.Empty; var noNodesViewPath = _noNodesViewPath ?? "~/config/splashes/NoNodes.cshtml"; - Reset(); return new TestGlobalSettings { ConfigurationStatus = configurationStatus, @@ -219,32 +218,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _configurationStatus = null; - _databaseFactoryServerVersion = null; - _defaultUiLanguage = null; - _disableElectionForSingleServer = null; - _hideTopLevelNodeFromPath = null; - _installEmptyDatabase = null; - _installMissingDatabase = null; - _isSmtpServerConfigured = null; - _path = null; - _registerType = null; - _reservedPaths = null; - _reservedUrls = null; - _timeOutInMinutes = null; - _umbracoCssPath = null; - _umbracoMediaPath = null; - _umbracoPath = null; - _umbracoScriptsPath = null; - _mainDomLock = null; - _noNodesViewPath = null; - _useHttps = null; - _versionCheckPeriod = null; - _smtpSettingsBuilder = new SmtpSettingsBuilder>(this); - } - private class TestGlobalSettings : IGlobalSettings { public string ReservedUrls { get; set; } diff --git a/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs index 186b961526..953a64c5ed 100644 --- a/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs @@ -66,7 +66,6 @@ namespace Umbraco.Tests.Common.Builders var isDefault = _isDefault ?? false; var isMandatory = _isMandatory ?? false; - Reset(); return new Language(Mock.Of(), cultureInfo.Name) { Id = _id ?? 1, @@ -82,19 +81,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _createDate = null; - _cultureInfo = null; - _deleteDate = null; - _fallbackLanguageId = null; - _id = null; - _isDefault = null; - _isMandatory = null; - _key = null; - _updateDate = null; - } - DateTime? IWithCreateDateBuilder.CreateDate { get => _createDate; diff --git a/src/Umbraco.Tests.Common/Builders/MacroBuilder.cs b/src/Umbraco.Tests.Common/Builders/MacroBuilder.cs index 953f7c9a03..66e81ef8ce 100644 --- a/src/Umbraco.Tests.Common/Builders/MacroBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/MacroBuilder.cs @@ -95,25 +95,9 @@ namespace Umbraco.Tests.Common.Builders macro.Properties.Add(property); } - Reset(); return macro; } - protected override void Reset() - { - _id = null; - _key = null; - _alias = null; - _name = null; - _useInEditor = null; - _cacheDuration = null; - _cacheByPage = null; - _cacheByMember = null; - _dontRender = null; - _macroSource = null; - _propertyBuilders = new List(); - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs b/src/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs index 5730bb7271..ce80a056e9 100644 --- a/src/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs @@ -39,22 +39,9 @@ namespace Umbraco.Tests.Common.Builders var sortOrder = _sortOrder ?? 0; var editorAlias = _editorAlias ?? string.Empty; - var macroProperty = new MacroProperty(id, key, alias, name, sortOrder, editorAlias); - - Reset(); - return macroProperty; + return new MacroProperty(id, key, alias, name, sortOrder, editorAlias); } - protected override void Reset() - { - _id = null; - _key = null; - _alias = null; - _name = null; - _sortOrder = null; - _editorAlias = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs index f32035c5c9..16ec7ed005 100644 --- a/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs @@ -161,34 +161,9 @@ namespace Umbraco.Tests.Common.Builders member.ResetDirtyProperties(false); } - Reset(); return member; } - protected override void Reset() - { - _id = null; - _key = null; - _createDate = null; - _updateDate = null; - _name = null; - _creatorId = null; - _level = null; - _path = null; - _username = null; - _rawPasswordValue = null; - _email = null; - _failedPasswordAttempts = null; - _isApproved = null; - _isLockedOut = null; - _lastLockoutDate = null; - _lastLoginDate = null; - _lastPasswordChangeDate = null; - _sortOrder = null; - _trashed = null; - _propertyIdsIncrementingFrom = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs index 127a071083..bfd7f30a14 100644 --- a/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs @@ -57,20 +57,9 @@ namespace Umbraco.Tests.Common.Builders } } - Reset(); return memberGroup; } - protected override void Reset() - { - _id = null; - _key = null; - _createDate = null; - _updateDate = null; - _name = null; - _creatorId = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs index c132163c21..d5a145331e 100644 --- a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs @@ -134,25 +134,9 @@ namespace Umbraco.Tests.Common.Builders memberType.ResetDirtyProperties(false); - Reset(); return memberType; } - protected override void Reset() - { - _id = null; - _alias = null; - _name = null; - _parentId = null; - _sortOrder = null; - _creatorId = null; - _description = null; - _icon = null; - _thumbnail = null; - _trashed = null; - _propertyGroupBuilders.Clear(); - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs index 6396b604e9..6cb7a431f2 100644 --- a/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs @@ -36,7 +36,6 @@ namespace Umbraco.Tests.Common.Builders // Needs to be within collection to support publishing. var propertyTypeCollection = new PropertyTypeCollection(true, new[] { _propertyTypeBuilder.Build() }); - Reset(); return new Property(id, propertyTypeCollection[0]) { Key = key, @@ -45,14 +44,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _id = null; - _key = null; - _createDate = null; - _updateDate = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs index 25ec8bf21a..5df61dd072 100644 --- a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs @@ -62,7 +62,6 @@ namespace Umbraco.Tests.Common.Builders properties.Add(propertyType); } - Reset(); return new PropertyGroup(properties) { Id = id, @@ -74,17 +73,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _id = null; - _key = null; - _createDate = null; - _updateDate = null; - _name = null; - _sortOrder = null; - _propertyTypeBuilders.Clear(); - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs index 3c499fb855..9a16eb50e0 100644 --- a/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs @@ -108,7 +108,6 @@ namespace Umbraco.Tests.Common.Builders var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()); - Reset(); return new PropertyType(shortStringHelper, propertyEditorAlias, valueStorageType) { Id = id, @@ -128,26 +127,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _id = null; - _key = null; - _propertyEditorAlias = null; - _valueStorageType = null; - _alias = null; - _name = null; - _createDate = null; - _updateDate = null; - _sortOrder = null; - _description = null; - _dataTypeId = null; - _propertyGroupId = null; - _mandatory = null; - _mandatoryMessage = null; - _validationRegExp = null; - _validationRegExpMessage = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs b/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs index bf805aba77..2cea234200 100644 --- a/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs @@ -58,7 +58,6 @@ namespace Umbraco.Tests.Common.Builders var relationType = _relationTypeBuilder.Build(); - Reset(); return new Relation(parentId, childId, relationType) { Comment = comment, @@ -69,17 +68,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _id = null; - _parentId = null; - _childId = null; - _key = null; - _createDate = null; - _updateDate = null; - _comment = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs index dd25ae864a..243f5e3c96 100644 --- a/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs @@ -64,7 +64,6 @@ namespace Umbraco.Tests.Common.Builders var updateDate = _updateDate ?? DateTime.Now; var deleteDate = _deleteDate ?? null; - Reset(); return new RelationType(name, alias, isBidirectional, parentObjectType, childObjectType) { Id = id, @@ -75,20 +74,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _alias = null; - _childObjectType = null; - _createDate = null; - _deleteDate = null; - _id = null; - _isBidirectional = null; - _key = null; - _name = null; - _parentObjectType = null; - _updateDate = null; - } - string IWithAliasBuilder.Alias { get => _alias; diff --git a/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs index 586aedec9e..344d7bcf87 100644 --- a/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs @@ -52,7 +52,6 @@ namespace Umbraco.Tests.Common.Builders var port = _port ?? 25; var pickupDirectoryLocation = _pickupDirectoryLocation ?? null; - Reset(); return new TestSmtpSettings() { From = from, @@ -62,14 +61,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _from = null; - _host = null; - _port = null; - _pickupDirectoryLocation = null; - } - private class TestSmtpSettings : ISmtpSettings { public string From { get; set; } diff --git a/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs b/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs index c3eb097e65..ed871b9c31 100644 --- a/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs @@ -25,17 +25,10 @@ namespace Umbraco.Tests.Common.Builders var path = _path ?? string.Empty; var content = _content ?? string.Empty; - Reset(); return new Stylesheet(path) { Content = content, }; } - - protected override void Reset() - { - _path = null; - _content = null; - } } } diff --git a/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs index 6a29b89e6a..3948d285d3 100644 --- a/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs @@ -58,7 +58,6 @@ namespace Umbraco.Tests.Common.Builders var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()); - Reset(); return new Template(shortStringHelper, name, alias) { Id = id, @@ -73,21 +72,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _id = null; - _key = null; - _alias = null; - _name = null; - _createDate = null; - _updateDate = null; - _path = null; - _content = null; - _isMasterTemplate = null; - _masterTemplateAlias = null; - _masterTemplateId = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs index 4d69280ec5..9dd9ff047f 100644 --- a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs @@ -134,7 +134,6 @@ namespace Umbraco.Tests.Common.Builders var startContentIds = _startContentIds ?? new int[0]; var startMediaIds = _startMediaIds ?? new int[0]; - Reset(); return new User( globalSettings, name, @@ -160,31 +159,6 @@ namespace Umbraco.Tests.Common.Builders }; } - protected override void Reset() - { - _id = null; - _key = null; - _createDate = null; - _updateDate = null; - _language = null; - _name = null; - _username = null; - _rawPasswordValue = null; - _email = null; - _failedPasswordAttempts = null; - _isApproved = null; - _isLockedOut = null; - _lastLockoutDate = null; - _lastLoginDate = null; - _lastPasswordChangeDate = null; - _suffix = string.Empty; - _defaultLang = null; - _comments = null; - _sessionTimeout = null; - _startContentIds = null; - _startMediaIds = null; - } - int? IWithIdBuilder.Id { get => _id; diff --git a/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs index 8b0568d2d4..840cf80dd5 100644 --- a/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs @@ -68,24 +68,10 @@ namespace Umbraco.Tests.Common.Builders x.Icon == _icon && x.Permissions == _permissions && x.AllowedSections == _sectionCollection); - Reset(); return userGroup; } - protected override void Reset() - { - _startContentId = null; - _startMediaId = null; - _alias = null; - _icon = null; - _name = null; - _permissions = Enumerable.Empty(); - _sectionCollection = Enumerable.Empty(); - _suffix = null; - _id = null; - } - - int? IWithIdBuilder.Id + int? IWithIdBuilder.Id { get => _id; set => _id = value; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs index 92f728d4b8..3799d04751 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs @@ -12,7 +12,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models [TestFixture] public class PathValidationTests { - private readonly EntitySlimBuilder _builder = new EntitySlimBuilder(); + private EntitySlimBuilder _builder = new EntitySlimBuilder(); [Test] public void Validate_Path() @@ -93,18 +93,25 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models [Test] public void Ensure_Path_Entity_Valid_Recursive_Parent() { + // Not using the shared class-level builder as we need to reset after each usage when creating multiple entities. + _builder = new EntitySlimBuilder(); var parentA = _builder .WithId(999) .Build(); + + _builder = new EntitySlimBuilder(); var parentB = _builder .WithId(888) .WithParentId(999) .Build(); + + _builder = new EntitySlimBuilder(); var parentC = _builder .WithId(777) .WithParentId(888) .Build(); + _builder = new EntitySlimBuilder(); var entity = _builder .WithId(1234) .WithParentId(777)