X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fext%2Ftest%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifUserAdminTest.java;h=27e3c1dfc9a6a23f98615751d9ca82d2745e2a17;hb=4f0362bc7817d05a7c3e2c8a33c7e9eb62989257;hp=52682bf03ba85ce71b63d1f027178c49ab6e5309;hpb=40c3800ea57d5de136137e3fb0ff07cf54f2df48;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java index 52682bf03..27e3c1dfc 100644 --- a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java +++ b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java @@ -1,5 +1,7 @@ package org.argeo.osgi.useradmin; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.util.Arrays; import java.util.List; @@ -7,6 +9,7 @@ import junit.framework.TestCase; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.io.IOUtils; import org.osgi.service.useradmin.Authorization; import org.osgi.service.useradmin.Group; import org.osgi.service.useradmin.Role; @@ -15,8 +18,19 @@ import org.osgi.service.useradmin.User; public class LdifUserAdminTest extends TestCase implements BasicTestConstants { public void testBasicUserAdmin() throws Exception { - LdifUserAdmin userAdmin = new LdifUserAdmin(getClass() + // read + LdifUserAdmin initialUserAdmin = new LdifUserAdmin(getClass() .getResourceAsStream("basic.ldif")); + // write + ByteArrayOutputStream out = new ByteArrayOutputStream(); + initialUserAdmin.save(out); + byte[] arr = out.toByteArray(); + initialUserAdmin.destroy(); + IOUtils.closeQuietly(out); + String written = new String(arr); + System.out.print(written); + ByteArrayInputStream in = new ByteArrayInputStream(arr); + LdifUserAdmin userAdmin = new LdifUserAdmin(in); // users User rootUser = (User) userAdmin.getRole(ROOT_USER_DN); @@ -52,9 +66,11 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants { byte[] hashedPassword = ("{SHA}" + Base64 .encodeBase64String(DigestUtils.sha1("demo".getBytes()))) .getBytes(); - assertTrue(rootUser.hasCredential("userpassword", hashedPassword)); - assertTrue(demoUser.hasCredential("userpassword", hashedPassword)); - + assertTrue(rootUser.hasCredential(LdifName.userPassword.name(), + hashedPassword)); + assertTrue(demoUser.hasCredential(LdifName.userPassword.name(), + hashedPassword)); + // search Role[] search = userAdmin.getRoles(null); assertEquals(4, search.length);