Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SysML2.NET.Tests/Extend/ElementExtensionsTestFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -289,17 +289,17 @@ public void VerifyComputePathOperation()
using (Assert.EnterMultipleScope())
{
Assert.That(element.ComputePathOperation, Is.EqualTo("name"));
Assert.That(secondElement.ComputePathOperation, Throws.TypeOf<NotSupportedException>());
Assert.That(secondElement.ComputePathOperation(), Is.EqualTo("/2/1"));
}

namespaceElement.DeclaredName = "namespace";
membership.DeclaredName = "firstMember";
secondMembership.DeclaredName = "secondMember";

using (Assert.EnterMultipleScope())
{
Assert.That(element.ComputePathOperation, Is.EqualTo("name"));
Assert.That(secondElement.ComputePathOperation, Throws.TypeOf<NotSupportedException>());
Assert.That(secondElement.ComputePathOperation(), Is.EqualTo("/2/1"));
}
}

Expand Down
52 changes: 50 additions & 2 deletions SysML2.NET.Tests/Extend/OwningMembershipExtensionsTestFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,22 @@ public void VerifyComputeOwnedMemberElement()
}

[Test]
public void ComputeOwnedMemberElementId_ThrowsNotSupportedException()
public void VerifyComputeOwnedMemberElementId()
{
Assert.That(() => ((IOwningMembership)null).ComputeOwnedMemberElementId(), Throws.TypeOf<NotSupportedException>());
Assert.That(() => ((IOwningMembership)null).ComputeOwnedMemberElementId(), Throws.TypeOf<ArgumentNullException>());

// OwnedRelatedElement.Count != 1 → IncompleteModelException propagated from ComputeOwnedMemberElement
var emptyMembership = new OwningMembership();

Assert.That(() => emptyMembership.ComputeOwnedMemberElementId(), Throws.TypeOf<IncompleteModelException>());

// Populated: one owned element → returns that element's ElementId
var container = new Namespace();
var membership = new OwningMembership();
var ownedElement = new Definition { ElementId = "test-element-id-42" };
container.AssignOwnership(membership, ownedElement);

Assert.That(membership.ComputeOwnedMemberElementId(), Is.EqualTo(ownedElement.ElementId));
}

[Test]
Expand All @@ -73,5 +86,40 @@ public void ComputeOwnedMemberShortName_ThrowsArgumentNullException()
{
Assert.That(() => ((IOwningMembership)null).ComputeOwnedMemberShortName(), Throws.TypeOf<ArgumentNullException>());
}

[Test]
public void VerifyComputeRedefinedPathOperation()
{
Assert.That(() => ((IOwningMembership)null).ComputeRedefinedPathOperation(), Throws.TypeOf<ArgumentNullException>());

// OwnedRelatedElement.Count != 1 → IncompleteModelException propagated from ComputeOwnedMemberElement
var emptyMembership = new OwningMembership();

Assert.That(() => emptyMembership.ComputeRedefinedPathOperation(), Throws.TypeOf<IncompleteModelException>());

// qualifiedName != null → returns qualifiedName + "/owningMembership"
// Wire: owning package → named child namespace → named member definition
var rootPackage = new Namespace();
var childNamespace = new Namespace { DeclaredName = "Pkg" };
var childMembership = new OwningMembership();
rootPackage.AssignOwnership(childMembership, childNamespace);

var member = new Definition { DeclaredName = "Member" };
var memberMembership = new OwningMembership();
childNamespace.AssignOwnership(memberMembership, member);

Assert.That(memberMembership.ComputeRedefinedPathOperation(), Is.EqualTo("Pkg::Member/owningMembership"));

// qualifiedName == null → delegates to RelationshipExtensions.ComputeRedefinedPathOperation
// Wire: an OwningMembership with an unnamed owned element (no owning namespace → qualifiedName is null)
var unnamedContainer = new Namespace();
var unnamedMembership = new OwningMembership();
var unnamedElement = new Definition();
unnamedContainer.AssignOwnership(unnamedMembership, unnamedElement);

var expectedPath = ((IRelationship)unnamedMembership).ComputeRedefinedPathOperation();

Assert.That(unnamedMembership.ComputeRedefinedPathOperation(), Is.EqualTo(expectedPath));
}
}
}
18 changes: 14 additions & 4 deletions SysML2.NET/Extend/OwningMembershipExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@
/// <returns>
/// the computed result
/// </returns>
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
internal static string ComputeOwnedMemberElementId(this IOwningMembership owningMembershipSubject)
{
throw new NotSupportedException("Create a GitHub issue when this method is required");
return owningMembershipSubject == null ? throw new ArgumentNullException(nameof(owningMembershipSubject)) : owningMembershipSubject.ownedMemberElement.ElementId;
}

/// <summary>
Expand Down Expand Up @@ -119,10 +118,21 @@
/// <returns>
/// The expected <see cref="string" />
/// </returns>
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
internal static string ComputeRedefinedPathOperation(this IOwningMembership owningMembershipSubject)
{
throw new NotSupportedException("Create a GitHub issue when this method is required");
if (owningMembershipSubject == null)
{
throw new ArgumentNullException(nameof(owningMembershipSubject));
}

Check warning on line 126 in SysML2.NET/Extend/OwningMembershipExtensions.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use 'ArgumentNullException.ThrowIfNull' instead of explicitly throwing a new exception instance

See more on https://sonarcloud.io/project/issues?id=STARIONGROUP_SysML2.NET&issues=AZ45sVbmiLayjn1NuSAB&open=AZ45sVbmiLayjn1NuSAB&pullRequest=238

var ownedElement = owningMembershipSubject.ownedMemberElement;

if (ownedElement.qualifiedName != null)
{
return $"{ownedElement.qualifiedName}/owningMembership";
}

return RelationshipExtensions.ComputeRedefinedPathOperation(owningMembershipSubject);
}
}
}
Loading