Author: fdesbois Date: 2012-04-16 13:26:30 +0200 (Mon, 16 Apr 2012) New Revision: 3275 Url: http://chorem.org/repositories/revision/pollen/3275 Log: improve assertion for email Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-13 18:14:05 UTC (rev 3274) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-16 11:26:30 UTC (rev 3275) @@ -117,19 +117,23 @@ // ---- VERIFY ---- // PollenEmail result = emailQueue.readEmail(); - Assert.assertEquals("bob@toto.fr", result.getTo()); - - // TODO-fdesbois-2012-04-13 : check email subject and content + assertEmail("bob@toto.fr", result); UserAccount userUpdated = getEntityById(UserAccount.class, userId); Assert.assertNotNull(userUpdated); String encodedPassword = userService.encodePassword("password"); Assert.assertEquals(encodedPassword, userUpdated.getPassword()); } + + protected void assertEmail(String to, PollenEmail email) { + Assert.assertEquals(to, email.getTo()); + Assert.assertFalse(email.getContent().contains("null")); + Assert.assertFalse(email.getSubject().contains("null")); + } /** - * Mock to avoid sending emails. It uses a queue instead to allow tests - * to retrieve emails and check them. Use {@link #readEmail()} to read + * Mock to avoid sending emails. It uses a queue instead of smtp to allow + * tests to retrieve emails and check them. Use {@link #readEmail()} to read * the current email (FIFO). */ public class EmailServiceQueueMock extends EmailService {