Update models to harmonize with current UA-ModelCompiler release #655

- fixed some UT - Warning - there are still UT errors - recover the model using current version of the asp
mpostol · Apr 6, 2022 · 45ff5bd · 45ff5bd
1 parent 98d0f9a
commit 45ff5bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/SemanticData/Tests/USNodeSetValidationUnitTestProject/AddressSpaceContextUnitTest.cs b/SemanticData/Tests/USNodeSetValidationUnitTestProject/AddressSpaceContextUnitTest.cs
@@ -166,7 +166,7 @@ public void AddressSpaceContextValidateAndExportIndex0()
       TracedAddressSpaceContext _asp = new TracedAddressSpaceContext();
       IEnumerable<IUANodeContext> _returnValue = null;
       _asp.AddressSpaceContext.UTValidateAndExportModel(0, x => _returnValue = x);
-      Assert.AreEqual<int>(3909, (_returnValue.Count<IUANodeContext>()));
+      Assert.AreEqual<int>(4071, (_returnValue.Count<IUANodeContext>()));
       _asp.TestConsistency(0);
       _asp.AddressSpaceContext.UTValidateAndExportModel(1, x => _returnValue = x);
       Assert.AreEqual<int>(0, _returnValue.Count<IUANodeContext>());

diff --git a/SemanticData/UAModelDesignExport.UnitTest/UAResourcesUnitTestUnitTest.cs b/SemanticData/UAModelDesignExport.UnitTest/UAResourcesUnitTestUnitTest.cs
@@ -18,20 +18,20 @@ public void LoadUADefinedTypesTestMethod()
     {
       ModelDesign newInstance = UAResources.LoadUADefinedTypes();
       Assert.IsNotNull(newInstance);
-      Assert.AreEqual<int>(708, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace).Count<NodeDesign>());
-      Assert.AreEqual<int>(12, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 0).Count<NodeDesign>());
+      Assert.AreEqual<int>(749, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace).Count<NodeDesign>());
+      Assert.AreEqual<int>(17, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 0).Count<NodeDesign>());
       Assert.AreEqual<int>(0, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 1).Count<NodeDesign>());
       Assert.AreEqual<int>(0, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 2).Count<NodeDesign>());
-      Assert.AreEqual<int>(101, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 3).Count<NodeDesign>());
-      Assert.AreEqual<int>(55, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 4).Count<NodeDesign>());
+      Assert.AreEqual<int>(102, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 3).Count<NodeDesign>());
+      Assert.AreEqual<int>(53, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 4).Count<NodeDesign>());
       Assert.AreEqual<int>(209, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 5).Count<NodeDesign>());
       Assert.AreEqual<int>(0, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 6).Count<NodeDesign>());
       Assert.AreEqual<int>(0, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 7).Count<NodeDesign>());
       Assert.AreEqual<int>(22, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 8).Count<NodeDesign>());
       Assert.AreEqual<int>(65, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 9).Count<NodeDesign>());
       Assert.AreEqual<int>(8, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 10).Count<NodeDesign>());
       Assert.AreEqual<int>(16, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 11).Count<NodeDesign>());
-      Assert.AreEqual<int>(26, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 12).Count<NodeDesign>());
+      Assert.AreEqual<int>(33, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 12).Count<NodeDesign>());
       Assert.AreEqual<int>(38, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 13).Count<NodeDesign>());
       Assert.AreEqual<int>(146, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 14).Count<NodeDesign>());
       Assert.AreEqual<int>(0, newInstance.Items.Where<NodeDesign>(x => !x.NotInAddressSpace && x.PartNo == 15).Count<NodeDesign>());