diff --git a/build.txt b/build.txt
index c6a214da5581d365637a2e1dd37aefde679cd811..7531095928ebbb8bf64719b2bb8cb397149fa791 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-13625
\ No newline at end of file
+13628
\ No newline at end of file
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index bf7a5d46e160b4e3d69ff55903b343a7a8149db1..8148d8a0ef76f2cefd988b6acac0cdf17d9f40bd 100755
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -50,8 +50,8 @@ package ui.util;
*/
public class DefaultText {
- public static String BUILD = "13624";
- public static String DATE = "2021/01/06 03:16:13 CET";
+ public static String BUILD = "13627";
+ public static String DATE = "2021/01/07 10:09:08 CET";
public static StringBuffer sbAbout = makeAbout();
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
index 8fe2bc17616be395248f39687a4b888a3d02fb78..4c82e8e491215eebdc542cbd60635e69951ae2fb 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
@@ -17,7 +17,6 @@ import ui.AbstractUITest;
import ui.TDiagramPanel;
import ui.TMLArchiPanel;
import ui.TURTLEPanel;
-import ui.interactivesimulation.SimulationTransaction;
import ui.tmldd.TMLArchiDiagramPanel;
import java.io.BufferedReader;
@@ -25,7 +24,6 @@ import java.io.File;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import java.util.Vector;
import static org.junit.Assert.assertTrue;
@@ -36,12 +34,12 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
private RemoteConnection rc;
private boolean isReady = false;
private boolean running = true;
- private Vector<SimulationTransaction> trans;
private String ssxml;
+ static String CPP_DIR = "../../../../simulators/c++2/";
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
RESOURCES_DIR = getBaseResourcesDir() + "/tmltranslator/simulator/";
-
}
public DiplodocusSimulatorTerminationTest() {
@@ -50,12 +48,12 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
@Before
public void setUp() throws Exception {
- SIM_DIR = getBaseResourcesDir() + "../../../../simulators/c++2/";
+ SIM_DIR = getBaseResourcesDir() + CPP_DIR;
}
- @Test
+ @Test(timeout = 600000) // 10 minutes
public void testIsSimulationTerminated() throws Exception {
- /*for (int i = 0; i < MODELS_TERMINATE.length; i++) {
+ for (int i = 0; i < MODELS_TERMINATE.length; i++) {
String s = MODELS_TERMINATE[i];
SIM_DIR = DIR_GEN + s + "/";
System.out.println("executing: checking syntax " + s);
@@ -72,6 +70,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
break;
}
}
+
mainGUI.checkModelingSyntax(true);
TMLMapping tmap = mainGUI.gtm.getTMLMapping();
TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap);
@@ -94,7 +93,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
// Putting sim files
System.out.println("SIM executing: sim lib code copying for " + s);
- ConfigurationTTool.SystemCCodeDirectory = getBaseResourcesDir() + "../../../../simulators/c++2/";
+ ConfigurationTTool.SystemCCodeDirectory = getBaseResourcesDir() + CPP_DIR;
boolean simFiles = SpecConfigTTool.checkAndCreateSystemCDir(SIM_DIR);
System.out.println("SIM executing: sim lib code copying done with result " + simFiles);
@@ -151,6 +150,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
System.out.println("FAILED: executing: " + "make -C " + SIM_DIR);
return;
}
+
System.out.println("SUCCESS: executing: " + "make -C " + SIM_DIR);
// Starts simulation
Runtime.getRuntime().exec("./" + SIM_DIR + "run.x" + " -server");
@@ -163,18 +163,18 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
} catch (RemoteConnectionException rce) {
System.out.println("Could not connect to server.");
}
- try {
+ try {
toServer(" 1 6 500", rc);
Thread.sleep(5);
while (running) {
- String demo = null;
+ String line = null;
try {
- demo = rc.readOneLine();
+ line = rc.readOneLine();
} catch (RemoteConnectionException e) {
e.printStackTrace();
}
- running = analyzeServerAnswer(demo);
+ running = analyzeServerAnswer(line);
}
System.out.println(ssxml);
String content = "Simulation completed";
@@ -193,7 +193,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
} catch (Exception e) {
e.printStackTrace();
}
- }*/
+ }
}
private synchronized void toServer (String s, RemoteConnection rc) throws RemoteConnectionException {
diff --git a/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java b/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
index ee49eb8aa6e9e5a60c016ef312cf226a7bf766b2..c1cf3c7dfca97a2912b50cc7a5bd759244f75e6c 100644
--- a/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
+++ b/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
@@ -18,19 +18,13 @@ import ui.AbstractUITest;
import ui.TDiagramPanel;
import ui.TMLArchiPanel;
import ui.TURTLEPanel;
-import ui.interactivesimulation.JFrameTMLSimulationPanelTimeline;
-import ui.interactivesimulation.SimulationTransaction;
import ui.tmldd.TMLArchiDiagramPanel;
-import java.awt.*;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import static org.junit.Assert.assertTrue;
@@ -41,13 +35,13 @@ public class TimelineDiagramTest extends AbstractUITest {
private RemoteConnection rc;
private boolean isReady = false;
private boolean running = true;
- private Vector<SimulationTransaction> trans;
private String ssxml;
final static String EXPECTED_FILE_GENERATED_TIMELINE = getBaseResourcesDir() + "tmltranslator/expected/expected_get_generated_timeline.txt";
+ static String CPP_DIR = "../../../../simulators/c++2/";
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
RESOURCES_DIR = getBaseResourcesDir() + "/tmltranslator/simulator/";
-
}
public TimelineDiagramTest() {
@@ -56,12 +50,12 @@ public class TimelineDiagramTest extends AbstractUITest {
@Before
public void setUp() throws Exception {
- SIM_DIR = getBaseResourcesDir() + "../../../../simulators/c++2/";
+ SIM_DIR = getBaseResourcesDir() + CPP_DIR;
}
- @Test
+ @Test(timeout = 600000) // 10 minutes
public void testCompareTimelineGeneratedContent() throws Exception {
- /*for (int i = 0; i < MODELS_TIMELINE.length; i++) {
+ for (int i = 0; i < MODELS_TIMELINE.length; i++) {
String s = MODELS_TIMELINE[i];
SIM_DIR = DIR_GEN + s + "/";
System.out.println("executing: checking syntax " + s);
@@ -78,6 +72,7 @@ public class TimelineDiagramTest extends AbstractUITest {
break;
}
}
+
mainGUI.checkModelingSyntax(true);
TMLMapping tmap = mainGUI.gtm.getTMLMapping();
TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap);
@@ -100,7 +95,7 @@ public class TimelineDiagramTest extends AbstractUITest {
// Putting sim files
System.out.println("SIM executing: sim lib code copying for " + s);
- ConfigurationTTool.SystemCCodeDirectory = getBaseResourcesDir() + "../../../../simulators/c++2/";
+ ConfigurationTTool.SystemCCodeDirectory = getBaseResourcesDir() + CPP_DIR;
boolean simFiles = SpecConfigTTool.checkAndCreateSystemCDir(SIM_DIR);
System.out.println("SIM executing: sim lib code copying done with result " + simFiles);
@@ -141,8 +136,8 @@ public class TimelineDiagramTest extends AbstractUITest {
}
System.out.println("executing: " + "make -C " + SIM_DIR);
- try {
+ try {
proc = Runtime.getRuntime().exec("make -C " + SIM_DIR + "");
proc_in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
@@ -157,6 +152,7 @@ public class TimelineDiagramTest extends AbstractUITest {
System.out.println("FAILED: executing: " + "make -C " + SIM_DIR);
return;
}
+
System.out.println("SUCCESS: executing: " + "make -C " + SIM_DIR);
// Starts simulation
Runtime.getRuntime().exec("./" + SIM_DIR + "run.x" + " -server");
@@ -169,20 +165,20 @@ public class TimelineDiagramTest extends AbstractUITest {
} catch (RemoteConnectionException rce) {
System.out.println("Could not connect to server.");
}
- try {
+ try {
toServer(" 1 6 100", rc);
Thread.sleep(5);
toServer("7 4 ApplicationSimple__Src,ApplicationSimple__T1,ApplicationSimple__T2", rc);
Thread.sleep(5);
while (running) {
- String demo = null;
+ String line = null;
try {
- demo = rc.readOneLine();
+ line = rc.readOneLine();
} catch (RemoteConnectionException e) {
e.printStackTrace();
}
- running = analyzeServerAnswer(demo);
+ running = analyzeServerAnswer(line);
}
System.out.println(ssxml);
File file = new File(EXPECTED_FILE_GENERATED_TIMELINE);
@@ -198,11 +194,12 @@ public class TimelineDiagramTest extends AbstractUITest {
}
rc = null;
}
- }catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
- }*/
+ }
}
+
private synchronized void toServer (String s, RemoteConnection rc) throws RemoteConnectionException {
while (!isReady) {
TraceManager.addDev("Server not ready");