Author: tchemit Date: 2008-12-05 16:02:29 +0000 (Fri, 05 Dec 2008) New Revision: 1246 Added: topia-service/trunk/src/test/resources/ topia-service/trunk/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml Modified: topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java Log: make tests not failed (except the security one) Modified: topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java 2008-12-05 16:02:04 UTC (rev 1245) +++ topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java 2008-12-05 16:02:29 UTC (rev 1246) @@ -54,7 +54,7 @@ protected static Properties getProperties() throws Exception { Properties config = new Properties(); - //config.setProperty("hibernate.hbm2ddl.auto", "create"); + config.setProperty("hibernate.hbm2ddl.auto", "create"); config.setProperty("hibernate.show_sql", "true"); config.setProperty("topia.persistence.classes", entitiesList); @@ -70,6 +70,8 @@ config.setProperty("topia.history", "org.codelutin.topia.history.TopiaHistoryServiceImpl"); + config.setProperty("topia.service.history", + "org.codelutin.topia.history.TopiaHistoryServiceImpl"); return config; } Modified: topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java 2008-12-05 16:02:04 UTC (rev 1245) +++ topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java 2008-12-05 16:02:29 UTC (rev 1246) @@ -78,6 +78,7 @@ Properties result = getProperties(); result.setProperty("topia.index.engin", "org.codelutin.topia.index.LuceneIndexer"); result.setProperty("topia.index.lucene.directory", "/tmp/topia-test-index"); + result.setProperty("topia.service.index", "org.codelutin.topia.index.LuceneIndexer"); return result; } Modified: topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java 2008-12-05 16:02:04 UTC (rev 1245) +++ topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java 2008-12-05 16:02:29 UTC (rev 1246) @@ -33,7 +33,7 @@ @Before public void beforetest() { Configuration confHib = new Configuration(); - confHib.configure(); + confHib.configure("/ConfigurationAdapterTest-hibernate.cfg.xml"); confHib.setProperty(Environment.DEFAULT_ENTITY_MODE, EntityMode.MAP .toString()); confa = new ConfigurationAdapter(confHib, new Version("1")); Modified: topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java 2008-12-05 16:02:04 UTC (rev 1245) +++ topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java 2008-12-05 16:02:29 UTC (rev 1246) @@ -17,51 +17,60 @@ package org.codelutin.topia.security; -import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD; -import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE; - -import java.security.PrivilegedExceptionAction; -import java.util.List; -import java.util.Properties; - -import javax.security.auth.Subject; -import javax.security.auth.login.LoginContext; - -import junit.framework.TestCase; - import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaNotFoundException; import org.codelutin.topia.TopiaServiceDAOHelper; +import org.codelutin.topia.TopiaException; import org.codelutin.topia.security.jaas.TopiaCallbackHandler; import org.codelutin.topia.security.util.TopiaSecurityFactoryFilter; +import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD; +import static org.codelutin.topia.security.util.TopiaSecurityUtil.UPDATE; import org.codelutin.topia.test.entities.Person; import org.codelutin.topia.test.entities.PersonDAO; import org.codelutin.topia.test.entities.Pet; import org.codelutin.topia.test.entities.PetDAO; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.AfterClass; +import javax.security.auth.Subject; +import javax.security.auth.login.LoginContext; +import java.security.PrivilegedExceptionAction; +import java.util.List; +import java.util.Properties; + /** * Tests unitaires. * Ne pas oublier de lancer le script d'initialisation de la base données. + * * @author ruchaud */ -public class TopiaSecurityTest extends TestCase { +public class TopiaSecurityTest extends Assert { - protected TopiaContext context = TopiaContextFactory.getContext(getProperties()); - protected TopiaSecurityService securityManager = context.getService(TopiaSecurityService.class); - protected TopiaSecurityFactoryFilter factoryFilter = new TopiaSecurityFactoryFilter(securityManager); - + protected static TopiaContext context; + protected static TopiaSecurityService securityManager; + protected static TopiaSecurityFactoryFilter factoryFilter; + protected static String entitiesList = - "org.codelutin.topia.test.entities.PersonImpl," + - "org.codelutin.topia.test.entities.PetImpl"; + "org.codelutin.topia.test.entities.PersonImpl," + + "org.codelutin.topia.test.entities.PetImpl"; - - /** - * - */ - public TopiaSecurityTest() throws TopiaNotFoundException { + + @BeforeClass + public static void beforeClass() throws TopiaNotFoundException { + context = TopiaContextFactory.getContext(getProperties()); + securityManager = context.getService(TopiaSecurityService.class); + factoryFilter = new TopiaSecurityFactoryFilter(securityManager); } - + + @AfterClass + public static void afterClass() throws TopiaException { + if (context!=null) { + context.closeContext(); + } + } protected static Properties getProperties() { Properties config = new Properties(); //config.setProperty("hibernate.hbm2ddl.auto", "create"); @@ -69,43 +78,46 @@ config.setProperty("topia.persistence.classes", entitiesList); config.setProperty("topia.service.security", "org.codelutin.topia.security.TopiaSecurityServiceImpl"); - + config.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); config.setProperty("hibernate.connection.username", "sa"); config.setProperty("hibernate.connection.password", ""); config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); - config.setProperty("hibernate.connection.url", "jdbc:h2:data/topia-security;create=true;LOCK_MODE=0"); - + config.setProperty("hibernate.connection.url", "jdbc:h2:target/data/topia-security;create=true;LOCK_MODE=0"); + return config; } + @Test public void testLoginThimel() throws Exception { /* Authentification de l'utilisateur Thimel */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( "thimel", "zou;bi@da")); loginContext.login(); Subject subject = loginContext.getSubject(); - + /* Test */ assertEquals(subject.getPrincipals().size(), 1); - + loginContext.logout(); } - + + @Test public void testLoginRuchaud() throws Exception { /* Authentification de l'utilisateur Ruchaud */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( "ruchaud", "mdp")); loginContext.login(); Subject subject = loginContext.getSubject(); - + /* Test */ assertEquals(subject.getPrincipals().size(), 2); loginContext.logout(); } - + + @Test public void testAuthorizationThimel() throws Exception { /* Authentification de l'utilisateur Thimel */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( @@ -117,24 +129,24 @@ Subject.doAsPrivileged(subject, new PrivilegedExceptionAction() { public Object run() throws Exception { TopiaContext childContext = context.beginTransaction(); - + /* Personnes */ PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext); List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); assertEquals(2, personsLOAD.size()); - + List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); assertEquals(0, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); - + List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); assertEquals(0, petLOAD.size()); - + List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); assertEquals(0, petUPDATE.size()); @@ -145,6 +157,7 @@ loginContext.logout(); } + @Test public void testAuthorizationRuchaud() throws Exception { /* Authentification de l'utilisateur Admin */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( @@ -156,24 +169,24 @@ Subject.doAsPrivileged(subject, new PrivilegedExceptionAction() { public Object run() throws Exception { TopiaContext childContext = context.beginTransaction(); - + /* Personnes */ PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext); List<Person> findAllPerson = personDAO.findAll(); - + List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); assertEquals(3, personsLOAD.size()); - + List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); assertEquals(0, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); - + List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); assertEquals(2, petLOAD.size()); - + List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); assertEquals(1, petUPDATE.size()); @@ -195,24 +208,24 @@ Subject.doAsPrivileged(subject, new PrivilegedExceptionAction() { public Object run() throws Exception { TopiaContext childContext = context.beginTransaction(); - + /* Personnes */ PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext); List<Person> findAllPerson = personDAO.findAll(); - + List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); assertEquals(3, personsLOAD.size()); - + List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); assertEquals(3, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); - + List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); assertEquals(3, petLOAD.size()); - + List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); assertEquals(3, petUPDATE.size()); Added: topia-service/trunk/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml =================================================================== --- topia-service/trunk/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml (rev 0) +++ topia-service/trunk/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml 2008-12-05 16:02:29 UTC (rev 1246) @@ -0,0 +1,18 @@ +<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE hibernate-configuration + PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + + <session-factory> + + <!--property name="connection.datasource">java:comp/env/atelier-content-lmfr</property--> + <property name="show_sql">false</property> + <property name="dialect">org.hibernate.dialect.H2Dialect</property> + + <!-- Mapping files --> + + </session-factory> + +</hibernate-configuration>