Author: tchemit Date: 2012-05-09 19:03:12 +0200 (Wed, 09 May 2012) New Revision: 2461 Url: http://nuiton.org/repositories/revision/topia/2461 Log: use two different DAOHelper for it and mapping models Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/Test1.java Modified: trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java trunk/topia-persistence-tck/pom.xml trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TestHelper.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TopiaDatabase.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/EnumTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/DeleteEntityTest.java 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/generator/TopiaTestCase.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/EntityVisitorExportXmlTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/NaturalIdTest.java trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java Modified: trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -30,7 +30,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.tck.it.Personne; Modified: trunk/topia-persistence-tck/pom.xml =================================================================== --- trunk/topia-persistence-tck/pom.xml 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/pom.xml 2012-05-09 17:03:12 UTC (rev 2461) @@ -16,6 +16,9 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence-tck</artifactId> + <name>ToPIA :: Persistence :: Test Compatibility Kit</name> + <description>Tests to be shared between topia-persistence implementations</description> + <dependencies> <dependency> @@ -44,104 +47,35 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>ToPIA :: Persistence :: Test Compatibility Kit</name> - <description>Tests to be shared between topia-persistence implementations</description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - <build> - <testResources> - - <!--testResource> - <directory>${maven.gen.dir}/test-java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> - - <testResource> - <directory>${maven.src.dir}/test/resources</directory> - <includes> - <include>**/*.properties</include> - </includes> - </testResource> - - <testResource> - <directory>${maven.src.dir}/test/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource--> - - </testResources> - <plugins> <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <configuration> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <fullPackagePath>org.nuiton.topia.tck</fullPackagePath> + <defaultPackage>org.nuiton.topia.tck</defaultPackage> + </configuration> <executions> <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - <!-- restrict parsing beacause this is expensive --> - <!-- if you want to parse more, add your package in includes --> + <id>generate-objectmodel</id> + <phase>generate-sources</phase> <configuration> - <treateDefaultEntry>false</treateDefaultEntry> - <entries> - <entry> - <basedir>${maven.src.dir}/main/java</basedir> - <includes> - <include>org/nuiton/topia/framework/*.java</include> - </includes> - </entry> - </entries> + <skipInputs>model</skipInputs> + <inputs>zargo</inputs> </configuration> - </execution> - </executions> - </plugin> - - <!-- expose new plexus components --> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> <goals> - <goal>generate-metadata</goal> + <goal>smart-generate</goal> </goals> </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <configuration> - - </configuration> - <executions> <execution> - <id>Test Generator</id> + <id>Test Generator (itk)</id> <phase>generate-sources</phase> <configuration> - <testPhase>false</testPhase> + <inputs>target/generated-sources/models:topia-tck-it.objectmodel</inputs> <templates> org.nuiton.topia.generator.TopiaMetaTransformer, org.nuiton.eugene.java.JavaInterfaceTransformer, @@ -150,13 +84,28 @@ org.nuiton.topia.generator.BinderHelperTransformer, org.nuiton.topia.generator.QueryHelperTransformer </templates> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <defaultPackage>org.nuiton.topia</defaultPackage> + <fullPackagePath>org.nuiton.topia.tck.it</fullPackagePath> + <defaultPackage>org.nuiton.topia.tck.it</defaultPackage> </configuration> <goals> <goal>smart-generate</goal> </goals> </execution> + <execution> + <id>Test Generator (mapping)</id> + <phase>generate-sources</phase> + <configuration> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> + <inputs>target/generated-sources/models:topia-tck-mapping.objectmodel</inputs> + <fullPackagePath>org.nuiton.topia.tck.mapping</fullPackagePath> + <defaultPackage>org.nuiton.topia.tck.mapping</defaultPackage> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> </executions> </plugin> Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TestHelper.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TestHelper.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TestHelper.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -30,7 +30,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.util.FileUtil; import java.io.File; Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TopiaDatabase.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TopiaDatabase.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TopiaDatabase.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -31,7 +31,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import java.io.File; import java.io.InputStream; Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/EnumTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/EnumTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/EnumTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -30,7 +30,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; /** * Test the support of possibility to have an attribute of type enumeration Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/DeleteEntityTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/DeleteEntityTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/DeleteEntityTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -44,7 +44,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.Personne; import org.nuiton.topia.tck.it.PersonneDAO; 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 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -28,11 +28,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.tck.TopiaDatabase; -import org.nuiton.topia.TopiaTckItDAOHelper; -import org.nuiton.topia.test.ano1882.FrenchCompany; -import org.nuiton.topia.test.ano1882.FrenchCompanyDAO; -import org.nuiton.topia.test.ano1882.SIRET; -import org.nuiton.topia.test.ano1882.SIRETDAO; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import java.util.Arrays; 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 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -30,7 +30,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +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; 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 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -30,7 +30,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.tck.TopiaDatabase; -import org.nuiton.topia.TopiaTckItDAOHelper; +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; Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/generator/TopiaTestCase.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/generator/TopiaTestCase.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/generator/TopiaTestCase.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -33,7 +33,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.tck.it.Company; import org.nuiton.topia.tck.it.CompanyDAO; import org.nuiton.topia.tck.it.Department; Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/EntityVisitorExportXmlTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/EntityVisitorExportXmlTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/EntityVisitorExportXmlTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -35,7 +35,7 @@ import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.tck.it.Address; import org.nuiton.topia.tck.it.AddressDAO; import org.nuiton.topia.tck.it.Company; Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/NaturalIdTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/NaturalIdTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -33,7 +33,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.tck.it.NaturalizedEntity; import org.nuiton.topia.tck.it.NaturalizedEntityDAO; Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/Test1.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/Test1.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/Test1.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -0,0 +1,28 @@ +package org.nuiton.topia.tck.mapping.test1; + +import org.junit.Rule; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.TopiaDatabase; + +/** + * TODO + * + * @author tchemit <chemit@codelutin.com> + * @since TODO + */ +public class Test1 { + + @Rule + public final TopiaDatabase db = new TopiaDatabase(); + + /** Case 1 : simple OneToMany relation using class A1 -> B1. */ + @Test + public void testCase1Create() throws TopiaException { + + TopiaContext tx = db.beginTransaction(); + + + } +} Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo =================================================================== (Binary files differ) Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -32,7 +32,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.tck.it.Company; Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.tck.it.Company; import org.nuiton.topia.tck.it.CompanyImpl; import org.nuiton.topia.tck.it.Department; Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.tck.it.Company; Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2012-05-09 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.TopiaId; 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 16:57:24 UTC (rev 2460) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2012-05-09 17:03:12 UTC (rev 2461) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.topia.TopiaTckItDAOHelper.TopiaTckItEntityEnum; +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;