You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ra...@apache.org on 2012/04/27 16:57:04 UTC
svn commit: r1331453 [2/2] - in /rave/trunk: rave-components/rave-core/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/service/
rave-components/rave-core/src/main/jav...
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java Fri Apr 27 14:57:03 2012
@@ -19,14 +19,6 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.NewUser;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.service.UserService;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.validation.BindException;
-import org.springframework.validation.Errors;
-
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNotNull;
@@ -35,6 +27,13 @@ import static org.easymock.EasyMock.crea
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.service.UserService;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.validation.BindException;
+import org.springframework.validation.Errors;
+
/**
* Test class for {@link NewAccountValidator}
*/
@@ -54,37 +53,37 @@ public class NewAccountValidatorTest {
@Test
public void testSupports() throws Exception {
- assertTrue("Can validate org.apache.rave.portal.model.NewUser",
- newAccountValidator.supports(NewUser.class));
+ assertTrue("Can validate org.apache.rave.portal.model.User",
+ newAccountValidator.supports(User.class));
}
@Test
public void testValidate() throws Exception {
- NewUser newUser = new NewUser();
- newUser.setUsername(VALID_NAME);
- newUser.setPassword(VALID_PASSWORD);
- newUser.setConfirmPassword(VALID_PASSWORD);
- newUser.setPageLayout(VALID_PAGELAYOUT);
- newUser.setEmail(VALID_EMAIL);
- Errors errors = new BindException(newUser, NEW_USER);
+ User user = new User();
+ user.setUsername(VALID_NAME);
+ user.setPassword(VALID_PASSWORD);
+ user.setConfirmPassword(VALID_PASSWORD);
+ user.setDefaultPageLayoutCode(VALID_PAGELAYOUT);
+ user.setEmail(VALID_EMAIL);
+ Errors errors = new BindException(user, NEW_USER);
expect(mockUserService.getUserByUsername(VALID_NAME)).andReturn(null);
expect(mockUserService.getUserByEmail(VALID_EMAIL)).andReturn(null);
replay(mockUserService);
- newAccountValidator.validate(newUser, errors);
+ newAccountValidator.validate(user, errors);
assertFalse("No validation errors", errors.hasErrors());
}
@Test
- public void testValidationFailsOnEmptyNewUser() throws Exception {
- NewUser newUser = new NewUser();
- Errors errors = new BindException(newUser, NEW_USER);
+ public void testValidationFailsOnEmptyUser() throws Exception {
+ User user = new User();
+ Errors errors = new BindException(user, NEW_USER);
expect(mockUserService.getUserByUsername("")).andReturn(null);
replay(mockUserService);
- newAccountValidator.validate(newUser, errors);
+ newAccountValidator.validate(user, errors);
assertEquals("4 Validation errors", 4, errors.getErrorCount());
assertNotNull(errors.getFieldError(FIELD_USERNAME));
@@ -97,20 +96,20 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnExistingUser() throws Exception {
- NewUser newUser = new NewUser();
- newUser.setUsername("ExistingUser");
- newUser.setPassword(VALID_PASSWORD);
- newUser.setConfirmPassword(VALID_PASSWORD);
- newUser.setPageLayout(VALID_PAGELAYOUT);
- newUser.setEmail(VALID_EMAIL);
- Errors errors = new BindException(newUser, NEW_USER);
+ User user = new User();
+ user.setUsername("ExistingUser");
+ user.setPassword(VALID_PASSWORD);
+ user.setConfirmPassword(VALID_PASSWORD);
+ user.setDefaultPageLayoutCode(VALID_PAGELAYOUT);
+ user.setEmail(VALID_EMAIL);
+ Errors errors = new BindException(user, NEW_USER);
- User user = createMock(User.class);
- expect(mockUserService.getUserByUsername("ExistingUser")).andReturn(user);
+ User user1 = createMock(User.class);
+ expect(mockUserService.getUserByUsername("ExistingUser")).andReturn(user1);
expect(mockUserService.getUserByEmail(VALID_EMAIL)).andReturn(null);
replay(mockUserService);
- newAccountValidator.validate(newUser, errors);
+ newAccountValidator.validate(user, errors);
assertEquals("1 Validation error", 1, errors.getErrorCount());
assertNotNull(errors.getFieldError(FIELD_USERNAME));
@@ -118,20 +117,20 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnExistingEmail() throws Exception {
- NewUser newUser = new NewUser();
- newUser.setUsername(VALID_NAME);
- newUser.setPassword(VALID_PASSWORD);
- newUser.setConfirmPassword(VALID_PASSWORD);
- newUser.setPageLayout(VALID_PAGELAYOUT);
- newUser.setEmail("existing@localhost");
- Errors errors = new BindException(newUser, NEW_USER);
+ User user = new User();
+ user.setUsername(VALID_NAME);
+ user.setPassword(VALID_PASSWORD);
+ user.setConfirmPassword(VALID_PASSWORD);
+ user.setDefaultPageLayoutCode(VALID_PAGELAYOUT);
+ user.setEmail("existing@localhost");
+ Errors errors = new BindException(user, NEW_USER);
- User user = createMock(User.class);
+ User user1 = createMock(User.class);
expect(mockUserService.getUserByUsername(VALID_NAME)).andReturn(null);
- expect(mockUserService.getUserByEmail("existing@localhost")).andReturn(user);
+ expect(mockUserService.getUserByEmail("existing@localhost")).andReturn(user1);
replay(mockUserService);
- newAccountValidator.validate(newUser, errors);
+ newAccountValidator.validate(user, errors);
assertEquals("1 Validation error", 1, errors.getErrorCount());
assertNotNull(errors.getFieldError(FIELD_EMAIL));
@@ -140,18 +139,18 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnShortUserName() throws Exception {
- NewUser newUser = new NewUser();
- newUser.setUsername("A");
- newUser.setPassword(VALID_PASSWORD);
- newUser.setConfirmPassword(VALID_PASSWORD);
- newUser.setPageLayout(VALID_PAGELAYOUT);
- newUser.setEmail(VALID_EMAIL);
- Errors errors = new BindException(newUser, NEW_USER);
+ User user = new User();
+ user.setUsername("A");
+ user.setPassword(VALID_PASSWORD);
+ user.setConfirmPassword(VALID_PASSWORD);
+ user.setDefaultPageLayoutCode(VALID_PAGELAYOUT);
+ user.setEmail(VALID_EMAIL);
+ Errors errors = new BindException(user, NEW_USER);
expect(mockUserService.getUserByUsername("A")).andReturn(null);
expect(mockUserService.getUserByEmail(VALID_EMAIL)).andReturn(null);
replay(mockUserService);
- newAccountValidator.validate(newUser, errors);
+ newAccountValidator.validate(user, errors);
assertEquals("1 Validation error", 1, errors.getErrorCount());
assertNotNull(errors.getFieldError(FIELD_USERNAME));
@@ -159,19 +158,19 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnIllegalUsername() throws Exception {
- NewUser newUser = new NewUser();
+ User user = new User();
final String badUsername = "x'; DROP TABLE members; --";
- newUser.setUsername(badUsername);
- newUser.setPassword(VALID_PASSWORD);
- newUser.setConfirmPassword(VALID_PASSWORD);
- newUser.setPageLayout(VALID_PAGELAYOUT);
- newUser.setEmail(VALID_EMAIL);
- Errors errors = new BindException(newUser, NEW_USER);
+ user.setUsername(badUsername);
+ user.setPassword(VALID_PASSWORD);
+ user.setConfirmPassword(VALID_PASSWORD);
+ user.setDefaultPageLayoutCode(VALID_PAGELAYOUT);
+ user.setEmail(VALID_EMAIL);
+ Errors errors = new BindException(user, NEW_USER);
expect(mockUserService.getUserByUsername(badUsername)).andReturn(null);
expect(mockUserService.getUserByEmail(VALID_EMAIL)).andReturn(null);
replay(mockUserService);
- newAccountValidator.validate(newUser, errors);
+ newAccountValidator.validate(user, errors);
assertEquals("1 Validation error", 1, errors.getErrorCount());
assertNotNull(errors.getFieldError(FIELD_USERNAME));
@@ -179,18 +178,18 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnShortPassword() throws Exception {
- NewUser newUser = new NewUser();
- newUser.setUsername(VALID_NAME);
- newUser.setPassword("123");
- newUser.setConfirmPassword("123");
- newUser.setPageLayout(VALID_PAGELAYOUT);
- newUser.setEmail(VALID_EMAIL);
- Errors errors = new BindException(newUser, NEW_USER);
+ User user = new User();
+ user.setUsername(VALID_NAME);
+ user.setPassword("123");
+ user.setConfirmPassword("123");
+ user.setDefaultPageLayoutCode(VALID_PAGELAYOUT);
+ user.setEmail(VALID_EMAIL);
+ Errors errors = new BindException(user, NEW_USER);
expect(mockUserService.getUserByUsername(VALID_NAME)).andReturn(null);
expect(mockUserService.getUserByEmail(VALID_EMAIL)).andReturn(null);
replay(mockUserService);
- newAccountValidator.validate(newUser, errors);
+ newAccountValidator.validate(user, errors);
assertEquals("1 Validation error", 1, errors.getErrorCount());
assertNotNull(errors.getFieldError(FIELD_PASSWORD));
@@ -198,18 +197,18 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnNonMatchingPassword() throws Exception {
- NewUser newUser = new NewUser();
- newUser.setUsername(VALID_NAME);
- newUser.setPassword(VALID_PASSWORD);
- newUser.setConfirmPassword("doesnotmatch");
- newUser.setPageLayout(VALID_PAGELAYOUT);
- newUser.setEmail(VALID_EMAIL);
- Errors errors = new BindException(newUser, NEW_USER);
+ User user = new User();
+ user.setUsername(VALID_NAME);
+ user.setPassword(VALID_PASSWORD);
+ user.setConfirmPassword("doesnotmatch");
+ user.setDefaultPageLayoutCode(VALID_PAGELAYOUT);
+ user.setEmail(VALID_EMAIL);
+ Errors errors = new BindException(user, NEW_USER);
expect(mockUserService.getUserByUsername(VALID_NAME)).andReturn(null);
expect(mockUserService.getUserByEmail(VALID_EMAIL)).andReturn(null);
replay(mockUserService);
- newAccountValidator.validate(newUser, errors);
+ newAccountValidator.validate(user, errors);
assertEquals("1 Validation error", 1, errors.getErrorCount());
assertNotNull(errors.getFieldError(FIELD_CONFIRM_PASSWORD));
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp Fri Apr 27 14:57:03 2012
@@ -35,7 +35,7 @@
</li>
</ul>
<section class="formbox">
- <h2><fmt:message key="admin.userdetail.editdata"/></h2>
+ <h2><fmt:message key="page.login.createaccount"/></h2>
<%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
</section>
</article>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp Fri Apr 27 14:57:03 2012
@@ -60,7 +60,7 @@
<div class="control-group">
<label class="control-label" for="pageLayoutField"><fmt:message key="page.general.addpage.selectlayout"/></label>
<div class="controls">
- <form:select path="pageLayout" id="pageLayoutField">
+ <form:select path="defaultPageLayoutCode" id="pageLayoutField">
<form:option value="columns_1" id="columns_1_id"><fmt:message
key="page.general.addpage.layout.columns_1"/></form:option>
<form:option value="columns_2" id="columns_2_id"><fmt:message
@@ -88,14 +88,15 @@
<!-- Personal information optional -->
<h2><fmt:message key="page.general.personal.information"/></h2>
+
<fieldset>
<div class="control-group">
<label class="control-label" for="firstNameField"><fmt:message key="page.general.first.name"/></label>
- <div class="controls"><form:input id="firstNameField" path="firstName" autofocus="autofocus"/></div>
+ <div class="controls"><form:input id="firstNameField" path="givenName" autofocus="autofocus"/></div>
</div>
<div class="control-group">
<label class="control-label" for="lastNameField"><fmt:message key="page.general.last.name"/></label>
- <div class="controls"><form:input id="lastNameField" path="lastName" autofocus="autofocus"/></div>
+ <div class="controls"><form:input id="lastNameField" path="familyName" autofocus="autofocus"/></div>
</div>
<div class="control-group">
<label class="control-label" for="displayNameField"><fmt:message key="page.general.display.name"/></label>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp Fri Apr 27 14:57:03 2012
@@ -41,7 +41,7 @@
<c:otherwise>
- <form:form cssClass="form-horizontal well" commandName="newUser" action="newpassword" method="post">
+ <form:form cssClass="form-horizontal well" commandName="user" action="newpassword" method="post">
<fieldset>
<p><fmt:message key="form.all.fields.required"/></p>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp Fri Apr 27 14:57:03 2012
@@ -40,7 +40,7 @@
</c:when>
<c:otherwise>
- <form:form cssClass="form-horizontal well" commandName="newUser" action="retrieveusername" method="post">
+ <form:form cssClass="form-horizontal well" commandName="user" action="retrieveusername" method="post">
<fieldset>
<p><fmt:message key="form.all.fields.required"/></p>