[pollen] branch feature/adminUser updated (074e217 -> 7a80ca6)
This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git from 074e217 fix message for generate password successfull and translate message for disable user new 7a80ca6 fix create user test with generate password by the server The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7a80ca6ae1847f903a3e387bff65d7a5dd610439 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Jul 25 10:21:33 2014 +0200 fix create user test with generate password by the server Summary of changes: .../services/service/PollenUserServiceTest.java | 41 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git commit 7a80ca6ae1847f903a3e387bff65d7a5dd610439 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Jul 25 10:21:33 2014 +0200 fix create user test with generate password by the server --- .../services/service/PollenUserServiceTest.java | 41 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java index 80df789..ca53b96 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java @@ -25,11 +25,14 @@ package org.chorem.pollen.services.service; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.PollenUser; +import org.chorem.pollen.persistence.entity.PollenUsers; import org.chorem.pollen.services.AbstractPollenServiceTest; import org.chorem.pollen.services.bean.PaginationResultBean; +import org.chorem.pollen.services.bean.PollenEntityId; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.bean.PollenUserBean; import org.chorem.pollen.services.service.security.PollenAuthenticationException; +import org.chorem.pollen.services.service.security.PollenInvalidEmailActivationTokenException; import org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException; import org.junit.Assert; import org.junit.Before; @@ -110,7 +113,8 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { newUser.setEmail("pollen@pollen.org"); try { - service.createUser(newUser, true); + // no generate password + service.createUser(newUser, false); Assert.fail(); } catch (InvalidFormException e) { // no password @@ -118,7 +122,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { } newUser.setPassword("password"); - PollenEntityRef<PollenUser> savedUser = service.createUser(newUser, true); + PollenEntityRef<PollenUser> savedUser = service.createUser(newUser, false); Assert.assertNotNull(savedUser); Assert.assertNotNull(savedUser.getEntityId()); @@ -126,7 +130,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { newUser2.setEmail("pollen@pollen.org"); try { - service.createUser(newUser2, true); + service.createUser(newUser2, false); Assert.fail(); } catch (InvalidFormException e) { // no password @@ -137,7 +141,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { newUser2.setPassword("password"); try { - service.createUser(newUser2, true); + service.createUser(newUser2, false); Assert.fail(); } catch (InvalidFormException e) { // not available email @@ -145,9 +149,36 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { } newUser2.setEmail("pollen2@pollen.org"); - PollenEntityRef<PollenUser> savedUser2 = service.createUser(newUser2, true); + PollenEntityRef<PollenUser> savedUser2 = service.createUser(newUser2, false); Assert.assertNotNull(savedUser2); Assert.assertNotNull(savedUser2.getEntityId()); + + // generate password by the server + PollenUserBean newUser3 = new PollenUserBean(); + + try { + service.createUser(newUser3, true); + Assert.fail(); + } catch (InvalidFormException e) { + // null email + assertErrorKeyFound(e, "email"); + } + + newUser3.setEmail("pollen@pollen.org"); + + try { + service.createUser(newUser3, true); + Assert.fail(); + } catch (InvalidFormException e) { + // not available email + assertErrorKeyFound(e, "email"); + } + + newUser3.setEmail("pollen3@pollen.org"); + + PollenEntityId<PollenUser> savedUser3 = service.createUser(newUser3, true); + Assert.assertNotNull(savedUser3); + Assert.assertNotNull(savedUser3.getEntityId()); } @Test -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm