- Topia-commits - mailman.cloud.codelutin.com

r2691 - branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:05:23 +0100 (Sun, 25 Nov 2012) New Revision: 2691 Url: http://nuiton.org/repositories/revision/topia/2691 Log: fixes #2458: Fix topia-service-security tests Modified: branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java Modified: branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java =================================================================== --- branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2012-11-25 11:05:03 UTC (rev 2690) +++ branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2012-11-25 11:05:23 UTC (rev 2691) @@ -33,7 +33,9 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestName; import org.nuiton.i18n.I18n; import org.nuiton.topia.TestHelper; import org.nuiton.topia.TopiaContext; @@ -80,20 +82,24 @@ * @author ruchaud */ public class TopiaSecurityTest { + private static final Log log = LogFactory.getLog(TopiaSecurityTest.class); + protected String dbPath; - protected static TopiaContext context; + protected TopiaContext context; - protected static TopiaSecurityService securityManager; + protected TopiaSecurityService securityManager; - protected static TopiaSecurityFactoryFilter factoryFilter; + protected TopiaSecurityFactoryFilter factoryFilter; // FIXME comment il trouve les autres tout seul ? // The grande question !!! protected static File tesDir; + protected static boolean init; + protected static String entitiesList = PersonImpl.class.getName() + "," + PetImpl.class.getName() + "," + @@ -128,7 +134,8 @@ config.setProperty("hibernate.connection.password", ""); config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); - config.setProperty("hibernate.connection.url", "jdbc:h2:" + new File(tesDir, "topia-security")); +// config.setProperty("hibernate.connection.url", "jdbc:h2:" + new File(tesDir, "topia-security")); + config.setProperty("hibernate.connection.url", "jdbc:h2:" + dbPath); // add this to use security service config.setProperty("topia.service.security", "org.nuiton.topia.security.TopiaSecurityServiceImpl"); @@ -275,7 +282,12 @@ @Before public void setUp() throws TopiaException { - initDatabase(); + dbPath = new File(tesDir, "topia-security").getAbsolutePath(); + if (!init) { + + initDatabase(); + init = true; + } context = TopiaContextFactory.getContext(getProperties()); securityManager = context.getService(TopiaSecurityService.class); factoryFilter = new TopiaSecurityFactoryFilter(securityManager); @@ -287,7 +299,6 @@ context.closeContext(); } } - @Test public void testLoginThimel() throws Exception { /* Authentification de l'utilisateur Thimel */ @@ -377,8 +388,8 @@ List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - //Assert.assertEquals(3, personsLOAD.size()); - Assert.assertEquals(12, personsLOAD.size()); + Assert.assertEquals(3, personsLOAD.size()); +// Assert.assertEquals(12, personsLOAD.size()); List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); Assert.assertEquals(0, personsUPDATE.size()); @@ -419,24 +430,24 @@ List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - //Assert.assertEquals(3, personsLOAD.size()); - Assert.assertEquals(15, personsLOAD.size()); + Assert.assertEquals(3, personsLOAD.size()); +// Assert.assertEquals(15, personsLOAD.size()); List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); - //Assert.assertEquals(3, personsUPDATE.size()); - Assert.assertEquals(15, personsUPDATE.size()); + Assert.assertEquals(3, personsUPDATE.size()); +// Assert.assertEquals(15, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaTestDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); - //Assert.assertEquals(3, petLOAD.size()); - Assert.assertEquals(15, petLOAD.size()); + Assert.assertEquals(3, petLOAD.size()); +// Assert.assertEquals(15, petLOAD.size()); List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); - //Assert.assertEquals(3, petUPDATE.size()); - Assert.assertEquals(15, petUPDATE.size()); + Assert.assertEquals(3, petUPDATE.size()); +// Assert.assertEquals(15, petUPDATE.size()); return null; } }, null);

1 0

