Changeset 1141 for trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil

Timestamp:

03/27/13 15:01:00 (11 years ago)

Author:

adeicke

Message:

Adapted test project to refactoring of evaluation project.

Location:

trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil

Files:

• FestConditionUtil.java (modified) (2 diffs)
• GenerateTaskTreeUtil.java (modified) (4 diffs)

trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/FestConditionUtil.java

@@ -19 +19 @@
 import com.google.common.base.Optional;
 
-import de.ugoe.cs.autoquest.usability.UsabilityEvaluationReport;
-import de.ugoe.cs.autoquest.usability.evaluation.result.UsabilityDefectSeverityLevel;
-import de.ugoe.cs.autoquest.usability.evaluation.result.UsabilityDefect;
-import de.ugoe.cs.autoquest.usability.evaluation.rule.set.UsabilityRuleset;
+import de.ugoe.cs.autoquest.usability.result.UsabilityDefect;
+import de.ugoe.cs.autoquest.usability.result.UsabilityDefectSeverityLevel;
+import de.ugoe.cs.autoquest.usability.rules.UsabilityResult;
 
 /**
@@ -37 +36 @@
     }
 
-    public static Condition<UsabilityEvaluationReport> noUsabilityGuidlineRecommendations() {
-        return new Condition<UsabilityEvaluationReport>() {
+    public static Condition<UsabilityResult> noUsabilityGuidlineRecommendations() {
+        return new Condition<UsabilityResult>() {
 
             @Override
-            public boolean matches(UsabilityEvaluationReport usabilityEvaluationReport) {
-                return usabilityEvaluationReport.evaluationResults().isEmpty();
+            public boolean matches(UsabilityResult usabilityResult) {
+                return !usabilityResult.hasDefects();
             }
         };
     }
 
-    public static Condition<UsabilityEvaluationReport> usabilityGuidlineRecommendations() {
-        return new Condition<UsabilityEvaluationReport>() {
+    public static Condition<UsabilityResult> usabilityGuidlineRecommendations() {
+        return new Condition<UsabilityResult>() {
 
             @Override
-            public boolean matches(UsabilityEvaluationReport usabilityEvaluationReport) {
-                return !usabilityEvaluationReport.evaluationResults().isEmpty();
+            public boolean matches(UsabilityResult usabilityResult) {
+                return usabilityResult.hasDefects();
             }
-        };
-    }
-
-    public static Condition<UsabilityRuleset> noUsabilityRules() {
-        return new Condition<UsabilityRuleset>() {
-
-            @Override
-            public boolean matches(UsabilityRuleset usabilityRuleset) {
-                return usabilityRuleset.evaluationRules().isEmpty();
-            }
-
-        };
-    }
-
-    public static Condition<UsabilityRuleset> usabilityRules() {
-        return new Condition<UsabilityRuleset>() {
-
-            @Override
-            public boolean matches(UsabilityRuleset usabilityRuleset) {
-                return !usabilityRuleset.evaluationRules().isEmpty();
-            }
-
         };
     }

trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/GenerateTaskTreeUtil.java

@@ -24 +24 @@
 import de.ugoe.cs.autoquest.commands.usability.CMDgenerateTaskTree;
 import de.ugoe.cs.autoquest.plugin.jfc.commands.CMDparseJFC;
+import de.ugoe.cs.autoquest.tasktrees.TaskTreeInstantiator;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeNodeFactory;
 import de.ugoe.cs.autoquest.test.CommandRunner;
-import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.util.console.GlobalDataContainer;
 import de.ugoe.cs.util.console.TextConsole;
@@ -42 +45 @@
 
     private static final String taskTreeName = "taskTree";
-
+    
+    public static ITaskTree getTaskTreeFromSpec(String spec) {
+        TaskTreeNodeFactory factory = new TaskTreeNodeFactory();
+        ITaskTreeNode taskTree = new TaskTreeInstantiator(new TaskTreeNodeFactory(), new TaskTreeBuilder()).instantiateTaskTree(spec);
+        return factory.createTaskTree(taskTree);
+    }
+    
     public static ITaskTree getTaskTreeFromFile(String filename) {
-        new TextConsole(Level.FINEST);
+        new TextConsole(Level.OFF);
         parseTraceFile(filename);
         condenseGuiModel();
@@ -55 +64 @@
 
     static private void parseTraceFile(String filetoparse) {
-        Console.println("parsing trace file");
         CommandRunner.runCommand(CMDparseJFC.class, ClassLoader.getSystemResource(filetoparse)
             .getFile(), seqName);
@@ -61 +69 @@
 
     private static void condenseGuiModel() {
-        Console.println("condensing GUI model");
         CommandRunner.runCommand(CMDcondenseGuiModel.class, seqName);
     }
 
     private static void sortKeyInteractions() {
-        Console.println("sorting key interactions");
         CommandRunner.runCommand(CMDsortKeyInteractions.class, seqName);
     }
 
     private static void correctKeyInteractionTargets() {
-        Console.println("correcting key interaction targets");
         CommandRunner.runCommand(CMDcorrectKeyInteractionTargets.class, seqName);
     }
 
     private static void detectTextInputEvents() {
-        Console.println("detecting text input events");
         CommandRunner.runCommand(CMDdetectTextInputEvents.class, seqName);
     }
 
     private static void condenseMouseClicks() {
-        Console.println("condensing mouse click events");
         CommandRunner.runCommand(CMDcondenseMouseClicks.class, seqName);
     }