From 8c69c342c923aff75e3cc53afe390b767bb81e2e Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 6 Jun 2008 09:07:11 +0000 Subject: [PATCH 1/1] Improve formatting git-svn-id: https://svn.argeo.org/slc/trunk@1221 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../core/deploy/AbstractDeployedSystem.java | 1 - .../argeo/slc/core/deploy/DeployedSystem.java | 3 +- .../org/argeo/slc/core/deploy/Deployment.java | 2 +- .../core/deploy/ManageableDeployedSystem.java | 1 + .../slc/core/structure/SimpleSElement.java | 2 +- .../slc/core/structure/tree/TreeSPath.java | 2 +- .../core/structure/tree/TreeSRegistry.java | 2 +- .../slc/core/structure/tree/TreeSRelated.java | 4 +- .../argeo/slc/core/test/BasicTestData.java | 1 - .../org/argeo/slc/core/test/SlcTestUtils.java | 38 ++++++++----------- .../slc/core/test/TestResultListener.java | 3 +- .../argeo/slc/core/test/TestResultPart.java | 1 - .../java/org/argeo/slc/core/test/TestRun.java | 2 +- .../core/test/context/ParentContextAware.java | 1 + .../context/SimpleParentContextAware.java | 2 +- .../slc/core/test/tree/TreeTestResult.java | 3 +- .../tree/htmlreport/FullHtmlTreeReport.java | 2 +- .../slc/dao/process/SlcExecutionDao.java | 3 ++ .../dao/structure/tree/TreeSRegistryDao.java | 2 +- .../org/argeo/slc/dao/test/TestResultDao.java | 1 - .../slc/dao/test/TestRunDescriptorDao.java | 1 + .../java/org/argeo/slc/diff/DiffIssueKey.java | 8 ++-- .../org/argeo/slc/diff/DiffNotMatched.java | 10 +++-- .../slc/support/deploy/ApacheHttpdServer.java | 8 ++-- .../slc/support/deploy/WebApplication.java | 3 +- .../deploy/db/DbUnitDeploymentData.java | 9 ++--- .../support/deploy/db/SimpleJdbcDatabase.java | 5 --- .../core/structure/tree/TreeSPathTest.java | 27 ++++++------- 28 files changed, 70 insertions(+), 77 deletions(-) diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/AbstractDeployedSystem.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/AbstractDeployedSystem.java index 602e02d9f..3941f5529 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/AbstractDeployedSystem.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/AbstractDeployedSystem.java @@ -21,5 +21,4 @@ public abstract class AbstractDeployedSystem implements DeployedSystem { throw new UnsupportedException("Method not supported"); } - } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DeployedSystem.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DeployedSystem.java index 58f5a0427..fa383c331 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DeployedSystem.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DeployedSystem.java @@ -3,8 +3,7 @@ package org.argeo.slc.core.deploy; import org.argeo.slc.core.build.Distribution; /** An instance of a software system. */ -public interface DeployedSystem - extends TargetData { +public interface DeployedSystem extends TargetData { public String getDeployedSystemId(); public Distribution getDistribution(); diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/Deployment.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/Deployment.java index d59e4c146..fede6c1b3 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/Deployment.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/Deployment.java @@ -8,7 +8,7 @@ public interface Deployment { public void setTargetData(TargetData targetData); public void setDeploymentData(DeploymentData deploymentData); - + public void setDistribution(Distribution distribution); public void execute(); diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/ManageableDeployedSystem.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/ManageableDeployedSystem.java index 6afee96b6..a5c0e79ba 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/ManageableDeployedSystem.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/ManageableDeployedSystem.java @@ -2,5 +2,6 @@ package org.argeo.slc.core.deploy; public interface ManageableDeployedSystem extends DeployedSystem { public void start(); + public void stop(); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java index 6fcef33c8..2bab2e74c 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java @@ -62,7 +62,7 @@ public class SimpleSElement implements StructureElement { } @Override - public SimpleSElement clone(){ + public SimpleSElement clone() { return new SimpleSElement(this); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java index a31239f83..c673faa65 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java @@ -62,7 +62,7 @@ public class TreeSPath implements StructurePath, Comparable { /** Gets the name part of the path. */ public String getName() { int lastSep = getAsUniqueString().lastIndexOf(separator); - return getAsUniqueString().substring(lastSep+1); + return getAsUniqueString().substring(lastSep + 1); } /** Create a path without parent. */ diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java index 10125678c..7337367dc 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java @@ -24,7 +24,7 @@ public class TreeSRegistry implements StructureRegistry { private List activePaths; public T getElement(TreeSPath path) { - return (T)elements.get(path); + return (T) elements.get(path); } public List listElements() { diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java index f939fbc12..43a145a4e 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java @@ -4,8 +4,10 @@ import org.argeo.slc.core.structure.StructureAware; import org.argeo.slc.core.structure.StructureElement; import org.argeo.slc.core.structure.StructureRegistry; -public interface TreeSRelated extends StructureAware{ +public interface TreeSRelated extends StructureAware { public TreeSPath getBasePath(); + public StructureRegistry getRegistry(); + public StructureElement getStructureElement(String key); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestData.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestData.java index a8ee46cbf..e6be49632 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestData.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestData.java @@ -1,6 +1,5 @@ package org.argeo.slc.core.test; - public class BasicTestData implements TestData { private Object expected; private Object reached; diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java index c7d7840cd..9eeda4064 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java @@ -3,38 +3,32 @@ package org.argeo.slc.core.test; import org.argeo.slc.core.SlcException; public abstract class SlcTestUtils { - public static String statusToString(Integer status){ - if(status.equals(TestStatus.PASSED)){ + public static String statusToString(Integer status) { + if (status.equals(TestStatus.PASSED)) { return TestStatus.STATUSSTR_PASSED; - } - else if(status.equals(TestStatus.FAILED)){ + } else if (status.equals(TestStatus.FAILED)) { return TestStatus.STATUSSTR_FAILED; - } - else if(status.equals(TestStatus.ERROR)){ + } else if (status.equals(TestStatus.ERROR)) { return TestStatus.STATUSSTR_ERROR; - } - else{ - throw new SlcException("Unrecognized status "+status); + } else { + throw new SlcException("Unrecognized status " + status); } } - - public static Integer stringToStatus(String statusStr){ - if(statusStr.equals(TestStatus.STATUSSTR_PASSED)){ + + public static Integer stringToStatus(String statusStr) { + if (statusStr.equals(TestStatus.STATUSSTR_PASSED)) { return TestStatus.PASSED; - } - else if(statusStr.equals(TestStatus.STATUSSTR_FAILED)){ + } else if (statusStr.equals(TestStatus.STATUSSTR_FAILED)) { return TestStatus.FAILED; - } - else if(statusStr.equals(TestStatus.STATUSSTR_ERROR)){ + } else if (statusStr.equals(TestStatus.STATUSSTR_ERROR)) { return TestStatus.ERROR; - } - else{ - throw new SlcException("Unrecognized status string "+statusStr); + } else { + throw new SlcException("Unrecognized status string " + statusStr); } } - - private SlcTestUtils(){ - + + private SlcTestUtils() { + } } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultListener.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultListener.java index c42d783d0..fc8f1d73f 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultListener.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultListener.java @@ -3,8 +3,7 @@ package org.argeo.slc.core.test; /** Listener to the operations on a test result. */ public interface TestResultListener { /** Notified when a part was added to a test result. */ - public void resultPartAdded(T testResult, - TestResultPart testResultPart); + public void resultPartAdded(T testResult, TestResultPart testResultPart); /** Stops listening and release the related resources. */ public void close(T testResult); diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultPart.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultPart.java index fc5749b86..9956d8624 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultPart.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultPart.java @@ -1,6 +1,5 @@ package org.argeo.slc.core.test; - /** * Part of a test result. * diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestRun.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestRun.java index 5a4ac50b6..17cf42394 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestRun.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestRun.java @@ -4,7 +4,7 @@ import org.argeo.slc.core.deploy.DeployedSystem; import org.argeo.slc.core.process.SlcExecutionAware; /** The actual run of a test */ -public interface TestRun extends SlcExecutionAware{ +public interface TestRun extends SlcExecutionAware { /** Gets UUID */ public String getUuid(); diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ParentContextAware.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ParentContextAware.java index a8fc8b2be..5d13324a2 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ParentContextAware.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ParentContextAware.java @@ -4,5 +4,6 @@ import java.util.Collection; public interface ParentContextAware extends ContextAware { public Collection getChildContexts(); + public void addChildContext(ContextAware contextAware); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java index 2dfa12346..76ea43f3c 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java @@ -24,7 +24,7 @@ public class SimpleParentContextAware extends SimpleContextAware implements // If has a parent, sync it. super.afterPropertiesSet(); } else { - if(children.size()>0){ + if (children.size() > 0) { // No need to synchronize if no children ContextUtils.synchronize(this); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java index 328d5981a..96d0db046 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java @@ -24,7 +24,8 @@ import org.argeo.slc.core.test.TestRunAware; * Complex implementation of a test result compatible with a tree based * structure. */ -public class TreeTestResult implements TestResult, StructureAware,Comparable { +public class TreeTestResult implements TestResult, StructureAware, + Comparable { private Log log = LogFactory.getLog(TreeTestResult.class); private List> listeners = new Vector>(); diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java index a77eb34f0..6e9e496a8 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java @@ -86,7 +86,7 @@ public class FullHtmlTreeReport implements TestReport, StructureAware { } index.close(); } - log.info("Generated HTML test result report to "+reportDir); + log.info("Generated HTML test result report to " + reportDir); } /** diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java index 181a9febe..bc084dd0b 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java @@ -6,7 +6,10 @@ import org.argeo.slc.core.process.SlcExecution; public interface SlcExecutionDao { public void create(SlcExecution slcExecution); + public void update(SlcExecution slcExecution); + public SlcExecution getSlcExecution(String uuid); + public List listSlcExecutions(); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java index f271f8cbe..62c9bb444 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java @@ -18,7 +18,7 @@ public interface TreeSRegistryDao { /** Updates an existing registry. */ public void update(TreeSRegistry registry); - + /** Sync with local registry */ public void syncPath(TreeSRegistry registry, StructureRegistry localRegistry, TreeSPath path); diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java index 01cdffd25..6b72cfa7c 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java @@ -22,7 +22,6 @@ public interface TestResultDao { /** Lists all test results. */ public List listTestResults(); - public void close(String id, Date closeDate); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java index 7397458b5..53bc89a3c 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java @@ -4,5 +4,6 @@ import org.argeo.slc.core.test.TestRunDescriptor; public interface TestRunDescriptorDao { public TestRunDescriptor getTestRunDescriptor(String id); + public void saveOrUpdate(TestRunDescriptor testRunDescriptor); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffIssueKey.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffIssueKey.java index cf00fd8eb..9894edd32 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffIssueKey.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffIssueKey.java @@ -5,12 +5,12 @@ public abstract class DiffIssueKey extends DiffIssue { /** The position of this issue. */ protected DiffKey key; - /** Constructor without key*/ + /** Constructor without key */ public DiffIssueKey(DiffPosition position) { super(position); } - - /** Constructor with key*/ + + /** Constructor with key */ public DiffIssueKey(DiffPosition position, DiffKey key) { super(position); this.key = key; @@ -19,7 +19,7 @@ public abstract class DiffIssueKey extends DiffIssue { public Object getKey() { return key; } - + @Override public String toString() { if (key != null) { diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffNotMatched.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffNotMatched.java index a482548f5..4b205e98f 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffNotMatched.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffNotMatched.java @@ -11,7 +11,8 @@ public class DiffNotMatched extends DiffIssueKey { this.reached = reached; } - public DiffNotMatched(DiffPosition position, Object expected, Object reached, DiffKey key) { + public DiffNotMatched(DiffPosition position, Object expected, + Object reached, DiffKey key) { super(position, key); this.expected = expected; this.reached = reached; @@ -27,11 +28,12 @@ public class DiffNotMatched extends DiffIssueKey { @Override public String toString() { - String result = position + ": not matched " + expected + " <> " + reached; + String result = position + ": not matched " + expected + " <> " + + reached; if (super.key != null) { - result = result + " - Key: " + super.toString(); + result = result + " - Key: " + super.toString(); } - + return result; } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/ApacheHttpdServer.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/ApacheHttpdServer.java index 71227bf83..ae6a3dbfa 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/ApacheHttpdServer.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/ApacheHttpdServer.java @@ -18,16 +18,14 @@ public class ApacheHttpdServer implements WebServer { try { return baseUrlRes.getURL(); } catch (IOException e) { - throw new SlcException("Cannot get url from "+baseUrlRes,e); + throw new SlcException("Cannot get url from " + baseUrlRes, e); } } - public void setBaseUrlRes(Resource baseUrlRes){ + public void setBaseUrlRes(Resource baseUrlRes) { this.baseUrlRes = baseUrlRes; } - - - + public File getBaseLocation() { return baseLocation; } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/WebApplication.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/WebApplication.java index da0b1129e..ef167ba21 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/WebApplication.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/WebApplication.java @@ -5,7 +5,8 @@ import java.net.URL; import org.argeo.slc.core.deploy.DeployedSystem; -public interface WebApplication extends DeployedSystem{ +public interface WebApplication extends DeployedSystem { public URL getBaseUrl(); + public File getRootLocation(); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java index 0e3612394..3d328a0fb 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java @@ -8,10 +8,10 @@ import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.xml.FlatXmlDataSet; import org.springframework.core.io.Resource; -public class DbUnitDeploymentData implements DeploymentData{ +public class DbUnitDeploymentData implements DeploymentData { private Resource dataSetLocation; - public IDataSet createDataSet(){ + public IDataSet createDataSet() { try { InputStream in = dataSetLocation.getInputStream(); IDataSet dataSet = new FlatXmlDataSet(in); @@ -22,10 +22,9 @@ public class DbUnitDeploymentData implements DeploymentData{ } } - + public void setDataSetLocation(Resource dataSetLocation) { this.dataSetLocation = dataSetLocation; } - - + } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java index 29799038f..5fe1d4a67 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java @@ -2,12 +2,7 @@ package org.argeo.slc.support.deploy.db; import javax.sql.DataSource; -import org.argeo.slc.core.UnsupportedException; -import org.argeo.slc.core.build.Distribution; import org.argeo.slc.core.deploy.AbstractDeployedSystem; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.deploy.DeploymentData; -import org.argeo.slc.core.deploy.TargetData; public class SimpleJdbcDatabase extends AbstractDeployedSystem implements JdbcAware { diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/structure/tree/TreeSPathTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/structure/tree/TreeSPathTest.java index fab683111..f24abc580 100644 --- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/structure/tree/TreeSPathTest.java +++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/structure/tree/TreeSPathTest.java @@ -18,40 +18,41 @@ public class TreeSPathTest extends TestCase { TreeSPath path1 = new TreeSPath("/test"); TreeSPath path2 = new TreeSPath("/test"); assertEquals(path1, path2); - + path1 = new TreeSPath("/test/subdir/anotherdir"); path2 = new TreeSPath("/test/subdir/anotherdir"); assertEquals(path1, path2); - + path1 = new TreeSPath("/test/subdir/anotherd"); path2 = new TreeSPath("/test/subdir/anotherdir"); assertNotSame(path1, path2); - + path1 = new TreeSPath("/test/subdir"); path2 = new TreeSPath("/test/subdir/anotherdir"); assertNotSame(path1, path2); - + path1 = new TreeSPath("/test/subd/anotherdir"); path2 = new TreeSPath("/test/subdir/anotherdir"); assertNotSame(path1, path2); } - - public void testCheckFormat(){ - try{ + + public void testCheckFormat() { + try { new TreeSPath("hello"); fail("Bad format should be rejected"); - }catch(Exception e){ + } catch (Exception e) { // exception expected } - - try{ + + try { new TreeSPath("/"); fail("Bad format should be rejected"); - }catch(Exception e){ + } catch (Exception e) { // exception expected } - + assertEquals(new TreeSPath("/test"), new TreeSPath("/test/")); - assertEquals(new TreeSPath("/test/dir"), new TreeSPath("//test///dir////")); + assertEquals(new TreeSPath("/test/dir"), new TreeSPath( + "//test///dir////")); } } -- 2.39.2