Skip to content
Snippets Groups Projects
Commit 10cbb7fe authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool into master

parents fe29690d 91049adc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
build.txt
+ 1
− 1
View file @ 10cbb7fe
13625 13628
\ No newline at end of file \ No newline at end of file
src/main/java/ui/util/DefaultText.java
+ 2
− 2
View file @ 10cbb7fe
...@@ -50,8 +50,8 @@ package ui.util; ...@@ -50,8 +50,8 @@ package ui.util;
*/ */
public class DefaultText { public class DefaultText {
public static String BUILD = "13624"; public static String BUILD = "13627";
public static String DATE = "2021/01/06 03:16:13 CET"; public static String DATE = "2021/01/07 10:09:08 CET";
public static StringBuffer sbAbout = makeAbout(); public static StringBuffer sbAbout = makeAbout();
......
ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
+ 13
− 13
View file @ 10cbb7fe
...@@ -17,7 +17,6 @@ import ui.AbstractUITest; ...@@ -17,7 +17,6 @@ import ui.AbstractUITest;
import ui.TDiagramPanel; import ui.TDiagramPanel;
import ui.TMLArchiPanel; import ui.TMLArchiPanel;
import ui.TURTLEPanel; import ui.TURTLEPanel;
import ui.interactivesimulation.SimulationTransaction;
import ui.tmldd.TMLArchiDiagramPanel; import ui.tmldd.TMLArchiDiagramPanel;
import java.io.BufferedReader; import java.io.BufferedReader;
...@@ -25,7 +24,6 @@ import java.io.File; ...@@ -25,7 +24,6 @@ import java.io.File;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Vector;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
...@@ -36,12 +34,12 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest { ...@@ -36,12 +34,12 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
private RemoteConnection rc; private RemoteConnection rc;
private boolean isReady = false; private boolean isReady = false;
private boolean running = true; private boolean running = true;
private Vector<SimulationTransaction> trans;
private String ssxml; private String ssxml;
static String CPP_DIR = "../../../../simulators/c++2/";
@BeforeClass @BeforeClass
public static void setUpBeforeClass() throws Exception { public static void setUpBeforeClass() throws Exception {
RESOURCES_DIR = getBaseResourcesDir() + "/tmltranslator/simulator/"; RESOURCES_DIR = getBaseResourcesDir() + "/tmltranslator/simulator/";
} }
public DiplodocusSimulatorTerminationTest() { public DiplodocusSimulatorTerminationTest() {
...@@ -50,12 +48,12 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest { ...@@ -50,12 +48,12 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
@Before @Before
public void setUp() throws Exception { 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 { 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]; String s = MODELS_TERMINATE[i];
SIM_DIR = DIR_GEN + s + "/"; SIM_DIR = DIR_GEN + s + "/";
System.out.println("executing: checking syntax " + s); System.out.println("executing: checking syntax " + s);
...@@ -72,6 +70,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest { ...@@ -72,6 +70,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
break; break;
} }
} }
mainGUI.checkModelingSyntax(true); mainGUI.checkModelingSyntax(true);
TMLMapping tmap = mainGUI.gtm.getTMLMapping(); TMLMapping tmap = mainGUI.gtm.getTMLMapping();
TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap); TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap);
...@@ -94,7 +93,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest { ...@@ -94,7 +93,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
// Putting sim files // Putting sim files
System.out.println("SIM executing: sim lib code copying for " + s); 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); boolean simFiles = SpecConfigTTool.checkAndCreateSystemCDir(SIM_DIR);
System.out.println("SIM executing: sim lib code copying done with result " + simFiles); System.out.println("SIM executing: sim lib code copying done with result " + simFiles);
...@@ -151,6 +150,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest { ...@@ -151,6 +150,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
System.out.println("FAILED: executing: " + "make -C " + SIM_DIR); System.out.println("FAILED: executing: " + "make -C " + SIM_DIR);
return; return;
} }
System.out.println("SUCCESS: executing: " + "make -C " + SIM_DIR); System.out.println("SUCCESS: executing: " + "make -C " + SIM_DIR);
// Starts simulation // Starts simulation
Runtime.getRuntime().exec("./" + SIM_DIR + "run.x" + " -server"); Runtime.getRuntime().exec("./" + SIM_DIR + "run.x" + " -server");
...@@ -163,18 +163,18 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest { ...@@ -163,18 +163,18 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
} catch (RemoteConnectionException rce) { } catch (RemoteConnectionException rce) {
System.out.println("Could not connect to server."); System.out.println("Could not connect to server.");
} }
try {
try {
toServer(" 1 6 500", rc); toServer(" 1 6 500", rc);
Thread.sleep(5); Thread.sleep(5);
while (running) { while (running) {
String demo = null; String line = null;
try { try {
demo = rc.readOneLine(); line = rc.readOneLine();
} catch (RemoteConnectionException e) { } catch (RemoteConnectionException e) {
e.printStackTrace(); e.printStackTrace();
} }
running = analyzeServerAnswer(demo); running = analyzeServerAnswer(line);
} }
System.out.println(ssxml); System.out.println(ssxml);
String content = "Simulation completed"; String content = "Simulation completed";
...@@ -193,7 +193,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest { ...@@ -193,7 +193,7 @@ public class DiplodocusSimulatorTerminationTest extends AbstractUITest {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
}*/ }
} }
private synchronized void toServer (String s, RemoteConnection rc) throws RemoteConnectionException { private synchronized void toServer (String s, RemoteConnection rc) throws RemoteConnectionException {
......
ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
+ 16
− 19
View file @ 10cbb7fe
...@@ -18,19 +18,13 @@ import ui.AbstractUITest; ...@@ -18,19 +18,13 @@ import ui.AbstractUITest;
import ui.TDiagramPanel; import ui.TDiagramPanel;
import ui.TMLArchiPanel; import ui.TMLArchiPanel;
import ui.TURTLEPanel; import ui.TURTLEPanel;
import ui.interactivesimulation.JFrameTMLSimulationPanelTimeline;
import ui.interactivesimulation.SimulationTransaction;
import ui.tmldd.TMLArchiDiagramPanel; import ui.tmldd.TMLArchiDiagramPanel;
import java.awt.*;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Vector;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
...@@ -41,13 +35,13 @@ public class TimelineDiagramTest extends AbstractUITest { ...@@ -41,13 +35,13 @@ public class TimelineDiagramTest extends AbstractUITest {
private RemoteConnection rc; private RemoteConnection rc;
private boolean isReady = false; private boolean isReady = false;
private boolean running = true; private boolean running = true;
private Vector<SimulationTransaction> trans;
private String ssxml; private String ssxml;
final static String EXPECTED_FILE_GENERATED_TIMELINE = getBaseResourcesDir() + "tmltranslator/expected/expected_get_generated_timeline.txt"; final static String EXPECTED_FILE_GENERATED_TIMELINE = getBaseResourcesDir() + "tmltranslator/expected/expected_get_generated_timeline.txt";
static String CPP_DIR = "../../../../simulators/c++2/";
@BeforeClass @BeforeClass
public static void setUpBeforeClass() throws Exception { public static void setUpBeforeClass() throws Exception {
RESOURCES_DIR = getBaseResourcesDir() + "/tmltranslator/simulator/"; RESOURCES_DIR = getBaseResourcesDir() + "/tmltranslator/simulator/";
} }
public TimelineDiagramTest() { public TimelineDiagramTest() {
...@@ -56,12 +50,12 @@ public class TimelineDiagramTest extends AbstractUITest { ...@@ -56,12 +50,12 @@ public class TimelineDiagramTest extends AbstractUITest {
@Before @Before
public void setUp() throws Exception { 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 { 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]; String s = MODELS_TIMELINE[i];
SIM_DIR = DIR_GEN + s + "/"; SIM_DIR = DIR_GEN + s + "/";
System.out.println("executing: checking syntax " + s); System.out.println("executing: checking syntax " + s);
...@@ -78,6 +72,7 @@ public class TimelineDiagramTest extends AbstractUITest { ...@@ -78,6 +72,7 @@ public class TimelineDiagramTest extends AbstractUITest {
break; break;
} }
} }
mainGUI.checkModelingSyntax(true); mainGUI.checkModelingSyntax(true);
TMLMapping tmap = mainGUI.gtm.getTMLMapping(); TMLMapping tmap = mainGUI.gtm.getTMLMapping();
TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap); TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap);
...@@ -100,7 +95,7 @@ public class TimelineDiagramTest extends AbstractUITest { ...@@ -100,7 +95,7 @@ public class TimelineDiagramTest extends AbstractUITest {
// Putting sim files // Putting sim files
System.out.println("SIM executing: sim lib code copying for " + s); 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); boolean simFiles = SpecConfigTTool.checkAndCreateSystemCDir(SIM_DIR);
System.out.println("SIM executing: sim lib code copying done with result " + simFiles); System.out.println("SIM executing: sim lib code copying done with result " + simFiles);
...@@ -141,8 +136,8 @@ public class TimelineDiagramTest extends AbstractUITest { ...@@ -141,8 +136,8 @@ public class TimelineDiagramTest extends AbstractUITest {
} }
System.out.println("executing: " + "make -C " + SIM_DIR); System.out.println("executing: " + "make -C " + SIM_DIR);
try {
try {
proc = Runtime.getRuntime().exec("make -C " + SIM_DIR + ""); proc = Runtime.getRuntime().exec("make -C " + SIM_DIR + "");
proc_in = new BufferedReader(new InputStreamReader(proc.getInputStream())); proc_in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
...@@ -157,6 +152,7 @@ public class TimelineDiagramTest extends AbstractUITest { ...@@ -157,6 +152,7 @@ public class TimelineDiagramTest extends AbstractUITest {
System.out.println("FAILED: executing: " + "make -C " + SIM_DIR); System.out.println("FAILED: executing: " + "make -C " + SIM_DIR);
return; return;
} }
System.out.println("SUCCESS: executing: " + "make -C " + SIM_DIR); System.out.println("SUCCESS: executing: " + "make -C " + SIM_DIR);
// Starts simulation // Starts simulation
Runtime.getRuntime().exec("./" + SIM_DIR + "run.x" + " -server"); Runtime.getRuntime().exec("./" + SIM_DIR + "run.x" + " -server");
...@@ -169,20 +165,20 @@ public class TimelineDiagramTest extends AbstractUITest { ...@@ -169,20 +165,20 @@ public class TimelineDiagramTest extends AbstractUITest {
} catch (RemoteConnectionException rce) { } catch (RemoteConnectionException rce) {
System.out.println("Could not connect to server."); System.out.println("Could not connect to server.");
} }
try {
try {
toServer(" 1 6 100", rc); toServer(" 1 6 100", rc);
Thread.sleep(5); Thread.sleep(5);
toServer("7 4 ApplicationSimple__Src,ApplicationSimple__T1,ApplicationSimple__T2", rc); toServer("7 4 ApplicationSimple__Src,ApplicationSimple__T1,ApplicationSimple__T2", rc);
Thread.sleep(5); Thread.sleep(5);
while (running) { while (running) {
String demo = null; String line = null;
try { try {
demo = rc.readOneLine(); line = rc.readOneLine();
} catch (RemoteConnectionException e) { } catch (RemoteConnectionException e) {
e.printStackTrace(); e.printStackTrace();
} }
running = analyzeServerAnswer(demo); running = analyzeServerAnswer(line);
} }
System.out.println(ssxml); System.out.println(ssxml);
File file = new File(EXPECTED_FILE_GENERATED_TIMELINE); File file = new File(EXPECTED_FILE_GENERATED_TIMELINE);
...@@ -198,11 +194,12 @@ public class TimelineDiagramTest extends AbstractUITest { ...@@ -198,11 +194,12 @@ public class TimelineDiagramTest extends AbstractUITest {
} }
rc = null; rc = null;
} }
}catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
}*/ }
} }
private synchronized void toServer (String s, RemoteConnection rc) throws RemoteConnectionException { private synchronized void toServer (String s, RemoteConnection rc) throws RemoteConnectionException {
while (!isReady) { while (!isReady) {
TraceManager.addDev("Server not ready"); TraceManager.addDev("Server not ready");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment