From ed93fb9db5f9008a78d9ab892806ae398ed65b85 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 18 Nov 2007 14:58:20 +0000 Subject: [PATCH] Improve formatting of the code. Remove exception thrown when no closed date found. git-svn-id: https://svn.argeo.org/slc/trunk@721 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../include/ant/slc-factory-targets.xml | 6 ++--- .../org/argeo/slc/ant/SlcProjectHelper.java | 4 ++-- .../argeo/slc/ant/deploy/SlcDeployTask.java | 4 ++-- .../slc/ant/test/SlcCloseTestResultTask.java | 2 -- .../slc/core/deploy/WritableDeployment.java | 2 +- .../slc/core/test/ExecutableTestRun.java | 4 ++-- .../argeo/slc/core/test/SimpleResultPart.java | 1 + .../argeo/slc/core/test/SimpleTestResult.java | 3 +-- .../argeo/slc/core/test/TestResultPart.java | 2 +- .../org/argeo/slc/core/test/TestStatus.java | 2 +- .../AsynchronousTreeTestResultListener.java | 2 +- .../argeo/slc/core/test/tree/PartSubList.java | 4 ++-- .../slc/core/test/tree/TreeTestResult.java | 18 +++++++-------- .../tree/htmlreport/FullHtmlTreeReport.java | 6 ++--- .../core/test/tree/htmlreport/ResultPage.java | 8 ++++++- .../test/tree/htmlreport/ResultsList.java | 6 ++--- .../slc/dao/structure/tree/TreeSPathDao.java | 2 ++ .../java/org/argeo/slc/diff/DiffIssue.java | 4 ++-- .../java/org/argeo/slc/diff/DiffMissing.java | 4 +--- .../org/argeo/slc/diff/SimpleDiffResult.java | 2 +- .../org/argeo/slc/diff/XPathDiffPosition.java | 2 +- .../structure/tree/TreeSPathDaoHibernate.java | 4 +--- .../tree/TreeSRegistryDaoHibernate.java | 3 ++- .../argeo/slc/unit/SpringBasedTestCase.java | 4 ++-- .../org/argeo/slc/example/ExampleTask.java | 4 ++-- .../argeo/slc/example/appli/ExampleAppli.java | 6 ++--- .../tree/TreeSPathDaoHibernateTest.java | 11 +++++----- .../tree/TreeSRegistryDaoHibernateTest.java | 16 +++++++------- .../tree/TreeTestResultDaoHibernateTest.java | 22 +++++++++---------- 29 files changed, 80 insertions(+), 78 deletions(-) diff --git a/org.argeo.slc/src/main/config/include/ant/slc-factory-targets.xml b/org.argeo.slc/src/main/config/include/ant/slc-factory-targets.xml index c53515a1e..b76dbcb81 100644 --- a/org.argeo.slc/src/main/config/include/ant/slc-factory-targets.xml +++ b/org.argeo.slc/src/main/config/include/ant/slc-factory-targets.xml @@ -98,19 +98,19 @@ $LastChangedDate$ - + - + - + diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java index cefa61f69..d877e2b4b 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java @@ -46,8 +46,8 @@ public class SlcProjectHelper extends ProjectHelperImpl { // initialize config SlcAntConfig slcAntConfig = new SlcAntConfig(); - - if(!slcAntConfig.initProject(project)){ + + if (!slcAntConfig.initProject(project)) { // not SLC compatible, do normal Ant super.parse(project, source); return; diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java index 70c0ff7f6..fb470992d 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java @@ -48,13 +48,13 @@ public class SlcDeployTask extends SAwareTask { this.deploymentBean = deploymentBean; } - /** Creates deployment data sub tag.*/ + /** Creates deployment data sub tag. */ public DeploymentDataArg createDeploymentData() { deploymentDataArg = new DeploymentDataArg(); return deploymentDataArg; } - /** Creates target data sub tag.*/ + /** Creates target data sub tag. */ public TargetDataArg createTargetData() { targetDataArg = new TargetDataArg(); return targetDataArg; diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java index 660928abe..bc0c2ba1a 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java @@ -1,9 +1,7 @@ package org.argeo.slc.ant.test; import org.argeo.slc.ant.structure.SAwareTask; -import org.argeo.slc.core.structure.StructureAware; import org.argeo.slc.core.structure.StructureRegistry; -import org.argeo.slc.core.test.TestReport; import org.argeo.slc.core.test.TestResult; /** Ant tasks closing a given result. */ diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/deploy/WritableDeployment.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/deploy/WritableDeployment.java index f67531cca..15c3ccb6c 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/deploy/WritableDeployment.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/deploy/WritableDeployment.java @@ -1,6 +1,6 @@ package org.argeo.slc.core.deploy; -public interface WritableDeployment extends ExecutableDeployment{ +public interface WritableDeployment extends ExecutableDeployment { public void setDeployedSystem(DeployedSystem deployedSystem); public void setTargetData(TargetData targetData); diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/ExecutableTestRun.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/ExecutableTestRun.java index bd1526412..34216799f 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/ExecutableTestRun.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/ExecutableTestRun.java @@ -1,7 +1,7 @@ package org.argeo.slc.core.test; -/** A test run that can be executed*/ -public interface ExecutableTestRun extends TestRun{ +/** A test run that can be executed */ +public interface ExecutableTestRun extends TestRun { /** Executes this test run. */ public void execute(); 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 97b937fa8..249fd2149 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,6 +5,7 @@ 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, TestStatus { diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java index 3f673305d..9ef6cdea3 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java @@ -8,8 +8,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * Basic implementation of a test result containing only a list of result - * parts. + * Basic implementation of a test result containing only a list of result parts. */ public class SimpleTestResult implements TestResult { private static Log log = LogFactory.getLog(SimpleTestResult.class); 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 3d56a5f11..707c00f3b 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,7 +5,7 @@ package org.argeo.slc.core.test; * * @see TestResult */ -public interface TestResultPart { +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 9f7f6e821..0f54d9655 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,7 +1,7 @@ package org.argeo.slc.core.test; /** - * Simple statuses. + * Simple statuses. *

