X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fext%2Ftest%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifUserAdminTest.java;h=8432ce999ca1d51bb07f85e383c3e972cedebf01;hb=5986e55820cba0821f0c16627c4ab144863c82ab;hp=1d6b0f3a5d80bcfef29b0af53b3e01fcd7066c1d;hpb=438237c2b8c995d4f9562d53bfe4ea63c4442054;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
index 1d6b0f3a5..8432ce999 100644
--- a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
+++ b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
@@ -5,21 +5,19 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 
-import javax.transaction.TransactionManager;
-
 import org.argeo.naming.LdapAttrs;
-import org.argeo.transaction.simple.SimpleTransactionManager;
+import org.argeo.osgi.transaction.SimpleTransactionManager;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
@@ -31,12 +29,12 @@ import junit.framework.TestCase;
 public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 	// We have to keep using JUnit because of
 	// https://issues.apache.org/jira/browse/SUREFIRE-1669
-	
+
 	final static int TM_SIMPLE = 0;
 	final static int TM_BITRONIX = 1;
 
 	private int tmType = TM_SIMPLE;
-	private TransactionManager tm;
+	private SimpleTransactionManager tm;
 	private URI uri;
 	private AbstractUserDirectory userAdmin;
 	private Path tempDir;
@@ -134,10 +132,10 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 		assert "root@localhost".equals(rootUser.getProperties().get("mail"));
 
 		// credentials
-		byte[] hashedPassword = ("{SHA}" + Base64.getEncoder().encodeToString(DigestUtils.sha1("demo".getBytes())))
-				.getBytes();
-		assert rootUser.hasCredential(LdapAttrs.userPassword.name(), hashedPassword);
-		assert demoUser.hasCredential(LdapAttrs.userPassword.name(), hashedPassword);
+		// {SHA}
+		assert rootUser.hasCredential(LdapAttrs.userPassword.name(), "demo".getBytes(StandardCharsets.UTF_8));
+		// {PBKDF2_SHA256}
+		assert demoUser.hasCredential(LdapAttrs.userPassword.name(), "demo".getBytes(StandardCharsets.UTF_8));
 
 		// search
 		Role[] search = userAdmin.getRoles(null);
@@ -171,7 +169,7 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 		}
 	}
 
-	private AbstractUserDirectory initUserAdmin(URI uri, TransactionManager tm) {
+	private AbstractUserDirectory initUserAdmin(URI uri, SimpleTransactionManager tm) {
 		Dictionary<String, Object> props = new Hashtable<>();
 		props.put(UserAdminConf.uri.name(), uri.toString());
 		props.put(UserAdminConf.baseDn.name(), BASE_DN);
@@ -186,7 +184,7 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 		// JTA
 //		if (TM_BITRONIX == tmType)
 //			EhCacheXAResourceProducer.registerXAResource(UserDirectory.class.getName(), userAdmin.getXaResource());
-		userAdmin.setTransactionManager(tm);
+		userAdmin.setTransactionControl(tm);
 		return userAdmin;
 	}