Changeset 1141

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

Files:

• CMDperformUsabilityEvaluationTest.java (added)
• rules (added)
• rules/metrics (copied) (copied from trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/evaluation/rule/evaluator)
• rules/metrics/AbstractUsabilityEvaluationTC.java (modified) (1 diff)
• rules/metrics/NoLetterOrDigitTextInputsEvaluatorTest.java (modified) (7 diffs)
• rules/metrics/TextInputEntryRepetitionsEvaluatorTest.java (modified) (8 diffs)
• rules/metrics/TextInputRatioEvaluatorTest.java (modified) (8 diffs)
• testutil/FestConditionUtil.java (modified) (2 diffs)
• testutil/GenerateTaskTreeUtil.java (modified) (4 diffs)

trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/AbstractUsabilityEvaluationTC.java

@@ -13 +13 @@
 //   limitations under the License.
 
-package de.ugoe.cs.autoquest.usability.evaluation.rule.evaluator;
+package de.ugoe.cs.autoquest.usability.rules.metrics;
 
 import static org.junit.Assert.assertEquals;

trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/NoLetterOrDigitTextInputsEvaluatorTest.java

@@ -13 +13 @@
 //   limitations under the License.
 
-package de.ugoe.cs.autoquest.usability.evaluation.rule.evaluator;
+package de.ugoe.cs.autoquest.usability.rules.metrics;
 
-import static de.ugoe.cs.autoquest.usability.evaluation.rule.set.RulesetFactory.textInputUsabiliyRuleset;
 import static de.ugoe.cs.autoquest.usability.testutil.FestConditionUtil.absent;
 import static de.ugoe.cs.autoquest.usability.testutil.FestConditionUtil.highRecommendationSeverityLevel;
