SLC test results

From: Mathieu Baudier Date: Sat, 1 Dec 2007 15:23:26 +0000 (+0000) Subject: Manage with Maven X-Git-Tag: argeo-slc-2.1.7~3148 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=b5c4e0c9c2fcf788a56d6ce72989fe15182e057d;p=gpl%2Fargeo-slc.git Manage with Maven git-svn-id: https://svn.argeo.org/slc/trunk@801 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc/.classpath b/org.argeo.slc/.classpath index 46fd2f448..d439082a1 100644 --- a/org.argeo.slc/.classpath +++ b/org.argeo.slc/.classpath @@ -1,27 +1,10 @@ + - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/org.argeo.slc/.project b/org.argeo.slc/.project index 7bcd1f9f3..810d37929 100644 --- a/org.argeo.slc/.project +++ b/org.argeo.slc/.project @@ -5,6 +5,11 @@ + + org.maven.ide.eclipse.maven2Builder + + + org.eclipse.jdt.core.javabuilder @@ -13,5 +18,6 @@ org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature diff --git a/org.argeo.slc/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc/.settings/org.eclipse.jdt.core.prefs index 3a43ca756..1485b0214 100644 --- a/org.argeo.slc/.settings/org.eclipse.jdt.core.prefs +++ b/org.argeo.slc/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Sun Nov 18 09:33:59 CET 2007 +#Sat Dec 01 11:46:50 CET 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml new file mode 100644 index 000000000..847d2a6fe --- /dev/null +++ b/org.argeo.slc/pom.xml @@ -0,0 +1,176 @@ + + + 4.0.0 + org.argeo.slc + argeo-slc-core + Argeo SLC + 0.5.1-SNAPSHOT + SLC Core + + + scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc + + + scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc + + https://www.argeo.org/svn/slc/trunk/org.argeo.slc + + + Bugzilla + https://www.argeo.org/bugzilla/ + + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + Argeo + http://www.argeo.org + + + + mbaudier + Mathieu Baudier + mbaudier@argeo.org + Argeo + + architect + developer + + +1 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + surefire-it + integration-test + + test + + + false + + + it.slc.base + + ${basedir}/src/test/slc + + + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-changelog-plugin + + + + + + + log4j + log4j + 1.2.14 + + + org.hibernate + hibernate + 3.2.5.ga + + + org.springframework + spring + 2.0.6 + + + org.apache.ant + ant + 1.7.0 + + + org.apache.commons + commons-io + 1.3.2 + + + org.dbunit + dbunit + 2.2 + + + junit + junit + 3.8.2 + + + hsqldb + hsqldb + 1.8.0.9 + + + + + + javax.transaction + jta + 1.0.1 + + + org.dbunit + dbunit + 2.2 + + + junit-addons + junit-addons + + + poi + poi + + + + + + \ No newline at end of file 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 6085c6635..e55a39c65 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 @@ -156,6 +156,7 @@ public class SlcAntConfig { Properties all = prepareAllProperties(slcRootFile); for (Object o : all.keySet()) { String key = o.toString(); + //System.out.println(key+"="+all.getProperty(key)); if (project.getUserProperty(key) == null) {// not already set project.setUserProperty(key, all.getProperty(key)); } @@ -179,6 +180,9 @@ public class SlcAntConfig { Properties all = new Properties(); all.putAll(System.getProperties()); all.put(ROOT_FILE_PROPERTY, slcRootFile.getCanonicalPath()); + // Remove basedir property in order to avoid conflict with Maven + if (all.containsKey("basedir")) + all.remove("basedir"); Properties rootProps = loadFile(slcRootFile.getCanonicalPath()); 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 9a13834dc..0b2698d26 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 @@ -17,6 +17,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.helper.ProjectHelperImpl; +import org.argeo.slc.core.UnsupportedException; import org.argeo.slc.core.structure.DefaultSRegistry; import org.argeo.slc.core.structure.SimpleSElement; import org.argeo.slc.core.structure.StructureRegistry; @@ -43,10 +44,17 @@ public class SlcProjectHelper extends ProjectHelperImpl { @Override public void parse(Project project, Object source) throws BuildException { + if (!(source instanceof File)) { + throw new UnsupportedException("Ant file", source); + } + File sourceFile = (File)source; // initialize config SlcAntConfig slcAntConfig = new SlcAntConfig(); + System.out.println("Base dir prop2: " + project.getProperty("basedir")); + // In order to avoid base dire override when running in Maven + project.setProperty("basedir", sourceFile.getParentFile().getAbsolutePath()); if (!slcAntConfig.initProject(project)) { // not SLC compatible, do normal Ant super.parse(project, source); @@ -58,17 +66,24 @@ public class SlcProjectHelper extends ProjectHelperImpl { log = LogFactory.getLog(SlcProjectHelper.class); } log.debug("SLC properties are set, starting initialization.."); + log.debug("Base dir1: " + project.getBaseDir().getAbsoluteFile()); + log.debug("Base dir prop1: " + project.getProperty("basedir")); // init Spring application context initSpringContext(project); + log.debug("Base dir2: " + project.getBaseDir().getAbsoluteFile()); // init structure registry DefaultSRegistry registry = new DefaultSRegistry(); project.addReference(REF_STRUCTURE_REGISTRY, registry); + log.debug("Base dir prop2: " + project.getProperty("basedir")); + // in order to prevent pb w/ basedir setting: + source = ((File) source).getAbsoluteFile(); // call the underlying implementation to do the actual work super.parse(project, source); + log.debug("Base dir3: " + project.getBaseDir().getAbsoluteFile()); // create structure root registerProjectAndParents(project, slcAntConfig); @@ -85,7 +100,6 @@ public class SlcProjectHelper extends ProjectHelperImpl { .getUserProperty(SlcAntConfig.ROOT_DIR_PROPERTY)) .getAbsoluteFile(); File baseDir = project.getBaseDir().getAbsoluteFile(); - List dirs = new Vector(); File currentDir = baseDir; do { diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/package.html b/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/package.html new file mode 100644 index 000000000..76582d159 --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/package.html @@ -0,0 +1,6 @@ + + + +Integration of SLC Deploy in Ant. + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/structure/package.html b/org.argeo.slc/src/main/java/org/argeo/slc/ant/structure/package.html index 4210b9bff..99e45d335 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/structure/package.html +++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/structure/package.html @@ -1,6 +1,6 @@ -Integration of SLC structure in Ant. +Integration of SLC Structure in Ant. \ No newline at end of file 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 deleted file mode 100644 index 85e0743c8..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/taskdefs.properties +++ /dev/null @@ -1,5 +0,0 @@ -# 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 -slc.report=org.argeo.slc.ant.test.SlcReportTask diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/package.html b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/package.html index 11138fda6..d9bab8a55 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/package.html +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/package.html @@ -1,6 +1,6 @@ -SLC structure framework allowing to uniquely reference actions. +SLC Structure framework allowing to uniquely reference actions. \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/index.html b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/index.html deleted file mode 100644 index 32beed3b5..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/index.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -SLC test results - - - - - - <h2>Frame Alert</h2> - <p>This document is designed to be viewed using the frames feature. - If you see this message, you are using a non-frame-capable web client. - </p> - - - diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/style.css b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/style.css deleted file mode 100644 index 134c6b55d..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/style.css +++ /dev/null @@ -1,64 +0,0 @@ -body { - font-family: sans-serif; - font-size: 12px; - color: black; - background-color: white; -} - -h1 { - font-family: sans-serif; - font-size: 16px; - font-weight: bold; - color: #000000; - padding: 0px 0px 5px 0px; - margin: 0px; -} - -h2 { - font-family: sans-serif; - font-size: 14px; - font-weight: bold; - color: #000000; - padding: 5px 0px 5px 0px; - margin: 0px; - margin-top: 5px; -} - -table,form { - margin: 0px; -} - -th { - font-size: 12px; - padding: 2px 20px 2px 2px; - vertical-align: top; - text-align: left; -} - -td { - font-size: 12px; - padding: 1px; - vertical-align: top; - text-align: left; -} - -.passed { - color: green; -} - -.failed { - color: red; -} - -a { - text-decoration: none; -} - -a.nav { - color: #0066CC; - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml deleted file mode 100644 index ed1d80cc1..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml deleted file mode 100644 index d9934ee33..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml deleted file mode 100644 index 9ae3d7604..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml deleted file mode 100644 index ca9c5d972..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml deleted file mode 100644 index 7b9fd7952..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/TestResultId.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/TestResultId.hbm.xml deleted file mode 100644 index dee13a618..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/TestResultId.hbm.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml deleted file mode 100644 index f9740fe10..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml deleted file mode 100644 index 5b7bcb38d..000000000 --- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/ant/taskdefs.properties b/org.argeo.slc/src/main/resources/org/argeo/slc/ant/taskdefs.properties new file mode 100644 index 000000000..85e0743c8 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/ant/taskdefs.properties @@ -0,0 +1,5 @@ +# 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 +slc.report=org.argeo.slc.ant.test.SlcReportTask diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/index.html b/org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/index.html new file mode 100644 index 000000000..32beed3b5 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/index.html @@ -0,0 +1,16 @@ + + + +SLC test results + + + + + + <h2>Frame Alert</h2> + <p>This document is designed to be viewed using the frames feature. + If you see this message, you are using a non-frame-capable web client. + </p> + + + diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/style.css b/org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/style.css new file mode 100644 index 000000000..134c6b55d --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/style.css @@ -0,0 +1,64 @@ +body { + font-family: sans-serif; + font-size: 12px; + color: black; + background-color: white; +} + +h1 { + font-family: sans-serif; + font-size: 16px; + font-weight: bold; + color: #000000; + padding: 0px 0px 5px 0px; + margin: 0px; +} + +h2 { + font-family: sans-serif; + font-size: 14px; + font-weight: bold; + color: #000000; + padding: 5px 0px 5px 0px; + margin: 0px; + margin-top: 5px; +} + +table,form { + margin: 0px; +} + +th { + font-size: 12px; + padding: 2px 20px 2px 2px; + vertical-align: top; + text-align: left; +} + +td { + font-size: 12px; + padding: 1px; + vertical-align: top; + text-align: left; +} + +.passed { + color: green; +} + +.failed { + color: red; +} + +a { + text-decoration: none; +} + +a.nav { + color: #0066CC; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml new file mode 100644 index 000000000..ed1d80cc1 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml new file mode 100644 index 000000000..d9934ee33 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml new file mode 100644 index 000000000..9ae3d7604 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml new file mode 100644 index 000000000..ca9c5d972 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml new file mode 100644 index 000000000..7b9fd7952 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/TestResultId.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/TestResultId.hbm.xml new file mode 100644 index 000000000..dee13a618 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/TestResultId.hbm.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml new file mode 100644 index 000000000..f9740fe10 --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml new file mode 100644 index 000000000..5b7bcb38d --- /dev/null +++ b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/site/apt/index.apt b/org.argeo.slc/src/site/apt/index.apt new file mode 100644 index 000000000..f414460db --- /dev/null +++ b/org.argeo.slc/src/site/apt/index.apt @@ -0,0 +1 @@ +Argeo SLC Site \ No newline at end of file diff --git a/org.argeo.slc/src/test/java/log4j.properties b/org.argeo.slc/src/test/java/log4j.properties deleted file mode 100644 index 551c14c6f..000000000 --- a/org.argeo.slc/src/test/java/log4j.properties +++ /dev/null @@ -1,23 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=INFO, console - -## Levels -# Slc -log4j.logger.org.argeo.slc=DEBUG -# Spring -log4j.logger.org.springframework=INFO -# Hibernate -log4j.logger.org.hibernate=WARN -#log4j.logger.org.hibernate.SQL=TRACE -#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE -#log4j.logger.org.hibernate.type=TRACE - - -## Appenders -# A1 is set to be a ConsoleAppender. -log4j.appender.console=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %n - diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java b/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java index 8fa1219e8..0d56f7f2f 100644 --- a/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java +++ b/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java @@ -4,6 +4,8 @@ import java.io.File; import org.springframework.context.ApplicationContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.tools.ant.Project; import junit.framework.TestCase; @@ -20,16 +22,20 @@ import org.argeo.slc.dao.test.TestResultDao; /** High level tests for SLC Ant. */ public class TestAntBuild extends TestCase { + private static Log log = LogFactory.getLog(TestAntBuild.class); + /** Tests an end-to-end Ant run. */ public void testAllRunSimple() { - File[] reportFiles = new File("src/test/slc/work/results/report/") - .listFiles(); + String slcBase = System.getProperty("it.slc.base"); + File slcBaseDir = new File(slcBase).getAbsoluteFile(); + log.info("SLC base: " + slcBaseDir); + + String reportDirPath = slcBaseDir.getPath() + "/work/results/report/"; + File[] reportFiles = new File(reportDirPath).listFiles(); for (File file : reportFiles) { file.delete(); } - File slcBaseDir = new File("./src/test/slc").getAbsoluteFile(); - File antFile = new File(slcBaseDir.getPath() + "/root/Category1/SubCategory2/build.xml"); Project p = AntRegistryUtil.runAll(antFile); @@ -71,7 +77,6 @@ public class TestAntBuild extends TestCase { TestStatus.FAILED, "Compare eu-reform-expected.txt with eu-reform-reached.txt"); - String reportDirPath = "src/test/slc/work/results/report/"; assertTrue(new File(reportDirPath + "index.html").exists()); assertTrue(new File(reportDirPath + "slc-resultsList.html").exists()); assertTrue(new File(reportDirPath + "slc-result-1.html").exists()); diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/applicationContext.xml b/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/applicationContext.xml deleted file mode 100644 index cf320fdb5..000000000 --- a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/applicationContext.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml - - - org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml - - - org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml - - - org/argeo/slc/hibernate/test/NumericTRId.hbm.xml - - - org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml - - - org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml - - - org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml - - - - - - hibernate.dialect=org.hibernate.dialect.HSQLDialect - hibernate.hbm2ddl.auto=create - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/src/test/resources/log4j.properties b/org.argeo.slc/src/test/resources/log4j.properties new file mode 100644 index 000000000..6d9a400d7 --- /dev/null +++ b/org.argeo.slc/src/test/resources/log4j.properties @@ -0,0 +1,23 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=INFO, console + +## Levels +# Slc +log4j.logger.org.argeo.slc=TRACE +# Spring +log4j.logger.org.springframework=INFO +# Hibernate +log4j.logger.org.hibernate=WARN +#log4j.logger.org.hibernate.SQL=TRACE +#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE +#log4j.logger.org.hibernate.type=TRACE + + +## Appenders +# A1 is set to be a ConsoleAppender. +log4j.appender.console=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %F%L%n + diff --git a/org.argeo.slc/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml b/org.argeo.slc/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml new file mode 100644 index 000000000..cf320fdb5 --- /dev/null +++ b/org.argeo.slc/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml + + + org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml + + + org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml + + + org/argeo/slc/hibernate/test/NumericTRId.hbm.xml + + + org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml + + + org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml + + + org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml + + + + + + hibernate.dialect=org.hibernate.dialect.HSQLDialect + hibernate.hbm2ddl.auto=create + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/test/slc/conf/log4j.properties b/org.argeo.slc/src/test/slc/conf/log4j.properties index 551c14c6f..63db0476d 100644 --- a/org.argeo.slc/src/test/slc/conf/log4j.properties +++ b/org.argeo.slc/src/test/slc/conf/log4j.properties @@ -19,5 +19,5 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender # A1 uses PatternLayout. log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %n +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %F:%L%n