From 37d41f7a64ac2d039226e18af045f89ed107c37e Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Mon, 19 Apr 2021 15:48:02 +0200
Subject: [PATCH] Update on testing facility: separating ui from non ui tests
---
Makefile | 9 +
ttool/build.gradle | 1 +
.../AvatarSecurityTranslationTests.java | 256 ------------------
.../totml}/CPUDoubleClickShowTraceTest.java | 4 +-
.../totml}/DMASendAndReceiveSignalTest.java | 4 +-
.../totml}/DiplodocusDelayTest.java | 5 +-
.../totml}/DiplodocusGeneralTest.java | 5 +-
.../DiplodocusSimulatorTerminationTest.java | 4 +-
.../totml}/DiplodocusSimulatorTest.java | 4 +-
.../totml}/FpgaClockDividerTest.java | 4 +-
.../totml}/HTMLParseTest.java | 4 +-
.../totml}/MemoryLeakTest.java | 4 +-
.../MulticoreCrossCpuSchedulingTest.java | 4 +-
.../totml}/MulticoreHangingTest.java | 4 +-
.../totml}/RemoveAllTransactionsTests.java | 4 +-
.../RunToNextBreakpointMaxTransTest.java | 4 +-
.../totml}/RunUntilChannelAccessTest.java | 4 +-
.../totml}/TimelineDiagramTest.java | 4 +-
18 files changed, 55 insertions(+), 273 deletions(-)
delete mode 100644 ttool/src/test/java/avatartranslator/AvatarSecurityTranslationTests.java
rename ttool/src/test/java/{tmltranslator => ui/totml}/CPUDoubleClickShowTraceTest.java (98%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/DMASendAndReceiveSignalTest.java (98%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/DiplodocusDelayTest.java (99%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/DiplodocusGeneralTest.java (97%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/DiplodocusSimulatorTerminationTest.java (98%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/DiplodocusSimulatorTest.java (99%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/FpgaClockDividerTest.java (98%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/HTMLParseTest.java (99%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/MemoryLeakTest.java (99%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/MulticoreCrossCpuSchedulingTest.java (99%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/MulticoreHangingTest.java (98%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/RemoveAllTransactionsTests.java (99%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/RunToNextBreakpointMaxTransTest.java (98%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/RunUntilChannelAccessTest.java (98%)
rename ttool/src/test/java/{tmltranslator => ui/totml}/TimelineDiagramTest.java (99%)
diff --git a/Makefile b/Makefile
index 7c2e762608..eee5c71fab 100755
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ GRADLE = $(shell which gradle)
GRADLE_VERSION_NEEDED = 3.3
ERROR_MSG = printf "$(COLOR)\nBuild with gradle failed. Falling back to regular javac command...\n$(RESET)"
+NO_GUI_TESTS = avatartranslator.* graph.* help.* launcher.* myutil.* tmltranslator.*
+
ifeq "$(GRADLE)" ""
ERROR_MSG = echo "Gradle was not found. Falling back to regular javac command...\n"
GRADLE = false && echo >/dev/null
@@ -44,6 +46,7 @@ make documentation Generate the documentation of java classes using javadoc
make release Prepare a new release for the website.
It produces the release.tgz and releaseWithSrc.tgz files.
make test Run tests on TTool.
+make noguitest Run non graphical tests on TTool.
make publish_jar Build TTool and upload the resulting archive.
!!! Must have the right ssh key installed for this !!!
make install Install TTool, the jar of companion software and the runtime
@@ -539,6 +542,12 @@ install:
test:
@$(GRADLE) test
+noguitest:
+ @@for p in $(NO_GUI_TESTS); do \
+ echo "\n-----> TESTS FOR:" $$p ;\
+ $(GRADLE) test --tests $$p ;\
+ done
+
# ========================================
# ========== CLEAN ==========
# ========================================
diff --git a/ttool/build.gradle b/ttool/build.gradle
index 9884471a97..b3e58dd9ee 100644
--- a/ttool/build.gradle
+++ b/ttool/build.gradle
@@ -75,3 +75,4 @@ mainClassName = 'Main'
test {
testLogging.showStandardStreams = false
}
+
diff --git a/ttool/src/test/java/avatartranslator/AvatarSecurityTranslationTests.java b/ttool/src/test/java/avatartranslator/AvatarSecurityTranslationTests.java
deleted file mode 100644
index 0c1c383d8e..0000000000
--- a/ttool/src/test/java/avatartranslator/AvatarSecurityTranslationTests.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
- * ludovic.apvrille AT enst.fr
- *
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- *
- * /**
- * Class AvatarSecurityTranslationTests
- * Creation: 1/10/2017
- * @version 1.1 01/10/2017
- * @author Letitia LI
- * @see
- */
-
-package avatartranslator;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.ToolTipManager;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import tmltranslator.SecurityPattern;
-import tmltranslator.TMLArchitecture;
-import tmltranslator.TMLExecC;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLStartState;
-import tmltranslator.TMLTask;
-import tmltranslator.toavatarsec.TML2Avatar;
-import ui.MainGUI;
-import ui.TGComponent;
-import ui.TMLComponentDesignPanel;
-import ui.tmlcompd.TMLCPrimitiveComponent;
-import ui.tmlcompd.TMLComponentTaskDiagramPanel;
-import ui.tree.DiagramTreeRenderer;
-import ui.tree.JDiagramTree;
-
-public class AvatarSecurityTranslationTests {
- TMLMapping<TGComponent> map;
- TMLTask task1;
- TMLStartState start;
- TMLModeling<TGComponent> tmlm;
- public AvatarSecurityTranslationTests () {
- //
- }
-
- @Before
- public void setupDiploMapping (){
- MainGUI mgui = new MainGUI(false, false, false, false, false, false, false, false, false, false, true, false, false);
- mgui.initActions();
- mgui.panelForTab = new JPanel();
- mgui.frame = new JFrame();
- mgui.dtree = new JDiagramTree(mgui);
- mgui.dtree.setCellRenderer(new DiagramTreeRenderer());
- ToolTipManager.sharedInstance().registerComponent(mgui.dtree);
- /*JScrollPane scrollPane =*/ new JScrollPane(mgui.dtree);
- mgui.newTurtleModeling();
-// mgui.tabs = new Vector<TURTLEPanel>();
- TMLComponentDesignPanel tmlcdp = new TMLComponentDesignPanel(mgui);
- tmlcdp.tmlctdp = new TMLComponentTaskDiagramPanel(mgui, null);
- tmlcdp.tmlctdp.tp = tmlcdp;
-
- tmlm = new TMLModeling<TGComponent>();
-
- task1= new TMLTask("DESIGN__task1", null, new TMLCPrimitiveComponent(0, 0, 0, 0, 0, 0, false, null, tmlcdp.tmlctdp));
-
-
- start = new TMLStartState("start",null);
- task1.getActivityDiagram().addElement(start);
-
- tmlm.addTask(task1);
- TMLArchitecture arch = new TMLArchitecture();
- map = new TMLMapping<TGComponent>(tmlm, arch, false);
-
-
-
- }
- //protected void test () {
-
- @Test
- public void testBlockTranslation(){
- TML2Avatar tml2avatar = new TML2Avatar(map,false,true);
-
- AvatarSpecification avspec =tml2avatar.generateAvatarSpec("1");
- assertTrue(avspec!=null);
- assertEquals(avspec.getListOfBlocks().size(),1);
-
- }
-
-
- @Test
- public void testKeyDistribution(){
-
- }
-
-
- @Test
- public void testTranslateStatesSymmetricEncryption(){
- //setup security pattern
- SecurityPattern sec = new SecurityPattern("sym", "Symmetric Encryption", "100", "100", "100", "100", "", "", "");
- tmlm.addSecurityPattern(sec);
-
- //Setup states
- TMLExecC tmlexecc = new TMLExecC("encrypt_sym", null);
- tmlexecc.securityPattern = sec;
- start.addNext(tmlexecc);
- task1.getActivityDiagram().addElement(tmlexecc);
-
-
- TML2Avatar tml2avatar = new TML2Avatar(map,false,true);
- AvatarSpecification avspec =tml2avatar.generateAvatarSpec("1");
- assertTrue(avspec!=null);
- AvatarBlock block1 = avspec.getBlockWithName("task1");
- AvatarStateMachine sm = block1.getStateMachine();
- List<AvatarStateMachineElement> elems= sm.getListOfElements();
- //First state is start state
- assertTrue(elems.get(0) instanceof AvatarStartState);
- //state is avatartransition
- assertTrue(elems.get(1) instanceof AvatarTransition);
- //state is avatarstate
- assertTrue(elems.get(2) instanceof AvatarState);
- assertEquals(elems.get(2).getName(),"_encrypt_sym");
- //Next state is avatartransition
- assertTrue(elems.get(3) instanceof AvatarTransition);
- assertEquals(elems.get(3).getName(),"__after_encrypt_sym");
- AvatarTransition at = (AvatarTransition) elems.get(3);
- //Check that action is encryption
- assertEquals(at.getActions().get(0).getName().replaceAll(" ",""),"sym_encrypted=sencrypt(sym,key_sym)");
- }
-
-
- @Test
- public void testTranslateStatesAsymmetricEncryption(){
- //setup security pattern
- SecurityPattern sec = new SecurityPattern("asym", "Asymmetric Encryption", "100", "100", "100", "100", "", "", "");
- tmlm.addSecurityPattern(sec);
-
- //Setup states
- TMLExecC tmlexecc = new TMLExecC("encrypt_asym", null);
- tmlexecc.securityPattern = sec;
- start.addNext(tmlexecc);
- task1.getActivityDiagram().addElement(tmlexecc);
-
-
- TML2Avatar tml2avatar = new TML2Avatar(map,false,true);
- AvatarSpecification avspec =tml2avatar.generateAvatarSpec("1");
- assertTrue(avspec!=null);
- AvatarBlock block1 = avspec.getBlockWithName("task1");
- AvatarStateMachine sm = block1.getStateMachine();
- List<AvatarStateMachineElement> elems= sm.getListOfElements();
-
- AvatarTransition at = (AvatarTransition) elems.get(3);
- //Check that action is encryption
- assertEquals(at.getActions().get(0).getName().replaceAll(" ",""),"asym_encrypted=aencrypt(asym,pubKey_asym)");
- }
-
-
- @Test
- public void testTranslateNonce(){
- //setup security pattern
- SecurityPattern sec = new SecurityPattern("asym", "Nonce", "100", "100", "100", "100", "", "", "");
- tmlm.addSecurityPattern(sec);
-
- //Setup states
- TMLExecC tmlexecc = new TMLExecC("encrypt_asym", null);
- tmlexecc.securityPattern = sec;
- start.addNext(tmlexecc);
- task1.getActivityDiagram().addElement(tmlexecc);
-
-
- TML2Avatar tml2avatar = new TML2Avatar(map,false,true);
- AvatarSpecification avspec =tml2avatar.generateAvatarSpec("1");
- assertTrue(avspec!=null);
- AvatarBlock block1 = avspec.getBlockWithName("task1");
- AvatarStateMachine sm = block1.getStateMachine();
- List<AvatarStateMachineElement> elems= sm.getListOfElements();
-
- AvatarTransition at = (AvatarTransition) elems.get(3);
- //Check that action is empty
- assertEquals(at.getActions().size(),0);
- //Check that next state is random
- //assertTrue(elems.get(4) instanceof AvatarRandom);
-
- }
-
-
-
- @Test
- public void testTranslateMAC(){
- //setup security pattern
- SecurityPattern sec = new SecurityPattern("mac", "MAC", "100", "100", "100", "100", "", "", "");
- tmlm.addSecurityPattern(sec);
-
- //Setup states
- TMLExecC tmlexecc = new TMLExecC("encrypt_mac", null);
- tmlexecc.securityPattern = sec;
- start.addNext(tmlexecc);
- task1.getActivityDiagram().addElement(tmlexecc);
-
-
- TML2Avatar tml2avatar = new TML2Avatar(map,false,true);
- AvatarSpecification avspec =tml2avatar.generateAvatarSpec("1");
- assertTrue(avspec!=null);
- AvatarBlock block1 = avspec.getBlockWithName("task1");
- AvatarStateMachine sm = block1.getStateMachine();
- List<AvatarStateMachineElement> elems= sm.getListOfElements();
-
- AvatarTransition at = (AvatarTransition) elems.get(3);
- //Check that action is encryption
- assertEquals(at.getActions().get(0).getName().replaceAll(" ",""),"mac_mac=MAC(mac,key_mac)");
- }
-
- public static void main(String[] args){
- AvatarSecurityTranslationTests apt = new AvatarSecurityTranslationTests ();
- //apt.runTest ();
- }
-}
diff --git a/ttool/src/test/java/tmltranslator/CPUDoubleClickShowTraceTest.java b/ttool/src/test/java/ui/totml/CPUDoubleClickShowTraceTest.java
similarity index 98%
rename from ttool/src/test/java/tmltranslator/CPUDoubleClickShowTraceTest.java
rename to ttool/src/test/java/ui/totml/CPUDoubleClickShowTraceTest.java
index a937cb69d4..f64446a980 100644
--- a/ttool/src/test/java/tmltranslator/CPUDoubleClickShowTraceTest.java
+++ b/ttool/src/test/java/ui/totml/CPUDoubleClickShowTraceTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -8,6 +8,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.simulation.SimulationTransaction;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
diff --git a/ttool/src/test/java/tmltranslator/DMASendAndReceiveSignalTest.java b/ttool/src/test/java/ui/totml/DMASendAndReceiveSignalTest.java
similarity index 98%
rename from ttool/src/test/java/tmltranslator/DMASendAndReceiveSignalTest.java
rename to ttool/src/test/java/ui/totml/DMASendAndReceiveSignalTest.java
index 63e5704625..b3ce1cb64c 100644
--- a/ttool/src/test/java/tmltranslator/DMASendAndReceiveSignalTest.java
+++ b/ttool/src/test/java/ui/totml/DMASendAndReceiveSignalTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -8,6 +8,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java b/ttool/src/test/java/ui/totml/DiplodocusDelayTest.java
similarity index 99%
rename from ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java
rename to ttool/src/test/java/ui/totml/DiplodocusDelayTest.java
index db7762f0f9..8f61958432 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java
+++ b/ttool/src/test/java/ui/totml/DiplodocusDelayTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -9,6 +9,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLMappingTextSpecification;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.compareTMLTest.CompareTML;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusGeneralTest.java b/ttool/src/test/java/ui/totml/DiplodocusGeneralTest.java
similarity index 97%
rename from ttool/src/test/java/tmltranslator/DiplodocusGeneralTest.java
rename to ttool/src/test/java/ui/totml/DiplodocusGeneralTest.java
index 00e8c3ea10..54c97b527d 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusGeneralTest.java
+++ b/ttool/src/test/java/ui/totml/DiplodocusGeneralTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -9,8 +9,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
-import tmltranslator.TMLSyntaxChecking;
-import tmltranslator.TMLTextSpecification;
+import tmltranslator.*;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java b/ttool/src/test/java/ui/totml/DiplodocusSimulatorTerminationTest.java
similarity index 98%
rename from ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
rename to ttool/src/test/java/ui/totml/DiplodocusSimulatorTerminationTest.java
index 4c82e8e491..cb39569f61 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTerminationTest.java
+++ b/ttool/src/test/java/ui/totml/DiplodocusSimulatorTerminationTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -10,6 +10,8 @@ import remotesimulation.RemoteConnection;
import remotesimulation.RemoteConnectionException;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java b/ttool/src/test/java/ui/totml/DiplodocusSimulatorTest.java
similarity index 99%
rename from ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java
rename to ttool/src/test/java/ui/totml/DiplodocusSimulatorTest.java
index 9b885acd2e..2400e4fd97 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusSimulatorTest.java
+++ b/ttool/src/test/java/ui/totml/DiplodocusSimulatorTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -9,6 +9,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLMappingTextSpecification;
import tmltranslator.TMLSyntaxChecking;
import tmltranslator.TMLTextSpecification;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
diff --git a/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java b/ttool/src/test/java/ui/totml/FpgaClockDividerTest.java
similarity index 98%
rename from ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java
rename to ttool/src/test/java/ui/totml/FpgaClockDividerTest.java
index b1fa9178b2..fc42b9e32e 100644
--- a/ttool/src/test/java/tmltranslator/FpgaClockDividerTest.java
+++ b/ttool/src/test/java/ui/totml/FpgaClockDividerTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -9,6 +9,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/HTMLParseTest.java b/ttool/src/test/java/ui/totml/HTMLParseTest.java
similarity index 99%
rename from ttool/src/test/java/tmltranslator/HTMLParseTest.java
rename to ttool/src/test/java/ui/totml/HTMLParseTest.java
index 85c661e99a..9855d67349 100644
--- a/ttool/src/test/java/tmltranslator/HTMLParseTest.java
+++ b/ttool/src/test/java/ui/totml/HTMLParseTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -13,6 +13,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/MemoryLeakTest.java b/ttool/src/test/java/ui/totml/MemoryLeakTest.java
similarity index 99%
rename from ttool/src/test/java/tmltranslator/MemoryLeakTest.java
rename to ttool/src/test/java/ui/totml/MemoryLeakTest.java
index 55576d0d82..6e94206149 100644
--- a/ttool/src/test/java/tmltranslator/MemoryLeakTest.java
+++ b/ttool/src/test/java/ui/totml/MemoryLeakTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -9,6 +9,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java b/ttool/src/test/java/ui/totml/MulticoreCrossCpuSchedulingTest.java
similarity index 99%
rename from ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java
rename to ttool/src/test/java/ui/totml/MulticoreCrossCpuSchedulingTest.java
index 28cc74eb2b..771e3268af 100644
--- a/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java
+++ b/ttool/src/test/java/ui/totml/MulticoreCrossCpuSchedulingTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -9,6 +9,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java b/ttool/src/test/java/ui/totml/MulticoreHangingTest.java
similarity index 98%
rename from ttool/src/test/java/tmltranslator/MulticoreHangingTest.java
rename to ttool/src/test/java/ui/totml/MulticoreHangingTest.java
index f97920a0db..506a3b33c5 100644
--- a/ttool/src/test/java/tmltranslator/MulticoreHangingTest.java
+++ b/ttool/src/test/java/ui/totml/MulticoreHangingTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -9,6 +9,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java b/ttool/src/test/java/ui/totml/RemoveAllTransactionsTests.java
similarity index 99%
rename from ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java
rename to ttool/src/test/java/ui/totml/RemoveAllTransactionsTests.java
index e29a6acd1d..a5fa0423ed 100644
--- a/ttool/src/test/java/tmltranslator/RemoveAllTransactionsTests.java
+++ b/ttool/src/test/java/ui/totml/RemoveAllTransactionsTests.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -9,6 +9,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java b/ttool/src/test/java/ui/totml/RunToNextBreakpointMaxTransTest.java
similarity index 98%
rename from ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java
rename to ttool/src/test/java/ui/totml/RunToNextBreakpointMaxTransTest.java
index 1f1c8b76aa..e8337d8364 100644
--- a/ttool/src/test/java/tmltranslator/RunToNextBreakpointMaxTransTest.java
+++ b/ttool/src/test/java/ui/totml/RunToNextBreakpointMaxTransTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -8,6 +8,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java b/ttool/src/test/java/ui/totml/RunUntilChannelAccessTest.java
similarity index 98%
rename from ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java
rename to ttool/src/test/java/ui/totml/RunUntilChannelAccessTest.java
index 270341612b..37df3e3989 100644
--- a/ttool/src/test/java/tmltranslator/RunUntilChannelAccessTest.java
+++ b/ttool/src/test/java/ui/totml/RunUntilChannelAccessTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -7,6 +7,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
diff --git a/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java b/ttool/src/test/java/ui/totml/TimelineDiagramTest.java
similarity index 99%
rename from ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
rename to ttool/src/test/java/ui/totml/TimelineDiagramTest.java
index c1cf3c7dfc..26e6ba3aef 100644
--- a/ttool/src/test/java/tmltranslator/TimelineDiagramTest.java
+++ b/ttool/src/test/java/ui/totml/TimelineDiagramTest.java
@@ -1,4 +1,4 @@
-package tmltranslator;
+package ui.totml;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
@@ -11,6 +11,8 @@ import remotesimulation.RemoteConnection;
import remotesimulation.RemoteConnectionException;
import req.ebrdd.EBRDD;
import tepe.TEPE;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLSyntaxChecking;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
--
GitLab