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);