From 64db290836a9c43ab9c41ac00ffaf3f7afb92b38 Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr> Date: Fri, 5 May 2023 13:41:06 +0200 Subject: [PATCH] Updating test on generateTML. --- .../src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java | 5 +++++ ttool/src/test/java/ui/TDiagramPanelCloneTest.java | 1 + .../tmltranslator/expected/expected_specdelay_readwrite.tml | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java b/ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java index 9821d1a20e..95f44e4290 100644 --- a/ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java +++ b/ttool/src/test/java/ui/DiplodocusDelayPenaltyDisableTests.java @@ -248,6 +248,11 @@ public class DiplodocusDelayPenaltyDisableTests extends AbstractUITest { mainGUI.generateTMLTxt(); File f1 = new File(EXPECTED_FILE1); File f2 = new File("spec.tml"); // Generated file after executing "TML generation" + + + System.out.println("\n\n\n*** Compared files: " + f1.getAbsolutePath() + " vs " + f2.getAbsolutePath() + "\n\n" + + "\n"); + assertTrue(compTML.compareTML(f1,f2)); } diff --git a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java index 189662e35b..22ee7aa6e0 100644 --- a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java +++ b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java @@ -77,6 +77,7 @@ public class TDiagramPanelCloneTest extends AbstractUITest { mainGUI.generateTMLTxt(); File f1 = new File(FILE_DIR + EXPECTED_FILES[i]); File f2 = new File("spec.tml"); // Generated file after executing "TML generation" + System.out.println("Comparing " + f1.getAbsolutePath() + " with " + f2.getAbsolutePath()); assertTrue(compTML.compareTML(f1, f2)); } } diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_specdelay_readwrite.tml b/ttool/src/test/resources/tmltranslator/expected/expected_specdelay_readwrite.tml index 950690add3..08da00ace7 100644 --- a/ttool/src/test/resources/tmltranslator/expected/expected_specdelay_readwrite.tml +++ b/ttool/src/test/resources/tmltranslator/expected/expected_specdelay_readwrite.tml @@ -13,10 +13,10 @@ TASK TestCycleEvt_wait__C0 TASKOP //Local variables int x = 0 - int loop__0 = 0 + int loop_0 = 0 //Behavior - FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1) + FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1) NOTIFY TestCycleEvt_wait__evt__TestCycleEvt_wait__evt x x=x+1 DELAY 1 us isActiveDelay true -- GitLab