[jboss-identity-commits] JBoss Identity SVN: r686 - in idm/trunk/idm-testsuite/src/test: java/org/jboss/identity/idm/impl/api and 1 other directories.
Author: bdaw
Date: 2009-08-10 04:45:17 -0400 (Mon, 10 Aug 2009)
New Revision: 686
Modified:
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/APITestCase.java
idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
Log:
small test fixes
Modified:
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java
===================================================================
---
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java 2009-08-09
15:53:59 UTC (rev 685)
+++
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java 2009-08-10
08:45:17 UTC (rev 686)
@@ -144,9 +144,15 @@
"-w", directoryConfig.getAdminPassword(),
"-a", "-f", ldifURL.toURI().getPath()};
-// System.out.println("Populate success: " + (LDAPModify.mainModify(cmd,
false, System.out, System.err) == 0));
- System.out.println("Populate success: " + (LDAPModify.mainModify(cmd) ==
0));
-
+ //Not sure why... but it actually does make a difference...
+ if (directoryName.equals(EMBEDDED_OPEN_DS_DIRECTORY_NAME))
+ {
+ System.out.println("Populate success: " + (LDAPModify.mainModify(cmd,
false, System.out, System.err) == 0));
+ }
+ else
+ {
+ System.out.println("Populate success: " + (LDAPModify.mainModify(cmd)
== 0));
+ }
}
protected void cleanUp(DirContext ldapCtx) throws Exception
Modified:
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/APITestCase.java
===================================================================
---
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/APITestCase.java 2009-08-09
15:53:59 UTC (rev 685)
+++
idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/APITestCase.java 2009-08-10
08:45:17 UTC (rev 686)
@@ -22,26 +22,13 @@
package org.jboss.identity.idm.impl.api;
-import junit.framework.TestCase;
-import org.jboss.identity.idm.impl.HibernateTestSupport;
+import org.jboss.identity.idm.api.IdentitySessionFactory;
import org.jboss.identity.idm.impl.IdentityTestPOJO;
import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl;
-import org.jboss.identity.idm.api.IdentitySessionFactory;
-import org.jboss.identity.idm.api.cfg.IdentityConfiguration;
-import org.jboss.identity.idm.opends.OpenDSService;
import org.jboss.unit.api.pojo.annotations.Create;
import org.jboss.unit.api.pojo.annotations.Destroy;
import org.jboss.unit.api.pojo.annotations.Test;
-import org.opends.server.tools.LDAPModify;
-import javax.naming.directory.DirContext;
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.Binding;
-import javax.naming.ldap.InitialLdapContext;
-import java.util.Hashtable;
-import java.io.File;
-
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw
Dawidowicz</a>
* @version : 0.1 $
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-08-09
15:53:59 UTC (rev 685)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-08-10
08:45:17 UTC (rev 686)
@@ -81,7 +81,7 @@
<datasource>
<datasource-name>hsqldb</datasource-name>
- <connection-url>jdbc:hsqldb:file:test</connection-url>
+ <connection-url>jdbc:hsqldb:mem:test</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
<password></password>