11:48 a.m.
Author: bdaw
Date: 2009-04-02 12:48:29 -0400 (Thu, 02 Apr 2009)
New Revision: 414
Modified:
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossUnitTest.java
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreJBossUnitTest.java
Log:
trata
Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java
===================================================================
--- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java 2009-04-02
16:24:17 UTC (rev 413)
+++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java 2009-04-02
16:48:29 UTC (rev 414)
@@ -31,6 +31,7 @@
import javax.naming.Binding;
import javax.naming.directory.DirContext;
import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
import java.util.Hashtable;
import java.io.File;
import java.net.URL;
@@ -54,7 +55,7 @@
public static final String LDAP_CREDENTIALS = "password";
- static Hashtable<String,String> env = new Hashtable<String,String>();
+ public static Hashtable<String,String> env = new
Hashtable<String,String>();
static
{
@@ -74,7 +75,7 @@
openDSService.start();
- populateClean();
+
}
@@ -162,5 +163,12 @@
mainCtx.unbind(name);
}
+
+ public LdapContext getLdapContext() throws Exception
+ {
+ return new InitialLdapContext(env, null);
+ }
+
+
}
Modified:
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java
===================================================================
---
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java 2009-04-02
16:24:17 UTC (rev 413)
+++
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java 2009-04-02
16:48:29 UTC (rev 414)
@@ -66,7 +66,9 @@
relationshipManagerTest = new RelationshipManagerTest(this);
roleManagerTest = new RoleManagerTest(this);
+ populateClean();
+
identitySessionFactory = new IdentityConfigurationImpl().
configure(getIdentityConfig()).buildIdentitySessionFactory();
}
Modified:
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java
===================================================================
---
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java 2009-04-02
16:24:17 UTC (rev 413)
+++
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java 2009-04-02
16:48:29 UTC (rev 414)
@@ -53,6 +53,8 @@
orgTest = new OrganizationTest(this);
+ populateClean();
+
identitySessionFactory = new IdentityConfigurationImpl().
configure(getIdentityConfig()).buildIdentitySessionFactory();
}
Modified:
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java
===================================================================
---
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java 2009-04-02
16:24:17 UTC (rev 413)
+++
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java 2009-04-02
16:48:29 UTC (rev 414)
@@ -77,7 +77,7 @@
commonTest = new CommonIdentityStoreTest(this);
IdentityConfigurationMetaData configurationMD = JAXB2IdentityConfiguration
- .createConfigurationMetaData(new File(getIdentityConfig()));
+ .createConfigurationMetaData(getIdentityConfig());
IdentityConfigurationContextRegistry identityConfiguration =
(IdentityConfigurationContextRegistry)
new IdentityConfigurationImpl().configure(configurationMD);
Modified:
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossUnitTest.java
===================================================================
---
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossUnitTest.java 2009-04-02
16:24:17 UTC (rev 413)
+++
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossUnitTest.java 2009-04-02
16:48:29 UTC (rev 414)
@@ -63,9 +63,11 @@
@Test
public void testPersistence() {
+
+ begin();
Session session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
+
HibernateRealm realm = new HibernateRealm("default");
session.persist(realm);
@@ -119,7 +121,7 @@
session.delete(iort);
assertFalse(session.contains(iort));
- session.getTransaction().commit();
+ commit();
}
@@ -127,9 +129,11 @@
@Test
public void testRelationships()
{
+ begin();
+
+
Session session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
HibernateRealm realm = new HibernateRealm("default");
session.persist(realm);
@@ -165,13 +169,15 @@
relationship = new HibernateIdentityObjectRelationship(memberType, group2,
group1);
session.persist(relationship);
- session.getTransaction().commit();
+ commit();
//
+
+
+ begin();
+
session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
-
Query ioQuery = session.createQuery("select o from HibernateIdentityObject o
where o.name like :name");
group1 = (HibernateIdentityObject)ioQuery.setParameter("name",
"group1").uniqueResult();
@@ -185,7 +191,7 @@
assertEquals(1, user3.getToRelationships().size());
assertEquals(0, user3.getFromRelationships().size());
assertEquals("group2",
user3.getToRelationships().iterator().next().getFromIdentityObject().getName());
- session.getTransaction().commit();
+ commit();
}
@@ -193,10 +199,11 @@
public void testNameTypeConstraint() throws Exception
{
+ begin();
Session session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
+
HibernateRealm realm = new HibernateRealm("default");
session.persist(realm);
@@ -210,12 +217,14 @@
HibernateIdentityObject user2 = new HibernateIdentityObject("user2",
userType, realm);
session.persist(user2);
- session.getTransaction().commit();
+ commit();
+
+
+ begin();
+
session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
-
try
{
@@ -231,11 +240,13 @@
session.getTransaction().rollback();
}
+
+
+ begin();
+
session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
-
HibernateIdentityObject user4 = new HibernateIdentityObject("group1",
userType, realm);
session.persist(user4);
@@ -262,16 +273,18 @@
session.getTransaction().rollback();
}
+
+
+ begin();
+
session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
-
HibernateIdentityObject group4 = new HibernateIdentityObject("user1",
groupType, realm);
session.persist(group4);
session.flush();
- session.getTransaction().commit();
+ commit();
@@ -282,11 +295,13 @@
@Test
public void testAttributes() throws Exception
{
+ begin();
+
Session session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
+
HibernateRealm realm = new HibernateRealm("default");
session.persist(realm);
@@ -305,19 +320,21 @@
user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1,
"simple2", new String[]{"Val1", "Val2",
"Val3"}));
- session.getTransaction().commit();
+ commit();
+
+
+ begin();
+
session = getSessionFactory().getCurrentSession();
- session.getTransaction().begin();
-
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);
- session.getTransaction().commit();
+ commit();
}
Modified:
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreJBossUnitTest.java
===================================================================
---
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreJBossUnitTest.java 2009-04-02
16:24:17 UTC (rev 413)
+++
idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreJBossUnitTest.java 2009-04-02
16:48:29 UTC (rev 414)
@@ -87,7 +87,7 @@
commonTest = new CommonIdentityStoreTest(this);
IdentityConfigurationMetaData configurationMD = JAXB2IdentityConfiguration
- .createConfigurationMetaData(new File(getIdentityConfig()));
+ .createConfigurationMetaData(getIdentityConfig());
IdentityConfigurationContextRegistry registry =
(IdentityConfigurationContextRegistry) new IdentityConfigurationImpl().
configure(configurationMD);
@@ -189,16 +189,7 @@
super.stop();
}
-// public void begin() throws Exception
-// {
-// //nothing
-// }
-//
-// public void commit() throws Exception
-// {
-// //nothing
-// }
-//
+
public void flush() throws Exception
{
//nothing
@@ -215,87 +206,6 @@
}
- public LdapContext getLdapContext() throws Exception
- {
- Hashtable<String,String> env = new Hashtable<String,String>();
- env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
- env.put(Context.PROVIDER_URL, LDAP_PROVIDER_URL);
- env.put(Context.SECURITY_AUTHENTICATION, "simple");
- env.put(Context.SECURITY_PRINCIPAL, LDAP_PRINCIPAL);
- env.put(Context.SECURITY_CREDENTIALS, LDAP_CREDENTIALS);
-
- return new InitialLdapContext(env, null);
- }
-
-
-
- public void populate() throws Exception
- {
- populateLDIF("target/test-classes/ldap/initial-opends.ldif");
- }
-
- public void populateClean() throws Exception
- {
- populateLDIF("target/test-classes/ldap/initial-empty-opends.ldif");
- }
-
- public void populateLDIF(String ldifRelativePath) throws Exception
- {
- File ldif = new File(ldifRelativePath);
-
- System.out.println("LDIF: " + ldif.getAbsolutePath());
-
- String[] cmd = new String[] {"-h", LDAP_HOST,
- "-p", LDAP_PORT,
- "-D", LDAP_PRINCIPAL,
- "-w", LDAP_CREDENTIALS,
- "-a", "-f", ldif.getPath()};
-
- System.out.println("Populate success: " + (LDAPModify.mainModify(cmd,
false, System.out, System.err) == 0));
-
- }
-
- protected void cleanUp() throws Exception
- {
- DirContext ldapCtx = getLdapContext();
-
- try
- {
-
-
- String dn = "dc=portal,dc=example,dc=com";
-
- System.out.println("Removing: " + dn);
-
- removeContext(ldapCtx, dn);
- }
- catch (Exception e)
- {
- //
- }
- finally
- {
- ldapCtx.close();
- }
- }
-
- //subsequent remove of javax.naming.Context
- protected void removeContext(Context mainCtx, String name) throws Exception
- {
- Context deleteCtx = (Context)mainCtx.lookup(name);
- NamingEnumeration subDirs = mainCtx.listBindings(name);
-
- while (subDirs.hasMoreElements())
- {
- Binding binding = (Binding)subDirs.nextElement();
- String subName = binding.getName();
-
- removeContext(deleteCtx, subName);
- }
-
- mainCtx.unbind(name);
- }
-
// Tests
// Just test if OpenDS is running and was populated...