Author: athimel Date: 2012-05-09 16:22:27 +0200 (Wed, 09 May 2012) New Revision: 2448 Url: http://nuiton.org/repositories/revision/topia/2448 Log: Move back some generator tests to topia-persistence Added: trunk/topia-persistence/src/test/java/org/ trunk/topia-persistence/src/test/java/org/nuiton/ trunk/topia-persistence/src/test/java/org/nuiton/topia/ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java Removed: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 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 trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java Copied: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java (from rev 2446, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java) =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -0,0 +1,68 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * 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% + */ +package org.nuiton.topia.generator; + +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.eugene.java.JavaBuilder; +import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; + +import java.util.HashMap; + +/** + * Created: 24 juin 2010 + * + * @author fdesbois <fdesbois@codelutin.com> + * @version $Id$ + */ +public class QueryHelperTransformerTest { + + @Test + public void testCreateAliasConstant() { + QueryHelperTransformer transformer = new QueryHelperTransformer(); + transformer.aliases = new HashMap<String, String>(); + transformer.helperClass = new ObjectModelClassImpl(); + transformer.setBuilder(new JavaBuilder("TopiaTest")); + + String entityName = "Department"; + transformer.createAliasConstant(entityName); + Assert.assertEquals(1, transformer.aliases.size()); + Assert.assertTrue(transformer.aliases.containsKey("D")); + + entityName = "Depot"; + transformer.createAliasConstant(entityName); + Assert.assertEquals(2, transformer.aliases.size()); + Assert.assertTrue(transformer.aliases.containsKey("DE")); + + entityName = "Deposite"; + transformer.createAliasConstant(entityName); + Assert.assertEquals(3, transformer.aliases.size()); + Assert.assertTrue(transformer.aliases.containsKey("DEP")); + + entityName = "Dep"; + transformer.createAliasConstant(entityName); + Assert.assertEquals(4, transformer.aliases.size()); + } +} Copied: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java (from rev 2446, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java) =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -0,0 +1,80 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * 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% + */ +package org.nuiton.topia.generator; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.eugene.ModelPropertiesUtil; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/** + * To test {@link TopiaGeneratorUtil.TopiaModelPropertiesProvider}. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.3 + */ +public class TopiaModelPropertiesProviderTest { + + protected ModelPropertiesUtil.ModelPropertiesProvider provider; + + @Before + public void setUp() throws Exception { + provider = new TopiaGeneratorUtil.TopiaModelPropertiesProvider(); + provider.init(); + } + + @Test + public void testGetTagValueTarget() throws Exception { + testTagValue(TopiaTagValues.TAG_PERSISTENCE_TYPE, ObjectModelClassifier.class); + //TODO Finish with other tag values... + } + + @Test + public void testGetStereotypeTarget() throws Exception { + + testStereotype(TopiaStereoTypes.STEREOTYPE_DAO, ObjectModelClassifier.class, ObjectModelOperation.class); + //TODO Finish with other stereotypes... + } + + @Test + public void testGetStore() throws Exception { + } + + protected void testStereotype(String name, Class<?>... expected) { + Class<?>[] classes = provider.getStereotypeTarget(name); + Assert.assertNotNull("Could not find target for " + name, classes); + Assert.assertEquals("Should have " + expected.length + " targets for " + name + " but had " + classes.length, classes.length, expected.length); + Assert.assertArrayEquals(expected, classes); + } + + protected void testTagValue(String name, Class<?>... expected) { + Class<?>[] classes = provider.getTagValueTarget(name); + Assert.assertNotNull("Could not find target for " + name, classes); + Assert.assertEquals("Should have " + expected.length + " targets for " + name + " but had " + classes.length, classes.length, expected.length); + Assert.assertArrayEquals(expected, classes); + } +} Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -29,8 +29,10 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaTckItDAOHelper; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.it.Personne; import org.nuiton.topia.test.entities.Person; import org.nuiton.topia.test.entities.PersonDAO; Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -37,6 +37,9 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.tck.it.persistence.Entity1Impl; +import org.nuiton.topia.tck.it.service.FakeService; +import org.nuiton.topia.tck.it.service.TestService; import java.io.File; import java.util.HashMap; Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -30,7 +30,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topiatest.QueriedEntity; +import org.nuiton.topia.tck.it.QueriedEntity; /** @author fdesbois */ public class TopiaQueryTest { Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -29,8 +29,8 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.tck.TopiaDatabase; +import org.nuiton.topia.tck.it.Personne; import org.nuiton.topia.test.entities.PersonImpl; -import org.nuiton.topiatest.Personne; import java.util.regex.Matcher; import java.util.regex.Pattern; Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -1,68 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * 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% - */ -package org.nuiton.topia.generator; - -import org.junit.Assert; -import org.junit.Test; -import org.nuiton.eugene.java.JavaBuilder; -import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; - -import java.util.HashMap; - -/** - * Created: 24 juin 2010 - * - * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ - */ -public class QueryHelperTransformerTest { - - @Test - public void testCreateAliasConstant() { - QueryHelperTransformer transformer = new QueryHelperTransformer(); - transformer.aliases = new HashMap<String, String>(); - transformer.helperClass = new ObjectModelClassImpl(); - transformer.setBuilder(new JavaBuilder("TopiaTest")); - - String entityName = "Department"; - transformer.createAliasConstant(entityName); - Assert.assertEquals(1, transformer.aliases.size()); - Assert.assertTrue(transformer.aliases.containsKey("D")); - - entityName = "Depot"; - transformer.createAliasConstant(entityName); - Assert.assertEquals(2, transformer.aliases.size()); - Assert.assertTrue(transformer.aliases.containsKey("DE")); - - entityName = "Deposite"; - transformer.createAliasConstant(entityName); - Assert.assertEquals(3, transformer.aliases.size()); - Assert.assertTrue(transformer.aliases.containsKey("DEP")); - - entityName = "Dep"; - transformer.createAliasConstant(entityName); - Assert.assertEquals(4, transformer.aliases.size()); - } -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaModelPropertiesProviderTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -1,80 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * 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% - */ -package org.nuiton.topia.generator; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.nuiton.eugene.ModelPropertiesUtil; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; - -/** - * To test {@link TopiaGeneratorUtil.TopiaModelPropertiesProvider}. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.3 - */ -public class TopiaModelPropertiesProviderTest { - - protected ModelPropertiesUtil.ModelPropertiesProvider provider; - - @Before - public void setUp() throws Exception { - provider = new TopiaGeneratorUtil.TopiaModelPropertiesProvider(); - provider.init(); - } - - @Test - public void testGetTagValueTarget() throws Exception { - testTagValue(TopiaTagValues.TAG_PERSISTENCE_TYPE, ObjectModelClassifier.class); - //TODO Finish with other tag values... - } - - @Test - public void testGetStereotypeTarget() throws Exception { - - testStereotype(TopiaStereoTypes.STEREOTYPE_DAO, ObjectModelClassifier.class, ObjectModelOperation.class); - //TODO Finish with other stereotypes... - } - - @Test - public void testGetStore() throws Exception { - } - - protected void testStereotype(String name, Class<?>... expected) { - Class<?>[] classes = provider.getStereotypeTarget(name); - Assert.assertNotNull("Could not find target for " + name, classes); - Assert.assertEquals("Should have " + expected.length + " targets for " + name + " but had " + classes.length, classes.length, expected.length); - Assert.assertArrayEquals(expected, classes); - } - - protected void testTagValue(String name, Class<?>... expected) { - Class<?>[] classes = provider.getTagValueTarget(name); - Assert.assertNotNull("Could not find target for " + name, classes); - Assert.assertEquals("Should have " + expected.length + " targets for " + name + " but had " + classes.length, classes.length, expected.length); - Assert.assertArrayEquals(expected, classes); - } -} Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -34,10 +34,10 @@ import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTckItDAOHelper; -import org.nuiton.topiatest.Company; -import org.nuiton.topiatest.CompanyDAO; -import org.nuiton.topiatest.Department; -import org.nuiton.topiatest.DepartmentDAO; +import org.nuiton.topia.tck.it.Company; +import org.nuiton.topia.tck.it.CompanyDAO; +import org.nuiton.topia.tck.it.Department; +import org.nuiton.topia.tck.it.DepartmentDAO; /** * TopiaTestCase. Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -34,14 +34,14 @@ import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTckItDAOHelper; -import org.nuiton.topiatest.Address; -import org.nuiton.topiatest.AddressDAO; -import org.nuiton.topiatest.Company; -import org.nuiton.topiatest.CompanyDAO; -import org.nuiton.topiatest.Department; -import org.nuiton.topiatest.DepartmentDAO; -import org.nuiton.topiatest.Employe; -import org.nuiton.topiatest.EmployeDAO; +import org.nuiton.topia.tck.it.Address; +import org.nuiton.topia.tck.it.AddressDAO; +import org.nuiton.topia.tck.it.Company; +import org.nuiton.topia.tck.it.CompanyDAO; +import org.nuiton.topia.tck.it.Department; +import org.nuiton.topia.tck.it.DepartmentDAO; +import org.nuiton.topia.tck.it.Employe; +import org.nuiton.topia.tck.it.EmployeDAO; /** * Test de visitor. Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -35,8 +35,8 @@ import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTckItDAOHelper; -import org.nuiton.topiatest.NaturalizedEntity; -import org.nuiton.topiatest.NaturalizedEntityDAO; +import org.nuiton.topia.tck.it.NaturalizedEntity; +import org.nuiton.topia.tck.it.NaturalizedEntityDAO; /** * NaturalIdTest @@ -162,8 +162,8 @@ public void testNaturalIdAreGeneralized() throws Exception { // test that natural ids are generalized - String[] generalizedNaturalizedNaturalIds = TopiaTckItDAOHelper.TopiaTestEntityEnum.GeneralizedNaturalizedEntity.getNaturalIds(); - String[] naturalizedNaturalIds = TopiaTckItDAOHelper.TopiaTestEntityEnum.NaturalizedEntity.getNaturalIds(); + String[] generalizedNaturalizedNaturalIds = TopiaTckItDAOHelper.TopiaTckItEntityEnum.GeneralizedNaturalizedEntity.getNaturalIds(); + String[] naturalizedNaturalIds = TopiaTckItDAOHelper.TopiaTckItEntityEnum.NaturalizedEntity.getNaturalIds(); Assert.assertArrayEquals(generalizedNaturalizedNaturalIds, naturalizedNaturalIds); } @@ -171,8 +171,8 @@ public void testNotNullsAreGeneralized() throws Exception { // test that not nulls are generalized - String[] generalizedNaturalizedNotNulls = TopiaTckItDAOHelper.TopiaTestEntityEnum.GeneralizedNaturalizedEntity.getNotNulls(); - String[] naturalizedNotNulls = TopiaTckItDAOHelper.TopiaTestEntityEnum.NaturalizedEntity.getNotNulls(); + String[] generalizedNaturalizedNotNulls = TopiaTckItDAOHelper.TopiaTckItEntityEnum.GeneralizedNaturalizedEntity.getNotNulls(); + String[] naturalizedNotNulls = TopiaTckItDAOHelper.TopiaTckItEntityEnum.NaturalizedEntity.getNotNulls(); Assert.assertArrayEquals(generalizedNaturalizedNotNulls, naturalizedNotNulls); } } 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 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -35,11 +35,11 @@ import org.nuiton.topia.TopiaTckItDAOHelper; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.topiatest.Company; -import org.nuiton.topiatest.CompanyImpl; -import org.nuiton.topiatest.Department; -import org.nuiton.topiatest.DepartmentImpl; -import org.nuiton.topiatest.EmployeImpl; +import org.nuiton.topia.tck.it.Company; +import org.nuiton.topia.tck.it.CompanyImpl; +import org.nuiton.topia.tck.it.Department; +import org.nuiton.topia.tck.it.DepartmentImpl; +import org.nuiton.topia.tck.it.EmployeImpl; /** @author tchemit <chemit@codelutin.com> */ public class CollectorTest { 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 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -30,10 +30,15 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.topia.TopiaTckItDAOHelper; import org.nuiton.topia.tck.it.Company; +import org.nuiton.topia.tck.it.CompanyImpl; import org.nuiton.topia.tck.it.Department; +import org.nuiton.topia.tck.it.DepartmentImpl; import org.nuiton.topia.tck.it.Employe; +import org.nuiton.topia.tck.it.EmployeImpl; import org.nuiton.topia.tck.it.Personne; +import org.nuiton.topia.tck.it.PersonneImpl; import java.util.Collection; 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 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -33,7 +33,7 @@ import org.nuiton.topia.TopiaTckItDAOHelper; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.topiatest.Company; +import org.nuiton.topia.tck.it.Company; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.beans.BinderModelBuilder; 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 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -34,16 +34,16 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.TopiaId; -import org.nuiton.topiatest.Company; -import org.nuiton.topiatest.CompanyImpl; -import org.nuiton.topiatest.Department; -import org.nuiton.topiatest.DepartmentImpl; -import org.nuiton.topiatest.Employe; -import org.nuiton.topiatest.EmployeAbstract; -import org.nuiton.topiatest.EmployeImpl; -import org.nuiton.topiatest.Personne; -import org.nuiton.topiatest.PersonneAbstract; -import org.nuiton.topiatest.PersonneImpl; +import org.nuiton.topia.tck.it.Company; +import org.nuiton.topia.tck.it.CompanyImpl; +import org.nuiton.topia.tck.it.Department; +import org.nuiton.topia.tck.it.DepartmentImpl; +import org.nuiton.topia.tck.it.Employe; +import org.nuiton.topia.tck.it.EmployeAbstract; +import org.nuiton.topia.tck.it.EmployeImpl; +import org.nuiton.topia.tck.it.Personne; +import org.nuiton.topia.tck.it.PersonneAbstract; +import org.nuiton.topia.tck.it.PersonneImpl; import java.util.HashSet; import java.util.List; 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 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -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.TopiaTestEntityEnum; +import org.nuiton.topia.TopiaTckItDAOHelper.TopiaTckItEntityEnum; import org.nuiton.topia.test.entities.Person; import org.nuiton.topia.test.entities.Pet; import org.nuiton.topia.test.entities.Race; @@ -42,7 +42,7 @@ * @author tchemit <chemit@codelutin.com> * @since 2.3.1 */ -public class TopiaEntityRefTesterTest extends TopiaEntityRefTester<TopiaTestEntityEnum> { +public class TopiaEntityRefTesterTest extends TopiaEntityRefTester<TopiaTckItEntityEnum> { /** Logger */ private static final Log log = @@ -57,26 +57,26 @@ private static final String PERSON1 = "person1"; @Override - protected TopiaTestEntityEnum[] getContracts0() { - return new TopiaTestEntityEnum[]{ - TopiaTestEntityEnum.Pet, - TopiaTestEntityEnum.Person, - TopiaTestEntityEnum.Race, + protected TopiaTckItEntityEnum[] getContracts0() { + return new TopiaTckItEntityEnum[]{ + TopiaTckItEntityEnum.Pet, + TopiaTckItEntityEnum.Person, + TopiaTckItEntityEnum.Race, }; } @Test public void testNoReferences() throws Exception { - Pet pet = newEntity(TopiaTestEntityEnum.Pet, PET1); + Pet pet = newEntity(TopiaTckItEntityEnum.Pet, PET1); detectReferences(pet, 0); - Race race = newEntity(TopiaTestEntityEnum.Race, RACE1); + Race race = newEntity(TopiaTckItEntityEnum.Race, RACE1); detectReferences(race, 0); - Person person = newEntity(TopiaTestEntityEnum.Person, PERSON1); + Person person = newEntity(TopiaTckItEntityEnum.Person, PERSON1); detectReferences(person, 0); @@ -85,10 +85,10 @@ @Test public void testReferences() throws Exception { - Pet pet = newEntity(TopiaTestEntityEnum.Pet, PET1); - Race race = newEntity(TopiaTestEntityEnum.Race, RACE1); + Pet pet = newEntity(TopiaTckItEntityEnum.Pet, PET1); + Race race = newEntity(TopiaTckItEntityEnum.Race, RACE1); pet.setRace(race); - Person person = newEntity(TopiaTestEntityEnum.Person, PERSON1); + Person person = newEntity(TopiaTckItEntityEnum.Person, PERSON1); detectReferences(pet, 1, RACE1); @@ -116,7 +116,7 @@ assertCurrentEntry(pet, 1); assertNextAssociationEntityRef(person, Person.PROPERTY_PET, PET1, person, pet); - Pet pet2 = newEntity(TopiaTestEntityEnum.Pet, PET2); + Pet pet2 = newEntity(TopiaTckItEntityEnum.Pet, PET2); person.addPet(pet2); Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Test; -import org.nuiton.topiatest.CompanyDTO; +import org.nuiton.topia.tck.it.CompanyDTO; /** @author ymartel <martel@codelutin.com> */ public class EntityDTOTransformerTest { Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -35,7 +35,7 @@ import org.nuiton.topia.TestHelper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaTestDAOHelper.TopiaTestEntityEnum; +import org.nuiton.topia.TopiaTestDAOHelper.TopiaTckItEntityEnum; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.replication.model.ReplicationOperationPhase; @@ -70,9 +70,9 @@ LogFactory.getLog(TopiaReplicationOperationTest.class); protected static final TopiaEntityEnum[] contracts = { - TopiaTestEntityEnum.Person, - TopiaTestEntityEnum.Pet, - TopiaTestEntityEnum.Race + TopiaTckItEntityEnum.Person, + TopiaTckItEntityEnum.Pet, + TopiaTckItEntityEnum.Race }; protected static final String entitiesList = @@ -158,14 +158,14 @@ public void testCreateOperation_nullPhase() throws Exception { model = getModelBuilder().createModel(context, contracts, true); - getModelBuilder().createOperation(model, TopiaTestEntityEnum.Pet, null, null); + getModelBuilder().createOperation(model, TopiaTckItEntityEnum.Pet, null, null); } @Test(expected = NullPointerException.class) public void testCreateOperation_nullOperationClass() throws Exception { model = getModelBuilder().createModel(context, contracts, true); - getModelBuilder().createOperation(model, TopiaTestEntityEnum.Pet, ReplicationOperationPhase.before, null); + getModelBuilder().createOperation(model, TopiaTckItEntityEnum.Pet, ReplicationOperationPhase.before, null); } @Test(expected = IllegalArgumentException.class) @@ -173,7 +173,7 @@ model = getModelBuilder().createModel(context, contracts, true); // le noeud Pet n'existe pas - getModelBuilder().addAfterOperation(model, TopiaTestEntityEnum.Pet, Duplicate.class); + getModelBuilder().addAfterOperation(model, TopiaTckItEntityEnum.Pet, Duplicate.class); } @Test(expected = IllegalArgumentException.class) @@ -181,59 +181,59 @@ model = getModelBuilder().createModel(context, contracts, true); // le noeud Pet n'existe pas - getModelBuilder().addAfterOperation(model, TopiaTestEntityEnum.Pet, UnregistredOperation.class); + getModelBuilder().addAfterOperation(model, TopiaTckItEntityEnum.Pet, UnregistredOperation.class); } @Test // @Test(expected = UnsupportedOperationException.class) public void testCreateSupportedBeforeOperation_Duplicate() throws Exception { - createSupportedBeforeOperation(TopiaTestEntityEnum.Person, person, Duplicate.class); + createSupportedBeforeOperation(TopiaTckItEntityEnum.Person, person, Duplicate.class); } // @Test(expected = UnsupportedOperationException.class) // public void testCreateUnsupportedBeforeOperation_AttachAssociation() throws Exception { -// createUnsupportedBeforeOperation(TopiaTestEntityEnum.Person, person, AttachAssociation.class); +// createUnsupportedBeforeOperation(TopiaTckItEntityEnum.Person, person, AttachAssociation.class); // } @Test // @Test(expected = UnsupportedOperationException.class) public void testCreateSupportedBeforeOperation_DetachAssociation() throws Exception { - createSupportedBeforeOperation(TopiaTestEntityEnum.Person, person, DettachAssociation.class); + createSupportedBeforeOperation(TopiaTckItEntityEnum.Person, person, DettachAssociation.class); } @Test // @Test(expected = UnsupportedOperationException.class) public void testCreateSupportedAfterOperation_Duplicate() throws Exception { - createSupportedAfterOperation(TopiaTestEntityEnum.Person, person, Duplicate.class); + createSupportedAfterOperation(TopiaTckItEntityEnum.Person, person, Duplicate.class); } // @Test(expected = UnsupportedOperationException.class) // public void testCreateSupportedAfterOperation_AttachAssociation() throws Exception { -// createUnsupportedAfterOperation(TopiaTestEntityEnum.Person, person, AttachAssociation.class); +// createUnsupportedAfterOperation(TopiaTckItEntityEnum.Person, person, AttachAssociation.class); // } @Test // @Test(expected = UnsupportedOperationException.class) public void testCreateSupportedAfterOperation_DetachAssociation() throws Exception { - createSupportedAfterOperation(TopiaTestEntityEnum.Person, person, DettachAssociation.class); + createSupportedAfterOperation(TopiaTckItEntityEnum.Person, person, DettachAssociation.class); } // @Test(expected = UnsupportedOperationException.class) // public void testCreateUnsupportedBeforeOperation_UncreatableOperation() throws Exception { -// createUnsupportedBeforeOperation(TopiaTestEntityEnum.Person, person, UncreatableOperation.class); +// createUnsupportedBeforeOperation(TopiaTckItEntityEnum.Person, person, UncreatableOperation.class); // } // @Test(expected = UnsupportedOperationException.class) // public void testCreateUnsupportedAfterOperation_UncreatableOperation() throws Exception { -// createUnsupportedAfterOperation(TopiaTestEntityEnum.Person, person, UncreatableOperation.class); +// createUnsupportedAfterOperation(TopiaTckItEntityEnum.Person, person, UncreatableOperation.class); // } @Test public void testCreateOperation() throws Exception { model = getModelBuilder().createModel(context, contracts, true, pet.getTopiaId()); - getModelBuilder().addBeforeOperation(model, TopiaTestEntityEnum.Pet, FakeOperation.class, "before"); - getModelBuilder().addAfterOperation(model, TopiaTestEntityEnum.Race, FakeOperation.class, "after"); + getModelBuilder().addBeforeOperation(model, TopiaTckItEntityEnum.Pet, FakeOperation.class, "before"); + getModelBuilder().addAfterOperation(model, TopiaTckItEntityEnum.Race, FakeOperation.class, "after"); } @Test(expected = NullPointerException.class) Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -36,7 +36,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTestDAOHelper.TopiaTestEntityEnum; +import org.nuiton.topia.TopiaTestDAOHelper.TopiaTckItEntityEnum; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; @@ -65,9 +65,9 @@ private static final Log log = LogFactory.getLog(TopiaReplicationServiceImplTest.class); protected static final TopiaEntityEnum[] contracts = { - TopiaTestEntityEnum.Person, - TopiaTestEntityEnum.Pet, - TopiaTestEntityEnum.Race + TopiaTckItEntityEnum.Person, + TopiaTckItEntityEnum.Pet, + TopiaTckItEntityEnum.Race }; protected static final String entitiesList = @@ -148,7 +148,7 @@ @Override public void testDetectAssociations() throws Exception { - detectAssociations(person, TopiaTestEntityEnum.Person, Person.PROPERTY_PET); + detectAssociations(person, TopiaTckItEntityEnum.Person, Person.PROPERTY_PET); detectAssociations(race); detectAssociations(pet); @@ -166,7 +166,7 @@ detectDirectDependencies(person); detectDirectDependencies(race); - detectDirectDependencies(pet, TopiaTestEntityEnum.Pet, Pet.PROPERTY_PERSON, TopiaTestEntityEnum.Pet, Pet.PROPERTY_RACE); + detectDirectDependencies(pet, TopiaTckItEntityEnum.Pet, Pet.PROPERTY_PERSON, TopiaTckItEntityEnum.Pet, Pet.PROPERTY_RACE); detectDirectDependencies(person2); detectDirectDependencies(race2); @@ -179,12 +179,12 @@ @Override public void testDetectShell() throws Exception { - detectShell(person, TopiaTestEntityEnum.Pet, TopiaTestEntityEnum.Race); + detectShell(person, TopiaTckItEntityEnum.Pet, TopiaTckItEntityEnum.Race); detectShell(race); - detectShell(pet, TopiaTestEntityEnum.Person, TopiaTestEntityEnum.Race); - detectShell(person2, TopiaTestEntityEnum.Pet, TopiaTestEntityEnum.Race); + detectShell(pet, TopiaTckItEntityEnum.Person, TopiaTckItEntityEnum.Race); + detectShell(person2, TopiaTckItEntityEnum.Pet, TopiaTckItEntityEnum.Race); detectShell(race2); - detectShell(pet2, TopiaTestEntityEnum.Person, TopiaTestEntityEnum.Race); + detectShell(pet2, TopiaTckItEntityEnum.Person, TopiaTckItEntityEnum.Race); } // @Ignore @@ -194,7 +194,7 @@ public void testDetectDependencies() throws Exception { detectDependencies(null, - new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Race}, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Person}, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Pet}); + new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Race}, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Person}, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Pet}); } // @Ignore @@ -203,7 +203,7 @@ @Override public void testDetectObjectsToDettach() throws Exception { - detectObjectsToDettach(null, TopiaTestEntityEnum.Person, new String[]{Person.PROPERTY_PET}); + detectObjectsToDettach(null, TopiaTckItEntityEnum.Person, new String[]{Person.PROPERTY_PET}); } // @Ignore Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2012-05-09 14:10:52 UTC (rev 2447) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2012-05-09 14:22:27 UTC (rev 2448) @@ -36,7 +36,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTestDAOHelper.TopiaTestEntityEnum; +import org.nuiton.topia.TopiaTestDAOHelper.TopiaTckItEntityEnum; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.util.TopiaEntityIdsMap; @@ -71,7 +71,7 @@ private static final Log log = LogFactory.getLog(TopiaReplicationServiceImplTest.class); - protected static final TopiaEntityEnum[] contracts = {TopiaTestEntityEnum.Person, TopiaTestEntityEnum.Pet, TopiaTestEntityEnum.Race}; + protected static final TopiaEntityEnum[] contracts = {TopiaTckItEntityEnum.Person, TopiaTckItEntityEnum.Pet, TopiaTckItEntityEnum.Race}; protected static final String entitiesList = PersonImpl.class.getName() + "," + PetImpl.class.getName() + "," + RaceImpl.class.getName(); @@ -149,7 +149,7 @@ @Override public void testDetectAssociations() throws Exception { - detectAssociations(person, TopiaTestEntityEnum.Person, Person.PROPERTY_PET); + detectAssociations(person, TopiaTckItEntityEnum.Person, Person.PROPERTY_PET); detectAssociations(race); detectAssociations(pet); @@ -164,7 +164,7 @@ detectDirectDependencies(person); detectDirectDependencies(race); - detectDirectDependencies(pet, TopiaTestEntityEnum.Pet, Pet.PROPERTY_PERSON, TopiaTestEntityEnum.Pet, Pet.PROPERTY_RACE); + detectDirectDependencies(pet, TopiaTckItEntityEnum.Pet, Pet.PROPERTY_PERSON, TopiaTckItEntityEnum.Pet, Pet.PROPERTY_RACE); detectDirectDependencies(person2); detectDirectDependencies(race2); @@ -175,9 +175,9 @@ @Override public void testDetectShell() throws Exception { - detectShell(person, TopiaTestEntityEnum.Pet, TopiaTestEntityEnum.Race); + detectShell(person, TopiaTckItEntityEnum.Pet, TopiaTckItEntityEnum.Race); detectShell(race); - detectShell(pet, TopiaTestEntityEnum.Person, TopiaTestEntityEnum.Race); + detectShell(pet, TopiaTckItEntityEnum.Person, TopiaTckItEntityEnum.Race); detectShell(person2); detectShell(race2); detectShell(pet2); @@ -187,22 +187,22 @@ @Override public void testDetectDependencies() throws Exception { - detectDependencies(person, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Race}, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Person}, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Pet}); - detectDependencies(race, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Race}); - detectDependencies(pet, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Race}, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Person}, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Pet}); + detectDependencies(person, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Race}, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Person}, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Pet}); + detectDependencies(race, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Race}); + detectDependencies(pet, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Race}, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Person}, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Pet}); - detectDependencies(person2, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Person}); - detectDependencies(race2, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Race}); - detectDependencies(pet2, new TopiaTestEntityEnum[]{TopiaTestEntityEnum.Pet}); + detectDependencies(person2, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Person}); + detectDependencies(race2, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Race}); + detectDependencies(pet2, new TopiaTckItEntityEnum[]{TopiaTckItEntityEnum.Pet}); } @Test @Override public void testDetectObjectsToDettach() throws Exception { - detectObjectsToDettach(person, TopiaTestEntityEnum.Person, new String[]{Person.PROPERTY_PET}); + detectObjectsToDettach(person, TopiaTckItEntityEnum.Person, new String[]{Person.PROPERTY_PET}); detectObjectsToDettach(race); - detectObjectsToDettach(pet, TopiaTestEntityEnum.Person, new String[]{Person.PROPERTY_PET}); + detectObjectsToDettach(pet, TopiaTckItEntityEnum.Person, new String[]{Person.PROPERTY_PET}); detectObjectsToDettach(person2); detectObjectsToDettach(race2); @@ -234,18 +234,18 @@ @Override public void testDoReplicate() throws Exception { - doReplicate(TopiaTestEntityEnum.Person, person); - doReplicate(TopiaTestEntityEnum.Person, person2); - doReplicate(TopiaTestEntityEnum.Person, person, person2); + doReplicate(TopiaTckItEntityEnum.Person, person); + doReplicate(TopiaTckItEntityEnum.Person, person2); + doReplicate(TopiaTckItEntityEnum.Person, person, person2); - doReplicate(TopiaTestEntityEnum.Pet, pet); - doReplicate(TopiaTestEntityEnum.Pet, pet2); - doReplicate(TopiaTestEntityEnum.Pet, pet, pet2, pet3); - doReplicate(TopiaTestEntityEnum.Pet, person2, pet3); + doReplicate(TopiaTckItEntityEnum.Pet, pet); + doReplicate(TopiaTckItEntityEnum.Pet, pet2); + doReplicate(TopiaTckItEntityEnum.Pet, pet, pet2, pet3); + doReplicate(TopiaTckItEntityEnum.Pet, person2, pet3); - doReplicate(TopiaTestEntityEnum.Race, race); - doReplicate(TopiaTestEntityEnum.Race, race2); - doReplicate(TopiaTestEntityEnum.Race, race, race2); + doReplicate(TopiaTckItEntityEnum.Race, race); + doReplicate(TopiaTckItEntityEnum.Race, race2); + doReplicate(TopiaTckItEntityEnum.Race, race, race2); }