From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 28 Oct 2007 19:35:45 +0000 (+0000)
Subject: Basic reporting
X-Git-Tag: argeo-slc-2.1.7~3193
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=9eb5d8493deed66f11248550fe5ec2202151846f;p=gpl%2Fargeo-slc.git

Basic reporting

git-svn-id: https://svn.argeo.org/slc/trunk@669 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 755c063bc..2487b20ea 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
@@ -45,142 +45,83 @@ public class SlcAntConfig {
 				project.setUserProperty(key, all.getProperty(key));
 			}
 		}
-
-		/*
-		Properties rootProps = loadFile(slcRootFile.getAbsolutePath());
-
-		final File confDir;
-		final File workDir;
-		// Root dir
-		final File rootDir = slcRootFile.getParentFile();
-		project.setUserProperty(ROOT_DIR_PROPERTY, rootDir.getAbsolutePath());
-
-		// Conf dir
-		if (project.getUserProperty(CONF_DIR_PROPERTY) == null) {
-			confDir = new File(rootProps.getProperty(CONF_DIR_PROPERTY, rootDir
-					.getAbsolutePath()
-					+ "/../conf")).getAbsoluteFile();
-			project.setUserProperty(CONF_DIR_PROPERTY, confDir
-					.getAbsolutePath());
-		} else {
-			confDir = new File(project.getUserProperty(CONF_DIR_PROPERTY))
-					.getAbsoluteFile();
-		}
-
-		// Work dir
-		if (project.getUserProperty(WORK_DIR_PROPERTY) == null) {
-			workDir = new File(rootProps.getProperty(WORK_DIR_PROPERTY, rootDir
-					.getAbsolutePath()
-					+ "/../work")).getAbsoluteFile();
-			project.setUserProperty(WORK_DIR_PROPERTY, workDir
-					.getAbsolutePath());
-		} else {
-			workDir = new File(project.getUserProperty(WORK_DIR_PROPERTY))
-					.getAbsoluteFile();
-		}
-
-		// Properties from the conf dir files
-		Properties properties = new Properties();
-		StringTokenizer st = new StringTokenizer(rootProps.getProperty(
-				PROPERTY_FILE_NAMES_PROPERTY, "slc.properties"), ",");
-		while (st.hasMoreTokens()) {
-			String fileName = st.nextToken();
-			properties.putAll(loadFile(confDir.getAbsolutePath() + "/"
-					+ fileName));
-		}
-
-		for (Object o : properties.keySet()) {
-			String key = o.toString();
-			if (project.getUserProperty(key) == null) {// not already set
-				project.setUserProperty(key, properties.getProperty(key));
-			}
-		}
-
-		// Default application context
-		if (project.getUserProperty(APPLICATION_CONTEXT_PROPERTY) == null) {
-			project.setUserProperty(APPLICATION_CONTEXT_PROPERTY, confDir
-					.getAbsolutePath()
-					+ "/applicationContext.xml");
-		}
-		// Default test run
-		if (project.getUserProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {
-			project
-					.setUserProperty(DEFAULT_TEST_RUN_PROPERTY,
-							"defaultTestRun");
-		}
-		*/
 	}
 
 	public static Properties prepareAllProperties() {
-		Properties all = new Properties();
-		all.putAll(System.getProperties());
+		try {
+			Properties all = new Properties();
+			all.putAll(System.getProperties());
 
-		if (all.getProperty(ROOT_FILE_PROPERTY) == null) {
-			throw new RuntimeException("System Property " + ROOT_FILE_PROPERTY
-					+ " has to be set.");
-		}
+			if (all.getProperty(ROOT_FILE_PROPERTY) == null) {
+				throw new RuntimeException("System Property "
+						+ ROOT_FILE_PROPERTY + " has to be set.");
+			}
 
-		File slcRootFile = new File(all.getProperty(ROOT_FILE_PROPERTY))
-				.getAbsoluteFile();
-		Properties rootProps = loadFile(slcRootFile.getAbsolutePath());
-
-		final File confDir;
-		final File workDir;
-		// Root dir
-		final File rootDir = slcRootFile.getParentFile();
-		all.setProperty(ROOT_DIR_PROPERTY, rootDir.getAbsolutePath());
-
-		// Conf dir
-		if (all.getProperty(CONF_DIR_PROPERTY) == null) {
-			confDir = new File(rootProps.getProperty(CONF_DIR_PROPERTY, rootDir
-					.getAbsolutePath()
-					+ "/../conf")).getAbsoluteFile();
-			all.setProperty(CONF_DIR_PROPERTY, confDir.getAbsolutePath());
-		} else {
-			confDir = new File(all.getProperty(CONF_DIR_PROPERTY))
+			File slcRootFile = new File(all.getProperty(ROOT_FILE_PROPERTY))
 					.getAbsoluteFile();
-		}
+			Properties rootProps = loadFile(slcRootFile.getAbsolutePath());
+
+			final File confDir;
+			final File workDir;
+			// Root dir
+			final File rootDir = slcRootFile.getParentFile();
+			all.setProperty(ROOT_DIR_PROPERTY, 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());
+			} else {
+				confDir = new File(all.getProperty(CONF_DIR_PROPERTY))
+						.getCanonicalFile();
+			}
 
-		// Work dir
-		if (all.getProperty(WORK_DIR_PROPERTY) == null) {
-			workDir = new File(rootProps.getProperty(WORK_DIR_PROPERTY, rootDir
-					.getAbsolutePath()
-					+ "/../work")).getAbsoluteFile();
-			all.setProperty(WORK_DIR_PROPERTY, workDir.getAbsolutePath());
-		} else {
-			workDir = new File(all.getProperty(WORK_DIR_PROPERTY))
-					.getAbsoluteFile();
-		}
+			// Work dir
+			if (all.getProperty(WORK_DIR_PROPERTY) == null) {
+				workDir = new File(rootProps.getProperty(WORK_DIR_PROPERTY,
+						rootDir.getAbsolutePath() + "/../work"))
+						.getCanonicalFile();
+				all.setProperty(WORK_DIR_PROPERTY, workDir.getAbsolutePath());
+			} else {
+				workDir = new File(all.getProperty(WORK_DIR_PROPERTY))
+						.getCanonicalFile();
+			}
 
-		// Properties from the conf dir files
-		Properties properties = new Properties();
-		StringTokenizer st = new StringTokenizer(rootProps.getProperty(
-				PROPERTY_FILE_NAMES_PROPERTY, "slc.properties"), ",");
-		while (st.hasMoreTokens()) {
-			String fileName = st.nextToken();
-			properties.putAll(loadFile(confDir.getAbsolutePath() + "/"
-					+ fileName));
-		}
+			// Properties from the conf dir files
+			Properties properties = new Properties();
+			StringTokenizer st = new StringTokenizer(rootProps.getProperty(
+					PROPERTY_FILE_NAMES_PROPERTY, "slc.properties"), ",");
+			while (st.hasMoreTokens()) {
+				String fileName = st.nextToken();
+				properties.putAll(loadFile(confDir.getAbsolutePath() + "/"
+						+ fileName));
+			}
 
-		for (Object o : properties.keySet()) {
-			String key = o.toString();
-			if (all.getProperty(key) == null) {// not already set
-				all.setProperty(key, properties.getProperty(key));
+			for (Object o : properties.keySet()) {
+				String key = o.toString();
+				if (all.getProperty(key) == null) {// not already set
+					all.setProperty(key, properties.getProperty(key));
+				}
 			}
-		}
 
-		// Default application context
-		if (all.getProperty(APPLICATION_CONTEXT_PROPERTY) == null) {
-			all.setProperty(APPLICATION_CONTEXT_PROPERTY, confDir
-					.getAbsolutePath()
-					+ "/applicationContext.xml");
-		}
-		// Default test run
-		if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {
-			all.setProperty(DEFAULT_TEST_RUN_PROPERTY, "defaultTestRun");
-		}
+			// Default application context
+			if (all.getProperty(APPLICATION_CONTEXT_PROPERTY) == null) {
+				all.setProperty(APPLICATION_CONTEXT_PROPERTY, confDir
+						.getAbsolutePath()
+						+ "/applicationContext.xml");
+			}
+			// Default test run
+			if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {
+				all.setProperty(DEFAULT_TEST_RUN_PROPERTY, "defaultTestRun");
+			}
 
-		return all;
+			return all;
+		} catch (Exception e) {
+			throw new SlcAntException("Unexpected exception while configuring",
+					e);
+		}
 	}
 
 	public static Properties loadFile(String path) {
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 4df33bd69..b0d1550ed 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 +1,2 @@
-slc.test=org.argeo.slc.ant.test.SlcTestTask
\ No newline at end of file
+slc.test=org.argeo.slc.ant.test.SlcTestTask
+slc.closeResult=org.argeo.slc.ant.test.SlcCloseTestResultTask
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
new file mode 100644
index 000000000..1a5bc7b2f
--- /dev/null
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java
@@ -0,0 +1,30 @@
+package org.argeo.slc.ant.test;
+
+import org.argeo.slc.ant.spring.AbstractSpringTask;
+import org.argeo.slc.core.test.TestReport;
+import org.argeo.slc.core.test.TestResult;
+
+public class SlcCloseTestResultTask extends AbstractSpringTask {
+	private String result;
+	private String report;
+	
+	public void execute(){
+		TestResult testResult = (TestResult)getContext().getBean(result);
+		testResult.close();
+		
+		if(report!=null){
+			TestReport testReport = (TestReport)getContext().getBean(report);
+			testReport.generateTestReport(testResult);
+		}
+	}
+
+	public void setResult(String bean) {
+		this.result = bean;
+	}
+
+	public void setReport(String report) {
+		this.report = report;
+	}
+	
+	
+}
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 1c7c7e267..62fd229fc 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
@@ -2,9 +2,9 @@ package org.argeo.slc.core.test;
 
 public class SimpleResultPart implements TestResultPart {
 
-	public final static Integer PASSED = 1;
-	public final static Integer FAILED = 2;
-	public final static Integer ERROR = 3;
+	public final static int PASSED = 1;
+	public final static int FAILED = 2;
+	public final static int ERROR = 3;
 
 	/** For ORM */
 	private Long tid;
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestReport.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestReport.java
new file mode 100644
index 000000000..51a97c9d8
--- /dev/null
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestReport.java
@@ -0,0 +1,5 @@
+package org.argeo.slc.core.test;
+
+public interface TestReport {
+	public void generateTestReport(TestResult result);
+}
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResult.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResult.java
index f01c8fb42..ec6b6babb 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResult.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResult.java
@@ -4,4 +4,5 @@ package org.argeo.slc.core.test;
 public interface TestResult {
 	public TestResultId getTestResultId();
 	public void addResultPart(TestResultPart part);
+	public void close();
 }
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultListener.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultListener.java
index 15ec96d89..adab823cf 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultListener.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultListener.java
@@ -3,4 +3,5 @@ package org.argeo.slc.core.test;
 public interface TestResultListener {
 	public void resultPartAdded(TestResult testResult,
 			TestResultPart testResultPart);
+	public void close();
 }
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 13b3b25df..4a86aa2b4 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
@@ -24,6 +24,21 @@ public abstract class AsynchronousTreeTestResultListener implements
 			partStructs.notifyAll();
 		}
 	}
