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

src/main/java/avatartranslator/AvatarTerm.java

@@ -63,6 +63,10 @@ public abstract class AvatarTerm extends AvatarElement {
     }
 
     public static AvatarTerm createFromString (AvatarStateMachineOwner block, String toParse) {
+        return AvatarTerm.createFromString(block, toParse, false);
+    }
+
+    public static AvatarTerm createFromString (AvatarStateMachineOwner block, String toParse, boolean allowRaw) {
         if (toParse == null || toParse.isEmpty ())
             return null;
 
@@ -105,7 +109,10 @@ public abstract class AvatarTerm extends AvatarElement {
         //TraceManager.addDev ("AvatarConstant '" + toParse + "' couldn't be parsed");
 
         //TraceManager.addDev ("AvatarTerm '" + toParse + "' couldn't be parsed");
-        return new AvatarTermRaw (toParse, block);
+        if (allowRaw)
+            return new AvatarTermRaw (toParse, block);
+        else
+            return null;
     }
 
     public static AvatarAction createActionFromString (AvatarStateMachineOwner block, String toParse) {

src/main/java/avatartranslator/AvatarTuple.java

@@ -62,8 +62,8 @@ public class AvatarTuple extends AvatarLeftHand {
     public static AvatarTuple createFromString (AvatarStateMachineOwner block, String toParse) {
         AvatarTuple result = null;
 
-        int indexLParen = toParse.indexOf ("(");
-        if (indexLParen != -1) {
+        if (toParse.trim().startsWith("(")) {
+            int indexLParen = toParse.indexOf ("(");
             int indexRParen = toParse.indexOf (")", indexLParen);
             if (indexRParen == -1)
                 indexRParen = toParse.length ();

tests/ui/fr.tpt.ttool.tests.ui/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="src" path="/src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

tests/ui/fr.tpt.ttool.tests.ui/.gitignore

+/bin/

tests/ui/fr.tpt.ttool.tests.ui/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>fr.tpt.ttool.tests.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

tests/util/fr.tpt.ttool.tests.util/src/fr/tpt/ttool/tests/util/MoveComponentTest.java → tests/ui/fr.tpt.ttool.tests.ui/src/fr/tpt/ttool/tests/ui/MoveComponentTest.java

-package fr.tpt.ttool.tests.util;
+package fr.tpt.ttool.tests.ui;
 
-import junit.framework.TestCase;
-import myutil.PluginManager;
+import org.junit.*;
 import ui.MainGUI;
 import ui.tmldd.TMLArchiBUSNode;
 import ui.tmldd.TMLArchiDiagramPanel;
 import ui.tmldd.TMLArchiDiagramToolBar;
-
-import org.junit.*;
+import junit.framework.TestCase;
+import myutil.PluginManager;
 
 public class MoveComponentTest extends TestCase {
 	static MainGUI mgui;
@@ -31,8 +30,8 @@ public class MoveComponentTest extends TestCase {
        tdp.upComponent();
        tdp.setComponentPointed(tgc);
        tdp.upComponent();
-       assert tgc.getY() == 499;
-       assert tgc.getX() == 500;
+       assertTrue(tgc.getY() == 499);
+       assertTrue(tgc.getX() == 500);
     }
 	
 	@Test
@@ -40,8 +39,8 @@ public class MoveComponentTest extends TestCase {
        tdp.downComponent();
        tdp.setComponentPointed(tgc);
        tdp.downComponent();
-       assert tgc.getY() == 501;
-       assert tgc.getX() == 500;
+       assertTrue(tgc.getY() == 501);
+       assertTrue(tgc.getX() == 500);
     }
 	
 	@Test
@@ -49,8 +48,8 @@ public class MoveComponentTest extends TestCase {
        tdp.rightComponent();
        tdp.setComponentPointed(tgc);
        tdp.rightComponent();
-       assert tgc.getX() == 501;
-       assert tgc.getY() == 500;
+       assertTrue(tgc.getX() == 501);
+       assertTrue(tgc.getY() == 500);
     }
 	
 	@Test
@@ -58,8 +57,8 @@ public class MoveComponentTest extends TestCase {
        tdp.leftComponent();
        tdp.setComponentPointed(tgc);
        tdp.leftComponent();
-       assert tgc.getX() == 499;
-       assert tgc.getY() == 500;
+       assertTrue(tgc.getX() == 499);
+       assertTrue(tgc.getY() == 500);
     }
 
 }
\ No newline at end of file

ttool/src/test/java/avatartranslator/AvatarGuardTests.java

@@ -43,6 +43,8 @@
  * @see
  */
 
+package avatartranslator;
+
 import org.junit.Test;
 import org.junit.*;