Author: echatellier Date: 2012-01-12 11:43:28 +0100 (Thu, 12 Jan 2012) New Revision: 1313 Url: http://nuiton.org/repositories/revision/wikitty/1313 Log: #1884: Integration test 5 fails : wikitty model dependency #1896: Method inherited are not redifined since muti inheritance addition Modified: trunk/wikitty-api/src/it/generation/pom.xml trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java Modified: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-api/src/it/generation/pom.xml 2012-01-12 10:43:28 UTC (rev 1313) @@ -139,8 +139,6 @@ </goals> </execution> - <!-- fail because of getLogin() et getPassword() method - are not inherited from wikittyUser, but in work outside IT <execution> <id>entities5 generator</id> <phase>generate-sources</phase> @@ -153,7 +151,7 @@ <goals> <goal>smart-generate</goal> </goals> - </execution> --> + </execution> </executions> <dependencies> Modified: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java 2012-01-12 10:43:28 UTC (rev 1313) @@ -33,20 +33,19 @@ * @author tchemit <chemit@codelutin.com> * @since 3.0 */ -@Ignore public class TestEntities { @Test public void testUser() { - /*User u = new UserImpl(); + User u = new UserImpl(); u.getLastName(); - u.setLastName("lastName");*/ + u.setLastName("lastName"); } @Test public void testAgent() { - /*Agent a = new AgentImpl(); + Agent a = new AgentImpl(); a.getLastName(); a.setLastName("lastName"); @@ -58,6 +57,6 @@ a.setLogin("login"); a.getPassword(); - a.setPassword("password");*/ + a.setPassword("password"); } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-12 10:43:28 UTC (rev 1313) @@ -502,7 +502,7 @@ // now, add to this abstract all operation due to inheritence from // other business entities - List<ObjectModelClass> superClasses = WikittyTransformerUtil.getAllSuperClasses(businessEntity); + List<ObjectModelClass> superClasses = WikittyTransformerUtil.getAllSuperClasses(model, businessEntity); for (ObjectModelClass superClass : superClasses) { // FIXME echatellier 20120106 it an eugene bug Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2012-01-12 10:43:28 UTC (rev 1313) @@ -82,7 +82,7 @@ // classe courante List<String> attributeNames = new ArrayList<String>(); - List<ObjectModelClass> allClasses = WikittyTransformerUtil.getAllSuperClasses(clazz); + List<ObjectModelClass> allClasses = WikittyTransformerUtil.getAllSuperClasses(model, clazz); allClasses.add(clazz); // also manage current class (last one) for (ObjectModelClass superClass : allClasses) { Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2012-01-12 10:43:28 UTC (rev 1313) @@ -30,9 +30,10 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.apache.commons.lang.StringEscapeUtils; - import org.apache.commons.lang.StringUtils; +import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -283,13 +284,19 @@ * Get all super class of class (recursively) ordered from top class to * bottom classes. * + * @param model model (only usefull due to a bug in eugene) * @param clazz class to get super classes * @return all class super classes */ - public static List<ObjectModelClass> getAllSuperClasses(ObjectModelClass clazz) { + public static List<ObjectModelClass> getAllSuperClasses(ObjectModel model, ObjectModelClass clazz) { List<ObjectModelClass> superClasses = new ArrayList<ObjectModelClass>(); for (ObjectModelClass superClass : clazz.getSuperclasses()) { - superClasses.addAll(getAllSuperClasses(superClass)); + + // FIXME echatellier 20120106 it an eugene bug + // super class are not same instance as model classes + superClass = model.getClass(superClass.getQualifiedName()); + + superClasses.addAll(getAllSuperClasses(model, superClass)); superClasses.add(superClass); } return superClasses;