+	
+	/** Finish the remaining and destroy*/
+	public void close(){
+		synchronized (partStructs) {
+			// TODO: put a timeout
+			while (partStructs.size() != 0) {
+				try {
+					partStructs.wait();
+				} catch (InterruptedException e) {
+					// silent
+				}
+			}
+			destroy();
+		}
+	}
 
 	public final void resultPartAdded(TestResult testResult,
 			TestResultPart testResultPart) {
@@ -36,6 +51,8 @@ public abstract class AsynchronousTreeTestResultListener implements
 		}
 	}
 
+	protected abstract void resultPartAdded(PartStruct partStruct);
+
 	public void run() {
 		while (thread != null) {
 			synchronized (partStructs) {
@@ -44,6 +61,7 @@ public abstract class AsynchronousTreeTestResultListener implements
 				}
 
 				partStructs.clear();
+				partStructs.notifyAll();
 				while (partStructs.size() == 0) {
 					try {
 						partStructs.wait();
@@ -55,7 +73,6 @@ public abstract class AsynchronousTreeTestResultListener implements
 		}
 	}
 
-	protected abstract void resultPartAdded(PartStruct partStruct);
 
 	protected static class PartStruct {
 		public final TreeSPath path;
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
new file mode 100644
index 000000000..9dd761033
--- /dev/null
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/FullHtmlTreeReport.java
@@ -0,0 +1,124 @@
+package org.argeo.slc.core.test.tree;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+
+import org.argeo.slc.core.structure.tree.TreeSPath;
+import org.argeo.slc.core.test.SimpleResultPart;
+import org.argeo.slc.core.test.TestReport;
+import org.argeo.slc.core.test.TestResult;
+import org.argeo.slc.core.test.TestResultPart;
+import org.argeo.slc.dao.test.TestResultDao;
+
+public class FullHtmlTreeReport implements TestReport {
+	private TestResultDao testResultDao;
+	private File reportDir;
+
+	public void generateTestReport(TestResult testResult) {
+		if (testResultDao == null) {
+			TreeTestResult result = (TreeTestResult) testResult;
+			generateResultPage(getResultFile(result), result);
+		} else {
+			if (reportDir.exists()) {
+				// clean
+				for (File file : reportDir.listFiles()) {
+					file.delete();
+				}
+			}
+			reportDir.mkdirs();
+
+			StringBuffer index = new StringBuffer("");
+			index
+					.append("<html><header><title>Results</title></header><body>\n<table border=1>\n");
+
+			List<TestResult> list = testResultDao.listTestResults();
+			for (TestResult testRes : list) {
+				TreeTestResult res = (TreeTestResult) testRes;
+
+				File file = getResultFile(res);
+				index.append("<tr><td><a href=\"").append(file.getName())
+						.append("\">");
+				index.append(res.getTestResultId()).append("</a></td></tr>\n");
+				generateResultPage(file, res);
+			}
+
+			index.append("</table>\n</body></html>");
+
+			try {
+				FileWriter writer = new FileWriter(reportDir.getPath()
+						+ File.separator + "index.html");
+				writer.write(index.toString());
+				writer.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+		}
+	}
+
+	protected void generateResultPage(File file, TreeTestResult result) {
+		StringBuffer buf = new StringBuffer("");
+		buf.append("<html>\n");
+		buf.append("<header><title>Result #").append(result.getTestResultId())
+				.append("</title></header>\n");
+
+		buf.append("<body>\n");
+
+		buf.append("<h1>Result #").append(result.getTestResultId()).append(
+				"</h1>\n");
+
+		buf.append("<table border=1>\n");
+		for (TreeSPath path : result.getResultParts().keySet()) {
+			buf.append("<tr><td>").append(path).append("</td>\n");
+			buf.append("<td>");
+			PartSubList subList = (PartSubList) result.getResultParts().get(
+					path);
+			buf.append("<table border=0>\n");
+			for (TestResultPart part : subList.getParts()) {
+				SimpleResultPart sPart = (SimpleResultPart) part;
+				String color = "yellow";
+				if (sPart.getStatus() == SimpleResultPart.PASSED) {
+					color = "green";
+				} else {
+					color = "red";
+				}
+				buf.append("<tr><td style=\"color:").append(color)
+						.append("\">");
+
+				buf.append(sPart.getMessage());
+				buf.append("</td></tr>\n");
+			}
+			buf.append("</table>\n");
+
+			buf.append("</td></tr>\n");
+		}
+		buf.append("</table>\n");
+
+		buf.append("</body>");
+		buf.append("</html>");
+
+		try {
+			FileWriter writer = new FileWriter(file);
+			writer.write(buf.toString());
+			writer.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	protected File getResultFile(TreeTestResult result) {
+		return new File(reportDir.getPath() + File.separator
+				+ result.getTestResultId() + ".html");
+	}
+
+	public void setTestResultDao(TestResultDao testResultDao) {
+		this.testResultDao = testResultDao;
+	}
+
+	public void setReportDir(File reportDir) {
+		this.reportDir = reportDir;
+	}
+
+}
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 c333bf79f..29f1c8d06 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
@@ -26,8 +26,6 @@ public class TreeTestResult implements TestResult, StructureAware {
 
 	private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();
 
-
-	
 	public TestResultId getTestResultId() {
 		return testResultId;
 	}
@@ -56,8 +54,10 @@ public class TreeTestResult implements TestResult, StructureAware {
 		subList.getParts().add(part);
 
 		// notify listeners
-		for (TestResultListener listener : listeners) {
-			listener.resultPartAdded(this, part);
+		synchronized (listeners) {
+			for (TestResultListener listener : listeners) {
+				listener.resultPartAdded(this, part);
+			}
 		}
 	}
 
@@ -77,6 +77,15 @@ public class TreeTestResult implements TestResult, StructureAware {
 		this.resultParts = resultParts;
 	}
 
+	public void close() {
+		synchronized (listeners) {
+			for (TestResultListener listener : listeners) {
+				listener.close();
+			}
+			listeners.clear();
+		}
+	}
+
 	Long getTid() {
 		return tid;
 	}
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java
index 16ec6facd..17cf66499 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java
@@ -1,32 +1,51 @@
 package org.argeo.slc.core.test.tree;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.argeo.slc.dao.test.TestResultDao;
 
 public class TreeTestResultPersister extends AsynchronousTreeTestResultListener {
+	private static Log log = LogFactory.getLog(TreeTestResultPersister.class);
+
 	private TestResultDao testResultDao;
 
 	@Override
 	protected void resultPartAdded(PartStruct partStruct) {
-		TreeTestResult persistedResult = (TreeTestResult) testResultDao
-				.getTestResult(partStruct.resultId);
-		if (persistedResult == null) {
-			persistedResult = new TreeTestResult();
-			persistedResult.setNumericResultId(partStruct.resultId);
-			PartSubList subList = new PartSubList();
-			subList.getParts().add(partStruct.part);
-			persistedResult.getResultParts().put(partStruct.path, subList);
-
-			testResultDao.create(persistedResult);
-		} else {
-			PartSubList subList = persistedResult.getResultParts().get(
-					partStruct.path);
-			if (subList == null) {
-				subList = new PartSubList();
+		try {
+			TreeTestResult persistedResult = (TreeTestResult) testResultDao
+					.getTestResult(partStruct.resultId);
+			if (persistedResult == null) {
+				persistedResult = new TreeTestResult();
+				persistedResult.setNumericResultId(partStruct.resultId);
+				PartSubList subList = new PartSubList();
+				subList.getParts().add(partStruct.part);
 				persistedResult.getResultParts().put(partStruct.path, subList);
-			}
-			subList.getParts().add(partStruct.part);
 
-			testResultDao.update(persistedResult);
+				testResultDao.create(persistedResult);
+			} else {
+				PartSubList subList = persistedResult.getResultParts().get(
+						partStruct.path);
+				if (subList == null) {
+					subList = new PartSubList();
+					persistedResult.getResultParts().put(partStruct.path,
+							subList);
+				}
+				persistedResult.getResultParts().get(partStruct.path)
+						.getParts().add(partStruct.part);
+
+				if (log.isTraceEnabled()) {
+					log.trace("ResultId:" + persistedResult.getTestResultId());
+					log.trace("ResultParts size:"
+							+ persistedResult.getResultParts().size());
+					log.trace("Sublist size:" + subList.getParts().size());
+					log.trace("Part: " + partStruct.part);
+				}
+				testResultDao.update(persistedResult);
+			}
+		} catch (Exception e) {
+			log.error("Could not persist part for result #"
+					+ partStruct.resultId, e);
 		}
 	}
 
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
index 158fe6d2d..f9740fe10 100644
--- 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
@@ -7,11 +7,12 @@
 		<id name="tid" column="T_ID">
 			<generator class="native" />
 		</id>
-		<list name="parts" table="SUB_LIST_PARTS"  cascade="all" lazy="false">
-			<key column="PARENT_ID" unique="true" />
-			<list-index column="INDEX" />
-			<many-to-many
-				class="org.argeo.slc.core.test.SimpleResultPart" column="PART_ID" lazy="false"/>
+		<list name="parts" cascade="all" lazy="false">
+			<key column="PART_SUBLIST_ID" />
+			<list-index column="INDX" />
+
+			<one-to-many
+				class="org.argeo.slc.core.test.SimpleResultPart" />
 		</list>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/example/SimpleExampleTestDef.java b/org.argeo.slc/src/test/java/org/argeo/slc/example/SimpleExampleTestDef.java
index e2e381073..62eaef43c 100644
--- a/org.argeo.slc/src/test/java/org/argeo/slc/example/SimpleExampleTestDef.java
+++ b/org.argeo.slc/src/test/java/org/argeo/slc/example/SimpleExampleTestDef.java
@@ -28,11 +28,25 @@ public class SimpleExampleTestDef implements TestDefinition {
 		String[] args = { data.getInputFile().getAbsolutePath(),
 				data.getReachedFile().getAbsolutePath() };
 
-		// execute
-		log.info("Execute example appli...");
-		appli.filter(args);
-
 		TestResult result = testRun.getTestResult();
+
+		SimpleResultPart executePart = new SimpleResultPart();
+		executePart.setMessage("Execute example appli");
+		try {
+			// execute
+			log.info("Execute example appli...");
+			appli.filter(args);
+			
+			executePart.setStatus(SimpleResultPart.PASSED);
+		} catch (Exception e) {
+			executePart.setStatus(SimpleResultPart.ERROR);
+			executePart.setException(e);
+		}
+		result.addResultPart(executePart);
+		if(executePart.getStatus()==SimpleResultPart.ERROR){
+			return;
+		}
+
 		result.addResultPart(assertFiles(data));
 	}
 
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 916d9809d..37440b6a0 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
@@ -16,10 +16,5 @@ public class TestAntBuild extends TestCase {
 				+ "/root/Category1/SubCategory2/build.xml");
 		AntRegistryUtil.runAll(antFile);
 		
-		try {
-			Thread.sleep(5000);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
 	}
 }
diff --git a/org.argeo.slc/src/test/slc/conf/data.xml b/org.argeo.slc/src/test/slc/conf/data.xml
index 2ea17cd20..428709133 100644
--- a/org.argeo.slc/src/test/slc/conf/data.xml
+++ b/org.argeo.slc/src/test/slc/conf/data.xml
@@ -6,10 +6,10 @@
 	<!-- Results -->
 	<bean id="dataSourceResults"
 		class="org.springframework.jdbc.datasource.DriverManagerDataSource"
-		destroy-method="close">
+		>
 		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
 		<property name="url"
-			value="jdbc:hsqldb:file:${slc.workDir}/results/hsqldb/db" />
+			value="jdbc:hsqldb:file:${slc.workDir}/results/hsqldb/db;shutdown=true" />
 		<property name="username" value="sa" />
 		<property name="password" value="" />
 	</bean>
@@ -36,10 +36,10 @@
 		<property name="hibernateProperties">
 			<value>
 				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				c3p0.min_size=1 c3p0.timeout=1800
 				cache.provider_class=org.hibernate.cache.NoCacheProvider
-				cache.use_query_cache=false cache.use_minimal_puts=false
-				max_fetch_depth=3 show_sql=true format_sql=true
+				cache.use_query_cache=false
+				cache.use_minimal_puts=false
+				max_fetch_depth=3
 				current_session_context_class=thread
 				hibernate.hbm2ddl.auto=update
 			</value>
@@ -51,5 +51,11 @@
 		<property name="sessionFactory" ref="sessionFactoryResults" />
 	</bean>
 
+	<bean id="report"
+		class="org.argeo.slc.core.test.tree.FullHtmlTreeReport">
+		<property name="testResultDao" ref="testResultDao" />
+		<property name="reportDir" value="${slc.workDir}/results/report" />
+	</bean>
 
+	
 </beans>
\ 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 21da2fc41..603ef8fdf 100644
--- a/org.argeo.slc/src/test/slc/conf/log4j.properties
+++ b/org.argeo.slc/src/test/slc/conf/log4j.properties
@@ -1,11 +1,16 @@
 # Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=DEBUG, console
+log4j.rootLogger=INFO, console
 
 ## Levels
+# Slc
+log4j.logger.org.argeo.slc=INFO
 # Spring
 log4j.logger.org.springframework=INFO
 # Hibernate
-log4j.logger.org.hibernate=INFO
+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
diff --git a/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/build.xml b/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/build.xml
index f54542046..4e605f56c 100644
--- a/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/build.xml
+++ b/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/build.xml
@@ -22,6 +22,7 @@
 			<testData bean="testData.eu-reform" />
 		</slc.test>
 
+		<slc.closeResult result="testResult" report="report"/>
 	</target>
 	
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc/src/test/slc/work/data/input/nato-in.txt b/org.argeo.slc/src/test/slc/work/data/input/nato-in.txt
index b1384091f..caa8dfeb4 100644
--- a/org.argeo.slc/src/test/slc/work/data/input/nato-in.txt
+++ b/org.argeo.slc/src/test/slc/work/data/input/nato-in.txt
@@ -7,7 +7,7 @@ The Parties to this Treaty reaffirm their faith in the purposes and principles o
 They are determined to safeguard the freedom, common heritage and civilisation of their peoples, founded on the principles of democracy, individual liberty and the rule of law. They seek to promote stability and well-being in the North Atlantic area.
 
 They are resolved to unite their efforts for collective defence and for the preservation of peace and security. They therefore agree to this North Atlantic Treaty :
-Article 1
+Article 1CHANGE
 
 The Parties undertake, as set forth in the Charter of the United Nations, to settle any international dispute in which they may be involved by peaceful means in such a manner that international peace and security and justice are not endangered, and to refrain in their international relations from the threat or use of force in any manner inconsistent with the purposes of the United Nations.
 Article 2