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

NIHVIVO-2279 Remove username from LoginStatusBean

Browse source
This commit is contained in:
j2blake 2011-06-06 15:47:56 +00:00
parent ccb6cc549d
commit 6f67a4da86
7 changed files with 54 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,8 +152,7 @@ public class AuthenticatorStub extends Authenticator {
recordedLogins.add(username);
User user = getUserByUsername(username);
LoginStatusBean lsb = new LoginStatusBean(user.getURI(), username,
authSource);
LoginStatusBean lsb = new LoginStatusBean(user.getURI(), authSource);
LoginStatusBean.setBean(request.getSession(), lsb);
}

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

@ -416,7 +416,7 @@ public class AuthenticateTest extends AbstractTestClass {
@Test
public void alreadyLoggedIn() {
LoginStatusBean statusBean = new LoginStatusBean(OLD_DBA_URI,
OLD_DBA_NAME, AuthenticationSource.INTERNAL);
AuthenticationSource.INTERNAL);
LoginStatusBean.setBean(session, statusBean);
setRequestFromLoginLink(URL_WITH_LINK);

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

@ -71,11 +71,11 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
boolean expectedResult;
public String getUsername() {
public String getUserUri() {
if (loginStatus == null) {
return "nobody";
} else {
return loginStatus.getUsername();
return loginStatus.getUserURI();
}
}
@ -170,7 +170,7 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
private static LoginStatusBean loginStatusBean(User user,
AuthenticationSource auth) {
return new LoginStatusBean(user.getURI(), user.getUsername(), auth);
return new LoginStatusBean(user.getURI(), auth);
}
private static final VClass PUBLIC_VCLASS = vClass("PUBLIC_vclass",
@ -568,7 +568,7 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
@Override
public String describeTest() {
String message = "IndividualTest, login=" + getRoleLevel() + "("
+ getUsername() + ")";
+ getUserUri() + ")";
if (individual == null) {
message += ", individual=null";
} else {
@ -596,7 +596,7 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
@Override
public String describeTest() {
String message = "VClassTest, login=" + getRoleLevel() + "("
+ getUsername() + ")";
+ getUserUri() + ")";
if (vClass == null) {
message += ", vClass=null";
} else {
@ -624,7 +624,7 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
@Override
public String describeTest() {
String message = "DataPropertyTest, login=" + getRoleLevel() + "("
+ getUsername() + ")";
+ getUserUri() + ")";
if (dataProperty == null) {
message += ", dataProperty=null";
} else {
@ -652,7 +652,7 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
@Override
public String describeTest() {
String message = "ObjectPropertyTest, login=" + getRoleLevel()
+ "(" + getUsername() + ")";
+ "(" + getUserUri() + ")";
if (objectProperty == null) {
message += ", objectProperty=null";
} else {
@ -695,7 +695,7 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
@Override
public String describeTest() {
String message = "DataPropertyStatementTest, login="
+ getRoleLevel() + "(" + getUsername() + ")";
+ getRoleLevel() + "(" + getUserUri() + ")";
if (subject == null) {
message += ", subject=null";
@ -752,7 +752,7 @@ public class HiddenFromDisplayBelowRoleLevelFilterTest extends
@Override
public String describeTest() {
String message = "ObjectPropertyStatementTest, login="
+ getRoleLevel() + "(" + getUsername() + ")";
+ getRoleLevel() + "(" + getUserUri() + ")";
if (subject == null) {
message += ", subject=null";