[jboss-identity-commits] JBoss Identity SVN: r424 - in idm/trunk/idm/src/test: resources and 1 other directories.

Author: bdaw Date: 2009-04-03 07:53:45 -0400 (Fri, 03 Apr 2009) New Revision: 424 Added: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java Removed: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java Modified: idm/trunk/idm/src/test/resources/datasources/datasources.xml idm/trunk/idm/src/test/resources/datasources/hibernates.xml idm/trunk/idm/src/test/resources/jboss-unit.xml Log: - test fix for oracle and postgres behaviour Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java 2009-04-03 10:03:06 UTC (rev 423) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java 2009-04-03 11:53:45 UTC (rev 424) @@ -1,341 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This 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 2.1 of -* the License, or (at your option) any later version. -* -* This software 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 -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.store.hibernate; - -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; -import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute; -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Test; -import org.hibernate.Session; -import org.hibernate.Query; -import static org.jboss.unit.api.Assert.*; - - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class HibernateModelJBossTestCase extends IdentityTestPOJO -{ - public HibernateModelJBossTestCase() - { - } - - - @Create - public void setUp() throws Exception - { - super.start(); - } - - @Destroy - public void tearDown() throws Exception - { - super.stop(); - } - - @Test - public void testPersistence() { - - - begin(); - Session session = getSessionFactory().getCurrentSession(); - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - // - - HibernateIdentityObjectType iot = new HibernateIdentityObjectType(); - iot.setName("User"); - - session.persist(iot); - assertTrue(session.contains(iot)); - - - HibernateIdentityObject io = new HibernateIdentityObject(); - io.setName("John Kowalski"); - io.setRealm(realm); - io.setIdentityType(iot); - - session.persist(io); - assertTrue(session.contains(io)); - - session.delete(io); - assertFalse(session.contains(io)); - - // - - - - // - - HibernateIdentityObjectRelationshipType iort = new HibernateIdentityObjectRelationshipType(); - iort.setName("Member"); - - session.persist(iort); - assertTrue(session.contains(iort)); - - // - -// JPAIdentityObjectRelationship ior = new JPAIdentityObjectRelationship(); -// ior.setType(iort); -// -// em.persist(ior); -// assertTrue(em.contains(ior)); - -// em.remove(ior); -// assertFalse(em.contains(ior)); - - // - - assertTrue(session.contains(iort)); - - session.delete(iort); - assertFalse(session.contains(iort)); - - commit(); - - - } - - @Test - public void testRelationships() - { - begin(); - - - Session session = getSessionFactory().getCurrentSession(); - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); - session.persist(groupType); - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user2); - HibernateIdentityObject user3 = new HibernateIdentityObject("user3", userType, realm); - session.persist(user3); - - HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); - session.persist(group1); - HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group2); - HibernateIdentityObject group3 = new HibernateIdentityObject("group3", groupType, realm); - session.persist(group3); - - HibernateIdentityObjectRelationshipType memberType = new HibernateIdentityObjectRelationshipType("member"); - session.persist(memberType); - - HibernateIdentityObjectRelationship relationship = new HibernateIdentityObjectRelationship(memberType, group1, user1); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group1, user2); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group2, user3); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group2, group1); - session.persist(relationship); - - commit(); - - // - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - Query ioQuery = session.createQuery("select o from HibernateIdentityObject o where o.name like :name"); - - group1 = (HibernateIdentityObject)ioQuery.setParameter("name", "group1").uniqueResult(); - assertEquals(2, group1.getFromRelationships().size()); - assertEquals(1, group1.getToRelationships().size()); - group2 = (HibernateIdentityObject)ioQuery.setParameter("name", "group2").uniqueResult(); - assertEquals(2, group2.getFromRelationships().size()); - assertEquals(0, group2.getToRelationships().size()); - - user3 = (HibernateIdentityObject)ioQuery.setParameter("name", "user3").uniqueResult(); - assertEquals(1, user3.getToRelationships().size()); - assertEquals(0, user3.getFromRelationships().size()); - assertEquals("group2", user3.getToRelationships().iterator().next().getFromIdentityObject().getName()); - commit(); - - } - - @Test - public void testNameTypeConstraint() throws Exception - { - - begin(); - Session session = getSessionFactory().getCurrentSession(); - - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); - session.persist(groupType); - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user2); - - commit(); - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - try - { - - HibernateIdentityObject user3 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user3); - - // Should fail - fail(); - } - catch (Exception e) - { - //expected - getHibernateSupport().commitTransaction(); - } - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - - HibernateIdentityObject user4 = new HibernateIdentityObject("group1", userType, realm); - session.persist(user4); - - - HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); - session.persist(group1); - HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group2); - - //session.flush(); - - try - { - - HibernateIdentityObject group3 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group3); - - // Should fail - fail(); - } - catch (Exception e) - { - //expected - getHibernateSupport().commitTransaction(); - } - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - HibernateIdentityObject group4 = new HibernateIdentityObject("user1", groupType, realm); - session.persist(group4); - - session.flush(); - - commit(); - - - - - - } - - @Test - public void testAttributes() throws Exception - { - begin(); - - Session session = getSessionFactory().getCurrentSession(); - - - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - -// Set<String> values1 = new HashSet<String>(); -// values1.add("Val1"); -// values1.add("Val2"); -// values1.add("Val3"); - - - user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple1", new String[]{"Val1", "Val2", "Val3"})); - user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple2", new String[]{"Val1", "Val2", "Val3"})); - - - commit(); - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new Long(user1.getId())); - assertEquals(2, user1.getAttributes().size() ); -// assertNotNull(user1.getProfileAttributes().get("simple1")); -// assertEquals(3, user1.getProfileAttributes().get("simple1").length); - - - commit(); - - } - -} \ No newline at end of file Copied: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java (from rev 422, idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java) =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java (rev 0) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java 2009-04-03 11:53:45 UTC (rev 424) @@ -0,0 +1,341 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This 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 2.1 of +* the License, or (at your option) any later version. +* +* This software 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.store.hibernate; + +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; +import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute; +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Test; +import org.hibernate.Session; +import org.hibernate.Query; +import static org.jboss.unit.api.Assert.*; + + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class HibernateModelTestCase extends IdentityTestPOJO +{ + public HibernateModelTestCase() + { + } + + + @Create + public void setUp() throws Exception + { + super.start(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + @Test + public void testPersistence() { + + + begin(); + Session session = getSessionFactory().getCurrentSession(); + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + // + + HibernateIdentityObjectType iot = new HibernateIdentityObjectType(); + iot.setName("User"); + + session.persist(iot); + assertTrue(session.contains(iot)); + + + HibernateIdentityObject io = new HibernateIdentityObject(); + io.setName("John Kowalski"); + io.setRealm(realm); + io.setIdentityType(iot); + + session.persist(io); + assertTrue(session.contains(io)); + + session.delete(io); + assertFalse(session.contains(io)); + + // + + + + // + + HibernateIdentityObjectRelationshipType iort = new HibernateIdentityObjectRelationshipType(); + iort.setName("Member"); + + session.persist(iort); + assertTrue(session.contains(iort)); + + // + +// JPAIdentityObjectRelationship ior = new JPAIdentityObjectRelationship(); +// ior.setType(iort); +// +// em.persist(ior); +// assertTrue(em.contains(ior)); + +// em.remove(ior); +// assertFalse(em.contains(ior)); + + // + + assertTrue(session.contains(iort)); + + session.delete(iort); + assertFalse(session.contains(iort)); + + commit(); + + + } + + @Test + public void testRelationships() + { + begin(); + + + Session session = getSessionFactory().getCurrentSession(); + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); + session.persist(groupType); + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user2); + HibernateIdentityObject user3 = new HibernateIdentityObject("user3", userType, realm); + session.persist(user3); + + HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); + session.persist(group1); + HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group2); + HibernateIdentityObject group3 = new HibernateIdentityObject("group3", groupType, realm); + session.persist(group3); + + HibernateIdentityObjectRelationshipType memberType = new HibernateIdentityObjectRelationshipType("member"); + session.persist(memberType); + + HibernateIdentityObjectRelationship relationship = new HibernateIdentityObjectRelationship(memberType, group1, user1); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group1, user2); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group2, user3); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group2, group1); + session.persist(relationship); + + commit(); + + // + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + Query ioQuery = session.createQuery("select o from HibernateIdentityObject o where o.name like :name"); + + group1 = (HibernateIdentityObject)ioQuery.setParameter("name", "group1").uniqueResult(); + assertEquals(2, group1.getFromRelationships().size()); + assertEquals(1, group1.getToRelationships().size()); + group2 = (HibernateIdentityObject)ioQuery.setParameter("name", "group2").uniqueResult(); + assertEquals(2, group2.getFromRelationships().size()); + assertEquals(0, group2.getToRelationships().size()); + + user3 = (HibernateIdentityObject)ioQuery.setParameter("name", "user3").uniqueResult(); + assertEquals(1, user3.getToRelationships().size()); + assertEquals(0, user3.getFromRelationships().size()); + assertEquals("group2", user3.getToRelationships().iterator().next().getFromIdentityObject().getName()); + commit(); + + } + + @Test + public void testNameTypeConstraint() throws Exception + { + + begin(); + Session session = getSessionFactory().getCurrentSession(); + + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); + session.persist(groupType); + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user2); + + commit(); + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + try + { + + HibernateIdentityObject user3 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user3); + + assertFalse(getHibernateSupport().commitTransaction()); + + } + catch (Exception e) + { + // may be expected + getHibernateSupport().rollbackTransaction(); + } + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + + HibernateIdentityObject user4 = new HibernateIdentityObject("group1", userType, realm); + session.persist(user4); + + + HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); + session.persist(group1); + HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group2); + + //session.flush(); + + try + { + + HibernateIdentityObject group3 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group3); + + // Should fail + assertFalse(getHibernateSupport().commitTransaction()); + } + catch (Exception e) + { + //expected + getHibernateSupport().rollbackTransaction(); + } + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + HibernateIdentityObject group4 = new HibernateIdentityObject("user1", groupType, realm); + session.persist(group4); + + session.flush(); + + commit(); + + + + + + } + + @Test + public void testAttributes() throws Exception + { + begin(); + + Session session = getSessionFactory().getCurrentSession(); + + + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + +// Set<String> values1 = new HashSet<String>(); +// values1.add("Val1"); +// values1.add("Val2"); +// values1.add("Val3"); + + + user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple1", new String[]{"Val1", "Val2", "Val3"})); + user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple2", new String[]{"Val1", "Val2", "Val3"})); + + + commit(); + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new Long(user1.getId())); + assertEquals(2, user1.getAttributes().size() ); +// assertNotNull(user1.getProfileAttributes().get("simple1")); +// assertEquals(3, user1.getProfileAttributes().get("simple1").length); + + + commit(); + + } + +} \ No newline at end of file Modified: idm/trunk/idm/src/test/resources/datasources/datasources.xml =================================================================== --- idm/trunk/idm/src/test/resources/datasources/datasources.xml 2009-04-03 10:03:06 UTC (rev 423) +++ idm/trunk/idm/src/test/resources/datasources/datasources.xml 2009-04-03 11:53:45 UTC (rev 424) @@ -32,14 +32,31 @@ </datasource> <datasource> + <datasource-name>mysql4-local</datasource-name> + <connection-url>jdbc:mysql://192.168.1.101:3306/jbid?useServerPrepStmts=false&amp;jdbcCompliantTruncation=false</connection-url> + <driver-class>com.mysql.jdbc.Driver</driver-class> + <user-name>root</user-name> + <password>password</password> + </datasource> + + + <datasource> <datasource-name>mysql5-local</datasource-name> <connection-url>jdbc:mysql://localhost:3306/jbid?useServerPrepStmts=false&amp;jdbcCompliantTruncation=false</connection-url> <driver-class>com.mysql.jdbc.Driver</driver-class> <user-name>root</user-name> <password></password> - </datasource> + </datasource> <datasource> + <datasource-name>postgresql8-local</datasource-name> + <connection-url>jdbc:postgresql://192.168.1.101:5432:jbid</connection-url> + <driver-class>org.postgresql.Driver</driver-class> + <user-name>postgres</user-name> + <password>password</password> + </datasource> + + <datasource> <datasource-name>hsqldb</datasource-name> <connection-url>jdbc:hsqldb:file:test</connection-url> <driver-class>org.hsqldb.jdbcDriver</driver-class> Modified: idm/trunk/idm/src/test/resources/datasources/hibernates.xml =================================================================== --- idm/trunk/idm/src/test/resources/datasources/hibernates.xml 2009-04-03 10:03:06 UTC (rev 423) +++ idm/trunk/idm/src/test/resources/datasources/hibernates.xml 2009-04-03 11:53:45 UTC (rev 424) @@ -125,6 +125,15 @@ </property> </properties> </configuration> + <configuration> + <configuration-name>mysql4-local</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.MySQLInnoDBDialect</value> + </property> + </properties> + </configuration> <!-- The mysql 5 configuration --> <configuration> <configuration-name>mysql5</configuration-name> @@ -154,4 +163,13 @@ </property> </properties> </configuration> + <configuration> + <configuration-name>postgresql8-local</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.PostgreSQLDialect</value> + </property> + </properties> + </configuration> </configurations> Modified: idm/trunk/idm/src/test/resources/jboss-unit.xml =================================================================== --- idm/trunk/idm/src/test/resources/jboss-unit.xml 2009-04-03 10:03:06 UTC (rev 423) +++ idm/trunk/idm/src/test/resources/jboss-unit.xml 2009-04-03 11:53:45 UTC (rev 424) @@ -46,7 +46,7 @@ <!--Without LDAP--> <test > - <class name="org.jboss.identity.idm.impl.store.hibernate.HibernateModelJBossTestCase"/> + <class name="org.jboss.identity.idm.impl.store.hibernate.HibernateModelTestCase"/> </test> <!--With LDAP-->