Skip to content

Commit

Permalink
Merge pull request #561 from mpostol/SemanticData-6.1.3
Browse files Browse the repository at this point in the history 
UAReferenceContext - causes circular references #558
  • Loading branch information
@mpostol
mpostol authored Apr 4, 2021
2 parents c8932c1 + fcff314 commit 5e51db6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 55 deletions.
40 changes: 0 additions & 40 deletions SemanticData/Tests/USNodeSetValidationUnitTestProject/UAReferenceContextTestClass.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,46 +226,6 @@ private bool ListContainingAggregatesTypesFixture(List<IUANodeContext> reference
return true;
}

[TestMethod]
public void IsSubtypeOfReferenceTypeTest()
{
XML.Reference reference = new XML.Reference() { IsForward = true, ReferenceType = ReferenceTypeIds.HasOrderedComponent.ToString(), Value = "ns=1;i=11" };
reference.RecalculateNodeIds(x => NodeId.Parse(x));

Mock<IUANodeContext> sourceMock = new Mock<IUANodeContext>();
Mock<IAddressSpaceBuildContext> asMock = new Mock<IAddressSpaceBuildContext>();
asMock.Setup(x => x.GetOrCreateNodeContext(It.Is<NodeId>(z => z == ReferenceTypeIds.HasOrderedComponent), It.IsAny<Func<NodeId, IUANodeContext>>()));
asMock.Setup(x => x.GetOrCreateNodeContext(It.Is<NodeId>(z => z == NodeId.Parse(reference.Value)), It.IsAny<Func<NodeId, IUANodeContext>>()));
asMock.Setup(x => x.GetBaseTypes(It.IsAny<IUANodeContext>(), It.Is<List<IUANodeContext>>(z => ListOTypesFixture(z))));

UAReferenceContext instance2Test = new UAReferenceContext(reference, asMock.Object, sourceMock.Object);

asMock.Verify(x => x.GetOrCreateNodeContext(It.Is<NodeId>(z => z == ReferenceTypeIds.HasOrderedComponent), It.IsAny<Func<NodeId, IUANodeContext>>()), Times.Once);
asMock.Verify(x => x.GetOrCreateNodeContext(It.Is<NodeId>(z => z == NodeId.Parse(reference.Value)), It.IsAny<Func<NodeId, IUANodeContext>>()), Times.Once);

Assert.IsTrue(instance2Test.IsSubtypeOf(NodeId.Parse("i=123")));
Assert.IsFalse(instance2Test.IsSubtypeOf(NodeId.Parse("i=124")));
}

private bool ListOTypesFixture(List<IUANodeContext> references)
{
Assert.AreEqual<int>(0, references.Count);
Mock<IUANodeContext> node1 = new Mock<IUANodeContext>();
references.Add(node1.Object);
references.Add(node1.Object);
references.Add(node1.Object);
Mock<IUANodeContext> node2 = new Mock<IUANodeContext>();
node2.Setup(x => x.NodeIdContext).Returns(NodeId.Parse("i=123"));
references.Add(node2.Object);
Mock<IUANodeContext> node3 = new Mock<IUANodeContext>();
references.Add(node3.Object);
references.Add(node3.Object);
references.Add(node3.Object);
references.Add(node1.Object);
references.Add(node1.Object);
return true;
}

