From 19b8430d97bfc62c3dc5104dde2f4605a42b81bc Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Wed, 11 Mar 2020 19:10:41 +0100
Subject: [PATCH] Update on test for XML generation from TML diag
---
src/main/java/tmltranslator/TMLTask.java | 8 ++---
src/main/java/ui/MainGUI.java | 2 +-
.../ui/diagram2tml/expected/Mapping_0.xml | 32 +++++++++----------
.../ui/diagram2tml/expected/Zigbee_TX.xml | 28 ++++++++--------
4 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/main/java/tmltranslator/TMLTask.java b/src/main/java/tmltranslator/TMLTask.java
index ea431d73b7..f32299e976 100755
--- a/src/main/java/tmltranslator/TMLTask.java
+++ b/src/main/java/tmltranslator/TMLTask.java
@@ -469,10 +469,10 @@ public class TMLTask extends TMLElement {
public String toXML() {
String s = new String("<TASK name=\"" + name);
s += "\" priority=\"" + priority + "\" ";
- s += "\" isDaemon=\"" + isDaemon() + "\" ";
- s += "\" isPeriodic=\"" + isPeriodic() + "\" ";
- s += "\" periodValue=\"" + getPeriodValue() + "\" ";
- s += "\" periodUnit=\"" + getPeriodUnit() + "\" ";
+ s += " isDaemon=\"" + isDaemon() + "\" ";
+ s += " isPeriodic=\"" + isPeriodic() + "\" ";
+ s += " periodValue=\"" + getPeriodValue() + "\" ";
+ s += " periodUnit=\"" + getPeriodUnit() + "\" ";
s += ">\n";
for (TMLAttribute attr : attributes) {
s += attr.toXML();
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 9e90d9ad37..412fac95bb 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -341,7 +341,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
// Thread for autosave
private PeriodicBehaviorThread pbt;
- private TMLArchiPanel tmlap; // USed to retrieve the currently opened architecture panel
+ private TMLArchiPanel tmlap; // Used to retrieve the currently opened architecture panel
// Plugin management
// public static PluginManager pluginManager;
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/Mapping_0.xml b/ttool/src/test/resources/ui/diagram2tml/expected/Mapping_0.xml
index 3392bf6fbe..ce67e73bf7 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/Mapping_0.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/Mapping_0.xml
@@ -1,6 +1,6 @@
<TMLMAPPING>
<TMLMODELING>
-<TASK name="Zigbee_TX__X_Sink" priority="0" >
+<TASK name="Zigbee_TX__X_Sink" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -25,7 +25,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_CWP_I" priority="0" >
+<TASK name="Zigbee_TX__F_CWP_I" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -49,7 +49,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_CWP_Q" priority="0" >
+<TASK name="Zigbee_TX__F_CWP_Q" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -73,7 +73,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_CWL" priority="0" >
+<TASK name="Zigbee_TX__F_CWL" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -101,7 +101,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_Sink" priority="0" >
+<TASK name="Zigbee_TX__F_Sink" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="size_1" initialValue=""/>
<ACTIVITY first="0">
@@ -126,7 +126,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_Chip2Octet" priority="0" >
+<TASK name="Zigbee_TX__X_Chip2Octet" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -155,7 +155,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_Symbol2ChipSeq" priority="0" >
+<TASK name="Zigbee_TX__F_Symbol2ChipSeq" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -179,7 +179,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_Source" priority="0" >
+<TASK name="Zigbee_TX__X_Source" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -204,7 +204,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_Source" priority="0" >
+<TASK name="Zigbee_TX__F_Source" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue="127"/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -228,7 +228,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_Chip2Octet" priority="0" >
+<TASK name="Zigbee_TX__F_Chip2Octet" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -252,7 +252,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_CWL" priority="0" >
+<TASK name="Zigbee_TX__X_CWL" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -281,7 +281,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_CWP_Q" priority="0" >
+<TASK name="Zigbee_TX__X_CWP_Q" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -310,7 +310,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_CWP_I" priority="0" >
+<TASK name="Zigbee_TX__X_CWP_I" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -339,7 +339,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_Symbol2ChipSeq" priority="0" >
+<TASK name="Zigbee_TX__X_Symbol2ChipSeq" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -368,7 +368,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="FORKTASK_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in" priority="0" >
+<TASK name="FORKTASK_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in" priority="0" isDaemon="true" isPeriodic="false" periodValue="" periodUnit="ns" >
<ATTRIBUTE type="1" name="i" initialValue="0"/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="startOfFork">
@@ -400,7 +400,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="JOINTASK_S_Zigbee_TX__cwpQ_ch_out__sink_ch_in__cwpI_ch_out" priority="0" >
+<TASK name="JOINTASK_S_Zigbee_TX__cwpQ_ch_out__sink_ch_in__cwpI_ch_out" priority="0" isDaemon="true" isPeriodic="false" periodValue="" periodUnit="ns" >
<ATTRIBUTE type="1" name="i" initialValue="0"/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="startOfJoin">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/Zigbee_TX.xml b/ttool/src/test/resources/ui/diagram2tml/expected/Zigbee_TX.xml
index 14fddee8b3..ebc3291e13 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/Zigbee_TX.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/Zigbee_TX.xml
@@ -1,5 +1,5 @@
<TMLMODELING>
-<TASK name="Zigbee_TX__F_Source" priority="0" >
+<TASK name="Zigbee_TX__F_Source" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue="127"/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -23,7 +23,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_Source" priority="0" >
+<TASK name="Zigbee_TX__X_Source" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -48,7 +48,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_Symbol2ChipSeq" priority="0" >
+<TASK name="Zigbee_TX__F_Symbol2ChipSeq" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -72,7 +72,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_Symbol2ChipSeq" priority="0" >
+<TASK name="Zigbee_TX__X_Symbol2ChipSeq" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -101,7 +101,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_Chip2Octet" priority="0" >
+<TASK name="Zigbee_TX__F_Chip2Octet" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -125,7 +125,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_Chip2Octet" priority="0" >
+<TASK name="Zigbee_TX__X_Chip2Octet" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -154,7 +154,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_CWL" priority="0" >
+<TASK name="Zigbee_TX__F_CWL" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -182,7 +182,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_CWL" priority="0" >
+<TASK name="Zigbee_TX__X_CWL" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -211,7 +211,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_Sink" priority="0" >
+<TASK name="Zigbee_TX__F_Sink" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="size_1" initialValue=""/>
<ACTIVITY first="0">
@@ -236,7 +236,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_Sink" priority="0" >
+<TASK name="Zigbee_TX__X_Sink" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -261,7 +261,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_CWP_Q" priority="0" >
+<TASK name="Zigbee_TX__F_CWP_Q" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -285,7 +285,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_CWP_Q" priority="0" >
+<TASK name="Zigbee_TX__X_CWP_Q" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
@@ -314,7 +314,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__F_CWP_I" priority="0" >
+<TASK name="Zigbee_TX__F_CWP_I" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ACTIVITY first="0">
<ACTIVITYELEMENT type="tmltranslator.TMLStartState" value="" id="0" name="start">
@@ -338,7 +338,7 @@
</ACTIVITYELEMENT>
</ACTIVITY>
</TASK>
-<TASK name="Zigbee_TX__X_CWP_I" priority="0" >
+<TASK name="Zigbee_TX__X_CWP_I" priority="0" isDaemon="false" isPeriodic="false" periodValue="" periodUnit="" >
<ATTRIBUTE type="1" name="size" initialValue=""/>
<ATTRIBUTE type="1" name="arg1__req" initialValue="0"/>
<ACTIVITY first="0">
--
GitLab