Introduce a factory bean to use execution resources

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / java / org / argeo / slc / core / test / BasicTestDefinition.java

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
index 4d62ba39db652c734c778ef46df07a75d0b01af9..876a3e16397e214ab6b834912fe32a8a366176fe 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
@@ -1,9 +1,15 @@
 package org.argeo.slc.core.test;\r
 \r
-import org.argeo.slc.core.SlcException;\r
+import org.argeo.slc.SlcException;\r
 import org.argeo.slc.core.structure.tree.TreeSRelatedHelper;\r
-import org.argeo.slc.core.test.context.ContextAware;\r
 import org.argeo.slc.core.test.context.ContextUtils;\r
+import org.argeo.slc.test.IncompatibleTestDataException;\r
+import org.argeo.slc.test.TestData;\r
+import org.argeo.slc.test.TestDefinition;\r
+import org.argeo.slc.test.TestResult;\r
+import org.argeo.slc.test.TestRun;\r
+import org.argeo.slc.test.TestStatus;\r
+import org.argeo.slc.test.context.ContextAware;\r
 \r
 /** Understands basic test data and context aware test data. */\r
 public class BasicTestDefinition extends TreeSRelatedHelper implements\r
@@ -21,7 +27,7 @@ public class BasicTestDefinition extends TreeSRelatedHelper implements
                                } else {\r
                                        result.addResultPart(new SimpleResultPart(\r
                                                        TestStatus.FAILED, "Expected "\r
-                                                                       + testData.getExpected() + " but reched "\r
+                                                                       + testData.getExpected() + " but reached "\r
                                                                        + testData.getReached()));\r
                                }\r
                        } catch (Exception e) {\r
@@ -33,7 +39,7 @@ public class BasicTestDefinition extends TreeSRelatedHelper implements
                        ContextUtils.compareReachedExpected((ContextAware) testData,\r
                                        testRun.getTestResult(), this);\r
                } else {\r
-                       throw new SlcException("No test data defined.");\r
+                       throw new IncompatibleTestDataException(testRun);\r
                }\r
        }\r
 }\r