From: Mathieu Baudier Date: Sun, 11 Nov 2007 19:34:31 +0000 (+0000) Subject: Revert changes in result parts X-Git-Tag: argeo-slc-2.1.7~3179 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6b1db6edae28268550c1ff26291cde6ac45c6463;p=gpl%2Fargeo-slc.git Revert changes in result parts git-svn-id: https://svn.argeo.org/slc/trunk@701 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java index 93502245d..e845b0719 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java @@ -165,6 +165,8 @@ public class SlcAntConfig { */ protected Properties prepareAllProperties(File slcRootFile) { try { + final String fileUrlPrefix =""; + Properties all = new Properties(); all.putAll(System.getProperties()); all.put(ROOT_FILE_PROPERTY, slcRootFile.getCanonicalPath()); @@ -175,14 +177,16 @@ public class SlcAntConfig { final File workDir; // Root dir final File rootDir = slcRootFile.getParentFile(); - all.setProperty(ROOT_DIR_PROPERTY, rootDir.getCanonicalPath()); + all.setProperty(ROOT_DIR_PROPERTY, fileUrlPrefix + + rootDir.getCanonicalPath()); // Conf dir if (all.getProperty(CONF_DIR_PROPERTY) == null) { confDir = new File(rootProps.getProperty(CONF_DIR_PROPERTY, rootDir.getAbsolutePath() + "/../conf")) .getCanonicalFile(); - all.setProperty(CONF_DIR_PROPERTY, confDir.getAbsolutePath()); + all.setProperty(CONF_DIR_PROPERTY, fileUrlPrefix + + confDir.getAbsolutePath()); } else { confDir = new File(all.getProperty(CONF_DIR_PROPERTY)) .getCanonicalFile(); @@ -193,7 +197,8 @@ public class SlcAntConfig { workDir = new File(rootProps.getProperty(WORK_DIR_PROPERTY, rootDir.getAbsolutePath() + "/../work")) .getCanonicalFile(); - all.setProperty(WORK_DIR_PROPERTY, workDir.getAbsolutePath()); + all.setProperty(WORK_DIR_PROPERTY, fileUrlPrefix + + workDir.getAbsolutePath()); } else { workDir = new File(all.getProperty(WORK_DIR_PROPERTY)) .getCanonicalFile(); diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/taskdefs.properties b/org.argeo.slc/src/main/java/org/argeo/slc/ant/taskdefs.properties index 4944b63a4..7ae6f6839 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/taskdefs.properties +++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/taskdefs.properties @@ -1,3 +1,4 @@ +# Tasks slc.test=org.argeo.slc.ant.test.SlcTestTask slc.deploy=org.argeo.slc.ant.deploy.SlcDeployTask slc.closeResult=org.argeo.slc.ant.test.SlcCloseTestResultTask diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java index 6ea2d9dbf..97b937fa8 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java @@ -5,33 +5,25 @@ package org.argeo.slc.core.test; * Basic implementation of a result part, implementing the standard three status * approach for test results. *

- *

- *

- *

