Revision 002f394d
Added by Andreas Kohlbecker over 2 years ago
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/security/PasswordResetServiceTest.java | ||
---|---|---|
33 | 33 |
import org.subethamail.wiser.Wiser; |
34 | 34 |
import org.subethamail.wiser.WiserMessage; |
35 | 35 |
import org.unitils.dbunit.annotation.DataSet; |
36 |
import org.unitils.spring.annotation.SpringBeanByName; |
|
36 | 37 |
import org.unitils.spring.annotation.SpringBeanByType; |
37 | 38 |
|
38 | 39 |
import eu.etaxonomy.cdm.api.security.AbstractRequestTokenStore; |
39 |
import eu.etaxonomy.cdm.api.security.IPasswordResetTokenStore;
|
|
40 |
import eu.etaxonomy.cdm.api.security.IAbstractRequestTokenStore;
|
|
40 | 41 |
import eu.etaxonomy.cdm.api.security.PasswordResetRequest; |
41 | 42 |
import eu.etaxonomy.cdm.api.service.IUserService; |
42 | 43 |
import eu.etaxonomy.cdm.model.permission.User; |
... | ... | |
48 | 49 |
*/ |
49 | 50 |
public class PasswordResetServiceTest extends eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest { |
50 | 51 |
|
51 |
/** |
|
52 |
* |
|
53 |
*/ |
|
54 | 52 |
private static final double maxRequestRate = 4.0; |
55 | 53 |
|
56 | 54 |
Logger logger = Logger.getLogger(PasswordResetServiceTest.class); |
... | ... | |
73 | 71 |
@SpringBeanByType |
74 | 72 |
private IPasswordResetService passwordResetService; |
75 | 73 |
|
76 |
@SpringBeanByType
|
|
77 |
private IPasswordResetTokenStore passwordResetTokenStore;
|
|
74 |
@SpringBeanByName
|
|
75 |
private IAbstractRequestTokenStore<PasswordResetRequest> passwordResetTokenStore;
|
|
78 | 76 |
|
79 | 77 |
@SpringBeanByType |
80 | 78 |
private JavaMailSender emailSender; |
... | ... | |
173 | 171 |
// -- read email message |
174 | 172 |
WiserMessage requestMessage = wiser.getMessages().get(0); |
175 | 173 |
MimeMessage requestMimeMessage = requestMessage.getMimeMessage(); |
176 |
assertEquals(PasswordResetTemplates.RESET_REQUEST_EMAIL_SUBJECT_TEMPLATE.replace("${userName}", userName), requestMimeMessage.getSubject());
|
|
174 |
assertEquals(UserAccountEmailTemplates.RESET_REQUEST_EMAIL_SUBJECT_TEMPLATE.replace("${userName}", userName), requestMimeMessage.getSubject());
|
|
177 | 175 |
|
178 | 176 |
String messageContent = requestMimeMessage.getContent().toString(); |
179 | 177 |
// -- extract token |
... | ... | |
197 | 195 |
assertEquals(2, wiser.getMessages().size()); |
198 | 196 |
WiserMessage successMessage = wiser.getMessages().get(1); |
199 | 197 |
MimeMessage successMimeMessage = successMessage.getMimeMessage(); |
200 |
assertEquals(PasswordResetTemplates.RESET_SUCCESS_EMAIL_SUBJECT_TEMPLATE.replace("${userName}", userName), successMimeMessage.getSubject());
|
|
198 |
assertEquals(UserAccountEmailTemplates.RESET_SUCCESS_EMAIL_SUBJECT_TEMPLATE.replace("${userName}", userName), successMimeMessage.getSubject());
|
|
201 | 199 |
} |
202 | 200 |
|
203 | 201 |
@Test |
... | ... | |
297 | 295 |
passwordChangedSignal.await(); |
298 | 296 |
|
299 | 297 |
assertNotNull(assyncError); |
300 |
assertEquals(PasswordResetException.class, assyncError.getClass());
|
|
298 |
assertEquals(AccountSelfManagementException.class, assyncError.getClass());
|
|
301 | 299 |
assertEquals(0, wiser.getMessages().size()); |
302 | 300 |
} |
303 | 301 |
|
Also available in: Unified diff
fix #9497 User self registration service implemented