/*
* Copyright 2005 the original author or authors.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.wamblee.usermgt;
-import java.util.Set;
-
import junit.framework.TestCase;
import org.apache.log4j.Logger;
+
import org.wamblee.security.encryption.Md5HexMessageDigester;
+
import org.wamblee.usermgt.UserMgtException.Reason;
+import java.util.Set;
+
+
/**
* Test of user administration implementation.
*
* @author Erik Brakkee
*/
public class UserAdministrationImplTest extends TestCase {
+ /**
+ * DOCUMENT ME!
+ */
+ private static final Logger LOGGER = Logger.getLogger(UserAdministrationImplTest.class);
- private static final Logger LOGGER = Logger
- .getLogger(UserAdministrationImplTest.class);
-
+ /**
+ * DOCUMENT ME!
+ */
private static final String USER1 = "piet";
+ /**
+ * DOCUMENT ME!
+ */
private static final String PASS1 = "passpiet";
+ /**
+ * DOCUMENT ME!
+ */
private static final String USER2 = "kees";
+ /**
+ * DOCUMENT ME!
+ */
private static final String PASS2 = "passkees";
+ /**
+ * DOCUMENT ME!
+ */
private static final String GROUP1 = "cyclists";
+ /**
+ * DOCUMENT ME!
+ */
private static final String GROUP2 = "runners";
+ /**
+ * DOCUMENT ME!
+ */
private UserAdministration admin;
-
/*
* (non-Javadoc)
- *
+ *
* @see junit.framework.TestCase#setUp()
*/
+ /**
+ * DOCUMENT ME!
+ *
+ * @throws Exception DOCUMENT ME!
+ */
@Override
protected void setUp() throws Exception {
super.setUp();
admin = createAdmin();
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
protected UserAdministration createAdmin() {
- UserSet users = new InMemoryUserSet( new RegexpNameValidator(RegexpNameValidator.PASSWORD_PATTERN, Reason.INVALID_PASSWORD, "Password must contain at least 6 characters"),
+ UserSet users = new InMemoryUserSet(new RegexpNameValidator(
+ RegexpNameValidator.PASSWORD_PATTERN,
+ Reason.INVALID_PASSWORD,
+ "Password must contain at least 6 characters"),
new Md5HexMessageDigester());
GroupSet groups = new InMemoryGroupSet();
+
return new UserAdministrationImpl(users, groups,
- new RegexpNameValidator(RegexpNameValidator.ID_PATTERN,
- Reason.INVALID_USERNAME, "Invalid user"),
- new RegexpNameValidator(RegexpNameValidator.ID_PATTERN,
- Reason.INVALID_GROUPNAME, "Invalid group"));
+ new RegexpNameValidator(RegexpNameValidator.ID_PATTERN,
+ Reason.INVALID_USERNAME, "Invalid user"),
+ new RegexpNameValidator(RegexpNameValidator.ID_PATTERN,
+ Reason.INVALID_GROUPNAME, "Invalid group"));
}
-
- protected User createUser(String aName, String aPassword, Group aGroup) throws UserMgtException {
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param aName DOCUMENT ME!
+ * @param aPassword DOCUMENT ME!
+ * @param aGroup DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ *
+ * @throws UserMgtException DOCUMENT ME!
+ */
+ protected User createUser(String aName, String aPassword, Group aGroup)
+ throws UserMgtException {
return UsermgtTestUtils.createUser(aName, aPassword, aGroup);
}
}
/**
- * Creates a new group. Verifies the group is created correctly and that the
- * user is added.
- *
+ * Creates a new group. Verifies the group is created correctly and
+ * that the user is added.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testCreateGroup() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
assertTrue(groups.contains(group));
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @param aUsername DOCUMENT ME!
+ */
private void createInvalidGroup(String aUsername) {
try {
admin.createGroup(aUsername);
fail();
} catch (UserMgtException e) {
- assertEquals(UserMgtException.Reason.INVALID_GROUPNAME, e
- .getReason());
+ assertEquals(UserMgtException.Reason.INVALID_GROUPNAME,
+ e.getReason());
assertEquals(0, admin.getGroupCount());
}
}
/**
- * Creates a new group with an invalid name. Verifies that the appropriate
- * exception is thrown.
- *
+ * Creates a new group with an invalid name. Verifies that the
+ * appropriate exception is thrown.
+ *
* @throws UserMgtException
*/
public void testCreateInvalidGroupName() throws UserMgtException {
}
/**
- * Creates a new group which conflicts with an existing one. Verifies that
- * the UserMgtException is thrown and that no group is added.
- *
+ * Creates a new group which conflicts with an existing one.
+ * Verifies that the UserMgtException is thrown and that no group is
+ * added.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testCreateDuplicateGroup() throws UserMgtException {
admin.createGroup(GROUP1);
+
try {
admin.createGroup(GROUP1);
} catch (UserMgtException e) {
assertEquals(UserMgtException.Reason.DUPLICATE_GROUP, e.getReason());
assertEquals(1, admin.getGroupCount());
+
return;
}
+
fail();
}
/**
- * Creates a new user. Verifies the user is created correctly and that the
- * user is added.
- *
+ * Creates a new user. Verifies the user is created correctly and
+ * that the user is added.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testCreateUser() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
+ User user = admin.createUser(USER1, PASS1, group);
assertNotNull(user);
assertEquals(USER1, user.getName());
user.checkPassword(PASS1);
assertTrue(users.contains(user));
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @param aUsername DOCUMENT ME!
+ * @param aGroup DOCUMENT ME!
+ */
private void createInvalidUser(String aUsername, Group aGroup) {
try {
admin.createUser(aUsername, "pass", aGroup);
fail();
} catch (UserMgtException e) {
- assertEquals(UserMgtException.Reason.INVALID_USERNAME, e
- .getReason());
+ assertEquals(UserMgtException.Reason.INVALID_USERNAME, e.getReason());
assertEquals(0, admin.getUserCount());
}
}
/**
- * Constructs users with invalid names. Verifies that the appropriate
- * exception is thrown.
- *
+ * Constructs users with invalid names. Verifies that the
+ * appropriate exception is thrown.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testCreateInvalidUserName() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
}
/**
- * Creates a new user which conflicts with an existing one. Verifies that
- * the UserMgtException is thrown and that no user is added.
- *
+ * Creates a new user which conflicts with an existing one.
+ * Verifies that the UserMgtException is thrown and that no user is added.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testCreateDuplicateUser() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
admin.createUser(USER1, PASS1, group);
+
try {
admin.createUser(USER1, PASS2, group);
fail();
}
/**
- * Gets a known user by name. Verifies the correct user is obtained.
- * Verifies that null is returned when trying to obtain an unknown user.
- *
+ * Gets a known user by name. Verifies the correct user is
+ * obtained. Verifies that null is returned when trying to obtain an
+ * unknown user.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testGetUser() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
- User user2 = admin.getUser(USER1);
+ User user = admin.createUser(USER1, PASS1, group);
+ User user2 = admin.getUser(USER1);
assertTrue(user.equals(user2));
assertNull(admin.getUser(USER2));
}
/**
- * Gets a known group by name. Verifies the correct group is obtained.
- * Verifies that null is returned when the group is not known.
- *
+ * Gets a known group by name. Verifies the correct group is
+ * obtained. Verifies that null is returned when the group is not known.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testGetGroup() throws UserMgtException {
- Group group = admin.createGroup(GROUP1);
+ Group group = admin.createGroup(GROUP1);
Group group2 = admin.getGroup(GROUP1);
assertTrue(group.equals(group2));
assertNull(admin.getGroup(GROUP2));
}
/**
- * Adds a user to a group. Verifies that the user is added using several API
- * calls. Verifies that an exception occurs if the user is not already part
- * of the group.
- *
+ * Adds a user to a group. Verifies that the user is added using
+ * several API calls. Verifies that an exception occurs if the user is not
+ * already part of the group.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testAddUserToGroup() throws UserMgtException {
-
- Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
+ Group group = admin.createGroup(GROUP1);
+ User user = admin.createUser(USER1, PASS1, group);
Group group2 = admin.createGroup(GROUP2);
assertTrue(user.isInGroup(group));
assertFalse(user.isInGroup(group2));
admin.addUserToGroup(user, group2);
assertTrue(user.isInGroup(group));
assertTrue(user.isInGroup(group2));
+
Set<User> users = admin.getUsers(group2);
assertNotNull(users);
assertEquals(1, users.size());
try {
admin.addUserToGroup(user, group);
} catch (UserMgtException e) {
- assertEquals(UserMgtException.Reason.USER_ALREADY_IN_GROUP, e
- .getReason());
+ assertEquals(UserMgtException.Reason.USER_ALREADY_IN_GROUP,
+ e.getReason());
+
return;
}
+
fail();
}
/**
- * Adds a user to a group where the user does not exist. Verifies that an
- * exception occurs.
- *
+ * Adds a user to a group where the user does not exist. Verifies
+ * that an exception occurs.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testAddUserToGroupUnknownUser() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user = createUser(USER1, PASS1, group);
+ User user = createUser(USER1, PASS1, group);
+
try {
admin.addUserToGroup(user, group);
} catch (UserMgtException e) {
assertEquals(UserMgtException.Reason.UNKNOWN_USER, e.getReason());
+
return;
}
+
fail();
}
/**
- * Adds a user to a group where the user does not exist. Verifies that an
- * exception occurs.
- *
+ * Adds a user to a group where the user does not exist. Verifies
+ * that an exception occurs.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testAddUserToGroupUnknownGroup() throws UserMgtException {
- Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
+ Group group = admin.createGroup(GROUP1);
+ User user = admin.createUser(USER1, PASS1, group);
Group group2 = new Group(GROUP2);
+
try {
admin.addUserToGroup(user, group2);
} catch (UserMgtException e) {
assertEquals(UserMgtException.Reason.UNKNOWN_GROUP, e.getReason());
+
return;
}
+
fail();
}
/**
- * Removes a user from a group. Verifies that the user is removed from the
- * group using several API calls. Verifies that an exception occurs if the
- * user not part of the group or if the user is only part of one group.
+ * Removes a user from a group. Verifies that the user is removed
+ * from the group using several API calls. Verifies that an exception
+ * occurs if the user not part of the group or if the user is only part of
+ * one group.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRemoveUserFromGroup() throws UserMgtException {
- Group group = admin.createGroup(GROUP1);
+ Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
+ User user = admin.createUser(USER1, PASS1, group);
Group group2 = admin.createGroup(GROUP2);
admin.addUserToGroup(user, group2);
+
Set<Group> groups = user.getGroups();
assertEquals(2, groups.size());
assertTrue(groups.contains(group));
}
/**
- * Removes a user from a group where the user is not known. Verifies that an
- * exception is thrown.
- *
+ * Removes a user from a group where the user is not known.
+ * Verifies that an exception is thrown.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRemoveUserFromGroupUnknownUser() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user = createUser(USER1, GROUP1, group);
+ User user = createUser(USER1, GROUP1, group);
+
try {
admin.removeUserFromGroup(user, group);
} catch (UserMgtException e) {
}
/**
- * Removes a user from a group where the group is not known. Verifies that
- * an exception is thrown.
- *
+ * Removes a user from a group where the group is not known.
+ * Verifies that an exception is thrown.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRemoveUserFromGroupUnknownGroup() throws UserMgtException {
- Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
+ Group group = admin.createGroup(GROUP1);
+ User user = admin.createUser(USER1, PASS1, group);
Group group2 = new Group(GROUP2);
+
try {
admin.removeUserFromGroup(user, group2);
} catch (UserMgtException e) {
}
/**
- * Removes a user from a group where the user is only part of one group.
- * Verifies that an exception is thrown.
+ * Removes a user from a group where the user is only part of one
+ * group. Verifies that an exception is thrown.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRemoveUserFromGroupOnlyGroup() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
+ User user = admin.createUser(USER1, PASS1, group);
+
try {
admin.removeUserFromGroup(user, group);
} catch (UserMgtException e) {
- assertEquals(UserMgtException.Reason.USER_MUST_BE_IN_A_GROUP, e
- .getReason());
+ assertEquals(UserMgtException.Reason.USER_MUST_BE_IN_A_GROUP,
+ e.getReason());
}
}
/**
- * Gets the list of users and groups. Verifies that the correct suers and
- * groups are returned. Verifies also that the relations from user to group
- * are correct.
- *
+ * Gets the list of users and groups. Verifies that the correct
+ * suers and groups are returned. Verifies also that the relations from
+ * user to group are correct.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testGetUsersAndGroups() throws UserMgtException {
Group group1 = admin.createGroup(GROUP1);
Group group2 = admin.createGroup(GROUP2);
- User user1 = admin.createUser(USER1, PASS1, group1);
+ User user1 = admin.createUser(USER1, PASS1, group1);
admin.addUserToGroup(user1, group2);
- User user2 = admin.createUser(USER2, PASS2, group2);
+
+ User user2 = admin.createUser(USER2, PASS2, group2);
Set<User> users = admin.getUsers();
assertEquals(2, users.size());
* Renames a user. Verifies that the user is renamed. Verifies that
* exceptions are thrown when an attempt is made to rename the user to
* itself or to another existing user, or when the group does not exist.
- *
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRenameUser() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user1 = admin.createUser(USER1, PASS1, group);
+ User user1 = admin.createUser(USER1, PASS1, group);
admin.renameUser(user1, USER2);
assertEquals(USER2, user1.getName());
assertEquals(user1, admin.getUser(USER2));
try {
admin.renameUser(user1, user1.getName());
} catch (UserMgtException e2) {
- assertEquals(UserMgtException.Reason.TRIVIAL_RENAME, e2
- .getReason());
+ assertEquals(UserMgtException.Reason.TRIVIAL_RENAME,
+ e2.getReason());
+
return;
}
+
fail();
}
+
fail();
}
/**
- * Renames a user to a user with an invalid username. Verifies that the
- * appropriate exception is thrown.
- *
+ * Renames a user to a user with an invalid username. Verifies that
+ * the appropriate exception is thrown.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRenameUserInvalidUsername() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user1 = admin.createUser(USER1, PASS1, group);
+ User user1 = admin.createUser(USER1, PASS1, group);
+
try {
admin.renameUser(user1, USER2);
} catch (UserMgtException e) {
}
/**
- * Renames a group. Verifies that the group is renamed. Verifies that
- * exceptions are thrown when an attempt is made to rename the group to
- * itself or to another existing group or when the group does not exist.
- *
+ * Renames a group. Verifies that the group is renamed. Verifies
+ * that exceptions are thrown when an attempt is made to rename the group
+ * to itself or to another existing group or when the group does not
+ * exist.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRenameGroup() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
assertEquals(group, admin.getGroup(GROUP2));
admin.createGroup(GROUP1);
+
try {
admin.renameGroup(group, GROUP1);
} catch (UserMgtException e) {
try {
admin.renameGroup(group, group.getName());
} catch (UserMgtException e2) {
- assertEquals(UserMgtException.Reason.TRIVIAL_RENAME, e2
- .getReason());
+ assertEquals(UserMgtException.Reason.TRIVIAL_RENAME,
+ e2.getReason());
+
return;
}
+
fail();
+
return;
}
+
fail();
}
/**
- * Renames a group to a group with an invalid name. Verifies that the
- * appropriate exception is thrown.
- *
+ * Renames a group to a group with an invalid name. Verifies that
+ * the appropriate exception is thrown.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRenameGroupInvalidGroupname() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
+
try {
admin.renameGroup(group, "a b");
} catch (UserMgtException e) {
}
/**
- * Removes a user. Verifies that the user is removed. Verifies that the an
- * exception is thrown when the user does not exist.
- *
+ * Removes a user. Verifies that the user is removed. Verifies that
+ * the an exception is thrown when the user does not exist.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRemoveUser() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
+ User user = admin.createUser(USER1, PASS1, group);
assertEquals(1, admin.getUserCount());
admin.removeUser(user);
}
/**
- * Removes a group. Verifies that the group is removed. Verifies that the an
- * exception is thrown when the group does not exist or if there are still
- * users in the group.
- *
+ * Removes a group. Verifies that the group is removed. Verifies
+ * that the an exception is thrown when the group does not exist or if
+ * there are still users in the group.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRemoveGroup() throws UserMgtException {
Group group1 = admin.createGroup(GROUP1);
group1 = admin.createGroup(GROUP1);
admin.createUser(USER1, PASS1, group1);
+
try {
admin.removeGroup(group1);
} catch (UserMgtException e) {
- assertEquals(UserMgtException.Reason.GROUP_STILL_OCCUPIED, e
- .getReason());
+ assertEquals(UserMgtException.Reason.GROUP_STILL_OCCUPIED,
+ e.getReason());
+
return;
}
+
fail();
}
/**
- * Tries to remove an unknown group. Verifies that an exception is thrown.
- *
+ * Tries to remove an unknown group. Verifies that an exception is
+ * thrown.
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testRemoveGroupUnknownGroup() throws UserMgtException {
- Group group = admin.createGroup(GROUP1);
+ Group group = admin.createGroup(GROUP1);
Group group2 = new Group(GROUP2);
+
try {
admin.removeGroup(group2);
} catch (UserMgtException e) {
/**
* Changes the password, verifies that this succeeds.
- *
+ *
* @throws UserMgtException
*/
public void testChangePassword() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
- User user = admin.createUser(USER1, PASS1, group);
+ User user = admin.createUser(USER1, PASS1, group);
user.changePassword(PASS1, PASS2);
// retrieve the user and verifies the password hasn't changed.
User user2 = admin.getUser(USER1);
+
try {
user2.checkPassword(PASS2);
fail(); // password should not have changed already.
user2 = admin.getUser(USER1);
user2.checkPassword(PASS2); // this time it should succeed.
-
}
/**
* Performance test. Finds a user by name.
- *
+ *
+ * @throws UserMgtException DOCUMENT ME!
*/
public void testPerformanceFindUserByName() throws UserMgtException {
Group group = admin.createGroup(GROUP1);
admin.createUser(USER1, PASS1, group);
- int n = 1000;
+ int n = 1000;
long time = System.currentTimeMillis();
+
for (int i = 0; i < n; i++) {
admin.getUser(USER1);
}
+
LOGGER.info("Looked up a user " + n + " times in "
- + (float) (System.currentTimeMillis() - time) / 1000.0);
+ + ((float) (System.currentTimeMillis() - time) / 1000.0));
}
-
}
git://wamblee.org / utils / blobdiff