Adding test for modelchecker

src/main/java/cli/Action.java

@@ -616,7 +616,7 @@ public class Action extends Command {
                 amc.setComputeRG(true);
                 TraceManager.addDev("Starting model checking");
                 amc.startModelChecking();
-                System.out.println("Model checking done states:" + amc.getNbOfStates() +
+                System.out.println("Model checking done\nGraph: states:" + amc.getNbOfStates() +
                         " links:" + amc.getNbOfLinks() + "\n");
 
                 // Saving graph
@@ -627,18 +627,19 @@ public class Action extends Command {
                     graphPath =  System.getProperty("user.dir") + "/" + "rg$.aut";
                 }
 
-                System.out.println("graphpath=" + graphPath);
+
 
                 if (graphPath.indexOf("?") != -1) {
-                    System.out.println("question mark found");
+                    //System.out.println("Question mark found");
                     DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
                     Date date = new Date();
                     String dateAndTime = dateFormat.format(date);
                     autfile = Conversion.replaceAllChar(graphPath, '?', dateAndTime);
-                    System.out.println("graphpath=" + graphPath);
+                    //System.out.println("graphpath=" + graphPath);
                 } else {
                     autfile = graphPath;
                 }
+                System.out.println("graphpath=" + graphPath);
 
                 System.out.println("autfile=" + autfile);
 

src/main/java/cli/Print.java

@@ -60,6 +60,7 @@ import java.util.*;
  */
 public class Print extends Command  {
     private final static String TABS = "tabs";
+    private final static String DIR = "dir";
 
     public Print() {
 
@@ -127,7 +128,21 @@ public class Print extends Command  {
                 return null;
             }
         };
+        Command dir = new Command() {
+            public String getCommand() { return DIR; }
+            public String getShortCommand() { return "d"; }
+            public String getDescription() { return "Printing the default directory"; }
+
+            public  String executeCommand(String command, Interpreter interpreter) {
+
+
+                System.out.println("Defautl directory: " +  System.getProperty("user.dir"));
+
+                return null;
+            }
+        };
         addAndSortSubcommand(tabs);
+        addAndSortSubcommand(dir);
 
     }
 

ttool/src/test/java/cli/CLIAvatarModelCheckerTest.java

+/**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 AvatarPragma
+ * Creation: 20/05/2010
+ * @version 1.1 01/07/2014
+ * @author Ludovic APVRILLE, Raja GATGOUT
+ * @see
+ */
+
+package cli;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import cli.Interpreter;
+import graph.AUTGraph;
+import org.junit.Before;
+import org.junit.Test;
+
+import test.AbstractTest;
+import ui.TAttribute;
+import ui.avatarbd.AvatarBDPanel;
+import ui.avatarbd.AvatarBDPragma;
+
+public class CLIAvatarModelCheckerTest extends AbstractTest implements InterpreterOutputInterface {
+
+    final static String PATH_TO_TEST_FILE = "/cli/input/";
+	
+	public CLIAvatarModelCheckerTest() {
+       //
+    }
+	
+
+    public void exit(int reason) {
+	    System.out.println("Exit reason=" + reason);
+	    assertTrue(reason == 1);
+    }
+
+    public void printError(String error) {
+        System.out.println("Error=" + error);
+    }
+
+    public void print(String s) {
+	    System.out.println("info from interpreter:" + s);
+    }
+	
+	@Test
+	public void testCoffeeMachine() {
+	    String filePath = getBaseResourcesDir() + PATH_TO_TEST_FILE + "scriptmodelchecker";
+	    String script;
+
+	    File f = new File(filePath);
+	    assertTrue(myutil.FileUtils.checkFileForOpen(f));
+
+	    script = myutil.FileUtils.loadFileData(f);
+
+	    assertTrue(script.length() > 0);
+
+	    boolean show = false;
+        Interpreter interpret = new Interpreter(script, (InterpreterOutputInterface)this, show);
+        interpret.interpret();
+
+        // Must now load the graph
+        filePath = "rgmodelchecker.aut";
+        f = new File(filePath);
+        assertTrue(myutil.FileUtils.checkFileForOpen(f));
+        String data = myutil.FileUtils.loadFileData(f);
+
+        assertTrue(data.length() > 0);
+        AUTGraph graph = new AUTGraph();
+        graph.buildGraph(data);
+        graph.computeStates();
+
+        System.out.println("states=" + graph.getNbOfStates() + " transitions=" + graph.getNbOfTransitions());
+        assertTrue(graph.getNbOfStates() == 14);
+        assertTrue(graph.getNbOfTransitions() == 16);
+
+
+	}
+	
+
+}

ttool/src/test/resources/cli/input/scriptmodelchecker

+print dir
+set model resources/test/cli/input/CoffeeMachine_Avatar.xml
+#print The model to be opened is: $model
+action start
+wait 2
+#toto
+action open $model
+wait 4
+action check-syntax
+action avatar-rg rgmodelchecker.aut
+action quit