Skip to content

Commit

Permalink
Update models to harmonize with current UA-ModelCompiler release #655
Browse files Browse the repository at this point in the history 
- modified SemanticData/Tests/USNodeSetValidationUnitTestProject/XMLModels/CorrectModels
  • Loading branch information
@mpostol
mpostol committed Mar 31, 2022
1 parent 69d4315 commit 4eab41a
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 41 deletions.
17 changes: 8 additions & 9 deletions ...ticData/Tests/USNodeSetValidationUnitTestProject/XMLModels/CorrectModels/DataTypeTest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type="text/xsl" href="OPCUAModelDesign.xslt"?>
<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<ModelDesign xmlns:cas="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<Namespaces>
<Namespace Name="cas" Prefix="DataTypeTest" XmlPrefix="cas">http://cas.eu/UA/CommServer/UnitTests/DataTypeTest</Namespace>
<Namespace Name="ua" XmlPrefix="ua">http://opcfoundation.org/UA/</Namespace>
</Namespaces>
<DataType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q1:AbstractEnumerationDataType" xmlns:q2="http://opcfoundation.org/UA/" BaseType="q2:Enumeration" IsAbstract="true">
<DataType SymbolicName="cas:AbstractEnumerationDataType" BaseType="ua:Enumeration" IsAbstract="true">
<Fields>
<Field Name="Field1" Identifier="0" />
<Field Name="Field2" Identifier="1" />
</Fields>
</DataType>
<DataType xmlns:q3="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q3:EnumerationDataType" BaseType="q3:AbstractEnumerationDataType">
<DataType SymbolicName="cas:EnumerationDataType" BaseType="cas:AbstractEnumerationDataType">
<Description>Enumeration DataType derived from abstract type</Description>
<Fields>
<Field Name="Field3" xmlns:q4="http://opcfoundation.org/UA/" DataType="q4:Int32" />
<Field Name="Field3" DataType="ua:Int32" />
</Fields>
</DataType>
<DataType xmlns:q5="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q5:AbstractStructure" xmlns:q6="http://opcfoundation.org/UA/" BaseType="q6:Structure" IsAbstract="true">
<DataType SymbolicName="cas:AbstractStructure" BaseType="ua:Structure" IsAbstract="true">
<Description>Abstract structure</Description>
<Fields>
<Field Name="Number" DataType="q6:Number" />
<Field Name="Number" DataType="ua:Number" />
</Fields>
</DataType>
<DataType xmlns:q7="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q7:DerivedStructure" BaseType="q7:AbstractStructure">
<DataType SymbolicName="cas:DerivedStructure" BaseType="cas:AbstractStructure">
<Fields>
<Field Name="Number" xmlns:q8="http://opcfoundation.org/UA/" DataType="q8:Int32">
<Field Name="Number" DataType="ua:Int32">
<Description>Derived from Number</Description>
</Field>
</Fields>
Expand Down
43 changes: 21 additions & 22 deletions ...cData/Tests/USNodeSetValidationUnitTestProject/XMLModels/CorrectModels/ObjectTypeTest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type="text/xsl" href="OPCUAModelDesign.xslt"?>
<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<ModelDesign xmlns:cas="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<Namespaces>
<Namespace Name="cas" Prefix="ObjectTypeTest" XmlPrefix="cas">http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest</Namespace>
<Namespace Name="ua" XmlPrefix="ua">http://opcfoundation.org/UA/</Namespace>
</Namespaces>
<ObjectType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q1:ComplexObjectType" xmlns:q2="http://opcfoundation.org/UA/" BaseType="q2:ServerType">
<ObjectType SymbolicName="cas:ComplexObjectType" BaseType="ua:ServerType">
<Children>
<Object SymbolicName="q1:ChildObject" ModellingRule="MandatoryPlaceholder" SupportsEvents="true" />
<Property SymbolicName="q1:BrowseName4node66" ModellingRule="Mandatory" DataType="q2:LocalizedText">
<Object SymbolicName="cas:ChildObject" ModellingRule="MandatoryPlaceholder" SupportsEvents="true" />
<Property SymbolicName="cas:BrowseName4node66" ModellingRule="Mandatory" DataType="ua:LocalizedText">
<BrowseName>ChildProperty</BrowseName>
<References>
<Reference IsInverse="true" IsOneWay="true">
<ReferenceType>q1:FlowTo</ReferenceType>
<TargetId>q1:ComplexObjectType_NameNotSet1109</TargetId>
<ReferenceType>cas:FlowTo</ReferenceType>
<TargetId>cas:ComplexObjectType_NameNotSet1109</TargetId>
</Reference>
</References>
</Property>
<Variable SymbolicName="q1:NameNotSet1109" TypeDefinition="q2:AnalogItemType" ModellingRule="Mandatory">
<Variable SymbolicName="cas:NameNotSet1109" TypeDefinition="ua:AnalogItemType" ModellingRule="Mandatory">
<BrowseName>BrowseName4node1109</BrowseName>
</Variable>
<Method SymbolicName="q1:ChildMethod" TypeDefinition="q1:ChildMethodComplexObjectType" ModellingRule="Mandatory" />
<Method SymbolicName="q1:NonExecutableMethod" TypeDefinition="q1:NonExecutableMethodComplexObjectType" ModellingRule="Mandatory" />
<Object SymbolicName="q2:ServerCapabilities" ModellingRule="Mandatory" />
<Method SymbolicName="cas:ChildMethod" TypeDefinition="cas:ChildMethodComplexObjectType" ModellingRule="Mandatory" />
<Method SymbolicName="cas:NonExecutableMethod" TypeDefinition="cas:NonExecutableMethodComplexObjectType" ModellingRule="Mandatory" />
<Object SymbolicName="ua:ServerCapabilities" ModellingRule="Mandatory" />
</Children>
</ObjectType>
<ReferenceType xmlns:q3="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q3:FlowTo" xmlns:q4="http://opcfoundation.org/UA/" BaseType="q4:NonHierarchicalReferences" Symmetric="false">
<ReferenceType SymbolicName="cas:FlowTo" BaseType="ua:NonHierarchicalReferences" Symmetric="false">
<DisplayName>Flow to type</DisplayName>
<Description>It is test ReferenceType</Description>
<InverseName>FlowFrom</InverseName>
</ReferenceType>
<Method xmlns:q5="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q5:ChildMethodComplexObjectType">
<Method SymbolicName="cas:ChildMethodComplexObjectType">
<InputArguments>
<Argument Name="Input1" xmlns:q6="http://opcfoundation.org/UA/" DataType="q6:Int32" />
<Argument Name="Input2" xmlns:q7="http://opcfoundation.org/UA/" DataType="q7:Int32" />
<Argument Name="Input1" DataType="ua:Int32" />
<Argument Name="Input2" DataType="ua:Int32" />
</InputArguments>
<OutputArguments>
<Argument Name="Output1" xmlns:q8="http://opcfoundation.org/UA/" DataType="q8:Int32" />
<Argument Name="Output1" DataType="ua:Int32" />
</OutputArguments>
</Method>
<Method xmlns:q9="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q9:NonExecutableMethodComplexObjectType" NonExecutable="true" />
<ObjectType xmlns:q10="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q10:DerivedFromComplexObjectType" BaseType="q10:ComplexObjectType">
<Method SymbolicName="cas:NonExecutableMethodComplexObjectType" NonExecutable="true" />
<ObjectType SymbolicName="cas:DerivedFromComplexObjectType" BaseType="cas:ComplexObjectType">
<Children>
<Method SymbolicName="q10:ChildMethod" />
<Method SymbolicName="cas:ChildMethod" />
</Children>
</ObjectType>
<Object xmlns:q11="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q11:NameNotSet6" TypeDefinition="q11:DerivedFromComplexObjectType">
<Object SymbolicName="cas:NameNotSet6" TypeDefinition="cas:DerivedFromComplexObjectType">
<References>
<Reference IsInverse="true">
<ReferenceType xmlns:q12="http://opcfoundation.org/UA/">q12:Organizes</ReferenceType>
<TargetId xmlns:q13="http://opcfoundation.org/UA/">q13:ObjectsFolder</TargetId>
<ReferenceType>ua:Organizes</ReferenceType>
<TargetId>ua:ObjectsFolder</TargetId>
</Reference>
</References>
</Object>
Expand Down
5 changes: 2 additions & 3 deletions ...icData/Tests/USNodeSetValidationUnitTestProject/XMLModels/CorrectModels/ReferenceTest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type="text/xsl" href="OPCUAModelDesign.xslt"?>
<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<ModelDesign xmlns:cas="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<Namespaces>
<Namespace Name="cas" Prefix="ReferenceTest" XmlPrefix="cas">http://cas.eu/UA/CommServer/UnitTests/ReferenceTest</Namespace>
<Namespace Name="ua" XmlPrefix="ua">http://opcfoundation.org/UA/</Namespace>
</Namespaces>
<ReferenceType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" SymbolicName="q1:ReferenceTypeTest" xmlns:q2="http://opcfoundation.org/UA/" BaseType="q2:HasProperty" Symmetric="false">
<ReferenceType SymbolicName="cas:ReferenceTypeTest" BaseType="ua:HasProperty" Symmetric="false">
<InverseName>FromSomwhere</InverseName>
</ReferenceType>
</ModelDesign>
13 changes: 6 additions & 7 deletions ...ata/Tests/USNodeSetValidationUnitTestProject/XMLModels/CorrectModels/VariableTypeTest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type="text/xsl" href="OPCUAModelDesign.xslt"?>
<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<ModelDesign xmlns:cas="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<Namespaces>
<Namespace Name="cas" Prefix="VariableTypeTest" XmlPrefix="cas">http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest</Namespace>
<Namespace Name="ua" XmlPrefix="ua">http://opcfoundation.org/UA/</Namespace>
</Namespaces>
<VariableType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" SymbolicName="q1:ComplexVariableType" xmlns:q2="http://opcfoundation.org/UA/" BaseType="q2:AnalogItemType">
<VariableType SymbolicName="cas:ComplexVariableType" BaseType="ua:AnalogItemType">
<Children>
<Property SymbolicName="q1:VariableChild" ModellingRule="Mandatory" DataType="q2:Int32" AccessLevel="Write" />
<Property SymbolicName="q2:EURange">
<Property SymbolicName="cas:VariableChild" ModellingRule="Mandatory" DataType="ua:Int32" AccessLevel="Write" />
<Property SymbolicName="ua:EURange">
<DisplayName> NewDisplayName</DisplayName>
</Property>
</Children>
</VariableType>
<VariableType xmlns:q3="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" SymbolicName="q3:ArrayVariableType" xmlns:q4="http://opcfoundation.org/UA/" DataType="q4:Int32" ValueRank="OneOrMoreDimensions" ArrayDimensions="0,0,0" />
<VariableType xmlns:q5="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" SymbolicName="q5:SimpleVariableWithValueType" xmlns:q6="http://opcfoundation.org/UA/" DataType="q6:Int32">
<VariableType SymbolicName="cas:ArrayVariableType" DataType="ua:Int32" ValueRank="OneOrMoreDimensions" ArrayDimensions="0,0,0" />
<VariableType SymbolicName="cas:SimpleVariableWithValueType" DataType="ua:Int32">
<DefaultValue>
<Int32 xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">1</Int32>
</DefaultValue>
Expand Down

0 comments on commit 4eab41a

Please sign in to comment.