@@ -24 +23 @@
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import java.util.EnumSet;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
-import de.ugoe.cs.autoquest.usability.evaluation.result.UsabilityDefect;
-import de.ugoe.cs.autoquest.usability.evaluation.rule.set.UsabilityRule;
-import de.ugoe.cs.autoquest.usability.tasktree.filter.FilterStatisticCache;
+import de.ugoe.cs.autoquest.usability.result.UsabilityDefect;
+import de.ugoe.cs.autoquest.usability.rules.metrics.NoLetterOrDigitRatioMetric;
 
 /**
@@ -48 +40 @@
 public class NoLetterOrDigitTextInputsEvaluatorTest extends AbstractUsabilityEvaluationTC {
 
-    private UsabilityRule ruleUnderTest;
-
-    @Before
-    public void initRuleUnderTest() {
-        EnumSet<? extends UsabilityRule> ruleset = textInputUsabiliyRuleset().evaluationRules();
-        this.ruleUnderTest = Iterables.find(ruleset, new Predicate<UsabilityRule>() {
-
-            public boolean apply(UsabilityRule usabilityRule) {
-                return usabilityRule.ruleIdentifier().equals("TEXT_FIELD_NO_LETTER_OR_DIGIT_RATIO");
-            }
-
-        });
-    }
-
-    @After
-    public void clearFilterStatisticCache() {
-        FilterStatisticCache.instance().clear();
-    }
-
     @Test
     public void should_return_no_recommendation() {
         // Given
-        String spec = "Sequence {" + "  TextInput () {}" + "}";
+        String spec = "Sequence {" + 
+                      "  TextInput () {}" + 
+                      "}";
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new NoLetterOrDigitTextInputsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(absent());
@@ -83 +57 @@
         // Given
         String spec =
-            "Sequence {"
-                + "  TextInput (1234567890123456789012345678901234567890123456789_01234567890"
-                + "12345678901234567890123456789012345) {}" + "}";
+            "Sequence {" + 
+            "  TextInput (1234567890123456789012345678901234567890123456789_01234567890" + 
+                         "12345678901234567890123456789012345) {}" + 
+            "}";
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new NoLetterOrDigitTextInputsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(infoRecommendationSeverityLevel());
@@ -98 +72 @@
         // Given
         String spec =
-            "Sequence {" + "  TextInput (123456789012345678901234567890_123456789012345) {}" + "}";
+            "Sequence {" + 
+            "  TextInput (123456789012345678901234567890_123456789012345) {}" + 
+            "}";
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new NoLetterOrDigitTextInputsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(lowRecommendationSeverityLevel());
@@ -110 +85 @@
     public void should_return_recommendation_with_medium_severity_level() {
         // Given
-        String spec = "Sequence {" + "  TextInput (12345_6789012345) {}" + "}";
+        String spec = "Sequence {" + 
+                      "  TextInput (12345_6789012345) {}" + 
+                      "}";
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new NoLetterOrDigitTextInputsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(mediumRecommendationSeverityLevel());
@@ -122 +98 @@
     public void should_return_recommendation_with_high_severity_level() {
         // Given
-        String spec = "Sequence {" + "  TextInput (_a_b_c_) {}" + "}";
+        String spec = "Sequence {" +
+                      "  TextInput (_a_b_c_) {}" +
+                      "}";
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new NoLetterOrDigitTextInputsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(highRecommendationSeverityLevel());

trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputEntryRepetitionsEvaluatorTest.java

@@ -13 +13 @@
 //   limitations under the License.
 
-package de.ugoe.cs.autoquest.usability.evaluation.rule.evaluator;
+package de.ugoe.cs.autoquest.usability.rules.metrics;
 
-import static de.ugoe.cs.autoquest.usability.evaluation.rule.set.RulesetFactory.textInputUsabiliyRuleset;
 import static de.ugoe.cs.autoquest.usability.testutil.FestConditionUtil.absent;
 import static de.ugoe.cs.autoquest.usability.testutil.FestConditionUtil.highRecommendationSeverityLevel;
@@ -24 +23 @@
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import java.util.EnumSet;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
-import de.ugoe.cs.autoquest.usability.evaluation.result.UsabilityDefect;
-import de.ugoe.cs.autoquest.usability.evaluation.rule.set.UsabilityRule;
-import de.ugoe.cs.autoquest.usability.tasktree.filter.FilterStatisticCache;
+import de.ugoe.cs.autoquest.usability.result.UsabilityDefect;
+import de.ugoe.cs.autoquest.usability.rules.metrics.TextInputEntryRepetitionsMetric;
 
 /**
@@ -48 +40 @@
 public class TextInputEntryRepetitionsEvaluatorTest extends AbstractUsabilityEvaluationTC {
 
-    private UsabilityRule ruleUnderTest;
-
-    @Before
-    public void initRuleUnderTest() {
-        EnumSet<? extends UsabilityRule> ruleset = textInputUsabiliyRuleset().evaluationRules();
-        this.ruleUnderTest = Iterables.find(ruleset, new Predicate<UsabilityRule>() {
-
-            public boolean apply(UsabilityRule usabilityRule) {
-                return usabilityRule.ruleIdentifier().equals("TEXT_FIELD_INPUT_REPETITIONS");
-            }
-
-        });
-    }
-
-    @After
-    public void clearFilterStatisticCache() {
-        FilterStatisticCache.instance().clear();
-    }
-
     @Test
     public void should_return_no_recommendation() {
@@ -73 +46 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputEntryRepetitionsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(absent());
@@ -87 +59 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputEntryRepetitionsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(infoRecommendationSeverityLevel());
@@ -101 +72 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputEntryRepetitionsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(lowRecommendationSeverityLevel());
@@ -121 +91 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputEntryRepetitionsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(mediumRecommendationSeverityLevel());
@@ -141 +110 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputEntryRepetitionsEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(highRecommendationSeverityLevel());

trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputRatioEvaluatorTest.java

@@ -13 +13 @@
 //   limitations under the License.
 
-package de.ugoe.cs.autoquest.usability.evaluation.rule.evaluator;
+package de.ugoe.cs.autoquest.usability.rules.metrics;
 
-import static de.ugoe.cs.autoquest.usability.evaluation.rule.set.RulesetFactory.textInputUsabiliyRuleset;
 import static de.ugoe.cs.autoquest.usability.testutil.FestConditionUtil.absent;
 import static de.ugoe.cs.autoquest.usability.testutil.FestConditionUtil.highRecommendationSeverityLevel;
@@ -24 +23 @@
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import java.util.EnumSet;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
-import de.ugoe.cs.autoquest.usability.evaluation.result.UsabilityDefect;
-import de.ugoe.cs.autoquest.usability.evaluation.rule.set.UsabilityRule;
-import de.ugoe.cs.autoquest.usability.tasktree.filter.FilterStatisticCache;
+import de.ugoe.cs.autoquest.usability.result.UsabilityDefect;
+import de.ugoe.cs.autoquest.usability.rules.metrics.TextInputRatioMetric;
 
 /**
@@ -48 +40 @@
 public class TextInputRatioEvaluatorTest extends AbstractUsabilityEvaluationTC {
 
-    private UsabilityRule ruleUnderTest;
-
-    @Before
-    public void initRuleUnderTest() {
-        EnumSet<? extends UsabilityRule> ruleset = textInputUsabiliyRuleset().evaluationRules();
-        this.ruleUnderTest = Iterables.find(ruleset, new Predicate<UsabilityRule>() {
-
-            public boolean apply(UsabilityRule usabilityRule) {
-                return usabilityRule.ruleIdentifier().equals("TEXT_FIELD_INPUT_RATIO");
-            }
-
-        });
-    }
-
-    @After
-    public void clearFilterStatisticCache() {
-        FilterStatisticCache.instance().clear();
-    }
-
     @Test
     public void should_return_no_recommendation() {
@@ -76 +49 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputRatioEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(absent());
@@ -90 +62 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputRatioEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(infoRecommendationSeverityLevel());
@@ -104 +75 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputRatioEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(lowRecommendationSeverityLevel());
@@ -118 +88 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputRatioEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(mediumRecommendationSeverityLevel());
@@ -130 +99 @@
         ITaskTree taskTree = createTaskTree(spec);
         // When
-        Optional<UsabilityDefect> recommendation =
-            new TextInputRatioEvaluator(this.ruleUnderTest, taskTree).evaluationResult();
+        Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).check();
         // Then
         assertThat(recommendation).is(present()).has(highRecommendationSeverityLevel());

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);
     }