From: Mathieu Baudier Date: Mon, 7 Jul 2008 09:03:19 +0000 (+0000) Subject: Prepare for release candidate X-Git-Tag: argeo-slc-2.1.7~2666 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4033929515e7799742bf5e48b37f5a1e94c0e1c2;p=gpl%2Fargeo-slc.git Prepare for release candidate git-svn-id: https://svn.argeo.org/slc/trunk@1376 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java index 0998b520d..09da07537 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java @@ -6,7 +6,6 @@ import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; import org.argeo.slc.core.build.Distribution; public class SimpleExecutables implements InstalledExecutables { diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java index 748d14c0b..4dcc63bbf 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java @@ -25,7 +25,7 @@ public class SimpleTestResult implements TestResult { private Date closeDate; private List parts = new Vector(); - + private Map attributes = new TreeMap(); public void addResultPart(TestResultPart part) { diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java index e9119a1de..eccacdbbb 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java @@ -1,13 +1,8 @@ package org.argeo.slc.support.deploy; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.net.URL; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.SlcException; import org.argeo.slc.core.build.Distribution; diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java index 8b187c5b7..8af51ece8 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java @@ -2,7 +2,7 @@ package org.argeo.slc.support.deploy; import org.argeo.slc.core.deploy.DeploymentData; -public class HttpdServerDeploymentData implements DeploymentData{ +public class HttpdServerDeploymentData implements DeploymentData { private String configFile; public String getConfigFile() { diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java index 29b391477..80905bcf0 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java @@ -5,13 +5,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.deploy.DeployedSystem; import org.argeo.slc.core.deploy.DeployedSystemManager; public class HttpdServerManager implements DeployedSystemManager { diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java index 67402d042..25f40c5f9 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java @@ -29,7 +29,7 @@ public abstract class SlcExecutionTestUtils { assertEquals(expected.getUser(), reached.getUser()); assertEquals(expected.getType(), reached.getType()); assertEquals(expected.getStatus(), reached.getStatus()); - + // Attributes assertEquals(expected.getAttributes().size(), reached.getAttributes() .size()); diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java index 6d40120aa..62b4f8226 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java @@ -1,14 +1,13 @@ package org.argeo.slc.unit.test.tree; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.fail; import static org.argeo.slc.unit.UnitUtils.assertDateSec; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.structure.SimpleSElement; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; @@ -156,6 +155,31 @@ public class UnitTestTreeUtil { } + public static void describeTreeTestResult(TreeTestResult ttr) { + log.info("TreeTestResult #" + ttr.getUuid()); + log.info(" Close date: " + ttr.getCloseDate()); + log.info(" Attributes:"); + for (String key : ttr.getAttributes().keySet()) + log.info(" " + key + "=" + ttr.getAttributes().get(key)); + + log.info(" Result parts: (size=" + ttr.getResultParts().size() + ")"); + for (TreeSPath path : ttr.getResultParts().keySet()) { + log.info(" Path: " + path); + PartSubList lst = ttr.getResultParts().get(path); + for (TestResultPart part : lst.getParts()) + log.info(" " + part); + } + + log.info(" Elements: (size=" + ttr.getElements().size() + ")"); + for (TreeSPath path : ttr.getElements().keySet()) { + SimpleSElement elem = (SimpleSElement) ttr.getElements().get(path); + log.info(" Path: " + path + ", Element: " + elem.getLabel()); + for (String tag : elem.getTags().keySet()) + log.info(" " + tag + "=" + elem.getTags().get(tag)); + } + + } + /** Makes sure this is a singleton */ private UnitTestTreeUtil() {