Index: lutingenerator/src/test/org/codelutin/generator/models/state/project.statemodel
diff -u lutingenerator/src/test/org/codelutin/generator/models/state/project.statemodel:1.1 lutingenerator/src/test/org/codelutin/generator/models/state/project.statemodel:1.2
--- lutingenerator/src/test/org/codelutin/generator/models/state/project.statemodel:1.1	Fri May 25 16:20:08 2007
+++ lutingenerator/src/test/org/codelutin/generator/models/state/project.statemodel	Tue May 29 09:58:15 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <stateModel xmlns="http://www.codelutin.org/lutingenerator/stateModel" name="Chorem" version="">
   <stateChart name="projectManagementUseCase" package="org.codelutin.chorem.web.contactManagement">
     <initState name="initProject">

Index: lutingenerator/src/test/org/codelutin/generator/models/state/StateModelTest.java
diff -u lutingenerator/src/test/org/codelutin/generator/models/state/StateModelTest.java:1.1 lutingenerator/src/test/org/codelutin/generator/models/state/StateModelTest.java:1.2
--- lutingenerator/src/test/org/codelutin/generator/models/state/StateModelTest.java:1.1	Fri May 25 16:20:08 2007
+++ lutingenerator/src/test/org/codelutin/generator/models/state/StateModelTest.java	Tue May 29 09:58:15 2007
@@ -19,54 +19,39 @@
 package org.codelutin.generator.models.state;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.digester.Digester;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.codelutin.generator.models.state.xml.DigesterStateModelRuleSet;
-import org.codelutin.generator.models.state.xml.StateModelImpl;
-import org.xml.sax.SAXException;
+import org.codelutin.generator.StateModelGenerator;
 
 /**
  * StateModelTest.java
  *
  * @author chatellier
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  *
- * Last update : $Date: 2007/05/25 16:20:08 $
+ * Last update : $Date: 2007/05/29 09:58:15 $
  * By : $Author: chatellier $
  */
 public class StateModelTest extends TestCase {
-
-	/** logger */
-	private static final Log log = LogFactory.getLog(StateModelTest.class);
 	
 	/** model */
 	private StateModel stateModel;
 	
 	/** init */
 	public void setUp() {
-		Digester d = new Digester();
-		d.addRuleSet(new DigesterStateModelRuleSet());
-		
-		stateModel = new StateModelImpl();
 		
-		// fin a deplacer
-		try {
-			d.push(stateModel);
-			d.parse(new File("src/test/org/codelutin/generator/models/state/project.statemodel"));
-			d.push(stateModel);
-			stateModel = (StateModel)d.parse(new File("src/test/org/codelutin/generator/models/state/contact.statemodel"));
-		} catch (IOException e) {
-			log.warn("Can't read model file",e);
-		} catch (SAXException e) {
-			log.warn("Can't read model file",e);
-		}
+		File[] testFiles = {
+			new File("src/test/org/codelutin/generator/models/state/project.statemodel"),
+			new File("src/test/org/codelutin/generator/models/state/contact.statemodel")
+		};
+		
+		StateModelGenerator generator = new StateModelGenerator();
+		generator.generate(testFiles, new File("output"));
+		stateModel = generator.getModel();
 	}
 	
 	/** various test */
@@ -141,5 +126,12 @@
 		assertNotNull(trEventCancel);
 		assertNotNull(trEventCancel.getDestinationState());
 		assertEquals(trEventCancel.getDestinationState().getName(), "finalSocietyFormCancel");
+		
+		// tagged value test
+		Map<String,String> tagValues = stateModel.getTagValues();
+		assertNotNull(tagValues);
+		String tagUseCaseEngineExtendedClass = tagValues.get("usecaseengineextendedclass");
+		assertNotNull(tagUseCaseEngineExtendedClass);
+		assertEquals(tagUseCaseEngineExtendedClass,"BasePage");
 	}
 }

Index: lutingenerator/src/test/org/codelutin/generator/models/state/contact.properties
diff -u /dev/null lutingenerator/src/test/org/codelutin/generator/models/state/contact.properties:1.1
--- /dev/null	Tue May 29 09:58:20 2007
+++ lutingenerator/src/test/org/codelutin/generator/models/state/contact.properties	Tue May 29 09:58:15 2007
@@ -0,0 +1 @@
+model.tagvalue.usecaseengineextendedclass=BasePage
\ No newline at end of file