diff --git a/src/Umbraco.Core/Models/RelationType.cs b/src/Umbraco.Core/Models/RelationType.cs index e1f5b4a388..ae20482229 100644 --- a/src/Umbraco.Core/Models/RelationType.cs +++ b/src/Umbraco.Core/Models/RelationType.cs @@ -21,9 +21,18 @@ namespace Umbraco.Core.Models public RelationType(Guid childObjectType, Guid parentObjectType, string @alias) { + Mandate.ParameterNotNullOrEmpty(@alias, "alias"); _childObjectType = childObjectType; _parentObjectType = parentObjectType; _alias = alias; + Name = _alias; + } + + public RelationType(Guid childObjectType, Guid parentObjectType, string @alias, string name) + :this(childObjectType, parentObjectType, @alias) + { + Mandate.ParameterNotNullOrEmpty(name, "name"); + Name = name; } private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo(x => x.Name); diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index 6434331e30..b5cd6842d0 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -14,7 +14,7 @@ using Umbraco.Tests.TestHelpers.Entities; namespace Umbraco.Tests.Services { - /// + /// /// Tests covering all methods in the ContentService class. /// This is more of an integration test as it involves multiple layers /// as well as configuration. diff --git a/src/Umbraco.Tests/Services/RelationServiceTests.cs b/src/Umbraco.Tests/Services/RelationServiceTests.cs new file mode 100644 index 0000000000..e2b9f57287 --- /dev/null +++ b/src/Umbraco.Tests/Services/RelationServiceTests.cs @@ -0,0 +1,34 @@ +using System; +using NUnit.Framework; +using Umbraco.Core; +using Umbraco.Core.Models; + +namespace Umbraco.Tests.Services +{ + [TestFixture, RequiresSTA] + public class RelationServiceTests : BaseServiceTest + { + [SetUp] + public override void Initialize() + { + base.Initialize(); + } + + [TearDown] + public override void TearDown() + { + base.TearDown(); + } + + [Test] + public void Can_Create_RelationType_Without_Name() + { + var rs = ServiceContext.RelationService; + var rt = new RelationType(new Guid(Constants.ObjectTypes.Document), new Guid(Constants.ObjectTypes.Document), "repeatedEventOccurence"); + + Assert.DoesNotThrow(() => rs.Save(rt)); + + Assert.AreEqual(rt.Name, "repeatedEventOccurence"); + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 1e943b964c..f654b441a7 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -234,6 +234,7 @@ +