r2690 - in branches/topia-2.6.x: . topia-persistence
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 12:05:03 +0100 (Sun, 25 Nov 2012) New Revision: 2690 Url: http://nuiton.org/repositories/revision/topia/2690 Log: optimize dependencies Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-25 10:01:19 UTC (rev 2689) +++ branches/topia-2.6.x/pom.xml 2012-11-25 11:05:03 UTC (rev 2690) @@ -67,6 +67,7 @@ <hibernateVersion>3.6.10.Final</hibernateVersion> <sl4jVersion>1.6.6</sl4jVersion> <h2Version>1.3.168</h2Version> + <hamcrestVersion>1.3</hamcrestVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -170,6 +171,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrestVersion}</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 10:01:19 UTC (rev 2689) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-25 11:05:03 UTC (rev 2690) @@ -134,6 +134,11 @@ </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope>

1 0

r2689 - branches/topia-2.6.x/topia-persistence/src/site/rst/user
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 11:01:19 +0100 (Sun, 25 Nov 2012) New Revision: 2689 Url: http://nuiton.org/repositories/revision/topia/2689 Log: fix typo Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst 2012-11-25 09:59:33 UTC (rev 2688) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst 2012-11-25 10:01:19 UTC (rev 2689) @@ -166,7 +166,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> <executions> <!-- Cette exécution permet de rassembler tous les messages i18n

1 0

r2688 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 10:59:33 +0100 (Sun, 25 Nov 2012) New Revision: 2688 Url: http://nuiton.org/repositories/revision/topia/2688 Log: fixes #2457: Fix Hibernate mapping generator format Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-11-25 09:57:24 UTC (rev 2687) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-11-25 09:59:33 UTC (rev 2688) @@ -649,7 +649,7 @@ <%=prefix%> <key column="OWNER"/> }*/ if (needsIndex) { -/*{<%=prefix%> <list-index/> +/*{<%=prefix%> <list-index/> }*/ } /*{<%=prefix%> <element type="<%=attrType%>" column="<%=attrColumn%>" node="id"/> @@ -741,7 +741,7 @@ <%=prefix%> <key column="<%=reverseAttrDBName%>"/> }*/ if (needsIndex) { -/*{<%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/> +/*{<%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/> }*/ } /*{<%=prefix%> <many-to-many class="<%=attrType%>" column="<%=attrColumn%>" <%=orderBy%>node="topiaId"/>

1 0

r2687 - branches/topia-2.6.x
by tchemit＠users.nuiton.org 25 Nov '12

25 Nov '12

Author: tchemit Date: 2012-11-25 10:57:24 +0100 (Sun, 25 Nov 2012) New Revision: 2687 Url: http://nuiton.org/repositories/revision/topia/2687 Log: fixes #2374: Updates to eugene 2.5.6.1 Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-16 17:40:45 UTC (rev 2686) +++ branches/topia-2.6.x/pom.xml 2012-11-25 09:57:24 UTC (rev 2687) @@ -59,7 +59,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.5.6.1-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.5.6.1</eugeneVersion> <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <processorPluginVersion>1.3</processorPluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r2686 - in branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton: topia/persistence topiatest
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 18:40:45 +0100 (Fri, 16 Nov 2012) New Revision: 2686 Url: http://nuiton.org/repositories/revision/topia/2686 Log: fix deprecated test compilation Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -23,7 +23,7 @@ */ package org.nuiton.topia.persistence; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -26,11 +26,11 @@ package org.nuiton.topia.persistence; import com.google.common.collect.Lists; +import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.matchers.JUnitMatchers; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; @@ -76,7 +76,7 @@ public void testCreateAndFindInTransaction() throws Exception { // appel 1 find all - Person person = createPerson("toto"); + createPerson("toto"); List<Person> allPerson = dao.findAll(); Assert.assertEquals(1, allPerson.size()); context.commitTransaction(); @@ -85,7 +85,7 @@ Person person2 = createPerson("titi"); allPerson = dao.findAll(); Assert.assertEquals(2, allPerson.size()); - Assert.assertThat(allPerson, JUnitMatchers.hasItem(person2)); + Assert.assertThat(allPerson, CoreMatchers.hasItem(person2)); context.rollbackTransaction(); @@ -93,7 +93,7 @@ Person person3 = createPerson("tata"); allPerson = dao.findAll(); Assert.assertEquals(2, allPerson.size()); - Assert.assertThat(allPerson, JUnitMatchers.hasItem(person3)); + Assert.assertThat(allPerson, CoreMatchers.hasItem(person3)); context.commitTransaction(); } @@ -171,7 +171,7 @@ List<Person> actual = Lists.newArrayList(); for (Person person : dao) { - Assert.assertThat(excepted, JUnitMatchers.hasItem(person)); + Assert.assertThat(excepted, CoreMatchers.hasItem(person)); actual.add(person); } Assert.assertEquals(excepted.size(), actual.size()); @@ -181,7 +181,7 @@ actual = Lists.newArrayList(); for (Person person : dao) { - Assert.assertThat(excepted, JUnitMatchers.hasItem(person)); + Assert.assertThat(excepted, CoreMatchers.hasItem(person)); actual.add(person); } Assert.assertEquals(excepted.size(), actual.size()); Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -24,7 +24,7 @@ */ package org.nuiton.topiatest; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext;

