Make testing more generic.

[lgpl/argeo-commons.git] / org.argeo.enterprise / ext / test / org / argeo / osgi / useradmin / LdifParserTest.java

diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java
index 75bfe11ff294c6789372d86ea96011f9a210d231..012a50ed1e6c7e98dc6cae6b7f6eb4babda3a2e6 100644 (file)
--- a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java
+++ b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java
@@ -13,38 +13,32 @@ import javax.naming.ldap.LdapName;
 import org.argeo.naming.LdapAttrs;
 import org.argeo.naming.LdifParser;
 
-import junit.framework.TestCase;
-
-public class LdifParserTest extends TestCase implements BasicTestConstants {
+/** {@link LdifParser} tests. */
+public class LdifParserTest implements BasicTestConstants {
        public void testBasicLdif() throws Exception {
                LdifParser ldifParser = new LdifParser();
-               SortedMap<LdapName, Attributes> res = ldifParser.read(getClass()
-                               .getResourceAsStream("basic.ldif"));
+               SortedMap<LdapName, Attributes> res = ldifParser.read(getClass().getResourceAsStream("basic.ldif"));
                LdapName rootDn = new LdapName(ROOT_USER_DN);
                Attributes rootAttributes = res.get(rootDn);
-               assertNotNull(rootAttributes);
-               assertEquals("Superuser",
-                               rootAttributes.get(LdapAttrs.description.name()).get());
-               byte[] rawPwEntry = (byte[]) rootAttributes.get(
-                               LdapAttrs.userPassword.name()).get();
-               assertEquals("{SHA}ieSV55Qc+eQOaYDRSha/AjzNTJE=",
-                               new String(rawPwEntry));
+               assert rootAttributes != null;
+               assert "Superuser".equals(rootAttributes.get(LdapAttrs.description.name()).get());
+               byte[] rawPwEntry = (byte[]) rootAttributes.get(LdapAttrs.userPassword.name()).get();
+               assert "{SHA}ieSV55Qc+eQOaYDRSha/AjzNTJE=".contentEquals(new String(rawPwEntry));
                byte[] hashedPassword = DigestUtils.sha1("demo".getBytes());
-               assertEquals("{SHA}" + Base64.getEncoder().encodeToString(hashedPassword),
-                               new String(rawPwEntry));
+               assert ("{SHA}" + Base64.getEncoder().encodeToString(hashedPassword)).equals(new String(rawPwEntry));
 
                LdapName adminDn = new LdapName(ADMIN_GROUP_DN);
                Attributes adminAttributes = res.get(adminDn);
-               assertNotNull(adminAttributes);
+               assert adminAttributes != null;
                Attribute memberAttribute = adminAttributes.get(LdapAttrs.member.name());
-               assertNotNull(memberAttribute);
+               assert memberAttribute != null;
                NamingEnumeration<?> members = memberAttribute.getAll();
                List<String> users = new ArrayList<String>();
                while (members.hasMore()) {
                        Object value = members.next();
                        users.add(value.toString());
                }
-               assertEquals(1, users.size());
-               assertEquals(rootDn, new LdapName(users.get(0)));
+               assert 1 == users.size();
+               assert rootDn.equals(new LdapName(users.get(0)));
        }
 }