Skip to content

Commit

Permalink
Import simple NodeSet2 file is incomplete #510
Browse files Browse the repository at this point in the history 
- updated NodeSet files using current ModelCompiler implementation
- Removed graph HasEncoding references - added warning, because the round trip test cannot be resolved (Key extension is same for different nodes)
- improved unit tests
- UT :21:
  • Loading branch information
@mpostol
mpostol committed Feb 21, 2021
1 parent 98d7e2b commit 52fe0a2
Show file tree
Hide file tree
Showing 48 changed files with 691 additions and 332 deletions.
4 changes: 4 additions & 0 deletions SemanticData/AddressSpaceComplianceTestTool/DoExportXMLModels.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
asp "XMLModels\DataTypeTest.NodeSet2.xml" -e "XMLModels\DataTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/DataTypeTest"
asp "XMLModels\ObjectTypeTest.NodeSet2.xml" -e "XMLModels\ObjectTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest"
asp "XMLModels\ReferenceTest.NodeSet2.xml" -e "XMLModels\ReferenceTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/ReferenceTest"
asp "XMLModels\VariableTypeTest.NodeSet2.xml" -e "XMLModels\VariableTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest"
3 changes: 3 additions & 0 deletions ...ticData/AddressSpaceComplianceTestTool/SemanticData.AddressSpaceComplianceTestTool.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
<None Include="DoExport.cmd">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DoExportXMLModels.cmd">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="OPCUAOOIKey.snk" />
<None Include="packages.config" />
<None Include="Properties\AssemblyInfo.tt">
Expand Down
13 changes: 9 additions & 4 deletions SemanticData/AddressSpaceComplianceTestTool/XMLModels/DataTypeTest.NodeSet2.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" LastModified="2015-04-03T15:25:33.2948054Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<NamespaceUris>
<Uri>http://cas.eu/UA/CommServer/UnitTests/DataTypeTest</Uri>
</NamespaceUris>
<Models>
<Model ModelUri="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest">
<RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04" PublicationDate="2016-12-31T00:00:00Z" />
</Model>
</Models>
<Aliases>
<Alias Alias="Boolean">i=1</Alias>
<Alias Alias="SByte">i=2</Alias>
Expand Down Expand Up @@ -127,7 +132,7 @@
<References>
<Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=13</Reference>
</References>
<Definition Name="DerivedStructure" BaseType="0:1:DerivedStructure">
<Definition Name="DerivedStructure">
<Field Name="Number" DataType="i=6">
<Description>Derived from Number</Description>
</Field>
Expand Down Expand Up @@ -281,9 +286,9 @@ U2NoZW1hLWluc3RhbmNlIg0KICB4bWxuczp1YT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VB
LyINCiAgeG1sbnM6dG5zPSJodHRwOi8vY2FzLmV1L1VBL0NvbW1TZXJ2ZXIvVW5pdFRlc3RzL0Rh
dGFUeXBlVGVzdCINCiAgRGVmYXVsdEJ5dGVPcmRlcj0iTGl0dGxlRW5kaWFuIg0KICBUYXJnZXRO
YW1lc3BhY2U9Imh0dHA6Ly9jYXMuZXUvVUEvQ29tbVNlcnZlci9Vbml0VGVzdHMvRGF0YVR5cGVU
ZXN0Ig0KPg0KICA8IS0tIFRoaXMgRmlsZSB3YXMgZ2VuZXJhdGVkIG9uIDIwMTUtMDQtMDMgYW5k
ZXN0Ig0KPg0KICA8IS0tIFRoaXMgRmlsZSB3YXMgZ2VuZXJhdGVkIG9uIDIwMTktMDUtMTEgYW5k
IHN1cHBvcnRzIHRoZSBzcGVjaWZpY2F0aW9ucyBzdXBwb3J0ZWQgYnkgdmVyc2lvbiAxLjIuMjYu
MjgxNDYgb2YgdGhlIE9QQyBVQSBkZWxpdmVyYWJsZXMuIC0tPg0KICA8b3BjOkltcG9ydCBOYW1l
MTYwMzIgb2YgdGhlIE9QQyBVQSBkZWxpdmVyYWJsZXMuIC0tPg0KICA8b3BjOkltcG9ydCBOYW1l
c3BhY2U9Imh0dHA6Ly9vcGNmb3VuZGF0aW9uLm9yZy9VQS8iIExvY2F0aW9uPSIuQmluYXJ5U2No
ZW1hLmJzZCIvPg0KDQogIDxvcGM6RW51bWVyYXRlZFR5cGUgTmFtZT0iQWJzdHJhY3RFbnVtZXJh
dGlvbkRhdGFUeXBlIiBMZW5ndGhJbkJpdHM9IjMyIj4NCiAgICA8b3BjOkVudW1lcmF0ZWRWYWx1
Expand Down
232 changes: 58 additions & 174 deletions SemanticData/AddressSpaceComplianceTestTool/XMLModels/ObjectTypeTest.NodeSet2.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" LastModified="2015-04-03T15:25:20.5736134Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<NamespaceUris>
<Uri>http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest</Uri>
</NamespaceUris>
<Models>
<Model ModelUri="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest">
<RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04" PublicationDate="2016-12-31T00:00:00Z" />
</Model>
</Models>
<Aliases>
<Alias Alias="Boolean">i=1</Alias>
<Alias Alias="SByte">i=2</Alias>
Expand Down Expand Up @@ -40,227 +45,106 @@
<Alias Alias="HasEncoding">i=38</Alias>
<Alias Alias="HasDescription">i=39</Alias>
</Aliases>
<UAObjectType NodeId="ns=1;i=196" BrowseName="1:ComplexObjectType">
<UAObjectType NodeId="ns=1;i=1" BrowseName="1:ComplexObjectType">
<DisplayName>ComplexObjectType</DisplayName>
<References>
<Reference ReferenceType="HasComponent">ns=1;i=308</Reference>
<Reference ReferenceType="HasProperty">ns=1;i=309</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=289</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=295</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=306</Reference>
<Reference ReferenceType="HasSubtype" IsForward="false">i=2004</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=2</Reference>
<Reference ReferenceType="HasProperty">ns=1;i=3</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=43</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=10</Reference>
<Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
</References>
</UAObjectType>
<UAObject NodeId="ns=1;i=308" BrowseName="1:ChildObject" ParentNodeId="ns=1;i=196" EventNotifier="1">
<UAObject NodeId="ns=1;i=2" BrowseName="1:ChildObject" ParentNodeId="ns=1;i=1" EventNotifier="1">
<DisplayName>ChildObject</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=58</Reference>
<Reference ReferenceType="HasModellingRule">i=11510</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=196</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1</Reference>
</References>
</UAObject>
<UAVariable NodeId="ns=1;i=309" BrowseName="1:ChildProperty" SymbolicName="BrowseName4node66" ParentNodeId="ns=1;i=196" DataType="LocalizedText">
<UAVariable NodeId="ns=1;i=3" BrowseName="1:ChildProperty" SymbolicName="BrowseName4node66" ParentNodeId="ns=1;i=1" DataType="LocalizedText">
<DisplayName>ChildProperty</DisplayName>
<References>
<Reference ReferenceType="ns=1;i=195" IsForward="false">ns=1;i=289</Reference>
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=196</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=1</Reference>
</References>
</UAVariable>
<UAVariable NodeId="ns=1;i=289" BrowseName="1:BrowseName4node1109" SymbolicName="NameNotSet1109" ParentNodeId="ns=1;i=196" DataType="Number">
<DisplayName>BrowseName4node1109</DisplayName>
<UAVariable NodeId="ns=1;i=43" BrowseName="1:ChildVariable" ParentNodeId="ns=1;i=1" DataType="Number">
<DisplayName>ChildVariable</DisplayName>
<References>
<Reference ReferenceType="HasProperty">ns=1;i=293</Reference>
<Reference ReferenceType="ns=1;i=195">ns=1;i=309</Reference>
<Reference ReferenceType="HasProperty">ns=1;i=47</Reference>
<Reference ReferenceType="HasTypeDefinition">i=2368</Reference>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=196</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1</Reference>
</References>
</UAVariable>
<UAVariable NodeId="ns=1;i=293" BrowseName="EURange" ParentNodeId="ns=1;i=289" DataType="i=884">
<UAVariable NodeId="ns=1;i=47" BrowseName="EURange" ParentNodeId="ns=1;i=43" DataType="i=884">
<DisplayName>EURange</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=289</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=43</Reference>
</References>
</UAVariable>
<UAMethod NodeId="ns=1;i=295" BrowseName="1:ChildMethod" ParentNodeId="ns=1;i=196">
<UAMethod NodeId="ns=1;i=10" BrowseName="1:ChildMethod" ParentNodeId="ns=1;i=1">
<DisplayName>ChildMethod</DisplayName>
<References>
<Reference ReferenceType="HasProperty">ns=1;i=299</Reference>
<Reference ReferenceType="HasProperty">ns=1;i=300</Reference>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=196</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1</Reference>
</References>
</UAMethod>
<UAVariable NodeId="ns=1;i=299" BrowseName="InputArguments" ParentNodeId="ns=1;i=295" DataType="i=296" ValueRank="1">
<DisplayName>InputArguments</DisplayName>
<UAObjectType NodeId="ns=1;i=16" BrowseName="1:DerivedFromComplexObjectType">
<DisplayName>DerivedFromComplexObjectType</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=295</Reference>
</References>
<Value>
<ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
<ExtensionObject>
<TypeId>
<Identifier>i=297</Identifier>
</TypeId>
<Body>
<Argument>
<Name>Input1</Name>
<DataType>
<Identifier>i=6</Identifier>
</DataType>
<ValueRank>-1</ValueRank>
<ArrayDimensions />
<Description p5:nil="true" xmlns:p5="http://www.w3.org/2001/XMLSchema-instance" />
</Argument>
</Body>
</ExtensionObject>
<ExtensionObject>
<TypeId>
<Identifier>i=297</Identifier>
</TypeId>
<Body>
<Argument>
<Name>Input2</Name>
<DataType>
<Identifier>i=6</Identifier>
</DataType>
<ValueRank>-1</ValueRank>
<ArrayDimensions />
<Description p5:nil="true" xmlns:p5="http://www.w3.org/2001/XMLSchema-instance" />
</Argument>
</Body>
</ExtensionObject>
</ListOfExtensionObject>
</Value>
</UAVariable>
<UAVariable NodeId="ns=1;i=300" BrowseName="OutputArguments" ParentNodeId="ns=1;i=295" DataType="i=296" ValueRank="1">
<DisplayName>OutputArguments</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=295</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=25</Reference>
<Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=1</Reference>
</References>
<Value>
<ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
<ExtensionObject>
<TypeId>
<Identifier>i=297</Identifier>
</TypeId>
<Body>
<Argument>
<Name>Output1</Name>
<DataType>
<Identifier>i=6</Identifier>
</DataType>
<ValueRank>-1</ValueRank>
<ArrayDimensions />
<Description p5:nil="true" xmlns:p5="http://www.w3.org/2001/XMLSchema-instance" />
</Argument>
</Body>
</ExtensionObject>
</ListOfExtensionObject>
</Value>
</UAVariable>
<UAMethod NodeId="ns=1;i=306" BrowseName="1:NonExecutableMethod" ParentNodeId="ns=1;i=196">
<DisplayName>NonExecutableMethod</DisplayName>
</UAObjectType>
<UAMethod NodeId="ns=1;i=25" BrowseName="1:ChildMethod" ParentNodeId="ns=1;i=16" MethodDeclarationId="ns=1;i=10">
<DisplayName>ChildMethodNewName</DisplayName>
<References>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=196</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=16</Reference>
</References>
</UAMethod>
<UAReferenceType NodeId="ns=1;i=195" BrowseName="1:FlowTo">
<DisplayName>Flow to type</DisplayName>
<Description>It is test ReferenceType</Description>
<UAObject NodeId="ns=1;i=30" BrowseName="1:InstanceOfDerivedFromComplexObjectType">
<DisplayName>InstanceOfDerivedFromComplexObjectType</DisplayName>
<References>
<Reference ReferenceType="HasSubtype" IsForward="false">i=32</Reference>
<Reference ReferenceType="HasProperty">ns=1;i=32</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=55</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=39</Reference>
<Reference ReferenceType="Organizes" IsForward="false">i=85</Reference>
<Reference ReferenceType="HasTypeDefinition">ns=1;i=16</Reference>
</References>
<InverseName>FlowFrom</InverseName>
</UAReferenceType>
<UAMethod NodeId="ns=1;i=303" BrowseName="1:ChildMethodComplexObjectType">
<DisplayName>ChildMethodComplexObjectType</DisplayName>
</UAObject>
<UAVariable NodeId="ns=1;i=32" BrowseName="1:ChildProperty" SymbolicName="BrowseName4node66" ParentNodeId="ns=1;i=30" DataType="LocalizedText">
<DisplayName>ChildProperty</DisplayName>
<References>
<Reference ReferenceType="HasProperty">ns=1;i=304</Reference>
<Reference ReferenceType="HasProperty">ns=1;i=305</Reference>
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=30</Reference>
</References>
</UAMethod>
<UAVariable NodeId="ns=1;i=304" BrowseName="InputArguments" ParentNodeId="ns=1;i=303" DataType="i=296" ValueRank="1">
<DisplayName>InputArguments</DisplayName>
</UAVariable>
<UAVariable NodeId="ns=1;i=55" BrowseName="1:ChildVariable" ParentNodeId="ns=1;i=30" DataType="Number">
<DisplayName>ChildVariable</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=303</Reference>
<Reference ReferenceType="HasProperty">ns=1;i=59</Reference>
<Reference ReferenceType="HasTypeDefinition">i=2368</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=30</Reference>
</References>
<Value>
<ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
<ExtensionObject>
<TypeId>
<Identifier>i=297</Identifier>
</TypeId>
<Body>
<Argument>
<Name>Input1</Name>
<DataType>
<Identifier>i=6</Identifier>
</DataType>
<ValueRank>-1</ValueRank>
<ArrayDimensions />
<Description p5:nil="true" xmlns:p5="http://www.w3.org/2001/XMLSchema-instance" />
</Argument>
</Body>
</ExtensionObject>
<ExtensionObject>
<TypeId>
<Identifier>i=297</Identifier>
</TypeId>
<Body>
<Argument>
<Name>Input2</Name>
<DataType>
<Identifier>i=6</Identifier>
</DataType>
<ValueRank>-1</ValueRank>
<ArrayDimensions />
<Description p5:nil="true" xmlns:p5="http://www.w3.org/2001/XMLSchema-instance" />
</Argument>
</Body>
</ExtensionObject>
</ListOfExtensionObject>
</Value>
</UAVariable>
<UAVariable NodeId="ns=1;i=305" BrowseName="OutputArguments" ParentNodeId="ns=1;i=303" DataType="i=296" ValueRank="1">
<DisplayName>OutputArguments</DisplayName>
<UAVariable NodeId="ns=1;i=59" BrowseName="EURange" ParentNodeId="ns=1;i=55" DataType="i=884">
<DisplayName>EURange</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=303</Reference>
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=55</Reference>
</References>
<Value>
<ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
<ExtensionObject>
<TypeId>
<Identifier>i=297</Identifier>
</TypeId>
<Body>
<Argument>
<Name>Output1</Name>
<DataType>
<Identifier>i=6</Identifier>
</DataType>
<ValueRank>-1</ValueRank>
<ArrayDimensions />
<Description p5:nil="true" xmlns:p5="http://www.w3.org/2001/XMLSchema-instance" />
</Argument>
</Body>
</ExtensionObject>
</ListOfExtensionObject>
</Value>
</UAVariable>
<UAMethod NodeId="ns=1;i=307" BrowseName="1:NonExecutableMethodComplexObjectType" Executable="false" UserExecutable="false">
<DisplayName>NonExecutableMethodComplexObjectType</DisplayName>
<References />
<UAMethod NodeId="ns=1;i=39" BrowseName="1:ChildMethod" ParentNodeId="ns=1;i=30" MethodDeclarationId="ns=1;i=10">
<DisplayName>ChildMethodNewName</DisplayName>
<References>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=30</Reference>
</References>
</UAMethod>
</UANodeSet>
7 changes: 6 additions & 1 deletion SemanticData/AddressSpaceComplianceTestTool/XMLModels/ReferenceTest.NodeSet2.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" LastModified="2015-04-03T15:25:14.0254814Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<NamespaceUris>
<Uri>http://cas.eu/UA/CommServer/UnitTests/ReferenceTest</Uri>
</NamespaceUris>
<Models>
<Model ModelUri="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest">
<RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04" PublicationDate="2016-12-31T00:00:00Z" />
</Model>
</Models>
<Aliases>
<Alias Alias="Boolean">i=1</Alias>
<Alias Alias="SByte">i=2</Alias>
Expand Down
Loading

0 comments on commit 52fe0a2

Please sign in to comment.