Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing tests

This commit is contained in:
Martin Stockhammer 2020-09-26 10:51:28 +02:00
parent 06b7ef2d39
commit aa139659ac
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeUserServiceTest.java
View File

@ -76,6 +76,10 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
.when( ).get( ).then( ).statusCode( 200 ).extract( ).response( ); .when( ).get( ).then( ).statusCode( 200 ).extract( ).response( );
assertNotNull( response ); assertNotNull( response );
List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class ); List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class );
for ( User user : userData )
{
System.out.println( user.getId( ) + " " + user.getFullName( ) );
}
assertNotNull( userData ); assertNotNull( userData );
assertEquals( 2, userData.size( ) ); assertEquals( 2, userData.size( ) );
assertEquals( Integer.valueOf( 0 ), response.body( ).jsonPath( ).get( "pagination.offset" ) ); assertEquals( Integer.valueOf( 0 ), response.body( ).jsonPath( ).get( "pagination.offset" ) );
@ -603,8 +607,8 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
{ {
String token = getAdminToken( ); String token = getAdminToken( );
given( ).spec( getRequestSpec( token ) ).contentType( JSON ) given( ).spec( getRequestSpec( token ) ).contentType( JSON )
.post( "aragorn2/password/require/set" ) .post( "aragorn2/password/require/set" )
.then( ).statusCode( 404 ); .then( ).statusCode( 404 );
} }
@Test @Test
@ -863,7 +867,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
try try
{ {
given( ).spec( getRequestSpec() ).contentType( JSON ) given( ).spec( getRequestSpec( ) ).contentType( JSON )
.when( ) .when( )
.get( "me" ) .get( "me" )
.then( ).statusCode( 401 ); .then( ).statusCode( 401 );
@ -894,7 +898,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
try try
{ {
Response response = given( ).spec( getRequestSpec(adminToken) ).contentType( JSON ) Response response = given( ).spec( getRequestSpec( adminToken ) ).contentType( JSON )
.when( ) .when( )
.post( "aragorn/cache/clear" ) .post( "aragorn/cache/clear" )
.then( ).statusCode( 200 ).extract( ).response( ); .then( ).statusCode( 200 ).extract( ).response( );
@ -928,7 +932,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
{ {
String token = getUserToken( "aragorn", "pAssw0rD" ); String token = getUserToken( "aragorn", "pAssw0rD" );
given( ).spec( getRequestSpec(token) ).contentType( JSON ) given( ).spec( getRequestSpec( token ) ).contentType( JSON )
.when( ) .when( )
.post( "admin/cache/clear" ) .post( "admin/cache/clear" )
.then( ).statusCode( 403 ); .then( ).statusCode( 403 );
@ -959,11 +963,20 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
requestMap.put( "user", userMap ); requestMap.put( "user", userMap );
requestMap.put( "applicationUrl", "http://localhost" ); requestMap.put( "applicationUrl", "http://localhost" );
given( ).spec( getRequestSpec( adminToken ) ).contentType( JSON ) try
.body( requestMap ) {
.when( ) given( ).spec( getRequestSpec( adminToken ) ).contentType( JSON )
.post( "bilbo/register" ) .body( requestMap )
.then( ).statusCode( 200 ); .when( )
.post( "bilbo/register" )
.then( ).statusCode( 200 );
}
finally
{
given( ).spec( getRequestSpec( adminToken ) ).contentType( JSON )
.delete( "bilbo" )
.then( ).statusCode( 200 );
}
} }
@Test @Test
@ -982,12 +995,12 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
userMap.put( "confirmPassword", "xxx" ); userMap.put( "confirmPassword", "xxx" );
requestMap.put( "user", userMap ); requestMap.put( "user", userMap );
requestMap.put( "applicationUrl", "http://localhost" ); requestMap.put( "applicationUrl", "http://localhost" );
given( ).spec( getRequestSpec( adminToken ) ).contentType( JSON ) given( ).spec( getRequestSpec( adminToken ) ).contentType( JSON )
.body( requestMap ) .body( requestMap )
.when( ) .when( )
.post( "bilbo/register" ) .post( "bilbo/register" )
.then( ).statusCode( 422 ); .then( ).statusCode( 422 );
} }
@Test @Test
@ -1008,12 +1021,12 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
try try
{ {
given( ).spec( getRequestSpec(null) ).contentType( JSON ) given( ).spec( getRequestSpec( null ) ).contentType( JSON )
.when( ) .when( )
.post( "aragorn/password/reset" ) .post( "aragorn/password/reset" )
.then( ).statusCode( 200 ); .then( ).statusCode( 200 );
given( ).spec( getRequestSpec(null) ).contentType( JSON ) given( ).spec( getRequestSpec( null ) ).contentType( JSON )
.when( ) .when( )
.post( "xxyy/password/reset" ) .post( "xxyy/password/reset" )
.then( ).statusCode( 404 ); .then( ).statusCode( 404 );
@ -1049,9 +1062,9 @@ public class NativeUserServiceTest extends AbstractNativeRestServices
Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON ) Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON )
.when( ) .when( )
.get( "aragorn/permissions" ) .get( "aragorn/permissions" )
.prettyPeek() .prettyPeek( )
.then( ).statusCode( 200 ).extract( ).response( ); .then( ).statusCode( 200 ).extract( ).response( );
assertEquals( 2, response.getBody( ).jsonPath().getList( "" ).size() ); assertEquals( 2, response.getBody( ).jsonPath( ).getList( "" ).size( ) );
} }

2
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/UserServiceTest.java
View File

@ -430,7 +430,7 @@ public class UserServiceTest
assertNotNull( messageContent ); assertNotNull( messageContent );
assertTrue( messageContent.contains( "Password Reset" ) ); assertTrue( messageContent.contains( "Password Reset" ) );
assertTrue( messageContent.contains( "Username: toto" ) ); assertTrue( messageContent.contains( "Username: toto" ) );
assertTrue( messageContent.contains( "http://foo.fr/bar" ) ); assertTrue( messageContent.contains( "/security/login" ) );
} }