From 36f1908bf85ebf015c1d1e69a796a5cd0795d75c Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Fri, 5 May 2023 13:54:15 +0200
Subject: [PATCH] Updating test after TML modification
---
.../test/java/ui/TDiagramPanelCloneTest.java | 1 -
.../tmltranslator/expected/expected_spec1.tml | 16 +++++-----
.../tmltranslator/expected/expected_spec2.tml | 24 +++++++-------
.../tmltranslator/expected/expected_spec3.tml | 32 +++++++++----------
.../tmltranslator/expected/expected_spec4.tml | 32 +++++++++----------
5 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
index 22ee7aa6e0..d5565ec786 100644
--- a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
+++ b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
@@ -1,6 +1,5 @@
package ui;
-import myutil.TraceManager;
import org.junit.*;
import tmltranslator.compareTMLTest.CompareTML;
import ui.tmlcompd.TMLComponentTaskDiagramPanel;
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
index ad4a9b72a5..9075629d18 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
@@ -116,19 +116,19 @@ TASK Application__PrimitiveComp5
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -150,19 +150,19 @@ TASK Application__PrimitiveComp5_
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_0 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
index f57ccb9e7f..cd2e3a4441 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
@@ -134,19 +134,19 @@ TASK Application__PrimitiveComp5
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -168,19 +168,19 @@ TASK Application__PrimitiveComp5_
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_0 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -202,19 +202,19 @@ TASK Application__PrimitiveComp5_0
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_1 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
index e887ed115b..81c1c45698 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
@@ -135,19 +135,19 @@ TASK Application__PrimitiveComp5
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -169,19 +169,19 @@ TASK Application__PrimitiveComp5_
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_0 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -203,19 +203,19 @@ TASK Application__PrimitiveComp5_0
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_1 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -237,19 +237,19 @@ TASK Application__PrimitiveComp5_1
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_2 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
index 7072799baa..5c57d1f1a8 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
@@ -136,19 +136,19 @@ TASK Application__PrimitiveComp5
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -170,19 +170,19 @@ TASK Application__PrimitiveComp5_
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_0 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -204,19 +204,19 @@ TASK Application__PrimitiveComp5_0
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_1 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
@@ -238,19 +238,19 @@ TASK Application__PrimitiveComp5_1
//Local variables
int attr1
bool attr2
- int loop__0 = 0
+ int loop_0 = 0
//Behavior
WRITE Application__channel3_2 1
EXECI 10
EXECI 10 20
DELAY 10 ms isActiveDelay false
- EXECC 100 encryption1 ADV 100 100 0 0
- EXECC 100 encryption1 ADV 100 100 0 0
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
+ EXECC 100 encryption1 ADV 100 100 0 0 - -
DELAY 10 20 ms isActiveDelay false
RANDOM 0 attr1 0 10
FOR( ; ; )
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+ FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
FOR(attr1=0; attr1<5; attr1 = attr1+1)
attr1=10
RANDOMSEQ
--
GitLab