Changeset 227 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/commands/CMDefgTestCasesToSequences.java

Timestamp:

09/30/11 19:31:43 (13 years ago)

Author:

sherbold

Message:

• extracted class de.ugoe.cs.eventbench.efg.EFGModelGenerator from de.ugoe.cs.eventbench.efg.commands.CMDefgToMM

+ added command efgToDFA

• extracted class de.ugoe.cs.eventbench.efg.GUITARTestCaseParser from de.ugoe.cs.eventbench.efg.commands.CMDefgTestCasesToSequences

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/commands/CMDefgTestCasesToSequences.java (modified) (4 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/commands/CMDefgTestCasesToSequences.java

@@ -9 +9 @@
 import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.efg.data.EFGEvent;
+import de.ugoe.cs.eventbench.efg.GUITARTestCaseParser;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
-import edu.umd.cs.guitar.model.IO;
-import edu.umd.cs.guitar.model.data.StepType;
-import edu.umd.cs.guitar.model.data.TestCase;
 
 /**
@@ -34 +31 @@
         public void run(List<Object> parameters) {
                 String foldername;
-                String sequencesName = "sequences";
+                String sequencesName;
+                String efgFileName = null;
                 try {
                         foldername = (String) parameters.get(0);
-                        if (parameters.size() >= 2) {
-                                sequencesName = (String) parameters.get(1);
+                        sequencesName = (String) parameters.get(1);
+                        if (parameters.size() >= 3) {
+                                efgFileName = (String) parameters.get(2);
                         }
                 } catch (Exception e) {
@@ -48 +47 @@
                 File[] testcaseFiles = folder.listFiles();
                 Collection<List<Event<?>>> sequences = new LinkedList<List<Event<?>>>();
+                GUITARTestCaseParser parser;
+                if (efgFileName == null) {
+                        parser = new GUITARTestCaseParser();
+                } else {
+                        parser = new GUITARTestCaseParser(efgFileName);
+                }
                 for (File testcaseFile : testcaseFiles) {
                         Console.traceln("Loading from file "
                                         + testcaseFile.getAbsolutePath());
-                        TestCase testcase = (TestCase) IO.readObjFromFile(
-                                        testcaseFile.getAbsolutePath(), TestCase.class);
-                        List<StepType> steps = testcase.getStep();
-                        List<Event<?>> sequence = new LinkedList<Event<?>>();
-                        for (StepType step : steps) {
-                                step.getEventId();
-                                sequence.add(new EFGEvent(step.getEventId()));
-                                /*
-                                 * Problem: widgetId unknown! Therefore, the events will not be
-                                 * equal to those in the generated from a EFG.
-                                 */
-                        }
-                        sequences.add(sequence);
+                        sequences.add(parser.parseTestCaseFile(testcaseFile));
                 }
                 if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
@@ -78 +71 @@
         @Override
         public void help() {
-                Console.println("Usage: efgTestCasesToSequences <folder> {<sequencesName>}");
+                Console.println("Usage: efgTestCasesToSequences <folder> <sequencesName> {<efgFileName>}");
         }