From c9cf713fed0cc6cb88ccb32838f60e076431d258 Mon Sep 17 00:00:00 2001 From: tlw72 Date: Mon, 31 Jan 2011 21:38:29 +0000 Subject: [PATCH] NIHVIVO-1963: modified error text for temp password change --- .../vitro/webapp/controller/login/LoginProcessBean.java | 3 +-- .../mannlib/vitro/webapp/controller/edit/AuthenticateTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java index c573d34d5..28a30115e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java @@ -131,8 +131,7 @@ public class LoginProcessBean { MLevel.ERROR); public static final Message USING_OLD_PASSWORD = new Message( - "Please choose a different password from the " - + "temporary one provided initially.", MLevel.ERROR); + "Your new password cannot match the current one.", MLevel.ERROR); private final String format; private final MLevel messageLevel; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java index 90e2dba2a..c3d94254d 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java @@ -379,8 +379,7 @@ public class AuthenticateTest extends AbstractTestClass { doTheRequest(); assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG, - "Please choose a different password from the temporary " - + "one provided initially.", URL_LOGIN, URL_WITH_LINK); + "Your new password cannot match the current one.", URL_LOGIN, URL_WITH_LINK); assertRedirectToLoginProcessPage(); }