Author: olamy
Date: Fri May 25 12:32:40 2012
New Revision: 1342594
URL: http://svn.apache.org/viewvc?rev=1342594&view=rev
Log:
test passing no url still work
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java?rev=1342594&r1=1342593&r2=1342594&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
Fri May 25 12:32:40 2012
@@ -180,6 +180,65 @@ public class UserServiceTest
}
@Test
+ public void registerNoUrl()
+ throws Exception
+ {
+ try
+ {
+ UserService service = getUserService();
+ User u = new User();
+ u.setFullName( "the toto" );
+ u.setUsername( "toto" );
+ u.setEmail( "[email protected]" );
+ u.setPassword( "toto123" );
+ u.setConfirmPassword( "toto123" );
+ String key = service.registerUser( new UserRegistrationRequest( u,
null ) ).getKey();
+
+ assertFalse( key.equals( "-1" ) );
+
+ ServicesAssert assertService =
+ JAXRSClientFactory.create( "http://localhost:"; + port + "/" +
getRestServicesPath() + "/testsService/",
+ ServicesAssert.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
+
+ List<EmailMessage> emailMessages =
assertService.getEmailMessageSended();
+ assertEquals( 1, emailMessages.size() );
+ assertEquals( "[email protected]", emailMessages.get( 0 ).getTos().get(
0 ) );
+
+ assertEquals( "Welcome", emailMessages.get( 0 ).getSubject() );
+ String messageContent = emailMessages.get( 0 ).getText();
+
+ log.info( "messageContent: {}", messageContent );
+
+ assertThat( messageContent ).contains( "Use the following URL to
validate your account." ).contains(
+ "http://localhost:"; + port ).containsIgnoringCase( "toto" );
+
+ assertTrue( service.validateUserFromKey( key ) );
+
+ service = getUserService( authorizationHeader );
+
+ u = service.getUser( "toto" );
+
+ assertNotNull( u );
+ assertTrue( u.isValidated() );
+ assertTrue( u.isPasswordChangeRequired() );
+
+ assertTrue( service.validateUserFromKey( key ) );
+
+ }
+ catch ( Exception e )
+ {
+ log.error( e.getMessage(), e );
+ throw e;
+ }
+ finally
+ {
+ getUserService( authorizationHeader ).deleteUser( "toto" );
+ }
+
+ }
+
+ @Test
public void resetPassword()
throws Exception
{
