Add a warning that the AS contains nodes orphaned and inaccessible fo…

…r browsing starting from the Root node #529 - prototyping with XMLModelsProblemsToReportUnitTest.cs - Added errors to signal that nodes have been duplicated (have same NodeId) - working copy
mpostol · Feb 21, 2021 · 808969e · 808969e
1 parent dc53d36
commit 808969e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/...ta/Tests/USNodeSetValidationUnitTestProject/ModelFactoryTestingFixture/NodeFactoryBase.cs b/...ta/Tests/USNodeSetValidationUnitTestProject/ModelFactoryTestingFixture/NodeFactoryBase.cs
@@ -27,7 +27,7 @@ internal class NodeFactoryBase : NodesContainer, INodeFactory
     /// <value>The BrowseName of the node.</value>
     public string BrowseName
     {
-      set { }
+      set; get;
     }
 
     /// <summary>

diff --git a/SemanticData/Tests/USNodeSetValidationUnitTestProject/XMLModelsProblemsToReportUnitTest.cs b/SemanticData/Tests/USNodeSetValidationUnitTestProject/XMLModelsProblemsToReportUnitTest.cs
@@ -78,13 +78,15 @@ public void eoursel510Test()
         List<IUANodeContext> orphanedNodes = new List<IUANodeContext>();
         foreach (IUANodeContext item in allNodes)
         {
-          if (!nodesDictionary.ContainsKey(item.BrowseName.Name))
+          if (!nodesDictionary.ContainsKey(item.BrowseName.ToString()))
           {
             orphanedNodes.Add(item);
             Debug.WriteLine($"The following node has been removed from the model: {item.ToString()}");
           }
         }
-        Debug.WriteLine($"After removing inherited and instance declaration nodes the recovered information model contains {nodes.Count<NodeFactoryBase>()}");
+        Debug.WriteLine($"The recovered information model contains {nodes.Count<NodeFactoryBase>()} nodes");
+        Debug.WriteLine($"The source information model contains {allNodes.Count<IUANodeContext>()} nodes");
+        Debug.WriteLine($"Number of nodes not considered for export {orphanedNodes.Count<IUANodeContext>()}");
       }
     }
 

diff --git a/SemanticData/UANodeSetValidation/AddressSpaceContext.cs b/SemanticData/UANodeSetValidation/AddressSpaceContext.cs
@@ -282,8 +282,14 @@ private Uri ImportNodeSet(UANodeSet model)
       IUAModelContext _modelContext = model.ParseUAModelContext(m_NamespaceTable, m_TraceEvent.TraceEvent);
       m_TraceEvent.TraceEvent(TraceMessage.DiagnosticTraceMessage($"Entering AddressSpaceContext.ImportNodeSet - starting import {_modelContext}."));
       m_TraceEvent.TraceEvent(TraceMessage.DiagnosticTraceMessage("AddressSpaceContext.ImportNodeSet - the context for the imported model is created and starting import nodes."));
-      foreach (UANode _nd in model.Items)
-        ImportUANode(_nd);
+      Dictionary<string, UANode> itemsDictionary = new Dictionary<string, UANode>();
+      foreach (UANode node in model.Items)
+      {
+        if (itemsDictionary.ContainsKey(node.NodeId.ToString()))
+          m_TraceEvent.TraceEvent(TraceMessage.BuildErrorTraceMessage(BuildError.NotSupportedFeature, $"{node.ToString()} has been duplicated in the imported model and is removed from further processing"));
+        else
+          ImportUANode(node);
+      }
       m_TraceEvent.TraceEvent(TraceMessage.DiagnosticTraceMessage($"Finishing AddressSpaceContext.ImportNodeSet - imported {model.Items.Length} nodes."));
       return _modelContext.ModelUri;
     }