From 93f45c4c16f4f1115efa187582e3ca0881b251b7 Mon Sep 17 00:00:00 2001 From: thomasfruehwirth Date: Thu, 1 Apr 2021 18:02:12 +0200 Subject: [PATCH] Added InstanceSpecification transformation tests --- .../InstanceWithInstanceValueSlot.di | 2 + .../InstanceWithInstanceValueSlot.notation | 125 ++++++++++++ .../InstanceWithInstanceValueSlot.uml | 24 +++ .../InstanceWithInstanceValueSlot.xml | 83 ++++++++ .../InstanceWithSlots.notation | 38 +++- .../InstanceWithSlots.uml | 6 + .../InstanceWithSlots.xml | 189 +++++++++++++++--- 7 files changed, 432 insertions(+), 35 deletions(-) create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.di create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.notation create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.uml create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.xml diff --git a/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.di b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.di new file mode 100644 index 0000000..8c549ee --- /dev/null +++ b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.di @@ -0,0 +1,2 @@ + + diff --git a/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.notation b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.notation new file mode 100644 index 0000000..e00e0b6 --- /dev/null +++ b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.notation @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.uml b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.uml new file mode 100644 index 0000000..60fafac --- /dev/null +++ b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.uml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.xml b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.xml new file mode 100644 index 0000000..5132938 --- /dev/null +++ b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.xml @@ -0,0 +1,83 @@ + + + + InstanceWithInstanceValueSlot + + + i=58 + i=40 + i=85 + i=47 + i=12 + i=35 + i=37 + i=45 + i=78 + i=63 + + + Version + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1001 + + + + RobotController + + ns=1;i=1002 + ns=1;i=1000 + ModellingRule_Mandatory + ns=1;i=1003 + + + + Version + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1002 + + + + ControllerType + + BaseObjectType + ns=1;i=1004 + + + + RobotType + + BaseObjectType + ns=1;i=1001 + + + + Version + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1005 + + + #006002 + + + + MyControllerInstance + + ns=1;i=1002 + ns=1;i=1006 + + + + MyRobotInstance + + ns=1;i=1000 + ObjectsFolder + ns=1;i=1005 + + + \ No newline at end of file diff --git a/Uml2OpcuaTransformationTests/InstanceWithSlots.notation b/Uml2OpcuaTransformationTests/InstanceWithSlots.notation index c554007..441f1f2 100644 --- a/Uml2OpcuaTransformationTests/InstanceWithSlots.notation +++ b/Uml2OpcuaTransformationTests/InstanceWithSlots.notation @@ -25,6 +25,10 @@ + + + + @@ -46,7 +50,7 @@ - + @@ -76,7 +80,37 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Uml2OpcuaTransformationTests/InstanceWithSlots.uml b/Uml2OpcuaTransformationTests/InstanceWithSlots.uml index bd257e7..bc97df2 100644 --- a/Uml2OpcuaTransformationTests/InstanceWithSlots.uml +++ b/Uml2OpcuaTransformationTests/InstanceWithSlots.uml @@ -19,6 +19,7 @@ + @@ -27,4 +28,9 @@ + + + + + diff --git a/Uml2OpcuaTransformationTests/InstanceWithSlots.xml b/Uml2OpcuaTransformationTests/InstanceWithSlots.xml index 73cc6b5..f515905 100644 --- a/Uml2OpcuaTransformationTests/InstanceWithSlots.xml +++ b/Uml2OpcuaTransformationTests/InstanceWithSlots.xml @@ -4,30 +4,27 @@ InstanceWithSlots - i=40 + i=6 + i=85 + i=35 i=63 + i=40 + i=12 i=45 i=37 - i=12 i=78 - i=6 - i=35 i=58 - i=85 i=47 - - Manufacturer + + Description BaseDataVariableType ModellingRule_Mandatory ns=1;i=1000 - - ABB - - + Axes BaseDataVariableType @@ -38,25 +35,60 @@ 6 - - Description + + SN BaseDataVariableType ModellingRule_Mandatory ns=1;i=1000 + + #000000 + - - SN + + Manufacturer BaseDataVariableType ModellingRule_Mandatory ns=1;i=1000 - #000000 + ABB + + Version + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1005 + + + + RobotController + + ns=1;i=1006 + ns=1;i=1000 + ModellingRule_Mandatory + ns=1;i=1007 + + + + Version + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1006 + + + + ControllerType + + BaseObjectType + ns=1;i=1008 + + RobotType @@ -65,58 +97,149 @@ ns=1;i=1002 ns=1;i=1003 ns=1;i=1004 + ns=1;i=1005 - + + SN + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1009 + + + #005001 + + + + Manufacturer + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1009 + + + ABB + + + Description BaseDataVariableType ModellingRule_Mandatory - ns=1;i=1005 + ns=1;i=1009 - - SN + + Axes BaseDataVariableType ModellingRule_Mandatory - ns=1;i=1005 + ns=1;i=1009 - #005001 + 6 - - Manufacturer + + Version BaseDataVariableType ModellingRule_Mandatory - ns=1;i=1005 + ns=1;i=1014 + + + + RobotController + + ns=1;i=1006 + ns=1;i=1009 + ModellingRule_Mandatory + ns=1;i=1015 + + + + Version + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1016 - ABB + #006002 - + + Description + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1018 + + + + SN + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1018 + + + #000000 + + + Axes BaseDataVariableType ModellingRule_Mandatory - ns=1;i=1005 + ns=1;i=1018 6 - + + Manufacturer + + BaseDataVariableType + ModellingRule_Mandatory + ns=1;i=1018 + + + ABB + + + + MyRobotInstance2 + + ns=1;i=1000 + ObjectsFolder + ns=1;i=1019 + ns=1;i=1020 + ns=1;i=1021 + ns=1;i=1022 + ns=1;i=1023 + + + MyRobotInstance ns=1;i=1000 ObjectsFolder - ns=1;i=1006 - ns=1;i=1007 - ns=1;i=1008 - ns=1;i=1009 + ns=1;i=1010 + ns=1;i=1011 + ns=1;i=1012 + ns=1;i=1013 + ns=1;i=1014 + + + + MyControllerInstance + + ns=1;i=1006 + ObjectsFolder + ns=1;i=1017 \ No newline at end of file