Changeset 1326 for trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability

Timestamp:

01/12/14 17:51:58 (11 years ago)

Author:

khartmann

Message:

Moved alexanders code into a new plugin project.
First commit of my experimental code (needs a lot of cleanup).

Location:

trunk/autoquest-plugin-usability2-test

Files:

• . (added)
• src (added)
• src/main (added)
• src/main/java (added)
• src/main/java/de (added)
• src/main/java/de/ugoe (added)
• src/main/java/de/ugoe/cs (added)
• src/main/java/de/ugoe/cs/autoquest (added)
• src/main/java/de/ugoe/cs/autoquest/usability (copied) (copied from trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability)
• src/main/java/de/ugoe/cs/autoquest/usability/SimpleTest.java (added)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsAndEndsWithEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventAndContainsEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternAndContainsPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndEndsWithPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsEventEndsWithPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndEndsWithEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsPatternAndEndsWithEventTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternTest.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/testutil/FestConditionUtil.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/usability/testutil/GenerateTaskModelUtil.java (modified) (3 diffs)

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsAndEndsWithEventTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsEventTest.java

@@ -22 +22 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsPatternTest.java

@@ -22 +22 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithEventTest.java

@@ -21 +21 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java

@@ -24 +24 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventAndContainsEventTest.java

@@ -22 +22 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternAndContainsPatternTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternTest.java

@@ -24 +24 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsEventTest.java

@@ -22 +22 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsPatternTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndEndsWithPatternTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsEventEndsWithPatternTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithEventTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithPatternTest.java

@@ -24 +24 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventTest.java

@@ -21 +21 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsEventTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsPatternTest.java

@@ -24 +24 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndEndsWithEventTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithEventTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithPatternTest.java

@@ -24 +24 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsPatternAndEndsWithEventTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/FestConditionUtil.java

@@ -18 +18 @@
 
 import com.google.common.base.Optional;
+
 
 import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription;

trunk/autoquest-plugin-usability2-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/GenerateTaskModelUtil.java

@@ -36 +36 @@
 import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskFactory;
 import de.ugoe.cs.autoquest.test.CommandRunner;
+import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.GlobalDataContainer;
 import de.ugoe.cs.util.console.TextConsole;
@@ -64 +65 @@
     
     public static ITaskModel getTaskTreeFromFile(String filename) {
+        return getTaskTreeFromFile(filename, CMDparseJFC.class);
+    }
+    
+    public static ITaskModel getTaskTreeFromFile(String filename, Class<? extends Command> parserClass) {
         new TextConsole(Level.ALL);
-        parseTraceFile(filename);
+        parseTraceFile(filename, parserClass);
         condenseGuiModel();
         sortKeyInteractions();
@@ -74 +79 @@
     }
 
-    static private void parseTraceFile(String filetoparse) {
-        CommandRunner.runCommand(CMDparseJFC.class, ClassLoader.getSystemResource(filetoparse)
+    static private void parseTraceFile(String filetoparse, Class<? extends Command> parserClass) {
+        CommandRunner.runCommand(parserClass, ClassLoader.getSystemResource(filetoparse)
             .getFile(), seqName);
     }