private bool CreatePathFixture(List<string> z)
{
z.Add("2P8ZkTA2Ccahvs");
Expand Down
1 change: 0 additions & 1 deletion SemanticData/UANodeSetValidation/UANodeContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ void IUANodeBase.CalculateNodeReferences(INodeFactory nodeFactory, IValidator va
_TraceEvent(TraceMessage.DiagnosticTraceMessage($"Removed the graph of nodes at {_ReferenceType.ToString()} from the model"));
return;
}
//TODO UAReferenceContext - causes circular references #558
IReferenceFactory _or = nodeFactory.NewReference();
_or.IsInverse = !_rfx.IsForward;
_or.ReferenceType = _ReferenceType;
Expand Down
26 changes: 12 additions & 14 deletions SemanticData/UANodeSetValidation/UAReferenceContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@ namespace UAOOI.SemanticData.UANodeSetValidation
/// </summary>
public class UAReferenceContext
{
//TODO UAReferenceContext - causes circular references #558

#region constructor

internal UAReferenceContext(Reference reference, IAddressSpaceBuildContext addressSpaceContext, IUANodeContext parentNode)
{
if (reference == null)
throw new ArgumentNullException(nameof(reference));
this.m_AddressSpace = addressSpaceContext ?? throw new ArgumentNullException(nameof(addressSpaceContext));
this._AddressSpace = addressSpaceContext ?? throw new ArgumentNullException(nameof(addressSpaceContext));
if (parentNode == null)
throw new ArgumentNullException(nameof(parentNode));
IUANodeContext targetNode = m_AddressSpace.GetOrCreateNodeContext(reference.ValueNodeId, parentNode.CreateUANodeContext);
IUANodeContext targetNode = _AddressSpace.GetOrCreateNodeContext(reference.ValueNodeId, parentNode.CreateUANodeContext);
this.IsForward = reference.IsForward;
this.SourceNode = reference.IsForward ? parentNode : targetNode;
this.TargetNode = reference.IsForward ? targetNode : parentNode;
Expand All @@ -55,15 +54,15 @@ internal ReferenceKindEnum ReferenceKind
get
{
if (_ReferenceKindEnum == null)
_ReferenceKindEnum = CalculateReferenceKind(this.TypeNode);
_ReferenceKindEnum = CalculateReferenceKind();
return _ReferenceKindEnum.Value;
}
}

/// <summary>
/// Gets the modeling rule.
/// </summary>
/// <returns>System.Nullable&lt;ModelingRules&gt;.</returns>
/// <returns>System.Nullable{ModelingRules}.</returns>
internal ModelingRules? GetModelingRule()
{
Debug.Assert(TargetNode.NodeIdContext.IdType == IdType.Numeric_0);
Expand All @@ -86,7 +85,7 @@ internal ReferenceKindEnum ReferenceKind
/// <summary>
/// Gets a value indicating whether the reference has been derived form <see cref="ReferenceKindEnum.HasProperty"/> or <see cref="ReferenceKindEnum.HasComponent"/>.
/// </summary>
/// <value><c>true</c> if is child reference; otherwise, <c>false</c>.</value>
/// <value><c>true</c> if it is child reference; otherwise, <c>false</c>.</value>
internal bool ChildConnector => (ReferenceKind == ReferenceKindEnum.HasProperty) || (ReferenceKind == ReferenceKindEnum.HasComponent);

#endregion semantics
Expand All @@ -96,14 +95,14 @@ internal ReferenceKindEnum ReferenceKind
/// <summary>
/// Gets the name of the reference type.
/// </summary>
/// <returns>XmlQualifiedName.</returns>
/// <returns>An instance of <see cref="XmlQualifiedName"/> capturing name of the reference type.</returns>
internal XmlQualifiedName GetReferenceTypeName()
{
return m_AddressSpace.ExportBrowseName(this.TypeNode.NodeIdContext, GetDefault());
return _AddressSpace.ExportBrowseName(this.TypeNode.NodeIdContext, GetDefault());
}

/// <summary>
/// Calculates the browse path starting from the node pointed out by this reference. If <see cref="XML.Reference.IsForward"/> is <c>true</c> <see cref="UAReferenceContext.TargetNode"/> is use, <see cref="UAReferenceContext.SourceNode"/> otherwise.
/// Calculates the browse path starting from the node pointed out by this reference. If <see cref="XML.Reference.IsForward"/> the <see cref="UAReferenceContext.TargetNode"/> is use, <see cref="UAReferenceContext.SourceNode"/> otherwise.
/// </summary>
/// <returns>An instance of <see cref="XmlQualifiedName" /> representing the browse path.</returns>
internal XmlQualifiedName BrowsePath()
Expand All @@ -112,7 +111,7 @@ internal XmlQualifiedName BrowsePath()
IUANodeContext _startingNode = this.IsForward ? TargetNode : SourceNode;
_startingNode.BuildSymbolicId(_path);
string _symbolicId = _path.SymbolicName();
return new XmlQualifiedName(_symbolicId, m_AddressSpace.GetNamespace(_startingNode.NodeIdContext.NamespaceIndex));
return new XmlQualifiedName(_symbolicId, _AddressSpace.GetNamespace(_startingNode.NodeIdContext.NamespaceIndex));
}

/// <summary>
Expand Down Expand Up @@ -171,19 +170,18 @@ internal void BuildSymbolicId(List<string> path)
#region private

//fields
private IAddressSpaceBuildContext m_AddressSpace;
private IAddressSpaceBuildContext _AddressSpace;

private ReferenceKindEnum? _ReferenceKindEnum = new Nullable<ReferenceKindEnum>();

//methods
private ReferenceKindEnum CalculateReferenceKind(IUANodeContext typeNode)
private ReferenceKindEnum CalculateReferenceKind()
{
if ((TypeNode == null) || TypeNode.NodeIdContext.NamespaceIndex != 0)
return ReferenceKindEnum.Custom;
ReferenceKindEnum _ret = default(ReferenceKindEnum);
List<IUANodeContext> inheritanceChain = new List<IUANodeContext>();
m_AddressSpace.GetBaseTypes(TypeNode, inheritanceChain);
//HierarchicalReferences
_AddressSpace.GetBaseTypes(TypeNode, inheritanceChain);
if (inheritanceChain.Where<IUANodeContext>(x => x.NodeIdContext == ReferenceTypeIds.HasProperty).Any<IUANodeContext>())
_ret = ReferenceKindEnum.HasProperty;
else if (inheritanceChain.Where<IUANodeContext>(x => x.NodeIdContext == ReferenceTypeIds.HasComponent).Any<IUANodeContext>())
Expand Down

0 comments on commit 5e51db6

Please sign in to comment.