Author: athimel Date: 2012-05-09 19:12:36 +0200 (Wed, 09 May 2012) New Revision: 2462 Url: http://nuiton.org/repositories/revision/topia/2462 Log: Add a specific legacy model Added: trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.zargo Modified: trunk/topia-persistence-tck/pom.xml trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java trunk/topia-persistence-tck/src/main/xmi/topia-tck-it.zargo trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java Modified: trunk/topia-persistence-tck/pom.xml =================================================================== --- trunk/topia-persistence-tck/pom.xml 2012-05-09 17:03:12 UTC (rev 2461) +++ trunk/topia-persistence-tck/pom.xml 2012-05-09 17:12:36 UTC (rev 2462) @@ -92,6 +92,26 @@ </goals> </execution> <execution> + <id>Test Generator (legacy)</id> + <phase>generate-sources</phase> + <configuration> + <inputs>target/generated-sources/models:topia-tck-legacy.objectmodel</inputs> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.topia.generator.EntityDTOTransformer, + org.nuiton.topia.generator.BinderHelperTransformer, + org.nuiton.topia.generator.QueryHelperTransformer + </templates> + <fullPackagePath>org.nuiton.topia.tck.legacy</fullPackagePath> + <defaultPackage>org.nuiton.topia.tck.legacy</defaultPackage> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + <execution> <id>Test Generator (mapping)</id> <phase>generate-sources</phase> <configuration> Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java 2012-05-09 17:03:12 UTC (rev 2461) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java 2012-05-09 17:12:36 UTC (rev 2462) @@ -29,6 +29,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.legacy.TopiaTckLegacyDAOHelper; import java.util.Arrays; @@ -41,8 +42,8 @@ public void testAno1882() throws Exception { TopiaContext transaction = db.beginTransaction(); - FrenchCompanyDAO dao = TopiaTckItDAOHelper.getFrenchCompanyDAO(transaction); - SIRETDAO siretDAO = TopiaTckItDAOHelper.getSIRETDAO(transaction); + FrenchCompanyDAO dao = TopiaTckLegacyDAOHelper.getFrenchCompanyDAO(transaction); + SIRETDAO siretDAO = TopiaTckLegacyDAOHelper.getSIRETDAO(transaction); SIRET siret = siretDAO.create(); FrenchCompany entity = dao.create( Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java 2012-05-09 17:03:12 UTC (rev 2461) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java 2012-05-09 17:12:36 UTC (rev 2462) @@ -32,10 +32,11 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.topia.test.entities.Person; -import org.nuiton.topia.test.entities.PersonDAO; -import org.nuiton.topia.test.entities.Pet; -import org.nuiton.topia.test.entities.PetDAO; +import org.nuiton.topia.tck.legacy.TopiaTckLegacyDAOHelper; +import org.nuiton.topia.tck.legacy.entities.Person; +import org.nuiton.topia.tck.legacy.entities.PersonDAO; +import org.nuiton.topia.tck.legacy.entities.Pet; +import org.nuiton.topia.tck.legacy.entities.PetDAO; import java.util.Arrays; import java.util.List; @@ -56,7 +57,7 @@ TopiaContext context = db.beginTransaction(); - PersonDAO personDAO = TopiaTckItDAOHelper.getPersonDAO(context); + PersonDAO personDAO = TopiaTckLegacyDAOHelper.getPersonDAO(context); // appel 1 find all Person toto = personDAO.create(Person.PROPERTY_NAME, "toto"); @@ -89,8 +90,8 @@ TopiaContext context = db.beginTransaction(); - PetDAO petDAO = TopiaTckItDAOHelper.getPetDAO(context); - PersonDAO personDAO = TopiaTckItDAOHelper.getPersonDAO(context); + PetDAO petDAO = TopiaTckLegacyDAOHelper.getPetDAO(context); + PersonDAO personDAO = TopiaTckLegacyDAOHelper.getPersonDAO(context); Pet bernard = petDAO.create(Pet.PROPERTY_NAME, "bernard"); Pet bianca = petDAO.create(Pet.PROPERTY_NAME, "bianca"); Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java 2012-05-09 17:03:12 UTC (rev 2461) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java 2012-05-09 17:12:36 UTC (rev 2462) @@ -30,11 +30,11 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.tck.TopiaDatabase; -import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; -import org.nuiton.topia.test.entities.Person; -import org.nuiton.topia.test.entities.PersonDAO; -import org.nuiton.topia.test.entities.Pet; -import org.nuiton.topia.test.entities.PetDAO; +import org.nuiton.topia.tck.legacy.TopiaTckLegacyDAOHelper; +import org.nuiton.topia.tck.legacy.entities.Person; +import org.nuiton.topia.tck.legacy.entities.PersonDAO; +import org.nuiton.topia.tck.legacy.entities.Pet; +import org.nuiton.topia.tck.legacy.entities.PetDAO; import java.io.File; import java.util.Properties; @@ -100,8 +100,8 @@ Pet petSource, petTarget; txSource = contextSource.beginTransaction(); - daoSource = TopiaTckItDAOHelper.getPersonDAO(txSource); - petDAOSource = TopiaTckItDAOHelper.getPetDAO(txSource); + daoSource = TopiaTckLegacyDAOHelper.getPersonDAO(txSource); + petDAOSource = TopiaTckLegacyDAOHelper.getPetDAO(txSource); personSource = daoSource.create(Person.PROPERTY_FIRSTNAME, " firstName", Person.PROPERTY_NAME, " name" @@ -116,7 +116,7 @@ txSource.commitTransaction(); - daoSource = TopiaTckItDAOHelper.getPersonDAO(txSource); + daoSource = TopiaTckLegacyDAOHelper.getPersonDAO(txSource); personSource = daoSource.findByTopiaId(personSource.getTopiaId()); Assert.assertNotNull(personSource); @@ -133,8 +133,8 @@ txTarget.commitTransaction(); - daoTarget = TopiaTckItDAOHelper.getPersonDAO(txTarget); - petDAOTarget = TopiaTckItDAOHelper.getPetDAO(txTarget); + daoTarget = TopiaTckLegacyDAOHelper.getPersonDAO(txTarget); + petDAOTarget = TopiaTckLegacyDAOHelper.getPetDAO(txTarget); personTarget = daoTarget.findByTopiaId(personSource.getTopiaId()); Assert.assertNotNull(personTarget); Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-05-09 17:03:12 UTC (rev 2461) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-05-09 17:12:36 UTC (rev 2462) @@ -31,7 +31,7 @@ import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.Personne; -import org.nuiton.topia.test.entities.PersonImpl; +import org.nuiton.topia.tck.legacy.entities.PersonImpl; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-it.zargo =================================================================== (Binary files differ) Added: trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties =================================================================== --- trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties (rev 0) +++ trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties 2012-05-09 17:12:36 UTC (rev 2462) @@ -0,0 +1,28 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id: topia-tck-it.properties 2451 2012-05-09 14:37:49Z athimel $ +# $HeadURL: http://svn.nuiton.org/svn/topia/trunk/topia-persistence-tck/src/main/xmi/top... $ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +model.tagvalue.i18n=topia.test.common. +model.tagvalue.generateOperatorForDAOHelper=true +model.tagvalue.constantPrefix=PROPERTY_ +model.tagvalue.generateDTOTopiaId=true Added: trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.zargo =================================================================== (Binary files differ) Property changes on: trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2012-05-09 17:03:12 UTC (rev 2461) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2012-05-09 17:12:36 UTC (rev 2462) @@ -28,10 +28,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.topia.tck.it.TopiaTckItDAOHelper.TopiaTckItEntityEnum; -import org.nuiton.topia.test.entities.Person; -import org.nuiton.topia.test.entities.Pet; -import org.nuiton.topia.test.entities.Race; +import org.nuiton.topia.tck.legacy.TopiaTckLegacyDAOHelper.TopiaTckLegacyEntityEnum; +import org.nuiton.topia.tck.legacy.entities.Person; +import org.nuiton.topia.tck.legacy.entities.Pet; +import org.nuiton.topia.tck.legacy.entities.Race; /** * Test the {@link TopiaEntityRefTester} on @@ -42,7 +42,7 @@ * @author tchemit <chemit@codelutin.com> * @since 2.3.1 */ -public class TopiaEntityRefTesterTest extends TopiaEntityRefTester<TopiaTckItEntityEnum> { +public class TopiaEntityRefTesterTest extends TopiaEntityRefTester<TopiaTckLegacyEntityEnum> { /** Logger */ private static final Log log = @@ -57,26 +57,26 @@ private static final String PERSON1 = "person1"; @Override - protected TopiaTckItEntityEnum[] getContracts0() { - return new TopiaTckItEntityEnum[]{ - TopiaTckItEntityEnum.Pet, - TopiaTckItEntityEnum.Person, - TopiaTckItEntityEnum.Race, + protected TopiaTckLegacyEntityEnum[] getContracts0() { + return new TopiaTckLegacyEntityEnum[]{ + TopiaTckLegacyEntityEnum.Pet, + TopiaTckLegacyEntityEnum.Person, + TopiaTckLegacyEntityEnum.Race, }; } @Test public void testNoReferences() throws Exception { - Pet pet = newEntity(TopiaTckItEntityEnum.Pet, PET1); + Pet pet = newEntity(TopiaTckLegacyEntityEnum.Pet, PET1); detectReferences(pet, 0); - Race race = newEntity(TopiaTckItEntityEnum.Race, RACE1); + Race race = newEntity(TopiaTckLegacyEntityEnum.Race, RACE1); detectReferences(race, 0); - Person person = newEntity(TopiaTckItEntityEnum.Person, PERSON1); + Person person = newEntity(TopiaTckLegacyEntityEnum.Person, PERSON1); detectReferences(person, 0); @@ -85,10 +85,10 @@ @Test public void testReferences() throws Exception { - Pet pet = newEntity(TopiaTckItEntityEnum.Pet, PET1); - Race race = newEntity(TopiaTckItEntityEnum.Race, RACE1); + Pet pet = newEntity(TopiaTckLegacyEntityEnum.Pet, PET1); + Race race = newEntity(TopiaTckLegacyEntityEnum.Race, RACE1); pet.setRace(race); - Person person = newEntity(TopiaTckItEntityEnum.Person, PERSON1); + Person person = newEntity(TopiaTckLegacyEntityEnum.Person, PERSON1); detectReferences(pet, 1, RACE1); @@ -116,7 +116,7 @@ assertCurrentEntry(pet, 1); assertNextAssociationEntityRef(person, Person.PROPERTY_PET, PET1, person, pet); - Pet pet2 = newEntity(TopiaTckItEntityEnum.Pet, PET2); + Pet pet2 = newEntity(TopiaTckLegacyEntityEnum.Pet, PET2); person.addPet(pet2);