Add Instance Tests

model-UA · Dec 7, 2021 · d93f587 · d93f587
1 parent fb4263a
commit d93f587
Show file tree

Hide file tree

Showing 40 changed files with 1,228 additions and 406 deletions.
diff --git a/Uml2OpcuaTransformationTests/Aggregation.xml b/Uml2OpcuaTransformationTests/Aggregation.xml
@@ -4,32 +4,32 @@
     <Uri>Aggregation</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="HasSubtype">i=45</Alias>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
     <Alias Alias="HasModellingRule">i=37</Alias>
     <Alias Alias="BaseObjectType">i=58</Alias>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
     <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
   </Aliases>
-  <UAObject BrowseName="Gripper1" NodeId="ns=1;s=Gripper1" ParentNodeId="ns=1;s=RobotType">
+  <UAObject BrowseName="Gripper1" NodeId="ns=1;i=1002" ParentNodeId="ns=1;i=1001">
     <DisplayName>Gripper1</DisplayName>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;s=GripperType</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=RobotType</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="RobotType" NodeId="ns=1;s=RobotType">
-    <DisplayName>RobotType</DisplayName>
+  <UAObjectType BrowseName="GripperType" NodeId="ns=1;i=1000">
+    <DisplayName>GripperType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=Gripper1</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="GripperType" NodeId="ns=1;s=GripperType">
-    <DisplayName>GripperType</DisplayName>
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1001">
+    <DisplayName>RobotType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1002</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
diff --git a/Uml2OpcuaTransformationTests/ChainedComposition.xml b/Uml2OpcuaTransformationTests/ChainedComposition.xml
@@ -5,56 +5,56 @@
   </NamespaceUris>
   <Aliases>
     <Alias Alias="BaseObjectType">i=58</Alias>
-    <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
     <Alias Alias="HasSubtype">i=45</Alias>
     <Alias Alias="ModellingRule_Optional">i=80</Alias>
-    <Alias Alias="HasModellingRule">i=37</Alias>
     <Alias Alias="HasTypeDefinition">i=40</Alias>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
   </Aliases>
-  <UAObject BrowseName="Program" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
+  <UAObject BrowseName="Program" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1001">
     <DisplayName>Program</DisplayName>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1004</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Optional</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="Program" NodeId="ns=1;i=1005" ParentNodeId="ns=1;i=1004">
-    <DisplayName>Program</DisplayName>
+  <UAObject BrowseName="Controller" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
+    <DisplayName>Controller</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1004</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Optional</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1003</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="Controller" NodeId="ns=1;i=1004" ParentNodeId="ns=1;i=1003">
-    <DisplayName>Controller</DisplayName>
+  <UAObject BrowseName="Program" NodeId="ns=1;i=1005" ParentNodeId="ns=1;i=1002">
+    <DisplayName>Program</DisplayName>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1003</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1005</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1004</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Optional</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;i=1000">
-    <DisplayName>ControllerType</DisplayName>
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1000">
+    <DisplayName>RobotType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
       <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="ProgramType" NodeId="ns=1;i=1002">
+  <UAObjectType BrowseName="ProgramType" NodeId="ns=1;i=1004">
     <DisplayName>ProgramType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1003">
-    <DisplayName>RobotType</DisplayName>
+  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;i=1002">
+    <DisplayName>ControllerType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1004</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1005</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
diff --git a/Uml2OpcuaTransformationTests/Class.csv b/Uml2OpcuaTransformationTests/Class.csv
@@ -0,0 +1 @@
+Class5Type, 1000, ObjectType
diff --git a/Uml2OpcuaTransformationTests/Class.xml b/Uml2OpcuaTransformationTests/Class.xml
@@ -4,10 +4,10 @@
     <Uri>Class</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="BaseObjectType">i=58</Alias>
     <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
   </Aliases>
-  <UAObjectType BrowseName="Class5Type" NodeId="ns=1;s=Class5Type">
+  <UAObjectType BrowseName="Class5Type" NodeId="ns=1;i=1000">
     <DisplayName>Class5Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>

diff --git a/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.csv b/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.csv
@@ -0,0 +1,8 @@
+Class1Type_StateMachine1_CurrentState_Id,1004,Variable
+Class1Type_StateMachine1,1001,Object
+Class1Type,1000,ObjectType
+MyStateMachineType,1002,ObjectType
+MyStateMachineType_State2,1006,Object
+MyStateMachineType_State1,1005,Object
+Class1Type_StateMachine1_CurrentState,1003,Variable
+MyStateMachineType_State1_to_State2,1007,Object
diff --git a/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.xml b/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.xml
@@ -4,69 +4,92 @@
     <Uri>ClassDiagramAndStateMachine</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="HasModellingRule">i=37</Alias>
-    <Alias Alias="FiniteStateMachineType">i=2771</Alias>
-    <Alias Alias="TransitionEventType">i=2311</Alias>
-    <Alias Alias="HasComponent">i=47</Alias>
-    <Alias Alias="StateType">i=2307</Alias>
-    <Alias Alias="FromState">i=51</Alias>
-    <Alias Alias="ToState">i=52</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasEffect">i=54</Alias>
+    <Alias Alias="PropertyType">i=68</Alias>
     <Alias Alias="BaseObjectType">i=58</Alias>
