This is an automated email from the git hooks/post-receive script. New commit to branch feature/spgeed in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 34c91488657aa3ea76d1e48d17902b9307ddd6ce Author: Killian <killian.herbreteau@epitech.eu> Date: Tue Oct 29 16:43:10 2019 +0100 correcting PollenUserServiceTest (display error | comment error type) --- .../chorem/pollen/services/AbstractPollenServiceTest.java | 3 ++- .../pollen/services/service/PollenUserServiceTest.java | 14 +++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java index ad495f7e..bedb4bc0 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java @@ -33,6 +33,7 @@ import org.chorem.pollen.services.test.FakePollenServiceContext; import org.junit.After; import org.junit.Assert; import org.junit.Rule; +import org.omg.PortableInterceptor.SYSTEM_EXCEPTION; import java.util.Locale; @@ -77,7 +78,7 @@ public abstract class AbstractPollenServiceTest { protected void assertErrorKeyFound(InvalidFormException e, String... keys) { Multimap<String, String> errors = e.getErrors(); - Assert.assertEquals("Expected " + keys.length + " errors, but had " + errors.keySet(), keys.length, errors.keySet().size()); + Assert.assertEquals("Expected " + keys.length + " errors, but had " + errors.keySet().size(), keys.length, errors.keySet().size()); for (String key : keys) { Assert.assertTrue("Expected error:" + key + ", but not found among:" + errors.keySet(), errors.containsKey(key)); 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 80c4d071..7fd1c152 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 @@ -21,15 +21,12 @@ package org.chorem.pollen.services.service; * #L% */ +import com.google.common.base.Preconditions; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.PollenUserEmailAddress; 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.bean.PollenUserEmailAddressBean; +import org.chorem.pollen.services.bean.*; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.chorem.pollen.services.service.security.PollenDefaultEmailAddressException; import org.chorem.pollen.services.service.security.PollenEmailNotValidatedException; @@ -90,8 +87,8 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { try { service.getUser("pollen_user_tony_" + System.nanoTime()); - - } catch (TopiaNoResultException e) { + Assert.fail("Should throw an error"); + } catch (TopiaNoResultException | IllegalArgumentException e) { Assert.assertTrue(true); } @@ -124,7 +121,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { try { // no name // no generate password - // unauthorized email + // unauthorized email pattern service.createUser(newUser); Assert.fail(); } catch (InvalidFormException e) { @@ -266,7 +263,6 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { service.removeEmailAddress(savedUser.getEntityId(), lastEmailAddress.getEntityId()); savedUser = service.getUser(savedUser.getEntityId()); Assert.assertEquals(2, savedUser.getEmailAddresses().size()); - } protected void setEmails(PollenUserBean user, String ... emailAddresses) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.