*

    *
  • {@link #PASSED}: the test succeeded
  • diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java index c3bc793ef..751b0e9b1 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java @@ -39,7 +39,7 @@ public abstract class AsynchronousTreeTestResultListener implements thread = null; partStructs.notifyAll(); } - postClose((TreeTestResult)testResult); + postClose((TreeTestResult) testResult); } public final void resultPartAdded(TestResult testResult, diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java index eab01a048..113ef48bb 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java @@ -20,12 +20,12 @@ public class PartSubList { private List parts = new Vector(); - /** Gets the result parts.*/ + /** Gets the result parts. */ public List getParts() { return parts; } - /** Sets the result parts.*/ + /** Sets the result parts. */ public void setParts(List parts) { this.parts = parts; } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java index dc0f3aa59..3124b055f 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java @@ -33,7 +33,7 @@ public class TreeTestResult implements TestResult, StructureAware { private List listeners = new Vector(); private TreeSPath currentPath; - + private Date closeDate; private boolean isClosed = false; @@ -41,7 +41,7 @@ public class TreeTestResult implements TestResult, StructureAware { private SortedMap resultParts = new TreeMap(); private StructureRegistry registry; - + public TestResultId getTestResultId() { return testResultId; } @@ -54,12 +54,12 @@ public class TreeTestResult implements TestResult, StructureAware { return testResultId; } - /** Sets the test result id as a numeric test result id.*/ + /** Sets the test result id as a numeric test result id. */ public void setNumericResultId(NumericTRId testResultId) { this.testResultId = testResultId; } - /** Sets the list of listeners.*/ + /** Sets the list of listeners. */ public void setListeners(List listeners) { this.listeners = listeners; } @@ -88,7 +88,7 @@ public class TreeTestResult implements TestResult, StructureAware { this.registry = registry; } - /** Gets the current path.*/ + /** Gets the current path. */ public TreeSPath getCurrentPath() { return currentPath; } @@ -117,7 +117,7 @@ public class TreeTestResult implements TestResult, StructureAware { listeners.clear(); } isClosed = true; - + log.info("Test Result #" + getTestResultId() + " closed."); } @@ -129,12 +129,12 @@ public class TreeTestResult implements TestResult, StructureAware { this.tid = tid; } - /** Gets the related registry (can be null).*/ + /** Gets the related registry (can be null). */ public StructureRegistry getRegistry() { return registry; } - /** Sets the related registry.*/ + /** Sets the related registry. */ public void setRegistry(StructureRegistry registry) { this.registry = registry; } @@ -143,7 +143,7 @@ public class TreeTestResult implements TestResult, StructureAware { return closeDate; } - /** Sets the close date (for ORM)*/ + /** Sets the close date (for ORM) */ public void setCloseDate(Date closeDate) { this.closeDate = closeDate; } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java index eb8a360d7..b05ed389a 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java @@ -132,11 +132,11 @@ public class FullHtmlTreeReport implements TestReport, StructureAware { return reportDir; } - void addStyles(StringBuffer buf){ + void addStyles(StringBuffer buf) { try { buf.append("