+    <Alias Alias="FromState">i=51</Alias>
     <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
-    <Alias Alias="HasEffect">i=54</Alias>
+    <Alias Alias="LocalizedText">i=21</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="FiniteStateMachineType">i=2771</Alias>
     <Alias Alias="HasSubtype">i=45</Alias>
     <Alias Alias="TransitionType">i=2310</Alias>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="NodeId">i=17</Alias>
+    <Alias Alias="HasProperty">i=46</Alias>
+    <Alias Alias="ToState">i=52</Alias>
+    <Alias Alias="FiniteStateVariableType">i=2760</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="TransitionEventType">i=2311</Alias>
+    <Alias Alias="StateType">i=2307</Alias>
   </Aliases>
-  <UAObject BrowseName="StateMachine1" NodeId="ns=1;s=StateMachine1" ParentNodeId="ns=1;s=Class1Type">
+  <UAVariable BrowseName="CurrentState" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1001" DataType="LocalizedText">
+    <DisplayName>CurrentState</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
+      <Reference ReferenceType="HasTypeDefinition">FiniteStateVariableType</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference ReferenceType="HasProperty">ns=1;i=1004</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable BrowseName="Id" NodeId="ns=1;i=1004" ParentNodeId="ns=1;i=1003" DataType="NodeId">
+    <DisplayName>CurrentState</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasProperty">ns=1;i=1003</Reference>
+      <Reference ReferenceType="HasTypeDefinition">PropertyType</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+    </References>
+  </UAVariable>
+  <UAObject BrowseName="StateMachine1" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
     <DisplayName>StateMachine1</DisplayName>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;s=MyStateMachineType</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=Class1Type</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1003</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="Class1Type" NodeId="ns=1;s=Class1Type">
+  <UAObjectType BrowseName="Class1Type" NodeId="ns=1;i=1000">
     <DisplayName>Class1Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=StateMachine1</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObjectType>
-  <UAObject BrowseName="State1" NodeId="ns=1;s=State1" ParentNodeId="ns=1;s=MyStateMachineType">
-    <DisplayName>State1</DisplayName>
+  <UAObject BrowseName="State2" NodeId="ns=1;i=1006" ParentNodeId="ns=1;i=1002">
+    <DisplayName>State2</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">StateType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=MyStateMachineType</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="State2" NodeId="ns=1;s=State2" ParentNodeId="ns=1;s=MyStateMachineType">
-    <DisplayName>State2</DisplayName>
+  <UAObject BrowseName="State1" NodeId="ns=1;i=1005" ParentNodeId="ns=1;i=1002">
+    <DisplayName>State1</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">StateType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=MyStateMachineType</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="State1_to_State2" NodeId="ns=1;s=State1_to_State2" ParentNodeId="ns=1;s=MyStateMachineType">
+  <UAObject BrowseName="State1_to_State2" NodeId="ns=1;i=1007" ParentNodeId="ns=1;i=1002">
     <DisplayName>State1_to_State2</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">TransitionType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=MyStateMachineType</Reference>
-      <Reference ReferenceType="FromState">ns=1;s=State1</Reference>
-      <Reference ReferenceType="ToState">ns=1;s=State2</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
+      <Reference ReferenceType="FromState">ns=1;i=1005</Reference>
+      <Reference ReferenceType="ToState">ns=1;i=1006</Reference>
       <Reference ReferenceType="HasEffect">TransitionEventType</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="MyStateMachineType" NodeId="ns=1;s=MyStateMachineType">
+  <UAObjectType BrowseName="MyStateMachineType" NodeId="ns=1;i=1002">
     <DisplayName>MyStateMachineType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">FiniteStateMachineType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=State2</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=State1</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=State1_to_State2</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1005</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1006</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1007</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
diff --git a/Uml2OpcuaTransformationTests/CompositionWithoutMemberName.xml b/Uml2OpcuaTransformationTests/CompositionWithoutMemberName.xml
@@ -4,32 +4,32 @@
     <Uri>CompositionWithoutMemberName</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="BaseObjectType">i=58</Alias>
     <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
-    <Alias Alias="HasModellingRule">i=37</Alias>
-    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
     <Alias Alias="HasTypeDefinition">i=40</Alias>
     <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
   </Aliases>
-  <UAObject BrowseName="Controller" NodeId="ns=1;s=Controller" ParentNodeId="ns=1;s=RobotType">
-    <DisplayName>Controller</DisplayName>
+  <UAObject NodeId="ns=1;i=1002" ParentNodeId="ns=1;i=1001">
+    <DisplayName/>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;s=ControllerType</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=RobotType</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;s=ControllerType">
+  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;i=1000">
     <DisplayName>ControllerType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="RobotType" NodeId="ns=1;s=RobotType">
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1001">
     <DisplayName>RobotType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=Controller</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1002</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>