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 [1/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...
Author: raminder
Date: Fri Apr 27 14:57:03 2012
New Revision: 1331453
URL: http://svn.apache.org/viewvc?rev=1331453&view=rev
Log:
removed NewUser model and change all the services to use User model. RAVE-511
Removed:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/NewUser.java
Modified:
rave/trunk/rave-components/rave-core/pom.xml
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp
Modified: rave/trunk/rave-components/rave-core/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/pom.xml?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/pom.xml (original)
+++ rave/trunk/rave-components/rave-core/pom.xml Fri Apr 27 14:57:03 2012
@@ -53,7 +53,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<!-- Shindig -->
<dependency>
<groupId>org.apache.shindig</groupId>
@@ -72,7 +72,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
@@ -183,8 +183,7 @@
<version>1.2</version>
<configuration>
<includes>org/apache/rave/portal/model/*.class</includes>
- <excludes>org/apache/rave/portal/model/NewUser.class,
- org/apache/rave/portal/model/WidgetStatus.class</excludes>
+ <excludes>org/apache/rave/portal/model/WidgetStatus.class</excludes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
</configuration>
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java Fri Apr 27 14:57:03 2012
@@ -98,11 +98,14 @@ public class User extends Person impleme
@ManyToOne
@JoinColumn(name="default_page_layout_id")
- private PageLayout defaultPageLayout;
+ private PageLayout defaultPageLayout;
@Transient
private String confirmPassword;
+ @Transient
+ private String defaultPageLayoutCode;
+
@ManyToMany(fetch = FetchType.EAGER)
@JoinTable(name = "user_authorities",
joinColumns =
@@ -213,7 +216,7 @@ public class User extends Person impleme
*
* @return <code>true</code> if the user's is not expired valid (ie non-expired), <code>false</code> if no longer valid
*/
- //REVIEW NOTE: Conflating Account and Credential (non)expiration seems likely to cause confusion at some point.
+ //REVIEW NOTE: Conflating Account and Credential (non)expiration seems likely to cause confusion at some point.
@Override
public boolean isAccountNonExpired() {
return isCredentialsNonExpired();
@@ -275,22 +278,21 @@ public class User extends Person impleme
public void setDefaultPageLayout(PageLayout defaultPageLayout) {
this.defaultPageLayout = defaultPageLayout;
- }
-
- public String getConfirmPassword() {
- //confirmPassword is not stored persistently, so if the value is not set,
- //return the password instead. This will need to be as secure as the password
- //field itself.
- if (confirmPassword != null && confirmPassword.length() > 0) {
- return confirmPassword;
- } else {
- return password;
- }
}
- public void setConfirmPassword(String confirmPassword) {
- this.confirmPassword = confirmPassword;
- }
+ /**
+ * @return the confirmPassword
+ */
+ public String getConfirmPassword() {
+ return confirmPassword;
+ }
+
+ /**
+ * @param confirmPassword the confirmPassword to set
+ */
+ public void setConfirmPassword(String confirmPassword) {
+ this.confirmPassword = confirmPassword;
+ }
@PreRemove
public void preRemove() {
@@ -350,7 +352,7 @@ public class User extends Person impleme
/**
* Conversion function to create a new Person object based off of this User class. This is useful for when you
* have a User object and want to pass on the Person data without the User class data (like password, etc)
- *
+ *
* @return a Person object representing the data contained in this class
*/
public Person toPerson() {
@@ -373,4 +375,12 @@ public class User extends Person impleme
p.setUsername(this.getUsername());
return p;
}
+
+ public String getDefaultPageLayoutCode() {
+ return defaultPageLayoutCode;
+ }
+
+ public void setDefaultPageLayoutCode(String defaultPageLayoutCode) {
+ this.defaultPageLayoutCode = defaultPageLayoutCode;
+ }
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java Fri Apr 27 14:57:03 2012
@@ -19,15 +19,15 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.NewUser;
+import org.apache.rave.portal.model.User;
public interface NewAccountService {
/**
* Creates a new account using several other Rave services.
*
- * @param newUser the {@link NewUser} from which a new {@link org.apache.rave.portal.model.User} can be created
+ * @param newUser the {@link User} from which a new {@link org.apache.rave.portal.model.User} can be created
* @throws Exception in case something goes wrong
*/
- public void createNewAccount(NewUser newUser) throws Exception;
+ public void createNewAccount(User newUser) throws Exception;
}
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java Fri Apr 27 14:57:03 2012
@@ -21,7 +21,6 @@ package org.apache.rave.portal.service;
import java.util.List;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.Person;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
@@ -122,25 +121,25 @@ public interface UserService extends Use
/**
* Sends an email which contains link for changing user password
*
- * @param user the {@link org.apache.rave.portal.model.NewUser} which requested password change
+ * @param user the {@link org.apache.rave.portal.model.User} which requested password change
*/
- void sendPasswordReminder(NewUser user);
+ void sendPasswordReminder(User user);
/**
* Sends an email which contains username
*
- * @param user the {@link org.apache.rave.portal.model.NewUser} which requested username reminder
+ * @param user the {@link org.apache.rave.portal.model.User} which requested username reminder
*/
- void sendUserNameReminder(NewUser user);
+ void sendUserNameReminder(User user);
/**
* Changes password for given user
*
- * @param user the {@link org.apache.rave.portal.model.NewUser} which requested password change
+ * @param user the {@link org.apache.rave.portal.model.User} which requested password change
* @throws Exception in case something goes wrong
*/
- void updatePassword(NewUser user);
+ void updatePassword(User user);
/**
* Check if username/email reminder request is still valid (not expired)
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java Fri Apr 27 14:57:03 2012
@@ -20,7 +20,6 @@
package org.apache.rave.portal.service.impl;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.AuthorityService;
import org.apache.rave.portal.service.NewAccountService;
@@ -37,7 +36,7 @@ public class DefaultNewAccountService im
private final PageLayoutService pageLayoutService;
private final AuthorityService authorityService;
- @Autowired
+ @Autowired
private PasswordEncoder passwordEncoder;
@Autowired
@@ -50,21 +49,21 @@ public class DefaultNewAccountService im
}
@Override
- public void createNewAccount(NewUser newUser) throws Exception {
+ public void createNewAccount(User newUser) throws Exception {
final String userName = newUser.getUsername();
final String password = newUser.getPassword();
- final String defaultPageLayoutCode = newUser.getPageLayout();
+ final String defaultPageLayoutCode = newUser.getDefaultPageLayoutCode();
final String email = newUser.getEmail();
-
+
//capture optional fields
- final String givenName = newUser.getFirstName();
- final String familyName = newUser.getLastName();
+ final String givenName = newUser.getGivenName();
+ final String familyName = newUser.getFamilyName();
final String displayName = newUser.getDisplayName();
final String status = newUser.getStatus();
final String aboutMe = newUser.getAboutMe();
throwExceptionIfUserExists(userName, email);
-
+
User user = new User();
//set the required fields
user.setUsername(userName);
@@ -75,17 +74,17 @@ public class DefaultNewAccountService im
user.setExpired(false);
user.setLocked(false);
user.setEnabled(true);
- user.setDefaultPageLayout(pageLayoutService.getPageLayoutByCode(defaultPageLayoutCode));
+ user.setDefaultPageLayout(pageLayoutService.getPageLayoutByCode(defaultPageLayoutCode));
user.setAuthorities(authorityService.getDefaultAuthorities().getResultSet());
-
+
//set the optional fields
user.setGivenName(givenName);
user.setFamilyName(familyName);
user.setDisplayName(displayName);
user.setStatus(status);
user.setAboutMe(aboutMe);
-
- userService.registerNewUser(user);
+
+ userService.registerNewUser(user);
}
private void throwExceptionIfUserExists(String userName, String email) {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Fri Apr 27 14:57:03 2012
@@ -20,13 +20,24 @@
package org.apache.rave.portal.service.impl;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.PageType;
import org.apache.rave.portal.model.Person;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
-import org.apache.rave.portal.repository.*;
+import org.apache.rave.portal.repository.PageRepository;
+import org.apache.rave.portal.repository.PageTemplateRepository;
+import org.apache.rave.portal.repository.UserRepository;
+import org.apache.rave.portal.repository.WidgetCommentRepository;
+import org.apache.rave.portal.repository.WidgetRatingRepository;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.service.EmailService;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -46,8 +57,6 @@ import org.springframework.security.cryp
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
-
/**
*
*/
@@ -269,7 +278,7 @@ public class DefaultUserService implemen
}
@Override
- public void updatePassword(NewUser newUser) {
+ public void updatePassword(User newUser) {
log.debug("Changing password for user {}", newUser);
User user = userRepository.getByForgotPasswordHash(newUser.getForgotPasswordHash());
if (user == null) {
@@ -286,7 +295,7 @@ public class DefaultUserService implemen
@Override
- public void sendUserNameReminder(NewUser newUser) {
+ public void sendUserNameReminder(User newUser) {
log.debug("Calling send username {}", newUser);
User user = userRepository.getByUserEmail(newUser.getEmail());
if (user == null) {
@@ -301,7 +310,7 @@ public class DefaultUserService implemen
@Override
- public void sendPasswordReminder(NewUser newUser) {
+ public void sendPasswordReminder(User newUser) {
log.debug("Calling send password change link for user {}", newUser);
User user = userRepository.getByUserEmail(newUser.getEmail());
if (user == null) {
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java Fri Apr 27 14:57:03 2012
@@ -19,8 +19,17 @@
package org.apache.rave.portal.service.impl;
+import static junit.framework.Assert.fail;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.PageLayout;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
@@ -36,16 +45,6 @@ import org.springframework.security.core
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.test.util.ReflectionTestUtils;
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.Assert.fail;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
/**
* Test class for {@link org.apache.rave.portal.service.impl.DefaultNewAccountService}
*/
@@ -65,7 +64,7 @@ public class DefaultNewAccountServiceTes
private PageLayout validPageLayout;
private SearchResult<Authority> validAuthoritySearchResult;
private List<Authority> validAuthorityList;
-
+
private final Logger logger = LoggerFactory.getLogger(DefaultNewAccountServiceTest.class);
@Before
@@ -77,32 +76,32 @@ public class DefaultNewAccountServiceTes
authorityService = createMock(AuthorityService.class);
newAccountService = new DefaultNewAccountService(userService, pageLayoutService, authorityService);
-
+
validPageLayout = new PageLayout();
validPageLayout.setEntityId(99L);
validPageLayout.setNumberOfRegions(4L);
validPageLayout.setCode(VALID_LAYOUT_CODE);
-
+
Authority role1 = new Authority();
role1.setAuthority("DEFAULT_ROLE1");
Authority role2 = new Authority();
role2.setAuthority("DEFAULT_ROLE2");
-
+
validAuthorityList = new ArrayList<Authority>();
validAuthorityList.add(role1);
validAuthorityList.add(role2);
- validAuthoritySearchResult = new SearchResult<Authority>(validAuthorityList, validAuthorityList.size());
- }
-
+ validAuthoritySearchResult = new SearchResult<Authority>(validAuthorityList, validAuthorityList.size());
+ }
+
@Test
public void createNewAccountTest() throws Exception {
- NewUser newUser = new NewUser();
+ User newUser = new User();
newUser.setUsername(VALID_USER);
newUser.setPassword(VALID_PASSWORD);
newUser.setConfirmPassword(VALID_PASSWORD);
newUser.setEmail(VALID_EMAIL);
- newUser.setPageLayout(VALID_LAYOUT_CODE);
-
+ newUser.setDefaultPageLayoutCode(VALID_LAYOUT_CODE);
+
User expectedUser = new User();
expectedUser.setUsername(newUser.getUsername());
expectedUser.setPassword(newUser.getPassword());
@@ -110,32 +109,32 @@ public class DefaultNewAccountServiceTes
expectedUser.setDefaultPageLayout(validPageLayout);
expectedUser.setExpired(false);
expectedUser.setLocked(false);
- expectedUser.setEnabled(true);
+ expectedUser.setEnabled(true);
ReflectionTestUtils.setField(newAccountService, "passwordEncoder", passwordEncoder);
expect(passwordEncoder.encode("valid.password")).andReturn("valid.password");
expect(userService.getUserByUsername(VALID_USER)).andReturn(null);
- expect(userService.getUserByEmail(VALID_EMAIL)).andReturn(null);
- expect(pageLayoutService.getPageLayoutByCode(VALID_LAYOUT_CODE)).andReturn(validPageLayout);
+ expect(userService.getUserByEmail(VALID_EMAIL)).andReturn(null);
+ expect(pageLayoutService.getPageLayoutByCode(VALID_LAYOUT_CODE)).andReturn(validPageLayout);
expect(authorityService.getDefaultAuthorities()).andReturn(validAuthoritySearchResult);
- userService.registerNewUser(expectedUser);
- expectLastCall();
+ userService.registerNewUser(expectedUser);
+ expectLastCall();
replay(userDetails, passwordEncoder, userService, pageLayoutService, authorityService);
-
+
newAccountService.createNewAccount(newUser);
-
+
verify(userDetails, passwordEncoder, userService, pageLayoutService);
}
@Test
public void createNewAccountTest_blankEmail() throws Exception {
- NewUser newUser = new NewUser();
+ User newUser = new User();
newUser.setUsername(VALID_USER);
newUser.setPassword(VALID_PASSWORD);
newUser.setConfirmPassword(VALID_PASSWORD);
newUser.setEmail("");
- newUser.setPageLayout(VALID_LAYOUT_CODE);
+ newUser.setDefaultPageLayoutCode(VALID_LAYOUT_CODE);
User expectedUser = new User();
expectedUser.setUsername(newUser.getUsername());
@@ -165,7 +164,7 @@ public class DefaultNewAccountServiceTes
@Test
public void failedAccountCreationTest_duplicateUsername() throws Exception {
String duplicateUserName = "duplicateUserName";
- NewUser newUser = new NewUser();
+ User newUser = new User();
newUser.setUsername(duplicateUserName);
User existingUser = new User();
existingUser.setUsername(duplicateUserName);
@@ -184,7 +183,7 @@ public class DefaultNewAccountServiceTes
@Test
public void failedAccountCreationTest_duplicateEmail() throws Exception {
String duplicateEmail = "duplicateEmail";
- NewUser newUser = new NewUser();
+ User newUser = new User();
newUser.setUsername("newUser");
newUser.setEmail(duplicateEmail);
User existingUser = new User();
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java Fri Apr 27 14:57:03 2012
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.NewUser;
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -65,18 +65,18 @@ public class ChangePasswordController {
@RequestMapping(value = {"/changepassword/{passwordHash:.*}"}, method = RequestMethod.GET)
public String initialize(Model model, @PathVariable("passwordHash") String passwordHash) {
log.debug("Requesting user for hash: {}", passwordHash);
- NewUser user = new NewUser();
- model.addAttribute(ModelKeys.NEW_USER, user);
+ User user = new User();
+ model.addAttribute(ModelKeys.USER, user);
user.setForgotPasswordHash(passwordHash);
return ViewNames.PASSWORD_CHANGE;
}
@RequestMapping(value = {"/changepassword", "/changepassword/**"}, method = RequestMethod.POST)
- public String update(@ModelAttribute NewUser newUser, BindingResult results, Model model, RedirectAttributes redirectAttributes) {
- log.debug("updating user password for hash {}", newUser.getForgotPasswordHash());
- model.addAttribute(ModelKeys.NEW_USER, newUser);
- passwordValidator.validate(newUser, results);
+ public String update(@ModelAttribute User user, BindingResult results, Model model, RedirectAttributes redirectAttributes) {
+ log.debug("updating user password for hash {}", user.getForgotPasswordHash());
+ model.addAttribute(ModelKeys.USER, user);
+ passwordValidator.validate(user, results);
if (results.hasErrors()) {
log.info("changepassword, request contains validation errors");
@@ -84,7 +84,7 @@ public class ChangePasswordController {
}
try {
log.debug("Submitted passwords were valid");
- userService.updatePassword(newUser);
+ userService.updatePassword(user);
redirectAttributes.addFlashAttribute(ModelKeys.REDIRECT_MESSAGE, messagePasswordChanged);
return ViewNames.REDIRECT_LOGIN ;
} catch (Exception ex) {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java Fri Apr 27 14:57:03 2012
@@ -19,7 +19,9 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.NewUser;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -38,8 +40,6 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import javax.servlet.http.HttpServletRequest;
-
@Controller
public class NewAccountController {
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -63,11 +63,11 @@ public class NewAccountController {
public void setUpForm(ModelMap model, HttpServletRequest request) {
logger.debug("Initializing form");
model.addAttribute(ModelKeys.CAPTCHA_HTML, captchaService.createHtml(request));
- model.addAttribute(ModelKeys.NEW_USER, new NewUser());
+ model.addAttribute(ModelKeys.NEW_USER, new User());
}
@RequestMapping(value = {"/newaccount", "/newaccount/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute NewUser newUser, BindingResult results, Model model, HttpServletRequest request, RedirectAttributes redirectAttributes) {
+ public String create(@ModelAttribute(value = "newUser") User newUser, BindingResult results, Model model, HttpServletRequest request, RedirectAttributes redirectAttributes) {
logger.debug("Creating a new user account");
model.addAttribute(ModelKeys.NEW_USER, newUser);
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java Fri Apr 27 14:57:03 2012
@@ -19,7 +19,9 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.NewUser;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -37,8 +39,6 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import javax.servlet.http.HttpServletRequest;
-
/**
* Handles password ans username reminder requests
*
@@ -65,7 +65,7 @@ public class ReminderController {
@RequestMapping(value = {"/retrieveusername", "/newpassword"})
public void initialize(ModelMap model, HttpServletRequest request) {
model.addAttribute(ModelKeys.CAPTCHA_HTML, captchaService.createHtml(request));
- model.addAttribute(ModelKeys.NEW_USER, new NewUser());
+ model.addAttribute(ModelKeys.USER, new User());
}
@@ -73,15 +73,15 @@ public class ReminderController {
* Processes username requests
*/
@RequestMapping(value = {"/retrieveusername"}, method = RequestMethod.POST)
- public String requestUsername(@ModelAttribute NewUser newUser, BindingResult results, Model model,
+ public String requestUsername(@ModelAttribute User user, BindingResult results, Model model,
HttpServletRequest request, RedirectAttributes redirectAttributes) {
log.debug("Requesting username reminder");
- if (!validateEmail(newUser, results, model, request)) {
+ if (!validateEmail(user, results, model, request)) {
return captchaRequest(model, request, ViewNames.USERNAME_REQUEST);
}
try {
- userService.sendUserNameReminder(newUser);
- populateRedirect(newUser, redirectAttributes);
+ userService.sendUserNameReminder(user);
+ populateRedirect(user, redirectAttributes);
return ViewNames.REDIRECT_RETRIEVE_USERNAME;
} catch (Exception e) {
if (log.isDebugEnabled()) {
@@ -97,15 +97,15 @@ public class ReminderController {
* Processes new password requests
*/
@RequestMapping(value = {"/newpassword"}, method = RequestMethod.POST)
- public String requestPassword(@ModelAttribute NewUser newUser, BindingResult results, Model model,
+ public String requestPassword(@ModelAttribute User user, BindingResult results, Model model,
HttpServletRequest request, RedirectAttributes redirectAttributes) {
log.debug("Requesting password reminder");
- if (!validateEmail(newUser, results, model, request)) {
+ if (!validateEmail(user, results, model, request)) {
return captchaRequest(model, request, ViewNames.NEW_PASSWORD_REQUEST);
}
try {
- userService.sendPasswordReminder(newUser);
- populateRedirect(newUser, redirectAttributes);
+ userService.sendPasswordReminder(user);
+ populateRedirect(user, redirectAttributes);
return ViewNames.REDIRECT_NEW_PASSWORD;
} catch (Exception e) {
if (log.isDebugEnabled()) {
@@ -119,15 +119,15 @@ public class ReminderController {
}
- private boolean validateEmail(NewUser newUser, BindingResult results, Model model, HttpServletRequest request) {
- model.addAttribute(ModelKeys.NEW_USER, newUser);
- passwordValidator.validate(newUser, results);
+ private boolean validateEmail(User user, BindingResult results, Model model, HttpServletRequest request) {
+ model.addAttribute(ModelKeys.USER, user);
+ passwordValidator.validate(user, results);
if (results.hasErrors()) {
log.info("newpassword request contains validation errors");
return false;
}
- String email = newUser.getEmail();
+ String email = user.getEmail();
log.debug("Submitted email {} is valid", email);
if (!captchaService.isValid(request)) {
log.debug("Captcha was invalid for user with email {}", email);
@@ -137,7 +137,7 @@ public class ReminderController {
}
- private void populateRedirect(NewUser newUser, RedirectAttributes redirectAttributes) {
+ private void populateRedirect(User newUser, RedirectAttributes redirectAttributes) {
redirectAttributes.addFlashAttribute("success", true);
redirectAttributes.addFlashAttribute("email", newUser.getEmail());
}
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java Fri Apr 27 14:57:03 2012
@@ -19,8 +19,14 @@
package org.apache.rave.portal.web.controller.admin;
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.DEFAULT_PAGE_SIZE;
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.addNavigationMenusToModel;
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.checkTokens;
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.isDeleteOrUpdate;
+
+import java.beans.PropertyEditorSupport;
+
import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.PortalPreference;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
@@ -53,13 +59,6 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.support.SessionStatus;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import java.beans.PropertyEditorSupport;
-
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.DEFAULT_PAGE_SIZE;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.addNavigationMenusToModel;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.checkTokens;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.isDeleteOrUpdate;
-
/**
* Admin controller to manipulate User data
*/
@@ -136,12 +135,13 @@ public class UserController {
}
@RequestMapping(value = "/admin/userdetail/update", method = RequestMethod.POST)
- public String updateUserDetail(@ModelAttribute("user") User user, BindingResult result,
+ public String updateUserDetail(@ModelAttribute User user, BindingResult result,
@ModelAttribute(ModelKeys.TOKENCHECK) String sessionToken,
@RequestParam() String token,
ModelMap modelMap,
SessionStatus status) {
checkTokens(sessionToken, token, status);
+ user.setConfirmPassword(user.getPassword());
userProfileValidator.validate(user, result);
if (result.hasErrors()) {
AdminControllerUtil.addNavigationMenusToModel(SELECTED_ITEM, (Model) modelMap);
@@ -154,7 +154,7 @@ public class UserController {
}
@RequestMapping(value = "/admin/userdetail/delete", method = RequestMethod.POST)
- public String deleteUserDetail(@ModelAttribute("user") User user,
+ public String deleteUserDetail(@ModelAttribute User user,
@ModelAttribute(ModelKeys.TOKENCHECK) String sessionToken,
@RequestParam String token,
@RequestParam(required = false) String confirmdelete,
@@ -176,13 +176,13 @@ public class UserController {
public String setUpForm(ModelMap model) {
logger.debug("Initializing new account form");
AdminControllerUtil.addNavigationMenusToModel(SELECTED_ITEM, (Model) model);
- model.addAttribute(ModelKeys.NEW_USER, new NewUser());
+ model.addAttribute(ModelKeys.NEW_USER, new User());
return ViewNames.ADMIN_NEW_ACCOUNT;
}
@RequestMapping(value = {"/admin/newaccount", "/admin/newaccount/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute NewUser newUser, BindingResult results, Model model,
+ public String create(@ModelAttribute(value = "newUser") User newUser, BindingResult results, Model model,
RedirectAttributes redirectAttributes) {
logger.debug("Creating a new user account");
model.addAttribute(ModelKeys.NEW_USER, newUser);
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java Fri Apr 27 14:57:03 2012
@@ -19,9 +19,10 @@
package org.apache.rave.portal.web.security;
+import java.util.Collection;
+
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
@@ -31,8 +32,6 @@ import org.springframework.security.core
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.ldap.userdetails.UserDetailsContextMapper;
-import java.util.Collection;
-
/**
* Mapping class between a Rave User and LDAP user
*/
@@ -87,7 +86,7 @@ public class LdapUserDetailsContextMappe
}
private void createRaveUserFromLdapInfo(DirContextOperations ctx, String username) {
- NewUser newUser = new NewUser();
+ User newUser = new User();
newUser.setUsername(username);
if (!ctx.attributeExists(mailAttributeName) || StringUtils.isBlank(ctx.getStringAttribute(mailAttributeName))) {
@@ -99,7 +98,7 @@ public class LdapUserDetailsContextMappe
newUser.setDisplayName(ctx.getStringAttribute(displayNameAttributeName));
}
newUser.setPassword(RandomStringUtils.random(16));
- newUser.setPageLayout(pageLayoutCode);
+ newUser.setDefaultPageLayoutCode(pageLayoutCode);
try {
newAccountService.createNewAccount(newUser);
} catch (Exception e) {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java Fri Apr 27 14:57:03 2012
@@ -38,6 +38,7 @@ public class ModelKeys {
public static final String REFERRING_PAGE_ID = "referringPageId";
public static final String OPENSOCIAL_ENVIRONMENT = "openSocialEnv";
public static final String NEW_USER = "newUser"; //a new user instance created
+ public static final String USER = "user"; //a new user instance created
public static final String USER_PROFILE = "userProfile";
public static final String SEARCH_TERM = "searchTerm";
public static final String OFFSET = "offset";
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java Fri Apr 27 14:57:03 2012
@@ -19,8 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.NewUser;
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +49,7 @@ public class ChangePasswordValidator ext
@Override
public void validate(Object target, Errors errors) {
log.debug("ChangePasswordValidator validator called");
- NewUser newUser = (NewUser) target;
+ User newUser = (User) target;
boolean validHash = getUserService().isValidReminderRequest(newUser.getForgotPasswordHash(), minutesValid);
if (!validHash) {
errors.rejectValue(FIELD_PASSWORD, "page.changepassword.expired");
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java Fri Apr 27 14:57:03 2012
@@ -18,9 +18,11 @@
*/
package org.apache.rave.portal.web.validator;
+import java.util.regex.Pattern;
+
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
-import org.apache.rave.portal.model.NewUser;
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,8 +32,6 @@ import org.springframework.validation.Er
import org.springframework.validation.ObjectError;
import org.springframework.validation.Validator;
-import java.util.regex.Pattern;
-
@Component
public class NewAccountValidator implements Validator {
@@ -52,12 +52,12 @@ public class NewAccountValidator impleme
}
public boolean supports(Class<?> aClass) {
- return NewUser.class.isAssignableFrom(aClass);
+ return User.class.isAssignableFrom(aClass);
}
public void validate(Object obj, Errors errors) {
logger.debug("Validator called");
- NewUser newUser = (NewUser) obj;
+ User newUser = (User) obj;
validateUsername(errors, newUser);
validatePassword(errors, newUser);
@@ -67,7 +67,7 @@ public class NewAccountValidator impleme
writeResultToLog(errors);
}
- private void validateUsername(Errors errors, NewUser newUser) {
+ private void validateUsername(Errors errors, User newUser) {
final String username = newUser.getUsername();
if (StringUtils.isBlank(username)) {
errors.rejectValue(FIELD_USERNAME, "username.required");
@@ -85,7 +85,7 @@ public class NewAccountValidator impleme
return userService.getUserByUsername(username) != null;
}
- protected void validatePassword(Errors errors, NewUser newUser) {
+ protected void validatePassword(Errors errors, User newUser) {
if (StringUtils.isBlank(newUser.getPassword())) {
errors.rejectValue(FIELD_PASSWORD, "password.required");
logger.info("Password required");
@@ -95,7 +95,7 @@ public class NewAccountValidator impleme
}
}
- protected void validateConfirmPassword(Errors errors, NewUser newUser) {
+ protected void validateConfirmPassword(Errors errors, User newUser) {
if (StringUtils.isBlank(newUser.getConfirmPassword())) {
errors.rejectValue(FIELD_CONFIRM_PASSWORD, "confirmPassword.required");
logger.info("Confirm Password required");
@@ -105,7 +105,7 @@ public class NewAccountValidator impleme
}
}
- private boolean isConfirmPasswordDifferentThanPassword(NewUser newUser) {
+ private boolean isConfirmPasswordDifferentThanPassword(User newUser) {
return !(newUser.getConfirmPassword().equals(newUser.getPassword()));
}
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java Fri Apr 27 14:57:03 2012
@@ -20,7 +20,6 @@
package org.apache.rave.portal.web.validator;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -48,7 +47,7 @@ public class NewPasswordValidator extend
@Override
public void validate(Object target, Errors errors) {
log.debug("Password validator called");
- NewUser newUser = (NewUser) target;
+ User newUser = (User) target;
// we only check for existing (and valid) email
String email = newUser.getEmail();
validateEmail(errors, email);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java Fri Apr 27 14:57:03 2012
@@ -19,7 +19,13 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.NewUser;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -32,12 +38,6 @@ import org.springframework.validation.Bi
import org.springframework.validation.DirectFieldBindingResult;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
/**
* @version "$Id$"
*/
@@ -71,30 +71,30 @@ public class ChangePasswordControllerTes
public void testUpdate() throws Exception {
final Model model = createNiceMock(Model.class);
RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- NewUser newUser = new NewUser();
+ User newUser = new User();
replay(redirectAttributes);
replay(model);
- BindingResult results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
+ BindingResult results = new DirectFieldBindingResult(newUser, ModelKeys.USER);
String viewName = controller.update(newUser, results, model, redirectAttributes);
assertThat(viewName, CoreMatchers.equalTo(ViewNames.PASSWORD_CHANGE));
assertThat(results.hasErrors(), CoreMatchers.equalTo(true));
assertThat(results.getErrorCount(), CoreMatchers.equalTo(2));
// invalid password, to short:
newUser.setPassword("123");
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
+ results = new DirectFieldBindingResult(newUser, ModelKeys.USER);
controller.update(newUser, results, model, redirectAttributes);
assertEquals("Expected password errors", 2, results.getErrorCount());
assertEquals("Expected password errors", "password.invalid.length", results.getFieldError().getCode());
// missing password confirm:
newUser.setPassword("1234");
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
+ results = new DirectFieldBindingResult(newUser, ModelKeys.USER);
controller.update(newUser, results, model, redirectAttributes);
assertEquals("Expected password errors", 1, results.getErrorCount());
assertEquals("Expected password errors", "confirmPassword.required", results.getFieldError().getCode());
// password confirm not equal:
newUser.setPassword("1234");
newUser.setConfirmPassword("12345");
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
+ results = new DirectFieldBindingResult(newUser, ModelKeys.USER);
controller.update(newUser, results, model, redirectAttributes);
assertEquals("Expected password errors", 1, results.getErrorCount());
assertEquals("Expected password errors", "confirmPassword.mismatch", results.getFieldError().getCode());
@@ -102,7 +102,7 @@ public class ChangePasswordControllerTes
// ok request
newUser.setPassword("1234");
newUser.setConfirmPassword("1234");
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
+ results = new DirectFieldBindingResult(newUser, ModelKeys.USER);
controller.update(newUser, results, model, redirectAttributes);
assertEquals("Expected password errors", 0, results.getErrorCount());
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java Fri Apr 27 14:57:03 2012
@@ -19,7 +19,14 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.NewUser;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.NewAccountService;
@@ -38,14 +45,6 @@ import org.springframework.validation.Bi
import org.springframework.validation.ObjectError;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.assertThat;
-
/**
* This is a test class for NewAccountController, which is used to make new user accounts through
@@ -60,7 +59,7 @@ public class NewAccountControllerTest {
private MockHttpServletRequest request;
private RedirectAttributes redirectAttributes;
private UserService userService;
-
+
@Before
public void setup() {
newAccountService = createNiceMock(NewAccountService.class);
@@ -71,60 +70,60 @@ public class NewAccountControllerTest {
captchaService = new ReCaptchaService(false, null, null, false, "error message");
newAccountController = new NewAccountController(newAccountService, newAccountValidator, captchaService);
}
-
+
@Test
- public void setUpForm_ShouldAddAttributeForNewUser() {
+ public void setUpForm_ShouldAddAttributeForUser() {
final ModelMap model = new ModelMap();
- String newUser = new String(ModelKeys.NEW_USER);
+ String User = new String(ModelKeys.NEW_USER);
newAccountController.setUpForm(model, request);
-
+
//assert that the model is not null
assertThat(model, CoreMatchers.notNullValue());
-
+
//assert that the model size is two
assertThat(model.size(), CoreMatchers.equalTo(2));
-
- //assert that the model does contain an attribute associated with newUser after setUpForm() is called
- assertThat(model.containsAttribute(newUser), CoreMatchers.equalTo(true));
-
+
+ //assert that the model does contain an attribute associated with User after setUpForm() is called
+ assertThat(model.containsAttribute(User), CoreMatchers.equalTo(true));
+
//assert that the model does not contain new user as null
- assertThat(model.get(newUser), CoreMatchers.notNullValue());
+ assertThat(model.get(User), CoreMatchers.notNullValue());
}
-
+
@Test
public void create_UsernameNotSpecified() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = ""; //no username specified
final String password = "password";
final String confirmPassword = password;
List<ObjectError> errorList = new ArrayList<ObjectError>();
final ObjectError error = new ObjectError("username.required", "Username required");
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
errorList.add(error);
-
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
assertThat(errorList.get(0).getDefaultMessage(), CoreMatchers.equalTo("Username required"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_UsernameAlreadyExists() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "canonical"; //specified username already exists in database
final String password = "password";
@@ -132,84 +131,84 @@ public class NewAccountControllerTest {
final User existingUser = new User();
List<ObjectError> errorList = new ArrayList<ObjectError>();
final ObjectError error = new ObjectError("username.exists", "Username already exists");
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
existingUser.setUsername(username);
existingUser.setPassword(password);
-
+
errorList.add(error);
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
-
+
expect(userService.getUserByUsername(username)).andReturn(existingUser).anyTimes();
replay(userService);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
assertThat(errorList.get(0).getDefaultMessage(), CoreMatchers.equalTo("Username already exists"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_InvalidUsernameLength() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "u"; //username length less than 2 characters
final String password = "password";
final String confirmPassword = password;
List<ObjectError> errorList = new ArrayList<ObjectError>();
final ObjectError error = new ObjectError("username.invalid.length", "Username must be atleast 2 characters long");
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
errorList.add(error);
-
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
assertThat(errorList.get(0).getDefaultMessage(), CoreMatchers.equalTo("Username must be atleast 2 characters long"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_PasswordNotSpecified() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
- final String username = "username";
+ final String username = "username";
final String password = ""; //password not specified
final String confirmPassword = password;
List<ObjectError> errorList = new ArrayList<ObjectError>();
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
errorList.add(new ObjectError("password.required", "Password required"));
errorList.add(new ObjectError("confirmPassword.required", "Confirm password required"));
-
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(2));
@@ -217,144 +216,144 @@ public class NewAccountControllerTest {
assertThat(errorList.get(1).getDefaultMessage(), CoreMatchers.equalTo("Confirm password required"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_ConfirmPasswordNotSpecified() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
- final String username = "usename";
+ final String username = "usename";
final String password = "pasword";
final String confirmPassword = ""; //confirm password not specified
List<ObjectError> errorList = new ArrayList<ObjectError>();
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
errorList.add(new ObjectError("confirmPassword.required", "Confirm password required"));
-
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
assertThat(errorList.get(0).getDefaultMessage(), CoreMatchers.equalTo("Confirm password required"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_InvalidPasswordLength() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
- final String username = "usename";
+ final String username = "usename";
final String password = "pas"; //invalid length password
final String confirmPassword = password;
List<ObjectError> errorList = new ArrayList<ObjectError>();
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
errorList.add(new ObjectError("password.invalid.length", "Password must be atleast 4 characters long"));
-
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
assertThat(errorList.get(0).getDefaultMessage(), CoreMatchers.equalTo("Password must be atleast 4 characters long"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_PasswordMismatchCaseOne() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
- final String username = "username";
+ final String username = "username";
final String password = "password";
final String confirmPassword = "passwor"; //confirm password not of same length as password
List<ObjectError> errorList = new ArrayList<ObjectError>();
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
errorList.add(new ObjectError("confirmPassword.mismatch", "Password mismatch"));
-
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
assertThat(errorList.get(0).getDefaultMessage(), CoreMatchers.equalTo("Password mismatch"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_PasswordMismatchCaseTwo() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
- final String username = "username";
+ final String username = "username";
final String password = "password";
final String confirmPassword = "passwodr"; //confirm password mistyped
List<ObjectError> errorList = new ArrayList<ObjectError>();
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
errorList.add(new ObjectError("confirmPassword.mismatch", "Password mismatch"));
-
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
assertThat(errorList.get(0).getDefaultMessage(), CoreMatchers.equalTo("Password mismatch"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_BlankFormSubmitted() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = ""; //Username not specified
final String password = ""; //Password not specified
final String confirmPassword = ""; //Confirm password not specified
List<ObjectError> errorList = new ArrayList<ObjectError>();
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
errorList.add(new ObjectError("username.required", "Username required"));
errorList.add(new ObjectError("password.required", "Password required"));
errorList.add(new ObjectError("confirmPassword.required", "Confirm password required"));
-
- expect(errors.hasErrors()).andReturn(true).anyTimes();
+
+ expect(errors.hasErrors()).andReturn(true).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
replay(model);
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(3));
@@ -363,26 +362,26 @@ public class NewAccountControllerTest {
assertThat(errorList.get(2).getDefaultMessage(), CoreMatchers.equalTo("Confirm password required"));
assertThat(result, CoreMatchers.equalTo(ViewNames.NEW_ACCOUNT));
}
-
+
@Test
public void create_ValidFormSubmitted() {
final Model model = createNiceMock(Model.class);
- final NewUser newUser = new NewUser();
+ final User User = new User();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username"; //Username not specified
final String password = "password"; //Password not specified
final String confirmPassword = password; //Confirm password not specified
List<ObjectError> errorList = new ArrayList<ObjectError>();
-
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
-
- expect(errors.hasErrors()).andReturn(false).anyTimes();
+
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+
+ expect(errors.hasErrors()).andReturn(false).anyTimes();
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
-
- String result = new String(newAccountController.create(newUser, errors, model, request, redirectAttributes));
+
+ String result = new String(newAccountController.create(User, errors, model, request, redirectAttributes));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(0));
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java Fri Apr 27 14:57:03 2012
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.NewUser;
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.impl.ReCaptchaService;
@@ -71,10 +71,10 @@ public class ReminderControllerTest {
controller.initialize(model, request);
assertThat(model, CoreMatchers.notNullValue());
// captcha & user mode should be
- assertEquals("Expected Captcha and NewUser model", 2, model.size());
- assertThat(model.containsAttribute(ModelKeys.NEW_USER), CoreMatchers.equalTo(true));
+ assertEquals("Expected Captcha and User model", 2, model.size());
+ assertThat(model.containsAttribute(ModelKeys.USER), CoreMatchers.equalTo(true));
assertThat(model.containsAttribute(ModelKeys.CAPTCHA_HTML), CoreMatchers.equalTo(true));
- assertThat(model.get(ModelKeys.NEW_USER), CoreMatchers.notNullValue());
+ assertThat(model.get(ModelKeys.USER), CoreMatchers.notNullValue());
assertThat(model.get(ModelKeys.CAPTCHA_HTML), CoreMatchers.notNullValue());
assertThat(captchaService.isValid(request), CoreMatchers.equalTo(true));
@@ -83,51 +83,51 @@ public class ReminderControllerTest {
@Test
public void testCreate() throws Exception {
Model model = createNiceMock(Model.class);
- NewUser newUser = new NewUser();
- BindingResult results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
+ User User = new User();
+ BindingResult results = new DirectFieldBindingResult(User, ModelKeys.USER);
RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
replay(redirectAttributes);
replay(model);
// user part
// required email
- controller.requestUsername(newUser, results, model, request, redirectAttributes);
+ controller.requestUsername(User, results, model, request, redirectAttributes);
assertThat(captchaService.isValid(request), CoreMatchers.equalTo(true));
assertEquals("Expected email errors", 1, results.getErrorCount());
assertEquals("Expected email errors", "email.required", results.getFieldError().getCode());
// invalid email
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
- newUser.setEmail("test_email");
- controller.requestUsername(newUser, results, model, request, redirectAttributes);
+ results = new DirectFieldBindingResult(User, ModelKeys.USER);
+ User.setEmail("test_email");
+ controller.requestUsername(User, results, model, request, redirectAttributes);
assertEquals("Expected email errors", "email.invalid", results.getFieldError().getCode());
// does not exists
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
- newUser.setEmail("test@mail.com");
- String viewResult = controller.requestUsername(newUser, results, model, request, redirectAttributes);
+ results = new DirectFieldBindingResult(User, ModelKeys.USER);
+ User.setEmail("test@mail.com");
+ String viewResult = controller.requestUsername(User, results, model, request, redirectAttributes);
assertEquals("Expected email errors", 1, results.getErrorCount());
assertEquals("Expected email errors", "email.doesnot.exist", results.getFieldError().getCode());
assertThat(viewResult, CoreMatchers.equalTo(ViewNames.USERNAME_REQUEST));
// password part:
model = createNiceMock(Model.class);
- newUser = new NewUser();
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
+ User = new User();
+ results = new DirectFieldBindingResult(User, ModelKeys.USER);
redirectAttributes = createNiceMock(RedirectAttributes.class);
replay(redirectAttributes);
replay(model);
// required email
- controller.requestPassword(newUser, results, model, request, redirectAttributes);
+ controller.requestPassword(User, results, model, request, redirectAttributes);
assertThat(captchaService.isValid(request), CoreMatchers.equalTo(true));
assertEquals("Expected email errors", 1, results.getErrorCount());
assertEquals("Expected email errors", "email.required", results.getFieldError().getCode());
// invalid email
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
- newUser.setEmail("test_email");
- controller.requestPassword(newUser, results, model, request, redirectAttributes);
+ results = new DirectFieldBindingResult(User, ModelKeys.USER);
+ User.setEmail("test_email");
+ controller.requestPassword(User, results, model, request, redirectAttributes);
assertEquals("Expected email errors", "email.invalid", results.getFieldError().getCode());
// does not exists
- results = new DirectFieldBindingResult(newUser, ModelKeys.NEW_USER);
- newUser.setEmail("test@mail.com");
- viewResult = controller.requestPassword(newUser, results, model, request, redirectAttributes);
+ results = new DirectFieldBindingResult(User, ModelKeys.USER);
+ User.setEmail("test@mail.com");
+ viewResult = controller.requestPassword(User, results, model, request, redirectAttributes);
assertEquals("Expected email errors", 1, results.getErrorCount());
assertEquals("Expected email errors", "email.doesnot.exist", results.getFieldError().getCode());
assertThat(viewResult, CoreMatchers.equalTo(ViewNames.NEW_PASSWORD_REQUEST));
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java?rev=1331453&r1=1331452&r2=1331453&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java Fri Apr 27 14:57:03 2012
@@ -19,8 +19,20 @@
package org.apache.rave.portal.web.controller.admin;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
@@ -41,19 +53,6 @@ import org.springframework.validation.Bi
import org.springframework.web.bind.support.SessionStatus;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
/**
* Test for {@link UserController}
*/
@@ -116,7 +115,7 @@ public class UserControllerTest {
String adminUserDetailView = controller.viewUserDetail(userid, model);
verify(userService);
-
+
assertEquals(ViewNames.ADMIN_USERDETAIL, adminUserDetailView);
assertTrue(model.containsAttribute(TABS));
assertEquals(user, model.asMap().get("user"));
@@ -130,7 +129,7 @@ public class UserControllerTest {
final String email = "john.doe.sr@example.net";
User user = new User(userid, "john.doe.sr");
user.setPassword("secrect");
- user.setConfirmPassword(user.getConfirmPassword());
+ user.setConfirmPassword("secrect");
user.setEmail(email);
final BindingResult errors = new BeanPropertyBindingResult(user, "user");
@@ -246,34 +245,34 @@ public class UserControllerTest {
final String viewName = controller.setUpForm(modelMap);
assertEquals(ViewNames.ADMIN_NEW_ACCOUNT, viewName);
assertTrue(modelMap.containsAttribute(TABS));
- assertTrue(modelMap.get(ModelKeys.NEW_USER) instanceof NewUser);
+ assertTrue(modelMap.get(ModelKeys.NEW_USER) instanceof User);
}
@Test
public void create_ValidFormSubmitted() throws Exception {
final Model model = createNiceMock(Model.class);
final RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- final NewUser newUser = new NewUser();
- final BindingResult errors = new BeanPropertyBindingResult(newUser, ModelKeys.NEW_USER);
+ final User User = new User();
+ final BindingResult errors = new BeanPropertyBindingResult(User, ModelKeys.NEW_USER);
final String username = "username";
final String password = "password";
- final String email = "newuser@example.com";
+ final String email = "User@example.com";
final String confirmPassword = password;
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
- newUser.setEmail(email);
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+ User.setEmail(email);
expect(userService.getUserByUsername(username)).andReturn(null);
expect(userService.getUserByEmail(email)).andReturn(null);
- newAccountService.createNewAccount(newUser);
+ newAccountService.createNewAccount(User);
expectLastCall();
replay(userService, model, newAccountService, redirectAttributes);
- String result = controller.create(newUser, errors, model, redirectAttributes);
+ String result = controller.create(User, errors, model, redirectAttributes);
verify(userService, model, newAccountService, redirectAttributes);
assertFalse(errors.hasErrors());
@@ -283,23 +282,23 @@ public class UserControllerTest {
public void create_EmptyForm() throws Exception {
final Model model = createNiceMock(Model.class);
final RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- final NewUser newUser = new NewUser();
- final BindingResult errors = new BeanPropertyBindingResult(newUser, ModelKeys.NEW_USER);
+ final User User = new User();
+ final BindingResult errors = new BeanPropertyBindingResult(User, ModelKeys.NEW_USER);
final String username = "";
final String password = "";
final String email = "";
final String confirmPassword = password;
- newUser.setUsername(username);
- newUser.setPassword(password);
- newUser.setConfirmPassword(confirmPassword);
- newUser.setEmail(email);
+ User.setUsername(username);
+ User.setPassword(password);
+ User.setConfirmPassword(confirmPassword);
+ User.setEmail(email);
- newAccountService.createNewAccount(newUser);
+ newAccountService.createNewAccount(User);
replay(model);
- String result = controller.create(newUser, errors, model, redirectAttributes);
+ String result = controller.create(User, errors, model, redirectAttributes);
verify(model);
assertTrue(errors.hasErrors());