Make testing more generic.

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

diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/UserAdminConfTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/UserAdminConfTest.java
index d69cae4c07aff65660a239c20d151237946317bc..77a35f424a2fc30b3b0a5a9b719d0e8765a99c85 100644 (file)
--- a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/UserAdminConfTest.java
+++ b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/UserAdminConfTest.java
@@ -6,48 +6,48 @@ import static org.argeo.osgi.useradmin.UserAdminConf.uriAsProperties;
 import java.net.URI;
 import java.util.Dictionary;
 
-import junit.framework.TestCase;
-
-public class UserAdminConfTest extends TestCase {
+/** {@link UserAdminConf} tests. */
+public class UserAdminConfTest {
        public void testUriFormat() throws Exception {
                // LDAP
                URI uriIn = new URI("ldap://" + "uid=admin,ou=system:secret@localhost:10389" + "/dc=example,dc=com"
                                + "?readOnly=false&userObjectClass=person");
                Dictionary<String, ?> props = uriAsProperties(uriIn.toString());
                System.out.println(props);
-               assertEquals("dc=example,dc=com", props.get(UserAdminConf.baseDn.name()));
-               assertEquals("false", props.get(UserAdminConf.readOnly.name()));
-               assertEquals("person", props.get(UserAdminConf.userObjectClass.name()));
+               assert "dc=example,dc=com".equals(props.get(UserAdminConf.baseDn.name()));
+               assert "false".equals(props.get(UserAdminConf.readOnly.name()));
+               assert "person".equals(props.get(UserAdminConf.userObjectClass.name()));
                URI uriOut = propertiesAsUri(props);
                System.out.println(uriOut);
-               assertEquals("/dc=example,dc=com?userObjectClass=person&readOnly=false", uriOut.toString());
+               assert "/dc=example,dc=com?userObjectClass=person&readOnly=false".equals(uriOut.toString());
 
                // File
                uriIn = new URI("file://some/dir/dc=example,dc=com.ldif");
                props = uriAsProperties(uriIn.toString());
                System.out.println(props);
-               assertEquals("dc=example,dc=com", props.get(UserAdminConf.baseDn.name()));
+               assert "dc=example,dc=com".equals(props.get(UserAdminConf.baseDn.name()));
 
                // Base configuration
                uriIn = new URI("/dc=example,dc=com.ldif?readOnly=true&userBase=ou=CoWorkers,ou=People&groupBase=ou=Roles");
                props = uriAsProperties(uriIn.toString());
                System.out.println(props);
-               assertEquals("dc=example,dc=com", props.get(UserAdminConf.baseDn.name()));
-               assertEquals("true", props.get(UserAdminConf.readOnly.name()));
-               assertEquals("ou=CoWorkers,ou=People", props.get(UserAdminConf.userBase.name()));
-               assertEquals("ou=Roles", props.get(UserAdminConf.groupBase.name()));
+               assert "dc=example,dc=com".equals(props.get(UserAdminConf.baseDn.name()));
+               assert "true".equals(props.get(UserAdminConf.readOnly.name()));
+               assert "ou=CoWorkers,ou=People".equals(props.get(UserAdminConf.userBase.name()));
+               assert "ou=Roles".equals(props.get(UserAdminConf.groupBase.name()));
                uriOut = propertiesAsUri(props);
                System.out.println(uriOut);
-               assertEquals("/dc=example,dc=com?userBase=ou=CoWorkers,ou=People&groupBase=ou=Roles&readOnly=true", uriOut.toString());
+               assert "/dc=example,dc=com?userBase=ou=CoWorkers,ou=People&groupBase=ou=Roles&readOnly=true"
+                               .equals(uriOut.toString());
 
                // OS
                uriIn = new URI("os:///dc=example,dc=com");
                props = uriAsProperties(uriIn.toString());
                System.out.println(props);
-               assertEquals("dc=example,dc=com", props.get(UserAdminConf.baseDn.name()));
-               assertEquals("true", props.get(UserAdminConf.readOnly.name()));
+               assert "dc=example,dc=com".equals(props.get(UserAdminConf.baseDn.name()));
+               assert "true".equals(props.get(UserAdminConf.readOnly.name()));
                uriOut = propertiesAsUri(props);
                System.out.println(uriOut);
-               assertEquals("/dc=example,dc=com?readOnly=true", uriOut.toString());
+               assert "/dc=example,dc=com?readOnly=true".equals(uriOut.toString());
        }
 }