Author: fdesbois Date: 2010-05-08 13:11:15 +0200 (Sat, 08 May 2010) New Revision: 1939 Url: http://nuiton.org/repositories/revision/topia/1939 Log: Test for Evo #580 : problem with inheritance. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java trunk/topia-persistence/src/test/resources/log4j.properties Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-07 20:50:21 UTC (rev 1938) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-08 11:11:15 UTC (rev 1939) @@ -33,6 +33,7 @@ import org.nuiton.eugene.models.object.*; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaDAOImpl; import org.nuiton.topia.persistence.TopiaEntity; @@ -294,7 +295,7 @@ PROP_DEFAULT_PACKAGE) + '.' + modelName + "DAOHelper.getImplementationClass"; for (ObjectModelAttribute attr : clazz.getAttributes()) { - String attrType = attr.getType(); + String attrType = GeneratorUtil.getSimpleName(attr.getType()); String reverseAttrName = attr.getReverseAttributeName(); ObjectModelAttribute reverse = attr.getReverseAttribute(); if (!attr.hasAssociationClass() && reverse != null && reverse.isNavigable() @@ -306,7 +307,33 @@ String attrClassifierDBName = TopiaGeneratorUtil.getDBName(attr.getClassifier()); String attrJoinTableName = TopiaGeneratorUtil.getManyToManyTableName(attr); String attrReverseDBName = TopiaGeneratorUtil.getReverseDBName(attr); + //FIXME_-FC-20100413 Use a TopiaQuery (use HQLin elements) +// // Add DAOHelper +// String daoHelper = modelName + "DAOHelper"; +// String daoHelperFQN = getOutputProperties(). +// getProperty(PROP_DEFAULT_PACKAGE) + '.' + daoHelper; +// addImport(result, daoHelperFQN); +// +// // Add import for TopiaQuery +// addImport(result, TopiaQuery.class); +// +// // Entity DAO and reversePropertyName +// String entityDAO = attrType + "DAO"; +// String reverseAttrNameProperty = +// attrType + "." + getConstantName(reverseAttrName); +// +// +// <%=entityDAO%> dao = <%=daoHelper%>.get<%=entityDAO%>(getContext()); +// TopiaQuery query = dao.createQuery("B"). +// addFrom(entity.getClass(), "A"). +// add("A", entity). +// addInElements("A", "B." + <%=reverseAttrNameProperty%>); +// +// System.out.println("Query : " + query); +// List<<%=attrType%>> list = dao.findAllByQuery(query); + + body.append("" /*{ { @@ -316,6 +343,7 @@ "where main.topiaid=secondary.<%=attrDBName%>" + " and secondary.<%=attrReverseDBName%>='" + entity.getTopiaId() + "'") .addEntity("main", <%=providerFQN%>(<%=attrType%>.class)).list(); + for (<%=attrType%> item : list) { item.remove<%=StringUtils.capitalize(reverseAttrName)%>(entity); } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2010-05-07 20:50:21 UTC (rev 1938) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2010-05-08 11:11:15 UTC (rev 1939) @@ -191,7 +191,7 @@ log.debug("ADD CONTACT TO PERSONNE"); personne.addContacts(contact); transaction.commitTransaction(); - assertEquals(personne.getContacts().size(),1); + assertEquals(1, personne.getContacts().size()); log.debug("CONTACT ADDED !"); log.debug("DELETE PERSONNE"); @@ -201,7 +201,7 @@ assertNull(res); log.debug("ENTITY PERSONNE DELETED !"); - assertEquals(contact.getParty2().size(),0); + assertEquals(0, contact.getParty2().size()); log.debug("DELETE CONTACT"); contactDAO.delete(contact); Modified: trunk/topia-persistence/src/test/resources/log4j.properties =================================================================== --- trunk/topia-persistence/src/test/resources/log4j.properties 2010-05-07 20:50:21 UTC (rev 1938) +++ trunk/topia-persistence/src/test/resources/log4j.properties 2010-05-08 11:11:15 UTC (rev 1939) @@ -8,4 +8,5 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level log4j.logger.org.nuiton.topia=INFO +#log4j.logger.org.nuiton.topiatest=DEBUG log4j.logger.org.nuiton.topia.persistence.util=INFO