X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Ftest%2FSlcTestTask.java;fp=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Ftest%2FSlcTestTask.java;h=66444f17e755f8c692eec8e4b4b7392433196826;hb=feab5f0b726a9f277e9b606b9e7e49159406bb9b;hp=fa22269c222487a7c7c2de514a64531277aaa0b3;hpb=bc87e55ca2e75b0135d0d24fbe9a1f0cfb5e247e;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java index fa22269c2..66444f17e 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java @@ -11,11 +11,14 @@ import org.argeo.slc.core.process.SlcExecution; import org.argeo.slc.core.structure.StructureAware; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.ExecutableTestRun; +import org.argeo.slc.core.test.SimpleResultPart; import org.argeo.slc.core.test.SimpleTestResult; import org.argeo.slc.core.test.SimpleTestRun; import org.argeo.slc.core.test.TestData; import org.argeo.slc.core.test.TestDefinition; import org.argeo.slc.core.test.TestResult; +import org.argeo.slc.core.test.TestResultPart; +import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.WritableTestRun; import org.argeo.slc.spring.SpringUtils; import org.springframework.beans.BeansException; @@ -108,7 +111,17 @@ public class SlcTestTask extends SAwareTask { getRegistry(), getTreeSPath()); } - ((ExecutableTestRun) testRun).execute(); + try { + ((ExecutableTestRun) testRun).execute(); + } catch (RuntimeException e) { + if (result != null) { + SimpleResultPart errorPart = new SimpleResultPart( + TestStatus.ERROR, + "Unexpected exception when running test", e); + result.addResultPart(errorPart); + } + throw e; + } } /**