+ * @see TestStatus */ -public class SimpleResultPart implements TestResultPart { +public class SimpleResultPart implements TestResultPart, TestStatus { + /** For ORM */ private Long tid; - private TestStatus status; + private Integer status; private String message; private Throwable exception; - - /** Empty constructor for ORM */ - public SimpleResultPart(){ - + public SimpleResultPart() { } - - public SimpleResultPart(TestStatus status, String message, - Throwable exception) { - super(); + + public SimpleResultPart(Integer status, String message) { + this(status, message, null); + } + + public SimpleResultPart(Integer status, String message, Throwable exception) { this.status = status; this.message = message; this.exception = exception; @@ -45,11 +37,11 @@ public class SimpleResultPart implements TestResultPart { this.message = message; } - public void setStatus(TestStatus status) { + public void setStatus(Integer status) { this.status = status; } - public TestStatus getStatus() { + public Integer getStatus() { return status; } @@ -64,7 +56,13 @@ public class SimpleResultPart implements TestResultPart { @Override public String toString() { StringBuffer buf = new StringBuffer(""); - buf.append(status).append(" "); + if (status == PASSED) { + buf.append("PASSED "); + } else if (status == FAILED) { + buf.append("FAILED "); + } else if (status == ERROR) { + buf.append("ERROR "); + } buf.append(message); if (exception != null) { buf.append("(").append(exception.getMessage()).append(")"); diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestDefinition.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestDefinition.java index 77ee48280..7c75d6a73 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestDefinition.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestDefinition.java @@ -4,7 +4,7 @@ package org.argeo.slc.core.test; * The programmatic definition of a test, which will be associated with * transient objects within a test run. */ -public interface TestDefinition { +public interface TestDefinition extends TestStatus { /** Performs the test. */ public void execute(TestRun testRun); } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultPart.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultPart.java index 844f6c419..3d56a5f11 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultPart.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultPart.java @@ -5,8 +5,8 @@ package org.argeo.slc.core.test; * * @see TestResult */ -public interface TestResultPart { - public TestStatus getStatus(); +public interface TestResultPart { + public Integer getStatus(); public String getMessage(); } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestStatus.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestStatus.java index bda5a74ab..9f7f6e821 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestStatus.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestStatus.java @@ -1,14 +1,25 @@ package org.argeo.slc.core.test; -/** Simple statuses. */ -public enum TestStatus { - /** Test passed */ - PASSED, - /** Test failed: the behavior was not the expected one */ - FAILED, +/** + * Simple statuses. + *

+ *

+ *

+ */ +public interface TestStatus { + /** The flag for a passed test: 0 */ + public final static int PASSED = 0; + /** The flag for a failed test: 1 */ + public final static int FAILED = 1; /** - * Test could not run properly because of an unexpected issue: their can be - * no feedback on the behavior of the tested component + * The flag for a test which could not properly run because of an error + * (there is no feedback on the behavior of the tested component): 2 */ - ERROR + public final static int ERROR = 2; } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/FullHtmlTreeReport.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/FullHtmlTreeReport.java index 7aec7c1b3..1144e2793 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/FullHtmlTreeReport.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/FullHtmlTreeReport.java @@ -11,6 +11,7 @@ import org.argeo.slc.core.structure.StructurePath; import org.argeo.slc.core.structure.StructureRegistry; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; +import org.argeo.slc.core.test.SimpleTestResult; import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.TestReport; import org.argeo.slc.core.test.TestResult; @@ -109,7 +110,7 @@ public class FullHtmlTreeReport implements TestReport, StructureAware { for (TestResultPart part : subList.getParts()) { SimpleResultPart sPart = (SimpleResultPart) part; String color = "yellow"; - if (sPart.getStatus() == TestStatus.PASSED) { + if (sPart.getStatus().equals(SimpleResultPart.PASSED)) { color = "green"; } else { color = "red"; diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/example/ExampleTask.java b/org.argeo.slc/src/test/java/org/argeo/slc/example/ExampleTask.java index 52e06bd59..4feafac53 100644 --- a/org.argeo.slc/src/test/java/org/argeo/slc/example/ExampleTask.java +++ b/org.argeo.slc/src/test/java/org/argeo/slc/example/ExampleTask.java @@ -6,7 +6,6 @@ import org.argeo.slc.core.structure.StructurePath; import org.argeo.slc.core.structure.StructureRegistry; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.TestDefinition; import org.argeo.slc.core.test.TestResult; import org.argeo.slc.core.test.TestRun; @@ -17,9 +16,8 @@ public class ExampleTask implements StructureAware, TestDefinition, private String description; public void execute(TestRun testRun) { - SimpleResultPart part = new SimpleResultPart(); - part.setStatus(TestStatus.PASSED); - part.setMessage("Sub task with path " + path + " executed"); + SimpleResultPart part = new SimpleResultPart(PASSED, + "Sub task with path " + path + " executed", null); TestResult result = testRun.getTestResult(); result.addResultPart(part);