X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2Ftree%2FCompositeTreeTestDefinition.java;h=3468bcb255c434f56bbbcfd40127ee1e64aee814;hb=7a8f034133c1112e187e2a2bfd2c56a8d2452345;hp=25479069b70e66ab9578609e3528ec76a91c814f;hpb=faf680e212bf3e18837c4f798587856e061273b3;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java
index 25479069b..3468bcb25 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java
@@ -5,11 +5,10 @@ import java.util.Vector;
 
 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.StructureAware;
 import org.argeo.slc.core.structure.StructureElement;
-import org.argeo.slc.core.structure.StructurePath;
+import org.argeo.slc.core.structure.StructureElementProvider;
 import org.argeo.slc.core.structure.StructureRegistry;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.test.TestDefinition;
@@ -21,16 +20,17 @@ import org.argeo.slc.core.test.TestRun;
  * children.
  */
 public class CompositeTreeTestDefinition implements TestDefinition,
-		StructureAware {
+		StructureAware<TreeSPath> {
 	private Log log = LogFactory.getLog(CompositeTreeTestDefinition.class);
 
 	private List<TestDefinition> tasks = null;
 	private List<TreeSPath> taskPaths = null;
 	private TreeSPath path;
-	private StructureRegistry registry;
+	private StructureRegistry<TreeSPath> registry;
 
 	public void execute(TestRun testRun) {
-		log.info("Execute sequence of test definitions...");
+		if (log.isTraceEnabled())
+			log.trace("Execute sequence of test definitions...");
 
 		int i = 0;
 		for (TestDefinition task : tasks) {
@@ -58,18 +58,20 @@ public class CompositeTreeTestDefinition implements TestDefinition,
 		}
 	}
 
-	public void notifyCurrentPath(StructureRegistry registry, StructurePath path) {
-		this.path = (TreeSPath) path;
+	public void notifyCurrentPath(StructureRegistry<TreeSPath> registry,
+			TreeSPath path) {
+		this.path = path;
 		this.registry = registry;
-		
+
 		// clear task paths
 		taskPaths.clear();
 
 		Integer count = 0;
 		for (TestDefinition task : tasks) {
 			final StructureElement element;
-			if (task instanceof StructureElement) {
-				element = (StructureElement) task;
+			if (task instanceof StructureElementProvider) {
+				element = ((StructureElementProvider) task)
+						.createStructureElement();
 			} else {
 				element = new SimpleSElement("[no desc]");
 			}
@@ -77,7 +79,8 @@ public class CompositeTreeTestDefinition implements TestDefinition,
 			registry.register(taskPath, element);
 			taskPaths.add(taskPath);
 			if (task instanceof StructureAware) {
-				((StructureAware) task).notifyCurrentPath(registry, taskPath);
+				((StructureAware<TreeSPath>) task).notifyCurrentPath(registry,
+						taskPath);
 			}
 			count++;
 		}