1 0

r2685 - branches/topia-2.6.x
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 18:40:19 +0100 (Fri, 16 Nov 2012) New Revision: 2685 Url: http://nuiton.org/repositories/revision/topia/2685 Log: refs #2374: Updates to eugene 2.5.6.1 Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) +++ branches/topia-2.6.x/pom.xml 2012-11-16 17:40:19 UTC (rev 2685) @@ -59,7 +59,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.5.6</eugeneVersion> + <eugeneVersion>2.5.6.1-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <processorPluginVersion>1.3</processorPluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r2684 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 18:07:43 +0100 (Fri, 16 Nov 2012) New Revision: 2684 Url: http://nuiton.org/repositories/revision/topia/2684 Log: fixes #2445: Updates to i18n-m-p 2.5 fixes #2444: Updates to processor-m-p 1.3 fixes #2375: Updates to nuiton-utils 2.6.4 fixes #2374: Updates to eugene 2.5.6 Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-service-migration/pom.xml branches/topia-2.6.x/topia-service-replication/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) +++ branches/topia-2.6.x/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) @@ -59,10 +59,10 @@ <projectId>topia</projectId>  - <eugeneVersion>2.5.5</eugeneVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> - <processorPluginVersion>1.2.2</processorPluginVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <eugeneVersion>2.5.6</eugeneVersion> + <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> + <processorPluginVersion>1.3</processorPluginVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> <sl4jVersion>1.6.6</sl4jVersion> @@ -348,7 +348,7 @@ <plugin> <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> + <artifactId>processor-maven-plugin</artifactId> <version>${processorPluginVersion}</version> <executions> <execution> @@ -379,7 +379,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) @@ -185,12 +185,12 @@ <plugin> <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> + <artifactId>processor-maven-plugin</artifactId> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) @@ -131,7 +131,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-11-16 17:07:43 UTC (rev 2684) @@ -120,7 +120,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals>

1 0

r2683 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 17:11:42 +0100 (Fri, 16 Nov 2012) New Revision: 2683 Url: http://nuiton.org/repositories/revision/topia/2683 Log: fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 16:11:09 UTC (rev 2682) +++ trunk/pom.xml 2012-11-16 16:11:42 UTC (rev 2683) @@ -503,7 +503,7 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <url>http://www.nuiton.org/projects/topia/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2682 - branches/topia-2.6.x
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 17:11:09 +0100 (Fri, 16 Nov 2012) New Revision: 2682 Url: http://nuiton.org/repositories/revision/topia/2682 Log: fix scm url Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-11-16 15:35:14 UTC (rev 2681) +++ branches/topia-2.6.x/pom.xml 2012-11-16 16:11:09 UTC (rev 2682) @@ -461,7 +461,7 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6.x</url> + <url>http://nuiton.org/projects/topia/repository/show/branches/topia-2.6.x</url> </scm> <distributionManagement>

1 0