litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2299 NIHVIVO-2279 Merge from the dev branch - replace User with UserAccounts, implement the root user policy.

Browse source
This commit is contained in:
j2blake 2011-06-09 14:42:09 +00:00
commit 253c8a3082
65 changed files with 1190 additions and 2029 deletions
Download patch file Download diff file Expand all files Collapse all files

83
webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AuthenticatorStub.java
View file

@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
/**
* A simple stub for unit tests that require an Authenticator. Call setup() to
@ -67,7 +67,9 @@ public class AuthenticatorStub extends Authenticator {
// Stub infrastructure
// ----------------------------------------------------------------------
private final Map<String, User> usersByName = new HashMap<String, User>();
private final Map<String, UserAccount> usersByEmail = new HashMap<String, UserAccount>();
private final Map<String, UserAccount> usersByExternalAuthId = new HashMap<String, UserAccount>();
private final Map<String, List<String>> editingPermissions = new HashMap<String, List<String>>();
private final Map<String, String> associatedUris = new HashMap<String, String>();
private final List<String> recordedLogins = new ArrayList<String>();
@ -79,8 +81,13 @@ public class AuthenticatorStub extends Authenticator {
this.request = request;
}
public void addUser(User user) {
usersByName.put(user.getUsername(), user);
public void addUser(UserAccount user) {
usersByEmail.put(user.getEmailAddress(), user);
String externalAuthId = user.getExternalAuthId();
if (!externalAuthId.isEmpty()) {
usersByExternalAuthId.put(user.getExternalAuthId(), user);
}
}
public void addEditingPermission(String username, String personUri) {
@ -107,52 +114,55 @@ public class AuthenticatorStub extends Authenticator {
// ----------------------------------------------------------------------
@Override
public boolean isExistingUser(String username) {
return usersByName.containsKey(username);
public UserAccount getAccountForInternalAuth(String emailAddress) {
return usersByEmail.get(emailAddress);
}
@Override
public User getUserByUsername(String username) {
return usersByName.get(username);
public UserAccount getAccountForExternalAuth(String externalAuthId) {
return usersByExternalAuthId.get(externalAuthId);
}
@Override
public List<String> getAssociatedIndividualUris(String username) {
public boolean isCurrentPassword(UserAccount userAccount,
String clearTextPassword) {
if (userAccount == null) {
return false;
} else {
return userAccount.getMd5Password().equals(
Authenticator.applyMd5Encoding(clearTextPassword));
}
}
@Override
public List<String> getAssociatedIndividualUris(UserAccount userAccount) {
List<String> uris = new ArrayList<String>();
if (associatedUris.containsKey(username)) {
uris.add(associatedUris.get(username));
String emailAddress = userAccount.getEmailAddress();
if (associatedUris.containsKey(emailAddress)) {
uris.add(associatedUris.get(emailAddress));
}
if (editingPermissions.containsKey(username)) {
uris.addAll(editingPermissions.get(username));
if (editingPermissions.containsKey(emailAddress)) {
uris.addAll(editingPermissions.get(emailAddress));
}
return uris;
}
@Override
public boolean isCurrentPassword(String username, String clearTextPassword) {
if (!isExistingUser(username)) {
return false;
}
String md5Password = applyMd5Encoding(clearTextPassword);
User user = getUserByUsername(username);
return md5Password.equals(user.getMd5password());
public void recordNewPassword(UserAccount userAccount,
String newClearTextPassword) {
newPasswords.put(userAccount.getEmailAddress(), newClearTextPassword);
}
@Override
public void recordNewPassword(String username, String newClearTextPassword) {
newPasswords.put(username, newClearTextPassword);
}
@Override
public void recordLoginAgainstUserAccount(String username,
public void recordLoginAgainstUserAccount(UserAccount userAccount,
AuthenticationSource authSource) {
recordedLogins.add(username);
recordedLogins.add(userAccount.getEmailAddress());
User user = getUserByUsername(username);
LoginStatusBean lsb = new LoginStatusBean(user.getURI(), authSource);
LoginStatusBean lsb = new LoginStatusBean(userAccount.getUri(),
authSource);
LoginStatusBean.setBean(request.getSession(), lsb);
}
@ -167,16 +177,15 @@ public class AuthenticatorStub extends Authenticator {
}
@Override
public void recordLoginWithoutUserAccount(String username,
String individualUri, AuthenticationSource authSource) {
public boolean accountRequiresEditing(UserAccount userAccount) {
throw new RuntimeException(
"AuthenticatorStub.accountRequiresEditing() not implemented.");
}
@Override
public void recordLoginWithoutUserAccount(String individualUri) {
throw new RuntimeException(
"AuthenticatorStub.recordLoginWithoutUserAccount() not implemented.");
}
@Override
public boolean isPasswordChangeRequired(String username) {
throw new RuntimeException(
"AuthenticatorStub.isPasswordChangeRequired() not implemented.");
}
}

39
webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java
View file

@ -2,15 +2,15 @@
package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_EMAIL_ADDRESS;
import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_NEW_PASSWORD;
import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_PASSWORD;
import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_USERNAME;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.URL;
import java.util.Date;
import java.util.Collections;
import javax.servlet.ServletException;
@ -27,7 +27,8 @@ import stubs.javax.servlet.http.HttpServletResponseStub;
import stubs.javax.servlet.http.HttpSessionStub;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader;
import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
/**
* Test the basic features of ProgramTest.
@ -38,13 +39,13 @@ public class ProgramLoginTest extends AbstractTestClass {
private static final String NEW_USER_URI = "new_user_uri";
private static final String NEW_USER_NAME = "new_user";
private static final String NEW_USER_PASSWORD = "new_user_pw";
private static final User NEW_USER = createUser(NEW_USER_URI,
private static final UserAccount NEW_USER = createUserAccount(NEW_USER_URI,
NEW_USER_NAME, NEW_USER_PASSWORD, 0);
private static final String OLD_USER_URI = "old_user_uri";
private static final String OLD_USER_NAME = "old_user";
private static final String OLD_USER_PASSWORD = "old_user_pw";
private static final User OLD_USER = createUser(OLD_USER_URI,
private static final UserAccount OLD_USER = createUserAccount(OLD_USER_URI,
OLD_USER_NAME, OLD_USER_PASSWORD, 10);
private AuthenticatorStub authenticator;
@ -57,7 +58,8 @@ public class ProgramLoginTest extends AbstractTestClass {
@Before
public void setLogging() {
// setLoggerLevel(this.getClass(), Level.DEBUG);
// setLoggerLevel(this.getClass(), Level.DEBUG);
// setLoggerLevel(ProgramLogin.class, Level.DEBUG);
}
@Before
@ -85,17 +87,16 @@ public class ProgramLoginTest extends AbstractTestClass {
response = new HttpServletResponseStub();
}
private static User createUser(String uri, String name, String password,
int loginCount) {
User user = new User();
user.setUsername(name);
user.setURI(uri);
user.setRoleURI(String.valueOf(50));
user.setMd5password(Authenticator.applyMd5Encoding(password));
private static UserAccount createUserAccount(String uri, String name,
String password, int loginCount) {
UserAccount user = new UserAccount();
user.setEmailAddress(name);
user.setUri(uri);
user.setPermissionSetUris(Collections
.singleton(PermissionSetsLoader.URI_DBA));
user.setMd5Password(Authenticator.applyMd5Encoding(password));
user.setLoginCount(loginCount);
if (loginCount > 0) {
user.setFirstTime(new Date(0));
}
user.setPasswordChangeRequired(loginCount == 0);
return user;
}
@ -170,10 +171,10 @@ public class ProgramLoginTest extends AbstractTestClass {
// Helper methods
// ----------------------------------------------------------------------
private void executeRequest(String username, String password,
private void executeRequest(String email, String password,
String newPassword) {
if (username != null) {
request.addParameter(PARAM_USERNAME, username);
if (email != null) {
request.addParameter(PARAM_EMAIL_ADDRESS, email);
}
if (password != null) {
request.addParameter(PARAM_PASSWORD, password);

58
webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
View file

@ -2,6 +2,8 @@
package edu.cornell.mannlib.vitro.webapp.controller.edit;
import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_DBA;
import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_SELF_EDITOR;
import static edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State.FORCED_PASSWORD_CHANGE;
import static edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State.LOGGING_IN;
import static org.junit.Assert.assertEquals;
@ -10,7 +12,7 @@ import static org.junit.Assert.fail;
import java.net.URL;
import java.util.Arrays;
import java.util.Date;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@ -20,7 +22,7 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.UserDaoStub;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDaoStub;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryStub;
import stubs.javax.servlet.ServletConfigStub;
import stubs.javax.servlet.ServletContextStub;
@ -30,7 +32,7 @@ import stubs.javax.servlet.http.HttpSessionStub;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
import edu.cornell.mannlib.vitro.webapp.controller.authenticate.AuthenticatorStub;
import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
@ -43,7 +45,7 @@ public class AuthenticateTest extends AbstractTestClass {
private AuthenticatorStub authenticator;
private ServletContextStub servletContext;
private WebappDaoFactoryStub webappDaoFactory;
private UserDaoStub userDao;
private UserAccountsDaoStub userAccountsDao;
private ServletConfigStub servletConfig;
private HttpSessionStub session;
private HttpServletRequestStub request;
@ -59,27 +61,27 @@ public class AuthenticateTest extends AbstractTestClass {
private static final String NEW_DBA_NAME = "new_dba_name";
private static final String NEW_DBA_PW = "new_dba_pw";
private static final UserInfo NEW_DBA = new UserInfo(NEW_DBA_NAME,
"new_dba_uri", NEW_DBA_PW, 50, 0);
"new_dba_uri", NEW_DBA_PW, URI_DBA, 0);
/** A DBA who has logged in before. */
private static final String OLD_DBA_NAME = "old_dba_name";
private static final String OLD_DBA_PW = "old_dba_pw";
private static final String OLD_DBA_URI = "old_dba_uri";
private static final int OLD_DBA_SECURITY_LEVEL = 50;
private static final UserInfo OLD_DBA = new UserInfo(OLD_DBA_NAME,
OLD_DBA_URI, OLD_DBA_PW, OLD_DBA_SECURITY_LEVEL, 5);
OLD_DBA_URI, OLD_DBA_PW, URI_DBA, 5);
/** A self-editor who has logged in before and has a profile. */
private static final String OLD_SELF_NAME = "old_self_name";
private static final String OLD_SELF_PW = "old_self_pw";
private static final UserInfo OLD_SELF = new UserInfo(OLD_SELF_NAME,
"old_self_uri", OLD_SELF_PW, 1, 100);
"old_self_uri", OLD_SELF_PW, URI_SELF_EDITOR, 100);
/** A self-editor who has logged in before but has no profile. */
private static final String OLD_STRANGER_NAME = "old_stranger_name";
private static final String OLD_STRANGER_PW = "stranger_pw";
private static final UserInfo OLD_STRANGER = new UserInfo(
OLD_STRANGER_NAME, "old_stranger_uri", OLD_STRANGER_PW, 1, 20);
OLD_STRANGER_NAME, "old_stranger_uri", OLD_STRANGER_PW,
URI_SELF_EDITOR, 20);
/** the login page */
private static final String URL_LOGIN = "/vivo/login";
@ -114,14 +116,14 @@ public class AuthenticateTest extends AbstractTestClass {
authenticator.setAssociatedUri(OLD_SELF.username,
"old_self_associated_uri");
userDao = new UserDaoStub();
userDao.addUser(createUserFromUserInfo(NEW_DBA));
userDao.addUser(createUserFromUserInfo(OLD_DBA));
userDao.addUser(createUserFromUserInfo(OLD_SELF));
userDao.addUser(createUserFromUserInfo(OLD_STRANGER));
userAccountsDao = new UserAccountsDaoStub();
userAccountsDao.addUser(createUserFromUserInfo(NEW_DBA));
userAccountsDao.addUser(createUserFromUserInfo(OLD_DBA));
userAccountsDao.addUser(createUserFromUserInfo(OLD_SELF));
userAccountsDao.addUser(createUserFromUserInfo(OLD_STRANGER));
webappDaoFactory = new WebappDaoFactoryStub();
webappDaoFactory.setUserDao(userDao);
webappDaoFactory.setUserAccountsDao(userAccountsDao);
servletContext = new ServletContextStub();
servletContext.setAttribute("webappDaoFactory", webappDaoFactory);
@ -143,16 +145,14 @@ public class AuthenticateTest extends AbstractTestClass {
auth.init(servletConfig);
}
private User createUserFromUserInfo(UserInfo userInfo) {
User user = new User();
user.setUsername(userInfo.username);
user.setURI(userInfo.uri);
user.setRoleURI(String.valueOf(userInfo.securityLevel));
user.setMd5password(Authenticator.applyMd5Encoding(userInfo.password));
private UserAccount createUserFromUserInfo(UserInfo userInfo) {
UserAccount user = new UserAccount();
user.setEmailAddress(userInfo.username);
user.setUri(userInfo.uri);
user.setPermissionSetUris(userInfo.permissionSetUris);
user.setMd5Password(Authenticator.applyMd5Encoding(userInfo.password));
user.setLoginCount(userInfo.loginCount);
if (userInfo.loginCount > 0) {
user.setFirstTime(new Date(0));
}
user.setPasswordChangeRequired(userInfo.loginCount == 0);
return user;
}
@ -617,23 +617,23 @@ public class AuthenticateTest extends AbstractTestClass {
final String username;
final String uri;
final String password;
final int securityLevel;
final Set<String> permissionSetUris;
final int loginCount;
public UserInfo(String username, String uri, String password,
int securityLevel, int loginCount) {
String roleUri, int loginCount) {
this.username = username;
this.uri = uri;
this.password = password;
this.securityLevel = securityLevel;
this.permissionSetUris = Collections.singleton(roleUri);
this.loginCount = loginCount;
}
@Override
public String toString() {
return "UserInfo[username=" + username + ", uri=" + uri
+ ", password=" + password + ", securityLevel="
+ securityLevel + ", loginCount=" + loginCount + "]";
+ ", password=" + password + ", roleUri="
+ permissionSetUris + ", loginCount=" + loginCount + "]";
}
}

83
webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HiddenFromDisplayBelowRoleLevelFilterTest.java
View file

@ -3,12 +3,18 @@
package edu.cornell.mannlib.vitro.webapp.dao.filtering.filters;
import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.INTERNAL;
import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_CURATOR;
import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_DBA;
import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_EDITOR;
import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_SELF_EDITOR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -21,7 +27,7 @@ import org.junit.runners.Parameterized.Parameters;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDaoStub;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.IndividualDaoStub;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDaoStub;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.UserDaoStub;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDaoStub;
import stubs.edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryStub;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
@ -35,7 +41,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
/**
@ -94,35 +100,32 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
private static final String NS = "http://someDomain/individual/";
private static final String ROLE_NON_EDITOR = "1";
private static final String ROLE_EDITOR = "4";
private static final String ROLE_CURATOR = "5";
private static final String ROLE_DBA = "50";
private static final User USER_SELF = user("userSelf", "self_editor",
ROLE_NON_EDITOR);
private static final User USER_EDITOR = user("userEditor", "editor",
ROLE_EDITOR);
private static final User USER_CURATOR = user("userCurator", "curator",
ROLE_CURATOR);
private static final User USER_DBA = user(NS + "userDba", "dba", ROLE_DBA);
private static final UserAccount USER_SELF = userAccount("userSelf",
"self_editor", URI_SELF_EDITOR);
private static final UserAccount USER_EDITOR = userAccount("userEditor",
"editor", URI_EDITOR);
private static final UserAccount USER_CURATOR = userAccount("userCurator",
"curator", URI_CURATOR);
private static final UserAccount USER_DBA = userAccount(NS + "userDba",
"dba", URI_DBA);
/** Create a User */
private static User user(String uri, String username, String roleUri) {
User user = new User();
user.setURI(NS + uri);
user.setUsername(username);
user.setRoleURI(roleUri);
private static UserAccount userAccount(String uri, String emailAddress,
String roleUri) {
UserAccount user = new UserAccount();
user.setUri(NS + uri);
user.setEmailAddress(emailAddress);
user.setPermissionSetUris(Collections.singleton(roleUri));
return user;
}
private static final UserDaoStub DAO_USER = userDao(USER_SELF, USER_EDITOR,
private static final UserAccountsDaoStub DAO_USER_ACCOUNT = userAccountsDao(USER_SELF, USER_EDITOR,
USER_CURATOR, USER_DBA);
/** Create the UserDao */
private static UserDaoStub userDao(User... users) {
UserDaoStub dao = new UserDaoStub();
for (User user : users) {
/** Create the UserAccountsDao */
private static UserAccountsDaoStub userAccountsDao(UserAccount... users) {
UserAccountsDaoStub dao = new UserAccountsDaoStub();
for (UserAccount user : users) {
dao.addUser(user);
}
return dao;
@ -138,6 +141,11 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
private static final LoginStatusBean LOGIN_DBA = loginStatusBean(USER_DBA,
INTERNAL);
private static LoginStatusBean loginStatusBean(UserAccount user,
AuthenticationSource auth) {
return new LoginStatusBean(user.getUri(), auth);
}
private static final LoginStatusBean[] LOGINS = new LoginStatusBean[] {
LOGIN_NONE, LOGIN_SELF, LOGIN_EDITOR, LOGIN_CURATOR, LOGIN_DBA };
@ -168,11 +176,6 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
return i;
}
private static LoginStatusBean loginStatusBean(User user,
AuthenticationSource auth) {
return new LoginStatusBean(user.getURI(), auth);
}
private static final VClass PUBLIC_VCLASS = vClass("PUBLIC_vclass",
RoleLevel.PUBLIC);
private static final VClass SELF_VCLASS = vClass("SELF_vclass",
@ -786,21 +789,21 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
return RoleLevel.PUBLIC;
}
User user = DAO_USER.getUserByURI(userUri);
UserAccount user = DAO_USER_ACCOUNT.getUserAccountByUri(userUri);
if (user == null) {
return RoleLevel.PUBLIC;
}
String roleURI = user.getRoleURI();
if ("1".equals(roleURI)) {
return RoleLevel.SELF;
} else if ("4".equals(roleURI)) {
return RoleLevel.EDITOR;
} else if ("5".equals(roleURI)) {
return RoleLevel.CURATOR;
} else if ("50".equals(roleURI)) {
return RoleLevel.DB_ADMIN;
} else {
Set<String> roleUris = user.getPermissionSetUris();
if (roleUris.contains(URI_DBA)) {
return RoleLevel.DB_ADMIN;
} else if (roleUris.contains(URI_CURATOR)) {
return RoleLevel.CURATOR;
} else if (roleUris.contains(URI_EDITOR)) {
return RoleLevel.EDITOR;
} else if (roleUris.contains(URI_SELF_EDITOR)) {
return RoleLevel.SELF;
} else {
return RoleLevel.PUBLIC;
}
}

2
webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java
View file

@ -200,8 +200,6 @@ public class VitroFiltersFactoryTest {
Assert.assertNotNull("getObjectPropertyFilter was null", vf.getObjectPropertyFilter());
Assert.assertNotNull("getObjectPropertyStatementFilter was null", vf.getObjectPropertyStatementFilter());
Assert.assertNotNull("getIndividualFilter was null", vf.getIndividualFilter());
//Assert.assertNotNull("getTabFilter was null", vf.getTabFilter());
Assert.assertNotNull("getUserFilter was null", vf.getUserFilter());
Assert.assertNotNull("getVClassGroupFilter was null", vf.getVClassGroupFilter());
}

60
webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java
View file

@ -3,19 +3,23 @@
package edu.cornell.mannlib.vitro.webapp.dao.jena;
import junit.framework.Assert;
import org.junit.Ignore;
import org.junit.Test;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
import edu.cornell.mannlib.vitro.webapp.dao.UserDao;
import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
@ -32,34 +36,33 @@ public class OntModelSegementationTest {
wadf = new WebappDaoFactoryJena(new SimpleOntModelSelector());
}
@org.junit.Test
@Test
public void testUserAccountModel() {
UserDao udao = wadf.getUserDao();
UserAccountsDao uadao = wadf.getUserAccountsDao();
OntModelSelector oms = wadf.getOntModelSelector();
User user = new User();
UserAccount user = new UserAccount();
user.setFirstName("Chuck");
user.setLastName("Roast");
user.setUsername("chuckroast");
user.setExternalAuthId("chuckroast");
String userURI = udao.insertUser(user);
user.setURI(userURI);
uadao.insertUserAccount(user);
Assert.assertTrue(oms.getUserAccountsModel().size() > 0);
Assert.assertTrue(oms.getFullModel().size() == 0);
Assert.assertTrue(oms.getABoxModel().size() == 0);
Assert.assertTrue(oms.getTBoxModel().size() == 0);
Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
user.setUsername("todd");
udao.updateUser(user);
user.setEmailAddress("todd@somewhere");
uadao.updateUserAccount(user);
Assert.assertTrue(oms.getUserAccountsModel().size() > 0);
Assert.assertTrue(oms.getFullModel().size() == 0);
Assert.assertTrue(oms.getABoxModel().size() == 0);
Assert.assertTrue(oms.getTBoxModel().size() == 0);
Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
udao.deleteUser(user);
uadao.deleteUserAccount(user.getUri());
Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
Assert.assertTrue(oms.getFullModel().size() == 0);
Assert.assertTrue(oms.getABoxModel().size() == 0);
@ -69,7 +72,7 @@ public class OntModelSegementationTest {
}
/*
@org.junit.Test
@Test
public void testApplicationMetadataModel() throws InsertException {
PortalDao pdao = wadf.getPortalDao();
@ -134,7 +137,7 @@ public class OntModelSegementationTest {
}
*/
@org.junit.Test
@Test
public void testTBoxModel() throws InsertException {
OntModelSelector oms = wadf.getOntModelSelector();
@ -189,7 +192,7 @@ public class OntModelSegementationTest {
}
@org.junit.Test
@Test
public void testAboxModel() throws InsertException {
OntModelSelector oms = wadf.getOntModelSelector();
@ -242,20 +245,21 @@ public class OntModelSegementationTest {
Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
}
@org.junit.Test
@Ignore
@Test
public void testConcurrency() throws InsertException {
// (new Thread(new ClassLister(wadf))).start();
// (new Thread(new ClassLister(wadf))).start();
// VClass v = null;
// for (int i = 0; i < 50; i++) {
// v = new VClass();
// v.setURI("http://example.org/vclass" + i);
// wadf.getVClassDao().insertNewVClass(v);
// }
// for (int i = 0; i < 500; i++) {
// v.setName("blah " + i);
// wadf.getVClassDao().updateVClass(v);
// }
(new Thread(new ClassLister(wadf))).start();
(new Thread(new ClassLister(wadf))).start();
VClass v = null;
for (int i = 0; i < 50; i++) {
v = new VClass();
v.setURI("http://example.org/vclass" + i);
wadf.getVClassDao().insertNewVClass(v);
}
for (int i = 0; i < 500; i++) {
v.setName("blah " + i);
wadf.getVClassDao().updateVClass(v);
}
}

7
webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
View file

@ -205,13 +205,6 @@ public class IndividualDaoStub implements IndividualDao {
"IndividualDaoStub.getKeywordObjectsForIndividual() not implemented.");
}
@Override
public String getIndividualURIFromNetId(String netIdStr,
String netidMatchingPropertyUri) {
throw new RuntimeException(
"IndividualDaoStub.getIndividualURIFromNetId() not implemented.");
}
@Override
public String getNetId(String entityURI) {
throw new RuntimeException(

98
webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java Normal file
View file

@ -0,0 +1,98 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package stubs.edu.cornell.mannlib.vitro.webapp.dao;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
/**
* TODO
*/
public class UserAccountsDaoStub implements UserAccountsDao {
private static final Log log = LogFactory.getLog(UserAccountsDaoStub.class);
private final Map<String, UserAccount> userAccountsByUri = new HashMap<String, UserAccount>();
// ----------------------------------------------------------------------
// Stub infrastructure
// ----------------------------------------------------------------------
public void addUser(UserAccount user) {
userAccountsByUri.put(user.getUri(), user);
}
// ----------------------------------------------------------------------
// Stub methods
// ----------------------------------------------------------------------
@Override
public UserAccount getUserAccountByUri(String uri) {
return userAccountsByUri.get(uri);
}
// ----------------------------------------------------------------------
// Un-implemented methods
// ----------------------------------------------------------------------
@Override
public UserAccount getUserAccountByEmail(String emailAddress) {
throw new RuntimeException(
"UserAccountsDaoStub.getUserAccountByEmail() not implemented.");
}
@Override
public boolean isRootUser(UserAccount userAccount) {
throw new RuntimeException("UserAccountsDao.isRootUser() not implemented.");
}
@Override
public String insertUserAccount(UserAccount userAccount) {
throw new RuntimeException(
"UserAccountsDaoStub.insertUserAccount() not implemented.");
}
@Override
public void updateUserAccount(UserAccount userAccount) {
throw new RuntimeException(
"UserAccountsDaoStub.updateUserAccount() not implemented.");
}
@Override
public void deleteUserAccount(String userAccountUri) {
throw new RuntimeException(
"UserAccountsDaoStub.deleteUserAccount() not implemented.");
}
@Override
public PermissionSet getPermissionSetByUri(String uri) {
throw new RuntimeException(
"UserAccountsDaoStub.getPermissionSetByUri() not implemented.");
}
@Override
public Collection<PermissionSet> getAllPermissionSets() {
throw new RuntimeException(
"UserAccountsDaoStub.getAllPermissionSets() not implemented.");
}
@Override
public UserAccount getUserAccountByExternalAuthId(String externalAuthId) {
throw new RuntimeException(
"UserAccountsDao.getUserAccountByExternalAuthId() not implemented.");
}
@Override
public Collection<UserAccount> getAllUserAccounts() {
throw new RuntimeException(
"UserAccountsDao.getAllUserAccounts() not implemented.");
}
}

83
webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserDaoStub.java
View file

@ -1,83 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package stubs.edu.cornell.mannlib.vitro.webapp.dao;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.dao.UserDao;
/**
* TODO
*/
public class UserDaoStub implements UserDao {
// ----------------------------------------------------------------------
// Stub infrastructure
// ----------------------------------------------------------------------
private final Map<String, User> userByUriMap = new HashMap<String, User>();
public void addUser(User user) {
userByUriMap.put(user.getURI(), user);
}
// ----------------------------------------------------------------------
// Stub methods
// ----------------------------------------------------------------------
@Override
public User getUserByURI(String URI) {
return userByUriMap.get(URI);
}
// ----------------------------------------------------------------------
// Un-implemented methods
// ----------------------------------------------------------------------
@Override
public User getUserByUsername(String username) {
throw new RuntimeException(
"UserDaoStub.getUserByUsername() not implemented.");
}
@Override
public List<User> getAllUsers() {
throw new RuntimeException("UserDaoStub.getAllUsers() not implemented.");
}
@Override
public void updateUser(User user) {
throw new RuntimeException("UserDaoStub.updateUser() not implemented.");
}
@Override
public String insertUser(User user) {
throw new RuntimeException("UserDaoStub.insertUser() not implemented.");
}
@Override
public void deleteUser(User user) {
throw new RuntimeException("UserDaoStub.deleteUser() not implemented.");
}
@Override
public List<String> getIndividualsUserMayEditAs(String userURI) {
throw new RuntimeException(
"UserDaoStub.getIndividualsUserMayEditAs() not implemented.");
}
@Override
public List<String> getUserAccountEmails() {
throw new RuntimeException(
"UserDaoStub.getUserAccountEmails() not implemented.");
}
@Override
public String getUserEmailAddress(String userURI) {
throw new RuntimeException(
"UserDaoStub.getUserEmailAddress() not implemented.");
}
}

19
webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
View file

@ -26,7 +26,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
import edu.cornell.mannlib.vitro.webapp.dao.UserDao;
import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
@ -45,6 +44,7 @@ public class WebappDaoFactoryStub implements WebappDaoFactory {
private IndividualDao individualDao;
private DataPropertyDao dataPropertyDao;
private ObjectPropertyDao objectPropertyDao;
private UserAccountsDao userAccountsDao;
public void setIndividualDao(IndividualDao individualDao) {
this.individualDao = individualDao;
@ -58,10 +58,8 @@ public class WebappDaoFactoryStub implements WebappDaoFactory {
this.objectPropertyDao = objectPropertyDao;
}
// TODO This goes away when the UserAccounts stuff is fully implemented -- jb
private UserDao userDao;
public void setUserDao(UserDao userDao) {
this.userDao = userDao;
public void setUserAccountsDao(UserAccountsDao userAccountsDao) {
this.userAccountsDao = userAccountsDao;
}
// ----------------------------------------------------------------------
@ -83,10 +81,9 @@ public class WebappDaoFactoryStub implements WebappDaoFactory {
return this.objectPropertyDao;
}
// TODO This goes away when the UserAccounts stuff is fully implemented -- jb
@Override
public UserDao getUserDao() {
return this.userDao;
public UserAccountsDao getUserAccountsDao() {
return this.userAccountsDao;
}
// ----------------------------------------------------------------------
@ -225,12 +222,6 @@ public class WebappDaoFactoryStub implements WebappDaoFactory {
"WebappDaoFactory.getLinktypeDao() not implemented.");
}
@Override
public UserAccountsDao getUserAccountsDao() {
throw new RuntimeException(
"WebappDaoFactory.getUserAccountsDao() not implemented.");
}
@Override
public VClassGroupDao getVClassGroupDao() {
throw new RuntimeException(