From 27ac6bde99fda9e2a70b362650b9e8676d04fbd0 Mon Sep 17 00:00:00 2001 From: MPostol Date: Fri, 1 Apr 2022 23:31:39 +0200 Subject: [PATCH] Update models to harmonize with current UA-ModelCompiler release #655 Updated SemanticData/UAModelDesignExport.UnitTest/Models/ using UA-Compiler Version 2.1.1.0 --- .../Models/DataTypeTest.csv | 4 + .../DataTypeTest/DataTypeTest.Classes.cs | 146 +++-- .../DataTypeTest/DataTypeTest.NodeIds.csv | 12 + .../DataTypeTest/DataTypeTest.NodeSet.xml | 272 ++++++++-- .../DataTypeTest/DataTypeTest.NodeSet2.xml | 236 ++++---- .../DataTypeTest.PredefinedNodes.uanodes | Bin 6559 -> 6954 bytes .../DataTypeTest.PredefinedNodes.xml | 506 ++++++++++++------ .../DataTypeTest/DataTypeTest.Types.bsd | 1 - .../Models/GoNodeSet.cmd | 6 + .../Models/ModelCompiler.log | Bin 0 -> 2536 bytes .../ObjectTypeTest/ObjectTypeTest.Classes.cs | 44 +- .../ObjectTypeTest/ObjectTypeTest.NodeIds.csv | 3 + .../ObjectTypeTest/ObjectTypeTest.NodeSet.xml | 37 +- .../ObjectTypeTest.NodeSet2.xml | 15 +- .../ObjectTypeTest.PredefinedNodes.xml | 2 - .../ObjectTypeTest/ObjectTypeTest.Types.bsd | 1 - .../ReferenceTest/ReferenceTest.Classes.cs | 2 +- .../ReferenceTest/ReferenceTest.NodeIds.csv | 1 + .../ReferenceTest/ReferenceTest.NodeSet2.xml | 15 +- .../ReferenceTest.PredefinedNodes.xml | 1 - .../ReferenceTest/ReferenceTest.Types.bsd | 1 - .../VariableTypeTest.Classes.cs | 37 +- .../VariableTypeTest.NodeIds.csv | 3 + .../VariableTypeTest.NodeSet2.xml | 15 +- .../VariableTypeTest.PredefinedNodes.xml | 1 - .../VariableTypeTest.Types.bsd | 1 - 26 files changed, 931 insertions(+), 431 deletions(-) create mode 100644 SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeIds.csv create mode 100644 SemanticData/UAModelDesignExport.UnitTest/Models/GoNodeSet.cmd create mode 100644 SemanticData/UAModelDesignExport.UnitTest/Models/ModelCompiler.log create mode 100644 SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeIds.csv create mode 100644 SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.NodeIds.csv create mode 100644 SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.NodeIds.csv diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.csv b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.csv index 9f4683c0..8015f68e 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.csv +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.csv @@ -1,9 +1,11 @@ +cas_BinarySchema_Deprecated,1,Variable cas_XmlSchema,2,Variable cas_XmlSchema_DataTypeVersion,3,Variable cas_XmlSchema_NamespaceUri,4,Variable cas_BinarySchema,5,Variable cas_BinarySchema_DataTypeVersion,6,Variable cas_BinarySchema_NamespaceUri,7,Variable +cas_XmlSchema_Deprecated,8,Variable AbstractEnumerationDataType,9,DataType AbstractEnumerationDataType_EnumStrings,10,Variable EnumerationDataType,11,DataType @@ -26,3 +28,5 @@ DerivedStructure_Encoding_DefaultBinary,27,Object cas_BinarySchema_DerivedStructure,28,Variable cas_BinarySchema_DerivedStructure_DataTypeVersion,29,Variable cas_BinarySchema_DerivedStructure_DictionaryFragment,30,Variable +AbstractStructure_Encoding_DefaultJson,31,Object +DerivedStructure_Encoding_DefaultJson,32,Object diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Classes.cs b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Classes.cs index 27b05d46..10911127 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Classes.cs +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Classes.cs @@ -1,5 +1,5 @@ /* ======================================================================== - * Copyright (c) 2005-2016 The OPC Foundation, Inc. All rights reserved. + * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 * @@ -74,6 +74,16 @@ public static partial class DataTypes [System.CodeDom.Compiler.GeneratedCodeAttribute("Opc.Ua.ModelCompiler", "1.0.0.0")] public static partial class Objects { + /// + /// The identifier for the AbstractStructure_Encoding_DefaultBinary Object. + /// + public const uint AbstractStructure_Encoding_DefaultBinary = 18; + + /// + /// The identifier for the DerivedStructure_Encoding_DefaultBinary Object. + /// + public const uint DerivedStructure_Encoding_DefaultBinary = 27; + /// /// The identifier for the AbstractStructure_Encoding_DefaultXml Object. /// @@ -85,14 +95,14 @@ public static partial class Objects public const uint DerivedStructure_Encoding_DefaultXml = 23; /// - /// The identifier for the AbstractStructure_Encoding_DefaultBinary Object. + /// The identifier for the AbstractStructure_Encoding_DefaultJson Object. /// - public const uint AbstractStructure_Encoding_DefaultBinary = 18; + public const uint AbstractStructure_Encoding_DefaultJson = 31; /// - /// The identifier for the DerivedStructure_Encoding_DefaultBinary Object. + /// The identifier for the DerivedStructure_Encoding_DefaultJson Object. /// - public const uint DerivedStructure_Encoding_DefaultBinary = 27; + public const uint DerivedStructure_Encoding_DefaultJson = 32; } #endregion @@ -115,44 +125,54 @@ public static partial class Variables public const uint EnumerationDataType_EnumValues = 12; /// - /// The identifier for the cas_XmlSchema Variable. + /// The identifier for the cas_BinarySchema Variable. /// - public const uint cas_XmlSchema = 2; + public const uint cas_BinarySchema = 5; /// - /// The identifier for the cas_XmlSchema_NamespaceUri Variable. + /// The identifier for the cas_BinarySchema_NamespaceUri Variable. /// - public const uint cas_XmlSchema_NamespaceUri = 4; + public const uint cas_BinarySchema_NamespaceUri = 7; /// - /// The identifier for the cas_XmlSchema_AbstractStructure Variable. + /// The identifier for the cas_BinarySchema_Deprecated Variable. /// - public const uint cas_XmlSchema_AbstractStructure = 15; + public const uint cas_BinarySchema_Deprecated = 1; /// - /// The identifier for the cas_XmlSchema_DerivedStructure Variable. + /// The identifier for the cas_BinarySchema_AbstractStructure Variable. /// - public const uint cas_XmlSchema_DerivedStructure = 24; + public const uint cas_BinarySchema_AbstractStructure = 19; /// - /// The identifier for the cas_BinarySchema Variable. + /// The identifier for the cas_BinarySchema_DerivedStructure Variable. /// - public const uint cas_BinarySchema = 5; + public const uint cas_BinarySchema_DerivedStructure = 28; /// - /// The identifier for the cas_BinarySchema_NamespaceUri Variable. + /// The identifier for the cas_XmlSchema Variable. /// - public const uint cas_BinarySchema_NamespaceUri = 7; + public const uint cas_XmlSchema = 2; /// - /// The identifier for the cas_BinarySchema_AbstractStructure Variable. + /// The identifier for the cas_XmlSchema_NamespaceUri Variable. /// - public const uint cas_BinarySchema_AbstractStructure = 19; + public const uint cas_XmlSchema_NamespaceUri = 4; /// - /// The identifier for the cas_BinarySchema_DerivedStructure Variable. + /// The identifier for the cas_XmlSchema_Deprecated Variable. /// - public const uint cas_BinarySchema_DerivedStructure = 28; + public const uint cas_XmlSchema_Deprecated = 8; + + /// + /// The identifier for the cas_XmlSchema_AbstractStructure Variable. + /// + public const uint cas_XmlSchema_AbstractStructure = 15; + + /// + /// The identifier for the cas_XmlSchema_DerivedStructure Variable. + /// + public const uint cas_XmlSchema_DerivedStructure = 24; } #endregion @@ -194,6 +214,16 @@ public static partial class DataTypeIds [System.CodeDom.Compiler.GeneratedCodeAttribute("Opc.Ua.ModelCompiler", "1.0.0.0")] public static partial class ObjectIds { + /// + /// The identifier for the AbstractStructure_Encoding_DefaultBinary Object. + /// + public static readonly ExpandedNodeId AbstractStructure_Encoding_DefaultBinary = new ExpandedNodeId(DataTypeTest.Objects.AbstractStructure_Encoding_DefaultBinary, DataTypeTest.Namespaces.cas); + + /// + /// The identifier for the DerivedStructure_Encoding_DefaultBinary Object. + /// + public static readonly ExpandedNodeId DerivedStructure_Encoding_DefaultBinary = new ExpandedNodeId(DataTypeTest.Objects.DerivedStructure_Encoding_DefaultBinary, DataTypeTest.Namespaces.cas); + /// /// The identifier for the AbstractStructure_Encoding_DefaultXml Object. /// @@ -205,14 +235,14 @@ public static partial class ObjectIds public static readonly ExpandedNodeId DerivedStructure_Encoding_DefaultXml = new ExpandedNodeId(DataTypeTest.Objects.DerivedStructure_Encoding_DefaultXml, DataTypeTest.Namespaces.cas); /// - /// The identifier for the AbstractStructure_Encoding_DefaultBinary Object. + /// The identifier for the AbstractStructure_Encoding_DefaultJson Object. /// - public static readonly ExpandedNodeId AbstractStructure_Encoding_DefaultBinary = new ExpandedNodeId(DataTypeTest.Objects.AbstractStructure_Encoding_DefaultBinary, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId AbstractStructure_Encoding_DefaultJson = new ExpandedNodeId(DataTypeTest.Objects.AbstractStructure_Encoding_DefaultJson, DataTypeTest.Namespaces.cas); /// - /// The identifier for the DerivedStructure_Encoding_DefaultBinary Object. + /// The identifier for the DerivedStructure_Encoding_DefaultJson Object. /// - public static readonly ExpandedNodeId DerivedStructure_Encoding_DefaultBinary = new ExpandedNodeId(DataTypeTest.Objects.DerivedStructure_Encoding_DefaultBinary, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId DerivedStructure_Encoding_DefaultJson = new ExpandedNodeId(DataTypeTest.Objects.DerivedStructure_Encoding_DefaultJson, DataTypeTest.Namespaces.cas); } #endregion @@ -235,44 +265,54 @@ public static partial class VariableIds public static readonly ExpandedNodeId EnumerationDataType_EnumValues = new ExpandedNodeId(DataTypeTest.Variables.EnumerationDataType_EnumValues, DataTypeTest.Namespaces.cas); /// - /// The identifier for the cas_XmlSchema Variable. + /// The identifier for the cas_BinarySchema Variable. /// - public static readonly ExpandedNodeId cas_XmlSchema = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId cas_BinarySchema = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema, DataTypeTest.Namespaces.cas); /// - /// The identifier for the cas_XmlSchema_NamespaceUri Variable. + /// The identifier for the cas_BinarySchema_NamespaceUri Variable. /// - public static readonly ExpandedNodeId cas_XmlSchema_NamespaceUri = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_NamespaceUri, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId cas_BinarySchema_NamespaceUri = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_NamespaceUri, DataTypeTest.Namespaces.cas); /// - /// The identifier for the cas_XmlSchema_AbstractStructure Variable. + /// The identifier for the cas_BinarySchema_Deprecated Variable. /// - public static readonly ExpandedNodeId cas_XmlSchema_AbstractStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_AbstractStructure, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId cas_BinarySchema_Deprecated = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_Deprecated, DataTypeTest.Namespaces.cas); /// - /// The identifier for the cas_XmlSchema_DerivedStructure Variable. + /// The identifier for the cas_BinarySchema_AbstractStructure Variable. /// - public static readonly ExpandedNodeId cas_XmlSchema_DerivedStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_DerivedStructure, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId cas_BinarySchema_AbstractStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_AbstractStructure, DataTypeTest.Namespaces.cas); /// - /// The identifier for the cas_BinarySchema Variable. + /// The identifier for the cas_BinarySchema_DerivedStructure Variable. /// - public static readonly ExpandedNodeId cas_BinarySchema = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId cas_BinarySchema_DerivedStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_DerivedStructure, DataTypeTest.Namespaces.cas); /// - /// The identifier for the cas_BinarySchema_NamespaceUri Variable. + /// The identifier for the cas_XmlSchema Variable. /// - public static readonly ExpandedNodeId cas_BinarySchema_NamespaceUri = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_NamespaceUri, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId cas_XmlSchema = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema, DataTypeTest.Namespaces.cas); /// - /// The identifier for the cas_BinarySchema_AbstractStructure Variable. + /// The identifier for the cas_XmlSchema_NamespaceUri Variable. /// - public static readonly ExpandedNodeId cas_BinarySchema_AbstractStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_AbstractStructure, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId cas_XmlSchema_NamespaceUri = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_NamespaceUri, DataTypeTest.Namespaces.cas); /// - /// The identifier for the cas_BinarySchema_DerivedStructure Variable. + /// The identifier for the cas_XmlSchema_Deprecated Variable. /// - public static readonly ExpandedNodeId cas_BinarySchema_DerivedStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_DerivedStructure, DataTypeTest.Namespaces.cas); + public static readonly ExpandedNodeId cas_XmlSchema_Deprecated = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_Deprecated, DataTypeTest.Namespaces.cas); + + /// + /// The identifier for the cas_XmlSchema_AbstractStructure Variable. + /// + public static readonly ExpandedNodeId cas_XmlSchema_AbstractStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_AbstractStructure, DataTypeTest.Namespaces.cas); + + /// + /// The identifier for the cas_XmlSchema_DerivedStructure Variable. + /// + public static readonly ExpandedNodeId cas_XmlSchema_DerivedStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_DerivedStructure, DataTypeTest.Namespaces.cas); } #endregion @@ -335,22 +375,18 @@ public static partial class Namespaces #region AbstractEnumerationDataType Enumeration #if (!OPCUA_EXCLUDE_AbstractEnumerationDataType) /// - /// A description for the AbstractEnumerationDataType DataType. + /// /// /// [System.CodeDom.Compiler.GeneratedCodeAttribute("Opc.Ua.ModelCompiler", "1.0.0.0")] [DataContract(Namespace = DataTypeTest.Namespaces.cas)] public enum AbstractEnumerationDataType { - /// - /// A description for the Field1 field. - /// + /// [EnumMember(Value = "Field1_0")] Field1 = 0, - /// - /// A description for the Field2 field. - /// + /// [EnumMember(Value = "Field2_1")] Field2 = 1, } @@ -452,9 +488,7 @@ public object Clone() [DataContract(Namespace = DataTypeTest.Namespaces.cas)] public enum EnumerationDataType { - /// - /// A description for the Field3 field. - /// + /// [EnumMember(Value = "Field3_1")] Field3 = 1, } @@ -584,9 +618,7 @@ private void Initialize() #endregion #region Public Properties - /// - /// A description for the Number field. - /// + /// [DataMember(Name = "Number", IsRequired = false, Order = 1)] public Variant Number { @@ -768,7 +800,7 @@ public object Clone() #region DerivedStructure Class #if (!OPCUA_EXCLUDE_DerivedStructure) /// - /// A description for the DerivedStructure DataType. + /// /// /// [System.CodeDom.Compiler.GeneratedCodeAttribute("Opc.Ua.ModelCompiler", "1.0.0.0")] @@ -803,9 +835,7 @@ private void Initialize() #endregion #region Public Properties - /// - /// Derived from Number - /// + /// [DataMember(Name = "Number", IsRequired = false, Order = 1)] public int Number { diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeIds.csv b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeIds.csv new file mode 100644 index 00000000..a7ce3575 --- /dev/null +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeIds.csv @@ -0,0 +1,12 @@ +AbstractEnumerationDataType,9,DataType +AbstractStructure,13,DataType +AbstractStructure_Encoding_DefaultBinary,18,Object +AbstractStructure_Encoding_DefaultJson,31,Object +AbstractStructure_Encoding_DefaultXml,14,Object +cas_BinarySchema,5,Variable +cas_XmlSchema,2,Variable +DerivedStructure,22,DataType +DerivedStructure_Encoding_DefaultBinary,27,Object +DerivedStructure_Encoding_DefaultJson,32,Object +DerivedStructure_Encoding_DefaultXml,23,Object +EnumerationDataType,11,DataType diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeSet.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeSet.xml index 5a5c1638..affffcfd 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeSet.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeSet.xml @@ -6,6 +6,61 @@ + + + ns=1;i=1 + + Variable_2 + + 0 + Deprecated + + + + Deprecated + + + 0 + 0 + + + 0 + + + + i=46 + + true + + ns=1;i=5 + + + + + i=40 + + false + + i=68 + + + + + + true + + + + i=1 + + -1 + + 1 + 1 + 0 + false + 0 + ns=1;i=2 @@ -53,6 +108,15 @@ ns=1;i=4 + + + i=46 + + false + + ns=1;i=8 + + i=47 @@ -157,10 +221,7 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ NamespaceUri - - - A URI that uniquely identifies the dictionary. - + 0 0 @@ -249,6 +310,15 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ns=1;i=7 + + + i=46 + + false + + ns=1;i=1 + + i=47 @@ -325,10 +395,7 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= NamespaceUri - - - A URI that uniquely identifies the dictionary. - + 0 0 @@ -370,6 +437,61 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= false 0 + + + ns=1;i=8 + + Variable_2 + + 0 + Deprecated + + + + Deprecated + + + 0 + 0 + + + 0 + + + + i=46 + + true + + ns=1;i=2 + + + + + i=40 + + false + + i=68 + + + + + + true + + + + i=1 + + -1 + + 1 + 1 + 0 + false + 0 + ns=1;i=9 @@ -459,25 +581,14 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= i=68 - - - i=37 - - false - - i=78 - - - Field1 - Field2 @@ -487,7 +598,9 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= i=21 1 - + + 0 + 1 1 0 @@ -577,15 +690,6 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= i=68 - - - i=37 - - false - - i=78 - - @@ -598,10 +702,8 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= 1 - Field3 - @@ -612,7 +714,9 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= i=7594 1 - + + 0 + 1 1 0 @@ -660,6 +764,15 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= ns=1;i=22 + + + i=38 + + false + + ns=1;i=18 + + i=38 @@ -675,7 +788,7 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= false - ns=1;i=18 + ns=1;i=31 @@ -921,6 +1034,15 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= ns=1;i=13 + + + i=38 + + false + + ns=1;i=27 + + i=38 @@ -936,7 +1058,7 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= false - ns=1;i=27 + ns=1;i=32 @@ -1153,5 +1275,87 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= false 0 + + + ns=1;i=31 + + Object_1 + + 0 + Default JSON + + + + Default JSON + + + 0 + 0 + + + 0 + + + + i=40 + + false + + i=76 + + + + + i=38 + + true + + ns=1;i=13 + + + + 0 + + + + ns=1;i=32 + + Object_1 + + 0 + Default JSON + + + + Default JSON + + + 0 + 0 + + + 0 + + + + i=40 + + false + + i=76 + + + + + i=38 + + true + + ns=1;i=22 + + + + 0 + \ No newline at end of file diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeSet2.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeSet2.xml index 8cdc293d..a37298dc 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeSet2.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeSet2.xml @@ -1,11 +1,11 @@  - + http://cas.eu/UA/CommServer/UnitTests/DataTypeTest - + @@ -44,6 +44,17 @@ i=37 i=38 i=39 + i=53 + i=52 + i=51 + i=54 + i=9004 + i=9005 + i=17597 + i=9006 + i=15112 + i=17604 + i=17603 AbstractEnumerationDataType @@ -51,28 +62,23 @@ ns=1;i=10 i=29 - + - + EnumStrings i=68 - i=78 ns=1;i=9 - - Field1 - - Field2 @@ -85,15 +91,14 @@ ns=1;i=12 ns=1;i=9 - + - + EnumValues i=68 - i=78 ns=1;i=11 @@ -106,11 +111,8 @@ 1 - - Field3 - @@ -123,7 +125,7 @@ i=22 - + @@ -132,12 +134,110 @@ ns=1;i=13 - + Derived from Number + + Default Binary + + ns=1;i=13 + ns=1;i=19 + i=76 + + + + Default Binary + + ns=1;i=22 + ns=1;i=28 + i=76 + + + + DataTypeTest + + ns=1;i=7 + ns=1;i=1 + ns=1;i=19 + ns=1;i=28 + i=93 + i=72 + + + PG9wYzpUeXBlRGljdGlvbmFyeQ0KICB4bWxuczpvcGM9Imh0dHA6Ly9vcGNmb3VuZGF0aW9uLm9y +Zy9CaW5hcnlTY2hlbWEvIg0KICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1M +U2NoZW1hLWluc3RhbmNlIg0KICB4bWxuczp1YT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VB +LyINCiAgeG1sbnM6dG5zPSJodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL0Rh +dGFUeXBlVGVzdCINCiAgRGVmYXVsdEJ5dGVPcmRlcj0iTGl0dGxlRW5kaWFuIg0KICBUYXJnZXRO +YW1lc3BhY2U9Imh0dHA6Ly9jYXMuZXUvVUEvQ29tbVNlcnZlci9Vbml0VGVzdHMvRGF0YVR5cGVU +ZXN0Ig0KPg0KICA8IS0tIFRoaXMgRmlsZSB3YXMgZ2VuZXJhdGVkIG9uIDIwMjItMDMtMzEgYW5k +IHN1cHBvcnRzIHRoZSBzcGVjaWZpY2F0aW9ucyBzdXBwb3J0ZWQgYnkgdmVyc2lvbiAxLjExLjMz +NS4xMCBvZiB0aGUgT1BDIFVBIGRlbGl2ZXJhYmxlcy4gLS0+DQogIDxvcGM6SW1wb3J0IE5hbWVz +cGFjZT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VBLyIgTG9jYXRpb249Ii5CaW5hcnlTY2hl +bWEuYnNkIi8+DQoNCiAgPG9wYzpFbnVtZXJhdGVkVHlwZSBOYW1lPSJBYnN0cmFjdEVudW1lcmF0 +aW9uRGF0YVR5cGUiIExlbmd0aEluQml0cz0iMzIiPg0KICAgIDxvcGM6RW51bWVyYXRlZFZhbHVl +IE5hbWU9IkZpZWxkMSIgVmFsdWU9IjAiIC8+DQogICAgPG9wYzpFbnVtZXJhdGVkVmFsdWUgTmFt +ZT0iRmllbGQyIiBWYWx1ZT0iMSIgLz4NCiAgPC9vcGM6RW51bWVyYXRlZFR5cGU+DQoNCiAgPG9w +YzpFbnVtZXJhdGVkVHlwZSBOYW1lPSJFbnVtZXJhdGlvbkRhdGFUeXBlIiBMZW5ndGhJbkJpdHM9 +IjMyIj4NCiAgICA8b3BjOkRvY3VtZW50YXRpb24+RW51bWVyYXRpb24gRGF0YVR5cGUgZGVyaXZl +ZCBmcm9tIGFic3RyYWN0IHR5cGU8L29wYzpEb2N1bWVudGF0aW9uPg0KICAgIDxvcGM6RW51bWVy +YXRlZFZhbHVlIE5hbWU9IkZpZWxkMSIgVmFsdWU9IjAiIC8+DQogICAgPG9wYzpFbnVtZXJhdGVk +VmFsdWUgTmFtZT0iRmllbGQyIiBWYWx1ZT0iMSIgLz4NCiAgICA8b3BjOkVudW1lcmF0ZWRWYWx1 +ZSBOYW1lPSJGaWVsZDMiIFZhbHVlPSIxIiAvPg0KICA8L29wYzpFbnVtZXJhdGVkVHlwZT4NCg0K +ICA8b3BjOlN0cnVjdHVyZWRUeXBlIE5hbWU9IkFic3RyYWN0U3RydWN0dXJlIiBCYXNlVHlwZT0i +dWE6RXh0ZW5zaW9uT2JqZWN0Ij4NCiAgICA8b3BjOkRvY3VtZW50YXRpb24+QWJzdHJhY3Qgc3Ry +dWN0dXJlPC9vcGM6RG9jdW1lbnRhdGlvbj4NCiAgICA8b3BjOkZpZWxkIE5hbWU9Ik51bWJlciIg +VHlwZU5hbWU9InVhOlZhcmlhbnQiIC8+DQogIDwvb3BjOlN0cnVjdHVyZWRUeXBlPg0KDQogIDxv +cGM6U3RydWN0dXJlZFR5cGUgTmFtZT0iRGVyaXZlZFN0cnVjdHVyZSIgQmFzZVR5cGU9InRuczpB +YnN0cmFjdFN0cnVjdHVyZSI+DQogICAgPG9wYzpGaWVsZCBOYW1lPSJOdW1iZXIiIFR5cGVOYW1l +PSJ1YTpWYXJpYW50IiBTb3VyY2VUeXBlPSJ0bnM6QWJzdHJhY3RTdHJ1Y3R1cmUiIC8+DQogICAg +PG9wYzpGaWVsZCBOYW1lPSJOdW1iZXIiIFR5cGVOYW1lPSJvcGM6SW50MzIiIC8+DQogIDwvb3Bj +OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= + + + + NamespaceUri + + i=68 + ns=1;i=5 + + + http://cas.eu/UA/CommServer/UnitTests/DataTypeTest + + + + Deprecated + + i=68 + ns=1;i=5 + + + true + + + + AbstractStructure + + i=69 + ns=1;i=5 + + + AbstractStructure + + + + DerivedStructure + + i=69 + ns=1;i=5 + + + DerivedStructure + + Default XML @@ -154,10 +254,11 @@ i=76 - + DataTypeTest ns=1;i=4 + ns=1;i=8 ns=1;i=15 ns=1;i=24 i=92 @@ -223,9 +324,8 @@ YW1lPSJMaXN0T2ZEZXJpdmVkU3RydWN0dXJlIiB0eXBlPSJ0bnM6TGlzdE9mRGVyaXZlZFN0cnVj dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ - + NamespaceUri - A URI that uniquely identifies the dictionary. i=68 ns=1;i=2 @@ -234,7 +334,17 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+http://cas.eu/UA/CommServer/UnitTests/DataTypeTest - + + Deprecated + + i=68 + ns=1;i=2 + + + true + + + AbstractStructure i=69 @@ -244,7 +354,7 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+//xs:element[@name='AbstractStructure'] - + DerivedStructure i=69 @@ -254,92 +364,18 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+//xs:element[@name='DerivedStructure'] - - Default Binary + + Default JSON ns=1;i=13 - ns=1;i=19 i=76 - - Default Binary + + Default JSON ns=1;i=22 - ns=1;i=28 i=76 - - DataTypeTest - - ns=1;i=7 - ns=1;i=19 - ns=1;i=28 - i=93 - i=72 - - - PG9wYzpUeXBlRGljdGlvbmFyeQ0KICB4bWxuczpvcGM9Imh0dHA6Ly9vcGNmb3VuZGF0aW9uLm9y -Zy9CaW5hcnlTY2hlbWEvIg0KICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1M -U2NoZW1hLWluc3RhbmNlIg0KICB4bWxuczp1YT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VB -LyINCiAgeG1sbnM6dG5zPSJodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL0Rh -dGFUeXBlVGVzdCINCiAgRGVmYXVsdEJ5dGVPcmRlcj0iTGl0dGxlRW5kaWFuIg0KICBUYXJnZXRO -YW1lc3BhY2U9Imh0dHA6Ly9jYXMuZXUvVUEvQ29tbVNlcnZlci9Vbml0VGVzdHMvRGF0YVR5cGVU -ZXN0Ig0KPg0KICA8IS0tIFRoaXMgRmlsZSB3YXMgZ2VuZXJhdGVkIG9uIDIwMjItMDMtMzEgYW5k -IHN1cHBvcnRzIHRoZSBzcGVjaWZpY2F0aW9ucyBzdXBwb3J0ZWQgYnkgdmVyc2lvbiAxLjExLjMz -NS4xMCBvZiB0aGUgT1BDIFVBIGRlbGl2ZXJhYmxlcy4gLS0+DQogIDxvcGM6SW1wb3J0IE5hbWVz -cGFjZT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VBLyIgTG9jYXRpb249Ii5CaW5hcnlTY2hl -bWEuYnNkIi8+DQoNCiAgPG9wYzpFbnVtZXJhdGVkVHlwZSBOYW1lPSJBYnN0cmFjdEVudW1lcmF0 -aW9uRGF0YVR5cGUiIExlbmd0aEluQml0cz0iMzIiPg0KICAgIDxvcGM6RW51bWVyYXRlZFZhbHVl -IE5hbWU9IkZpZWxkMSIgVmFsdWU9IjAiIC8+DQogICAgPG9wYzpFbnVtZXJhdGVkVmFsdWUgTmFt -ZT0iRmllbGQyIiBWYWx1ZT0iMSIgLz4NCiAgPC9vcGM6RW51bWVyYXRlZFR5cGU+DQoNCiAgPG9w -YzpFbnVtZXJhdGVkVHlwZSBOYW1lPSJFbnVtZXJhdGlvbkRhdGFUeXBlIiBMZW5ndGhJbkJpdHM9 -IjMyIj4NCiAgICA8b3BjOkRvY3VtZW50YXRpb24+RW51bWVyYXRpb24gRGF0YVR5cGUgZGVyaXZl -ZCBmcm9tIGFic3RyYWN0IHR5cGU8L29wYzpEb2N1bWVudGF0aW9uPg0KICAgIDxvcGM6RW51bWVy -YXRlZFZhbHVlIE5hbWU9IkZpZWxkMSIgVmFsdWU9IjAiIC8+DQogICAgPG9wYzpFbnVtZXJhdGVk -VmFsdWUgTmFtZT0iRmllbGQyIiBWYWx1ZT0iMSIgLz4NCiAgICA8b3BjOkVudW1lcmF0ZWRWYWx1 -ZSBOYW1lPSJGaWVsZDMiIFZhbHVlPSIxIiAvPg0KICA8L29wYzpFbnVtZXJhdGVkVHlwZT4NCg0K -ICA8b3BjOlN0cnVjdHVyZWRUeXBlIE5hbWU9IkFic3RyYWN0U3RydWN0dXJlIiBCYXNlVHlwZT0i -dWE6RXh0ZW5zaW9uT2JqZWN0Ij4NCiAgICA8b3BjOkRvY3VtZW50YXRpb24+QWJzdHJhY3Qgc3Ry -dWN0dXJlPC9vcGM6RG9jdW1lbnRhdGlvbj4NCiAgICA8b3BjOkZpZWxkIE5hbWU9Ik51bWJlciIg -VHlwZU5hbWU9InVhOlZhcmlhbnQiIC8+DQogIDwvb3BjOlN0cnVjdHVyZWRUeXBlPg0KDQogIDxv -cGM6U3RydWN0dXJlZFR5cGUgTmFtZT0iRGVyaXZlZFN0cnVjdHVyZSIgQmFzZVR5cGU9InRuczpB -YnN0cmFjdFN0cnVjdHVyZSI+DQogICAgPG9wYzpGaWVsZCBOYW1lPSJOdW1iZXIiIFR5cGVOYW1l -PSJ1YTpWYXJpYW50IiBTb3VyY2VUeXBlPSJ0bnM6QWJzdHJhY3RTdHJ1Y3R1cmUiIC8+DQogICAg -PG9wYzpGaWVsZCBOYW1lPSJOdW1iZXIiIFR5cGVOYW1lPSJvcGM6SW50MzIiIC8+DQogIDwvb3Bj -OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= - - - - NamespaceUri - A URI that uniquely identifies the dictionary. - - i=68 - ns=1;i=5 - - - http://cas.eu/UA/CommServer/UnitTests/DataTypeTest - - - - AbstractStructure - - i=69 - ns=1;i=5 - - - AbstractStructure - - - - DerivedStructure - - i=69 - ns=1;i=5 - - - DerivedStructure - - \ No newline at end of file diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.PredefinedNodes.uanodes b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.PredefinedNodes.uanodes index 9bb7eebbff1d7592998f48ca94c0a1c1c2c9b05d..63ad444a1f50ddd98834e78f56a3dc94711ad548 100644 GIT binary patch delta 674 zcma)4!Ab&A6uoyCtt`n5ZD^8)2$x0X(3@kizo`U98u7WX>3tZn?4|U>u{Zm z2>gLQqitUheL>y(nrVUzdT`&|%em*=^X9#-*;~F_kB$L=T7yD{z6d();x(Y}BaQ$h z5H67cg~D4(kh0CX)u=3jpP~!lA>Hqphk6}Z48&jE<@#@cK@-)2IaxRy&9SZ}9 z4Ri+sgQG%dkf%aPMq-IVXn diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.PredefinedNodes.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.PredefinedNodes.xml index 241c5e3e..829e6f18 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.PredefinedNodes.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.PredefinedNodes.xml @@ -16,6 +16,31 @@ i=29 true + + + i=14799 + + + + + + 0 + + Field1 + + Field1 + + + 1 + + Field2 + + Field2 + + + + + Variable_2 @@ -31,19 +56,14 @@ i=68 - - i=78 - 10 - Field1 - Field2 @@ -53,6 +73,7 @@ i=21 1 + 0 1 1 @@ -67,12 +88,29 @@ EnumerationDataType - Enumeration DataType derived from abstract type ns=1;i=9 + + + i=14799 + + + + + + 1 + + Field3 + + Field3 + + + + + Variable_2 @@ -88,9 +126,6 @@ i=68 - - i=78 - 12 @@ -103,10 +138,8 @@ 1 - Field3 - @@ -117,6 +150,7 @@ i=7594 1 + 0 1 1 @@ -131,13 +165,37 @@ AbstractStructure - Abstract structure i=22 true + + + i=14798 + + + + + i=22 + + Structure_0 + + + Number + + i=26 + + -1 + + 0 + false + + + + + DataType_64 @@ -151,20 +209,58 @@ ns=1;i=13 + + + i=14798 + + + + + ns=1;i=13 + + Structure_0 + + + Number + + i=26 + + -1 + + 0 + false + + + Number + + Derived from Number + + + i=6 + + -1 + + 0 + false + + + + + - + Object_1 - ns=1;i=14 + ns=1;i=18 0 - Default XML + Default Binary i=76 - 14 + 18 @@ -180,24 +276,24 @@ i=39 - ns=1;i=15 + ns=1;i=19 - - + + Object_1 - ns=1;i=23 + ns=1;i=27 0 - Default XML + Default Binary i=76 - 23 + 27 @@ -213,15 +309,15 @@ i=39 - ns=1;i=24 + ns=1;i=28 - - + + Variable_2 - ns=1;i=2 + ns=1;i=5 1 @@ -230,66 +326,38 @@ i=72 - 2 + 5 - PHhzOnNjaGVtYQ0KICB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEi -DQogIHhtbG5zOnVhPSJodHRwOi8vb3BjZm91bmRhdGlvbi5vcmcvVUEvMjAwOC8wMi9UeXBlcy54 -c2QiDQogIHhtbG5zOnRucz0iaHR0cDovL2Nhcy5ldS9VQS9Db21tU2VydmVyL1VuaXRUZXN0cy9E -YXRhVHlwZVRlc3QiDQogIHRhcmdldE5hbWVzcGFjZT0iaHR0cDovL2Nhcy5ldS9VQS9Db21tU2Vy -dmVyL1VuaXRUZXN0cy9EYXRhVHlwZVRlc3QiDQogIGVsZW1lbnRGb3JtRGVmYXVsdD0icXVhbGlm -aWVkIg0KPg0KICA8eHM6aW1wb3J0IG5hbWVzcGFjZT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3Jn -L1VBLyIgLz4NCg0KICA8eHM6c2ltcGxlVHlwZSAgbmFtZT0iQWJzdHJhY3RFbnVtZXJhdGlvbkRh -dGFUeXBlIj4NCiAgICA8eHM6cmVzdHJpY3Rpb24gYmFzZT0ieHM6c3RyaW5nIj4NCiAgICAgIDx4 -czplbnVtZXJhdGlvbiB2YWx1ZT0iRmllbGQxXzAiIC8+DQogICAgICA8eHM6ZW51bWVyYXRpb24g -dmFsdWU9IkZpZWxkMl8xIiAvPg0KICAgIDwveHM6cmVzdHJpY3Rpb24+DQogIDwveHM6c2ltcGxl -VHlwZT4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iQWJzdHJhY3RFbnVtZXJhdGlvbkRhdGFUeXBlIiB0 -eXBlPSJ0bnM6QWJzdHJhY3RFbnVtZXJhdGlvbkRhdGFUeXBlIiAvPg0KDQogIDx4czpjb21wbGV4 -VHlwZSBuYW1lPSJMaXN0T2ZBYnN0cmFjdEVudW1lcmF0aW9uRGF0YVR5cGUiPg0KICAgIDx4czpz -ZXF1ZW5jZT4NCiAgICAgIDx4czplbGVtZW50IG5hbWU9IkFic3RyYWN0RW51bWVyYXRpb25EYXRh -VHlwZSIgdHlwZT0idG5zOkFic3RyYWN0RW51bWVyYXRpb25EYXRhVHlwZSIgbWluT2NjdXJzPSIw -IiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOnNlcXVlbmNlPg0KICA8L3hzOmNv -bXBsZXhUeXBlPg0KICA8eHM6ZWxlbWVudCBuYW1lPSJMaXN0T2ZBYnN0cmFjdEVudW1lcmF0aW9u -RGF0YVR5cGUiIHR5cGU9InRuczpMaXN0T2ZBYnN0cmFjdEVudW1lcmF0aW9uRGF0YVR5cGUiIG5p -bGxhYmxlPSJ0cnVlIj48L3hzOmVsZW1lbnQ+DQoNCiAgPHhzOnNpbXBsZVR5cGUgIG5hbWU9IkVu -dW1lcmF0aW9uRGF0YVR5cGUiPg0KICAgIDx4czphbm5vdGF0aW9uPg0KICAgICAgPHhzOmRvY3Vt -ZW50YXRpb24+RW51bWVyYXRpb24gRGF0YVR5cGUgZGVyaXZlZCBmcm9tIGFic3RyYWN0IHR5cGU8 -L3hzOmRvY3VtZW50YXRpb24+DQogICAgPC94czphbm5vdGF0aW9uPg0KICAgIDx4czpyZXN0cmlj -dGlvbiBiYXNlPSJ4czpzdHJpbmciPg0KICAgICAgPHhzOmVudW1lcmF0aW9uIHZhbHVlPSJGaWVs -ZDNfMSIgLz4NCiAgICA8L3hzOnJlc3RyaWN0aW9uPg0KICA8L3hzOnNpbXBsZVR5cGU+DQogIDx4 -czplbGVtZW50IG5hbWU9IkVudW1lcmF0aW9uRGF0YVR5cGUiIHR5cGU9InRuczpFbnVtZXJhdGlv -bkRhdGFUeXBlIiAvPg0KDQogIDx4czpjb21wbGV4VHlwZSBuYW1lPSJMaXN0T2ZFbnVtZXJhdGlv -bkRhdGFUeXBlIj4NCiAgICA8eHM6c2VxdWVuY2U+DQogICAgICA8eHM6ZWxlbWVudCBuYW1lPSJF -bnVtZXJhdGlvbkRhdGFUeXBlIiB0eXBlPSJ0bnM6RW51bWVyYXRpb25EYXRhVHlwZSIgbWluT2Nj -dXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOnNlcXVlbmNlPg0KICA8 -L3hzOmNvbXBsZXhUeXBlPg0KICA8eHM6ZWxlbWVudCBuYW1lPSJMaXN0T2ZFbnVtZXJhdGlvbkRh -dGFUeXBlIiB0eXBlPSJ0bnM6TGlzdE9mRW51bWVyYXRpb25EYXRhVHlwZSIgbmlsbGFibGU9InRy -dWUiPjwveHM6ZWxlbWVudD4NCg0KICA8eHM6Y29tcGxleFR5cGUgbmFtZT0iQWJzdHJhY3RTdHJ1 -Y3R1cmUiPg0KICAgIDx4czphbm5vdGF0aW9uPg0KICAgICAgPHhzOmRvY3VtZW50YXRpb24+QWJz -dHJhY3Qgc3RydWN0dXJlPC94czpkb2N1bWVudGF0aW9uPg0KICAgIDwveHM6YW5ub3RhdGlvbj4N -CiAgICA8eHM6c2VxdWVuY2U+DQogICAgICA8eHM6ZWxlbWVudCBuYW1lPSJOdW1iZXIiIHR5cGU9 -InVhOlZhcmlhbnQiIG1pbk9jY3Vycz0iMCIgLz4NCiAgICA8L3hzOnNlcXVlbmNlPg0KICA8L3hz -OmNvbXBsZXhUeXBlPg0KICA8eHM6ZWxlbWVudCBuYW1lPSJBYnN0cmFjdFN0cnVjdHVyZSIgdHlw -ZT0idG5zOkFic3RyYWN0U3RydWN0dXJlIiAvPg0KDQogIDx4czpjb21wbGV4VHlwZSBuYW1lPSJM -aXN0T2ZBYnN0cmFjdFN0cnVjdHVyZSI+DQogICAgPHhzOnNlcXVlbmNlPg0KICAgICAgPHhzOmVs -ZW1lbnQgbmFtZT0iQWJzdHJhY3RTdHJ1Y3R1cmUiIHR5cGU9InRuczpBYnN0cmFjdFN0cnVjdHVy -ZSIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgbmlsbGFibGU9InRydWUiIC8+ -DQogICAgPC94czpzZXF1ZW5jZT4NCiAgPC94czpjb21wbGV4VHlwZT4NCiAgPHhzOmVsZW1lbnQg -bmFtZT0iTGlzdE9mQWJzdHJhY3RTdHJ1Y3R1cmUiIHR5cGU9InRuczpMaXN0T2ZBYnN0cmFjdFN0 -cnVjdHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KICA8eHM6Y29tcGxleFR5 -cGUgbmFtZT0iRGVyaXZlZFN0cnVjdHVyZSI+DQogICAgPHhzOmNvbXBsZXhDb250ZW50IG1peGVk -PSJmYWxzZSI+DQogICAgICA8eHM6ZXh0ZW5zaW9uIGJhc2U9InRuczpBYnN0cmFjdFN0cnVjdHVy -ZSI+DQogICAgICAgIDx4czpzZXF1ZW5jZT4NCiAgICAgICAgICA8eHM6ZWxlbWVudCBuYW1lPSJO -dW1iZXIiIHR5cGU9InhzOmludCIgbWluT2NjdXJzPSIwIiAvPg0KICAgICAgICA8L3hzOnNlcXVl -bmNlPg0KICAgICAgPC94czpleHRlbnNpb24+DQogICAgPC94czpjb21wbGV4Q29udGVudD4NCiAg -PC94czpjb21wbGV4VHlwZT4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iRGVyaXZlZFN0cnVjdHVyZSIg -dHlwZT0idG5zOkRlcml2ZWRTdHJ1Y3R1cmUiIC8+DQoNCiAgPHhzOmNvbXBsZXhUeXBlIG5hbWU9 -Ikxpc3RPZkRlcml2ZWRTdHJ1Y3R1cmUiPg0KICAgIDx4czpzZXF1ZW5jZT4NCiAgICAgIDx4czpl -bGVtZW50IG5hbWU9IkRlcml2ZWRTdHJ1Y3R1cmUiIHR5cGU9InRuczpEZXJpdmVkU3RydWN0dXJl -IiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiBuaWxsYWJsZT0idHJ1ZSIgLz4N -CiAgICA8L3hzOnNlcXVlbmNlPg0KICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8eHM6ZWxlbWVudCBu -YW1lPSJMaXN0T2ZEZXJpdmVkU3RydWN0dXJlIiB0eXBlPSJ0bnM6TGlzdE9mRGVyaXZlZFN0cnVj -dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ + PG9wYzpUeXBlRGljdGlvbmFyeQ0KICB4bWxuczpvcGM9Imh0dHA6Ly9vcGNmb3VuZGF0aW9uLm9y +Zy9CaW5hcnlTY2hlbWEvIg0KICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1M +U2NoZW1hLWluc3RhbmNlIg0KICB4bWxuczp1YT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VB +LyINCiAgeG1sbnM6dG5zPSJodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL0Rh +dGFUeXBlVGVzdCINCiAgRGVmYXVsdEJ5dGVPcmRlcj0iTGl0dGxlRW5kaWFuIg0KICBUYXJnZXRO +YW1lc3BhY2U9Imh0dHA6Ly9jYXMuZXUvVUEvQ29tbVNlcnZlci9Vbml0VGVzdHMvRGF0YVR5cGVU +ZXN0Ig0KPg0KICA8IS0tIFRoaXMgRmlsZSB3YXMgZ2VuZXJhdGVkIG9uIDIwMjItMDMtMzEgYW5k +IHN1cHBvcnRzIHRoZSBzcGVjaWZpY2F0aW9ucyBzdXBwb3J0ZWQgYnkgdmVyc2lvbiAxLjExLjMz +NS4xMCBvZiB0aGUgT1BDIFVBIGRlbGl2ZXJhYmxlcy4gLS0+DQogIDxvcGM6SW1wb3J0IE5hbWVz +cGFjZT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VBLyIgTG9jYXRpb249Ii5CaW5hcnlTY2hl +bWEuYnNkIi8+DQoNCiAgPG9wYzpFbnVtZXJhdGVkVHlwZSBOYW1lPSJBYnN0cmFjdEVudW1lcmF0 +aW9uRGF0YVR5cGUiIExlbmd0aEluQml0cz0iMzIiPg0KICAgIDxvcGM6RW51bWVyYXRlZFZhbHVl +IE5hbWU9IkZpZWxkMSIgVmFsdWU9IjAiIC8+DQogICAgPG9wYzpFbnVtZXJhdGVkVmFsdWUgTmFt +ZT0iRmllbGQyIiBWYWx1ZT0iMSIgLz4NCiAgPC9vcGM6RW51bWVyYXRlZFR5cGU+DQoNCiAgPG9w +YzpFbnVtZXJhdGVkVHlwZSBOYW1lPSJFbnVtZXJhdGlvbkRhdGFUeXBlIiBMZW5ndGhJbkJpdHM9 +IjMyIj4NCiAgICA8b3BjOkRvY3VtZW50YXRpb24+RW51bWVyYXRpb24gRGF0YVR5cGUgZGVyaXZl +ZCBmcm9tIGFic3RyYWN0IHR5cGU8L29wYzpEb2N1bWVudGF0aW9uPg0KICAgIDxvcGM6RW51bWVy +YXRlZFZhbHVlIE5hbWU9IkZpZWxkMSIgVmFsdWU9IjAiIC8+DQogICAgPG9wYzpFbnVtZXJhdGVk +VmFsdWUgTmFtZT0iRmllbGQyIiBWYWx1ZT0iMSIgLz4NCiAgICA8b3BjOkVudW1lcmF0ZWRWYWx1 +ZSBOYW1lPSJGaWVsZDMiIFZhbHVlPSIxIiAvPg0KICA8L29wYzpFbnVtZXJhdGVkVHlwZT4NCg0K +ICA8b3BjOlN0cnVjdHVyZWRUeXBlIE5hbWU9IkFic3RyYWN0U3RydWN0dXJlIiBCYXNlVHlwZT0i +dWE6RXh0ZW5zaW9uT2JqZWN0Ij4NCiAgICA8b3BjOkRvY3VtZW50YXRpb24+QWJzdHJhY3Qgc3Ry +dWN0dXJlPC9vcGM6RG9jdW1lbnRhdGlvbj4NCiAgICA8b3BjOkZpZWxkIE5hbWU9Ik51bWJlciIg +VHlwZU5hbWU9InVhOlZhcmlhbnQiIC8+DQogIDwvb3BjOlN0cnVjdHVyZWRUeXBlPg0KDQogIDxv +cGM6U3RydWN0dXJlZFR5cGUgTmFtZT0iRGVyaXZlZFN0cnVjdHVyZSIgQmFzZVR5cGU9InRuczpB +YnN0cmFjdFN0cnVjdHVyZSI+DQogICAgPG9wYzpGaWVsZCBOYW1lPSJOdW1iZXIiIFR5cGVOYW1l +PSJ1YTpWYXJpYW50IiBTb3VyY2VUeXBlPSJ0bnM6QWJzdHJhY3RTdHJ1Y3R1cmUiIC8+DQogICAg +PG9wYzpGaWVsZCBOYW1lPSJOdW1iZXIiIFR5cGVOYW1lPSJvcGM6SW50MzIiIC8+DQogIDwvb3Bj +OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= @@ -305,30 +373,26 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ true - i=92 + i=93 Variable_2 - ns=1;i=4 + ns=1;i=7 0 NamespaceUri - - - A URI that uniquely identifies the dictionary. - i=46 i=68 - 4 + 7 http://cas.eu/UA/CommServer/UnitTests/DataTypeTest @@ -341,10 +405,38 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+1 1 + + Variable_2 + + ns=1;i=1 + + + 0 + Deprecated + + + i=46 + + + i=68 + + 1 + + + true + + + + i=1 + + -1 + 1 + 1 + Variable_2 - ns=1;i=15 + ns=1;i=19 1 @@ -356,10 +448,10 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ i=69 - 15 + 19 - //xs:element[@name='AbstractStructure'] + AbstractStructure @@ -372,7 +464,7 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ Variable_2 - ns=1;i=24 + ns=1;i=28 1 @@ -384,10 +476,10 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ i=69 - 24 + 28 - //xs:element[@name='DerivedStructure'] + DerivedStructure @@ -397,20 +489,20 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+1 1 - - + + Object_1 - ns=1;i=18 + ns=1;i=14 0 - Default Binary + Default XML i=76 - 18 + 14 @@ -426,24 +518,24 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+i=39 - ns=1;i=19 + ns=1;i=15 - - + + Object_1 - ns=1;i=27 + ns=1;i=23 0 - Default Binary + Default XML i=76 - 27 + 23 @@ -459,15 +551,15 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+i=39 - ns=1;i=28 + ns=1;i=24 - - + + Variable_2 - ns=1;i=5 + ns=1;i=2 1 @@ -476,38 +568,66 @@ dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ i=72 - 5 + 2 - PG9wYzpUeXBlRGljdGlvbmFyeQ0KICB4bWxuczpvcGM9Imh0dHA6Ly9vcGNmb3VuZGF0aW9uLm9y -Zy9CaW5hcnlTY2hlbWEvIg0KICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1M -U2NoZW1hLWluc3RhbmNlIg0KICB4bWxuczp1YT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VB -LyINCiAgeG1sbnM6dG5zPSJodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL0Rh -dGFUeXBlVGVzdCINCiAgRGVmYXVsdEJ5dGVPcmRlcj0iTGl0dGxlRW5kaWFuIg0KICBUYXJnZXRO -YW1lc3BhY2U9Imh0dHA6Ly9jYXMuZXUvVUEvQ29tbVNlcnZlci9Vbml0VGVzdHMvRGF0YVR5cGVU -ZXN0Ig0KPg0KICA8IS0tIFRoaXMgRmlsZSB3YXMgZ2VuZXJhdGVkIG9uIDIwMjItMDMtMzEgYW5k -IHN1cHBvcnRzIHRoZSBzcGVjaWZpY2F0aW9ucyBzdXBwb3J0ZWQgYnkgdmVyc2lvbiAxLjExLjMz -NS4xMCBvZiB0aGUgT1BDIFVBIGRlbGl2ZXJhYmxlcy4gLS0+DQogIDxvcGM6SW1wb3J0IE5hbWVz -cGFjZT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VBLyIgTG9jYXRpb249Ii5CaW5hcnlTY2hl -bWEuYnNkIi8+DQoNCiAgPG9wYzpFbnVtZXJhdGVkVHlwZSBOYW1lPSJBYnN0cmFjdEVudW1lcmF0 -aW9uRGF0YVR5cGUiIExlbmd0aEluQml0cz0iMzIiPg0KICAgIDxvcGM6RW51bWVyYXRlZFZhbHVl -IE5hbWU9IkZpZWxkMSIgVmFsdWU9IjAiIC8+DQogICAgPG9wYzpFbnVtZXJhdGVkVmFsdWUgTmFt -ZT0iRmllbGQyIiBWYWx1ZT0iMSIgLz4NCiAgPC9vcGM6RW51bWVyYXRlZFR5cGU+DQoNCiAgPG9w -YzpFbnVtZXJhdGVkVHlwZSBOYW1lPSJFbnVtZXJhdGlvbkRhdGFUeXBlIiBMZW5ndGhJbkJpdHM9 -IjMyIj4NCiAgICA8b3BjOkRvY3VtZW50YXRpb24+RW51bWVyYXRpb24gRGF0YVR5cGUgZGVyaXZl -ZCBmcm9tIGFic3RyYWN0IHR5cGU8L29wYzpEb2N1bWVudGF0aW9uPg0KICAgIDxvcGM6RW51bWVy -YXRlZFZhbHVlIE5hbWU9IkZpZWxkMSIgVmFsdWU9IjAiIC8+DQogICAgPG9wYzpFbnVtZXJhdGVk -VmFsdWUgTmFtZT0iRmllbGQyIiBWYWx1ZT0iMSIgLz4NCiAgICA8b3BjOkVudW1lcmF0ZWRWYWx1 -ZSBOYW1lPSJGaWVsZDMiIFZhbHVlPSIxIiAvPg0KICA8L29wYzpFbnVtZXJhdGVkVHlwZT4NCg0K -ICA8b3BjOlN0cnVjdHVyZWRUeXBlIE5hbWU9IkFic3RyYWN0U3RydWN0dXJlIiBCYXNlVHlwZT0i -dWE6RXh0ZW5zaW9uT2JqZWN0Ij4NCiAgICA8b3BjOkRvY3VtZW50YXRpb24+QWJzdHJhY3Qgc3Ry -dWN0dXJlPC9vcGM6RG9jdW1lbnRhdGlvbj4NCiAgICA8b3BjOkZpZWxkIE5hbWU9Ik51bWJlciIg -VHlwZU5hbWU9InVhOlZhcmlhbnQiIC8+DQogIDwvb3BjOlN0cnVjdHVyZWRUeXBlPg0KDQogIDxv -cGM6U3RydWN0dXJlZFR5cGUgTmFtZT0iRGVyaXZlZFN0cnVjdHVyZSIgQmFzZVR5cGU9InRuczpB -YnN0cmFjdFN0cnVjdHVyZSI+DQogICAgPG9wYzpGaWVsZCBOYW1lPSJOdW1iZXIiIFR5cGVOYW1l -PSJ1YTpWYXJpYW50IiBTb3VyY2VUeXBlPSJ0bnM6QWJzdHJhY3RTdHJ1Y3R1cmUiIC8+DQogICAg -PG9wYzpGaWVsZCBOYW1lPSJOdW1iZXIiIFR5cGVOYW1lPSJvcGM6SW50MzIiIC8+DQogIDwvb3Bj -OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= + PHhzOnNjaGVtYQ0KICB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEi +DQogIHhtbG5zOnVhPSJodHRwOi8vb3BjZm91bmRhdGlvbi5vcmcvVUEvMjAwOC8wMi9UeXBlcy54 +c2QiDQogIHhtbG5zOnRucz0iaHR0cDovL2Nhcy5ldS9VQS9Db21tU2VydmVyL1VuaXRUZXN0cy9E +YXRhVHlwZVRlc3QiDQogIHRhcmdldE5hbWVzcGFjZT0iaHR0cDovL2Nhcy5ldS9VQS9Db21tU2Vy +dmVyL1VuaXRUZXN0cy9EYXRhVHlwZVRlc3QiDQogIGVsZW1lbnRGb3JtRGVmYXVsdD0icXVhbGlm +aWVkIg0KPg0KICA8eHM6aW1wb3J0IG5hbWVzcGFjZT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3Jn +L1VBLyIgLz4NCg0KICA8eHM6c2ltcGxlVHlwZSAgbmFtZT0iQWJzdHJhY3RFbnVtZXJhdGlvbkRh +dGFUeXBlIj4NCiAgICA8eHM6cmVzdHJpY3Rpb24gYmFzZT0ieHM6c3RyaW5nIj4NCiAgICAgIDx4 +czplbnVtZXJhdGlvbiB2YWx1ZT0iRmllbGQxXzAiIC8+DQogICAgICA8eHM6ZW51bWVyYXRpb24g +dmFsdWU9IkZpZWxkMl8xIiAvPg0KICAgIDwveHM6cmVzdHJpY3Rpb24+DQogIDwveHM6c2ltcGxl +VHlwZT4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iQWJzdHJhY3RFbnVtZXJhdGlvbkRhdGFUeXBlIiB0 +eXBlPSJ0bnM6QWJzdHJhY3RFbnVtZXJhdGlvbkRhdGFUeXBlIiAvPg0KDQogIDx4czpjb21wbGV4 +VHlwZSBuYW1lPSJMaXN0T2ZBYnN0cmFjdEVudW1lcmF0aW9uRGF0YVR5cGUiPg0KICAgIDx4czpz +ZXF1ZW5jZT4NCiAgICAgIDx4czplbGVtZW50IG5hbWU9IkFic3RyYWN0RW51bWVyYXRpb25EYXRh +VHlwZSIgdHlwZT0idG5zOkFic3RyYWN0RW51bWVyYXRpb25EYXRhVHlwZSIgbWluT2NjdXJzPSIw +IiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOnNlcXVlbmNlPg0KICA8L3hzOmNv +bXBsZXhUeXBlPg0KICA8eHM6ZWxlbWVudCBuYW1lPSJMaXN0T2ZBYnN0cmFjdEVudW1lcmF0aW9u +RGF0YVR5cGUiIHR5cGU9InRuczpMaXN0T2ZBYnN0cmFjdEVudW1lcmF0aW9uRGF0YVR5cGUiIG5p +bGxhYmxlPSJ0cnVlIj48L3hzOmVsZW1lbnQ+DQoNCiAgPHhzOnNpbXBsZVR5cGUgIG5hbWU9IkVu +dW1lcmF0aW9uRGF0YVR5cGUiPg0KICAgIDx4czphbm5vdGF0aW9uPg0KICAgICAgPHhzOmRvY3Vt +ZW50YXRpb24+RW51bWVyYXRpb24gRGF0YVR5cGUgZGVyaXZlZCBmcm9tIGFic3RyYWN0IHR5cGU8 +L3hzOmRvY3VtZW50YXRpb24+DQogICAgPC94czphbm5vdGF0aW9uPg0KICAgIDx4czpyZXN0cmlj +dGlvbiBiYXNlPSJ4czpzdHJpbmciPg0KICAgICAgPHhzOmVudW1lcmF0aW9uIHZhbHVlPSJGaWVs +ZDNfMSIgLz4NCiAgICA8L3hzOnJlc3RyaWN0aW9uPg0KICA8L3hzOnNpbXBsZVR5cGU+DQogIDx4 +czplbGVtZW50IG5hbWU9IkVudW1lcmF0aW9uRGF0YVR5cGUiIHR5cGU9InRuczpFbnVtZXJhdGlv +bkRhdGFUeXBlIiAvPg0KDQogIDx4czpjb21wbGV4VHlwZSBuYW1lPSJMaXN0T2ZFbnVtZXJhdGlv +bkRhdGFUeXBlIj4NCiAgICA8eHM6c2VxdWVuY2U+DQogICAgICA8eHM6ZWxlbWVudCBuYW1lPSJF +bnVtZXJhdGlvbkRhdGFUeXBlIiB0eXBlPSJ0bnM6RW51bWVyYXRpb25EYXRhVHlwZSIgbWluT2Nj +dXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOnNlcXVlbmNlPg0KICA8 +L3hzOmNvbXBsZXhUeXBlPg0KICA8eHM6ZWxlbWVudCBuYW1lPSJMaXN0T2ZFbnVtZXJhdGlvbkRh +dGFUeXBlIiB0eXBlPSJ0bnM6TGlzdE9mRW51bWVyYXRpb25EYXRhVHlwZSIgbmlsbGFibGU9InRy +dWUiPjwveHM6ZWxlbWVudD4NCg0KICA8eHM6Y29tcGxleFR5cGUgbmFtZT0iQWJzdHJhY3RTdHJ1 +Y3R1cmUiPg0KICAgIDx4czphbm5vdGF0aW9uPg0KICAgICAgPHhzOmRvY3VtZW50YXRpb24+QWJz +dHJhY3Qgc3RydWN0dXJlPC94czpkb2N1bWVudGF0aW9uPg0KICAgIDwveHM6YW5ub3RhdGlvbj4N +CiAgICA8eHM6c2VxdWVuY2U+DQogICAgICA8eHM6ZWxlbWVudCBuYW1lPSJOdW1iZXIiIHR5cGU9 +InVhOlZhcmlhbnQiIG1pbk9jY3Vycz0iMCIgLz4NCiAgICA8L3hzOnNlcXVlbmNlPg0KICA8L3hz +OmNvbXBsZXhUeXBlPg0KICA8eHM6ZWxlbWVudCBuYW1lPSJBYnN0cmFjdFN0cnVjdHVyZSIgdHlw +ZT0idG5zOkFic3RyYWN0U3RydWN0dXJlIiAvPg0KDQogIDx4czpjb21wbGV4VHlwZSBuYW1lPSJM +aXN0T2ZBYnN0cmFjdFN0cnVjdHVyZSI+DQogICAgPHhzOnNlcXVlbmNlPg0KICAgICAgPHhzOmVs +ZW1lbnQgbmFtZT0iQWJzdHJhY3RTdHJ1Y3R1cmUiIHR5cGU9InRuczpBYnN0cmFjdFN0cnVjdHVy +ZSIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgbmlsbGFibGU9InRydWUiIC8+ +DQogICAgPC94czpzZXF1ZW5jZT4NCiAgPC94czpjb21wbGV4VHlwZT4NCiAgPHhzOmVsZW1lbnQg +bmFtZT0iTGlzdE9mQWJzdHJhY3RTdHJ1Y3R1cmUiIHR5cGU9InRuczpMaXN0T2ZBYnN0cmFjdFN0 +cnVjdHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KICA8eHM6Y29tcGxleFR5 +cGUgbmFtZT0iRGVyaXZlZFN0cnVjdHVyZSI+DQogICAgPHhzOmNvbXBsZXhDb250ZW50IG1peGVk +PSJmYWxzZSI+DQogICAgICA8eHM6ZXh0ZW5zaW9uIGJhc2U9InRuczpBYnN0cmFjdFN0cnVjdHVy +ZSI+DQogICAgICAgIDx4czpzZXF1ZW5jZT4NCiAgICAgICAgICA8eHM6ZWxlbWVudCBuYW1lPSJO +dW1iZXIiIHR5cGU9InhzOmludCIgbWluT2NjdXJzPSIwIiAvPg0KICAgICAgICA8L3hzOnNlcXVl +bmNlPg0KICAgICAgPC94czpleHRlbnNpb24+DQogICAgPC94czpjb21wbGV4Q29udGVudD4NCiAg +PC94czpjb21wbGV4VHlwZT4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iRGVyaXZlZFN0cnVjdHVyZSIg +dHlwZT0idG5zOkRlcml2ZWRTdHJ1Y3R1cmUiIC8+DQoNCiAgPHhzOmNvbXBsZXhUeXBlIG5hbWU9 +Ikxpc3RPZkRlcml2ZWRTdHJ1Y3R1cmUiPg0KICAgIDx4czpzZXF1ZW5jZT4NCiAgICAgIDx4czpl +bGVtZW50IG5hbWU9IkRlcml2ZWRTdHJ1Y3R1cmUiIHR5cGU9InRuczpEZXJpdmVkU3RydWN0dXJl +IiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiBuaWxsYWJsZT0idHJ1ZSIgLz4N +CiAgICA8L3hzOnNlcXVlbmNlPg0KICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8eHM6ZWxlbWVudCBu +YW1lPSJMaXN0T2ZEZXJpdmVkU3RydWN0dXJlIiB0eXBlPSJ0bnM6TGlzdE9mRGVyaXZlZFN0cnVj +dHVyZSIgbmlsbGFibGU9InRydWUiPjwveHM6ZWxlbWVudD4NCg0KPC94czpzY2hlbWE+ @@ -523,30 +643,26 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= true - i=93 + i=92 Variable_2 - ns=1;i=7 + ns=1;i=4 0 NamespaceUri - - - A URI that uniquely identifies the dictionary. - i=46 i=68 - 7 + 4 http://cas.eu/UA/CommServer/UnitTests/DataTypeTest @@ -559,10 +675,38 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= 1 1 + + Variable_2 + + ns=1;i=8 + + + 0 + Deprecated + + + i=46 + + + i=68 + + 8 + + + true + + + + i=1 + + -1 + 1 + 1 + Variable_2 - ns=1;i=19 + ns=1;i=15 1 @@ -574,10 +718,10 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= i=69 - 19 + 15 - AbstractStructure + //xs:element[@name='AbstractStructure'] @@ -590,7 +734,7 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= Variable_2 - ns=1;i=28 + ns=1;i=24 1 @@ -602,10 +746,10 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= i=69 - 28 + 24 - DerivedStructure + //xs:element[@name='DerivedStructure'] @@ -615,5 +759,55 @@ OlN0cnVjdHVyZWRUeXBlPg0KDQo8L29wYzpUeXBlRGljdGlvbmFyeT4= 1 1 - + + + Object_1 + + ns=1;i=31 + + + 0 + Default JSON + + + i=76 + + 31 + + + + i=38 + + true + + ns=1;i=13 + + + + + + Object_1 + + ns=1;i=32 + + + 0 + Default JSON + + + i=76 + + 32 + + + + i=38 + + true + + ns=1;i=22 + + + + \ No newline at end of file diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Types.bsd b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Types.bsd index 13dcfb68..f255b393 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Types.bsd +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Types.bsd @@ -6,7 +6,6 @@ DefaultByteOrder="LittleEndian" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" > - diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/GoNodeSet.cmd b/SemanticData/UAModelDesignExport.UnitTest/Models/GoNodeSet.cmd new file mode 100644 index 00000000..5d9825a0 --- /dev/null +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/GoNodeSet.cmd @@ -0,0 +1,6 @@ +set COMPILER=OOI.ModelCompilerUI + +"%1\%COMPILER%" -d2 "ReferenceTest.xml" -cg "ReferenceTest.csv" -o "ReferenceTest" -console +"%1\%COMPILER%" -d2 "ObjectTypeTest.xml" -cg "ObjectTypeTest.csv" -o "ObjectTypeTest" -console +"%1\%COMPILER%" -d2 "VariableTypeTest.xml" -cg "VariableTypeTest.csv" -o "VariableTypeTest" -console +"%1\%COMPILER%" -d2 "DataTypeTest.xml" -cg "DataTypeTest.csv" -o "DataTypeTest" -console diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ModelCompiler.log b/SemanticData/UAModelDesignExport.UnitTest/Models/ModelCompiler.log new file mode 100644 index 0000000000000000000000000000000000000000..405332ee95bdf94f6383ad12de3d56c1f9f423ea GIT binary patch literal 2536 zcmeH}%}c{T5XIkF@P8;h+h8kL5frp~C@3lRqmVSTjYfn9$%F#qaS$a~S1;5hyS#P>$b*5K^irEP@W!KgKR!d`D@V0sS ztPbUabTtPT$kP?y3x<>6Zs9(Fn6mC;E5OHG*ZN3oM<6Y5^ThusL6|sxS+UMx`QRG( zw%Hlr^#%)fI?H0PR`5OinYaTy`iijKhiT4RuQNBZ`izs)N4%YtdN^b=)H`{bGP`8h z?57ne%SMOVwX<c66;)Km Y*(s^sO3MGMR8!DqbWu5*u>Yx;ANB^WLjV8( literal 0 HcmV?d00001 diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.Classes.cs b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.Classes.cs index 99f5bffa..5f447733 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.Classes.cs +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.Classes.cs @@ -1,5 +1,5 @@ /* ======================================================================== - * Copyright (c) 2005-2016 The OPC Foundation, Inc. All rights reserved. + * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 * @@ -378,10 +378,14 @@ protected override NodeId GetDefaultTypeDefinitionId(NamespaceTable namespaceUri /// protected override void Initialize(ISystemContext context) { + base.Initialize(context); Initialize(context, InitializationString); InitializeOptionalChildren(context); } + /// + /// Initializes the instance with a node. + /// protected override void Initialize(ISystemContext context, NodeState source) { InitializeOptionalChildren(context); @@ -399,19 +403,17 @@ protected override void InitializeOptionalChildren(ISystemContext context) #region Initialization String private const string InitializationString = "AQAAADQAAABodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL09iamVjdFR5cGVUZXN0" + - "/////wRggAABAAAAAQAZAAAAQ29tcGxleE9iamVjdFR5cGVJbnN0YW5jZQEBAQABAQEA/////wMAAAAV" + - "YMkKAgAAABEAAABCcm93c2VOYW1lNG5vZGU2NgEADQAAAENoaWxkUHJvcGVydHkBAQMAAC4ARAMAAAAA" + - "Ff////8BAf////8AAAAAFWCJCgIAAAABAA0AAABDaGlsZFZhcmlhYmxlAQErAAAvAQBACSsAAAAAGv//" + - "//8BAf////8BAAAAFWCJCgIAAAAAAAcAAABFVVJhbmdlAQEvAAAuAEQvAAAAAQB0A/////8BAf////8A" + - "AAAABGGCCgQAAAABAAsAAABDaGlsZE1ldGhvZAEBCgAALwEBCgAKAAAAAQH/////AAAAAA=="; + "/////wRggAIBAAAAAQAZAAAAQ29tcGxleE9iamVjdFR5cGVJbnN0YW5jZQEBAQABAQEAAQAAAP////8D" + + "AAAAFWDJCgIAAAARAAAAQnJvd3NlTmFtZTRub2RlNjYBAA0AAABDaGlsZFByb3BlcnR5AQEDAAAuAEQD" + + "AAAAABX/////AQH/////AAAAABVgiQoCAAAAAQANAAAAQ2hpbGRWYXJpYWJsZQEBKwAALwEAQAkrAAAA" + + "ABr/////AQH/////AQAAABVgiQoCAAAAAAAHAAAARVVSYW5nZQEBLwAALgBELwAAAAEAdAP/////AQH/" + + "////AAAAAARhggoEAAAAAQALAAAAQ2hpbGRNZXRob2QBAQoAAC8BAQoACgAAAAEB/////wAAAAA="; #endregion #endif #endregion #region Public Properties - /// - /// A description for the ChildProperty Property. - /// + /// public PropertyState BrowseName4node66 { get @@ -430,9 +432,7 @@ public PropertyState BrowseName4node66 } } - /// - /// A description for the ChildVariable Variable. - /// + /// public AnalogItemState ChildVariable { get @@ -451,9 +451,7 @@ public AnalogItemState ChildVariable } } - /// - /// A description for the ChildMethod Method. - /// + /// public ChildMethodMethodState ChildMethod { get @@ -632,10 +630,14 @@ protected override NodeId GetDefaultTypeDefinitionId(NamespaceTable namespaceUri /// protected override void Initialize(ISystemContext context) { + base.Initialize(context); Initialize(context, InitializationString); InitializeOptionalChildren(context); } + /// + /// Initializes the instance with a node. + /// protected override void Initialize(ISystemContext context, NodeState source) { InitializeOptionalChildren(context); @@ -653,12 +655,12 @@ protected override void InitializeOptionalChildren(ISystemContext context) #region Initialization String private const string InitializationString = "AQAAADQAAABodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL09iamVjdFR5cGVUZXN0" + - "/////wRggAABAAAAAQAkAAAARGVyaXZlZEZyb21Db21wbGV4T2JqZWN0VHlwZUluc3RhbmNlAQEQAAEB" + - "EAD/////AwAAABVgyQoCAAAAEQAAAEJyb3dzZU5hbWU0bm9kZTY2AQANAAAAQ2hpbGRQcm9wZXJ0eQEB" + - "EgAALgBEEgAAAAAV/////wEB/////wAAAAAVYIkKAgAAAAEADQAAAENoaWxkVmFyaWFibGUBATEAAC8B" + - "AEAJMQAAAAAa/////wEB/////wEAAAAVYIkKAgAAAAAABwAAAEVVUmFuZ2UBATUAAC4ARDUAAAABAHQD" + - "/////wEB/////wAAAABEYYIKBAAAAAEACwAAAENoaWxkTWV0aG9kAQEZAAMAAAAAEgAAAENoaWxkTWV0" + - "aG9kTmV3TmFtZQAvAQEKABkAAAABAf////8AAAAA"; + "/////wRggAIBAAAAAQAkAAAARGVyaXZlZEZyb21Db21wbGV4T2JqZWN0VHlwZUluc3RhbmNlAQEQAAEB" + + "EAAQAAAA/////wMAAAAVYMkKAgAAABEAAABCcm93c2VOYW1lNG5vZGU2NgEADQAAAENoaWxkUHJvcGVy" + + "dHkBARIAAC4ARBIAAAAAFf////8BAf////8AAAAAFWCJCgIAAAABAA0AAABDaGlsZFZhcmlhYmxlAQEx" + + "AAAvAQBACTEAAAAAGv////8BAf////8BAAAAFWCJCgIAAAAAAAcAAABFVVJhbmdlAQE1AAAuAEQ1AAAA" + + "AQB0A/////8BAf////8AAAAARGGCCgQAAAABAAsAAABDaGlsZE1ldGhvZAEBGQADAAAAABIAAABDaGls" + + "ZE1ldGhvZE5ld05hbWUALwEBCgAZAAAAAQH/////AAAAAA=="; #endregion #endif #endregion diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeIds.csv b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeIds.csv new file mode 100644 index 00000000..13b5e91a --- /dev/null +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeIds.csv @@ -0,0 +1,3 @@ +ComplexObjectType,1,ObjectType +DerivedFromComplexObjectType,16,ObjectType +InstanceOfDerivedFromComplexObjectType,30,Object diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeSet.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeSet.xml index 824d8ed9..e9117b7f 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeSet.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeSet.xml @@ -183,10 +183,7 @@ - - - - + @@ -229,15 +226,6 @@ ns=1;i=1 - - - i=40 - - false - - ns=1;i=10 - - i=37 @@ -321,15 +309,6 @@ ns=1;i=16 - - - i=40 - - false - - ns=1;i=10 - - i=37 @@ -452,10 +431,7 @@ - - - - + @@ -498,15 +474,6 @@ ns=1;i=30 - - - i=40 - - false - - ns=1;i=10 - - true true diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeSet2.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeSet2.xml index ad1c7746..4295a9ce 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeSet2.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.NodeSet2.xml @@ -1,11 +1,11 @@  - + http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest - + @@ -44,6 +44,17 @@ i=37 i=38 i=39 + i=53 + i=52 + i=51 + i=54 + i=9004 + i=9005 + i=17597 + i=9006 + i=15112 + i=17604 + i=17603 ComplexObjectType diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.PredefinedNodes.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.PredefinedNodes.xml index ed1716b1..ea4e575a 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.PredefinedNodes.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.PredefinedNodes.xml @@ -159,7 +159,6 @@ ChildMethod - ChildMethodNewName @@ -282,7 +281,6 @@ ChildMethod - ChildMethodNewName diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.Types.bsd b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.Types.bsd index 28ec1fea..444a66b9 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.Types.bsd +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest/ObjectTypeTest.Types.bsd @@ -6,7 +6,6 @@ DefaultByteOrder="LittleEndian" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" > - \ No newline at end of file diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.Classes.cs b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.Classes.cs index cabebefc..9157dded 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.Classes.cs +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.Classes.cs @@ -1,5 +1,5 @@ /* ======================================================================== - * Copyright (c) 2005-2016 The OPC Foundation, Inc. All rights reserved. + * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 * diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.NodeIds.csv b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.NodeIds.csv new file mode 100644 index 00000000..42467b20 --- /dev/null +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.NodeIds.csv @@ -0,0 +1 @@ +ReferenceTypeTest,1,ReferenceType diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.NodeSet2.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.NodeSet2.xml index 136cd8e0..14bc0404 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.NodeSet2.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.NodeSet2.xml @@ -1,11 +1,11 @@  - + http://cas.eu/UA/CommServer/UnitTests/ReferenceTest - + @@ -44,6 +44,17 @@ i=37 i=38 i=39 + i=53 + i=52 + i=51 + i=54 + i=9004 + i=9005 + i=17597 + i=9006 + i=15112 + i=17604 + i=17603 ReferenceTypeTest diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.PredefinedNodes.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.PredefinedNodes.xml index 388f55b5..0738913a 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.PredefinedNodes.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.PredefinedNodes.xml @@ -16,7 +16,6 @@ i=46 - FromSomwhere diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.Types.bsd b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.Types.bsd index 70198fc9..f4342a39 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.Types.bsd +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest/ReferenceTest.Types.bsd @@ -6,7 +6,6 @@ DefaultByteOrder="LittleEndian" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" > - \ No newline at end of file diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.Classes.cs b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.Classes.cs index d5cdf491..ee4faa71 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.Classes.cs +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.Classes.cs @@ -1,5 +1,5 @@ /* ======================================================================== - * Copyright (c) 2005-2016 The OPC Foundation, Inc. All rights reserved. + * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 * @@ -219,10 +219,14 @@ protected override int GetDefaultValueRank() /// protected override void Initialize(ISystemContext context) { + base.Initialize(context); Initialize(context, InitializationString); InitializeOptionalChildren(context); } + /// + /// Initializes the instance with a node. + /// protected override void Initialize(ISystemContext context, NodeState source) { InitializeOptionalChildren(context); @@ -240,18 +244,16 @@ protected override void InitializeOptionalChildren(ISystemContext context) #region Initialization String private const string InitializationString = "AQAAADYAAABodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL1ZhcmlhYmxlVHlwZVRl" + - "c3T/////FWCJAAIAAAABABsAAABDb21wbGV4VmFyaWFibGVUeXBlSW5zdGFuY2UBAQgAAQEIAAAa////" + - "/wEB/////wIAAABVYIkKAgAAAAAABwAAAEVVUmFuZ2UBAQwAAwAAAAAOAAAATmV3RGlzcGxheU5hbWUA" + - "LgBEDAAAAAEAdAP/////AQH/////AAAAABVgiQoCAAAAAQANAAAAVmFyaWFibGVDaGlsZAEBDgAALgBE" + - "DgAAAAAG/////wIC/////wAAAAA="; + "c3T/////FWCJAgIAAAABABsAAABDb21wbGV4VmFyaWFibGVUeXBlSW5zdGFuY2UBAQgAAQEIAAgAAAAA" + + "Gv////8BAf////8CAAAAVWCJCgIAAAAAAAcAAABFVVJhbmdlAQEMAAMAAAAADgAAAE5ld0Rpc3BsYXlO" + + "YW1lAC4ARAwAAAABAHQD/////wEB/////wAAAAAVYIkKAgAAAAEADQAAAFZhcmlhYmxlQ2hpbGQBAQ4A" + + "AC4ARA4AAAAABv////8CAv////8AAAAA"; #endregion #endif #endregion #region Public Properties - /// - /// A description for the VariableChild Property. - /// + /// public PropertyState VariableChild { get @@ -372,6 +374,9 @@ protected override void Initialize(ISystemContext context) ValueRank = TypeInfo.GetValueRank(typeof(T)); } + /// + /// Initializes the instance with a node. + /// protected override void Initialize(ISystemContext context, NodeState source) { InitializeOptionalChildren(context); @@ -448,10 +453,14 @@ protected override int GetDefaultValueRank() /// protected override void Initialize(ISystemContext context) { + base.Initialize(context); Initialize(context, InitializationString); InitializeOptionalChildren(context); } + /// + /// Initializes the instance with a node. + /// protected override void Initialize(ISystemContext context, NodeState source) { InitializeOptionalChildren(context); @@ -469,8 +478,8 @@ protected override void InitializeOptionalChildren(ISystemContext context) #region Initialization String private const string InitializationString = "AQAAADYAAABodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL1ZhcmlhYmxlVHlwZVRl" + - "c3T/////F2CJAAIAAAABABkAAABBcnJheVZhcmlhYmxlVHlwZUluc3RhbmNlAQEPAAEBDwAABgMAAAAD" + - "AAAAAAAAAAAAAAAAAAAAAQH/////AAAAAA=="; + "c3T/////F2CJAgIAAAABABkAAABBcnJheVZhcmlhYmxlVHlwZUluc3RhbmNlAQEPAAEBDwAPAAAAAAYD" + + "AAAAAwAAAAAAAAAAAAAAAAAAAAEB/////wAAAAA="; #endregion #endif #endregion @@ -534,10 +543,14 @@ protected override int GetDefaultValueRank() /// protected override void Initialize(ISystemContext context) { + base.Initialize(context); Initialize(context, InitializationString); InitializeOptionalChildren(context); } + /// + /// Initializes the instance with a node. + /// protected override void Initialize(ISystemContext context, NodeState source) { InitializeOptionalChildren(context); @@ -555,8 +568,8 @@ protected override void InitializeOptionalChildren(ISystemContext context) #region Initialization String private const string InitializationString = "AQAAADYAAABodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL1ZhcmlhYmxlVHlwZVRl" + - "c3T/////FWCpAAIAAAABACMAAABTaW1wbGVWYXJpYWJsZVdpdGhWYWx1ZVR5cGVJbnN0YW5jZQEBEAAB" + - "ARAABgEAAAAABv////8BAf////8AAAAA"; + "c3T/////FWCpAgIAAAABACMAAABTaW1wbGVWYXJpYWJsZVdpdGhWYWx1ZVR5cGVJbnN0YW5jZQEBEAAB" + + "ARAAEAAAAAYBAAAAAAb/////AQH/////AAAAAA=="; #endregion #endif #endregion diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.NodeIds.csv b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.NodeIds.csv new file mode 100644 index 00000000..f9c273a3 --- /dev/null +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.NodeIds.csv @@ -0,0 +1,3 @@ +ArrayVariableType,15,VariableType +ComplexVariableType,8,VariableType +SimpleVariableWithValueType,16,VariableType diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.NodeSet2.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.NodeSet2.xml index a4713193..39191051 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.NodeSet2.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.NodeSet2.xml @@ -1,11 +1,11 @@  - + http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest - + @@ -44,6 +44,17 @@ i=37 i=38 i=39 + i=53 + i=52 + i=51 + i=54 + i=9004 + i=9005 + i=17597 + i=9006 + i=15112 + i=17604 + i=17603 ComplexVariableType diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.PredefinedNodes.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.PredefinedNodes.xml index be5d20a2..bde371f5 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.PredefinedNodes.xml +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.PredefinedNodes.xml @@ -29,7 +29,6 @@ EURange - NewDisplayName diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.Types.bsd b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.Types.bsd index 06f06519..c86a0f48 100644 --- a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.Types.bsd +++ b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest/VariableTypeTest.Types.bsd @@ -6,7 +6,6 @@ DefaultByteOrder="LittleEndian" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" > - \ No newline at end of file