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

Timestamp:

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

Author:

adeicke

Message:

Adapted test project to refactoring of evaluation project.

File:

• trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/FestConditionUtil.java (modified) (2 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();
-            }
-
         };
     }