Author: olamy
Date: Tue Sep 6 21:54:42 2011
New Revision: 1165893
URL: http://svn.apache.org/viewvc?rev=1165893&view=rev
Log:
[MRM-1490] Expose Archiva services trough REST : repository group admin tru
rest service : basic unit tests
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java
- copied, changed from r1165866,
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java?rev=1165893&r1=1165892&r2=1165893&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
Tue Sep 6 21:54:42 2011
@@ -19,13 +19,18 @@ package org.apache.archiva.rest.services
*/
+import org.apache.archiva.rest.api.model.ManagedRepository;
import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
import org.apache.archiva.rest.api.services.PingService;
import org.apache.archiva.rest.api.services.RemoteRepositoriesService;
import org.apache.archiva.rest.api.services.RepositoriesService;
+import org.apache.archiva.rest.api.services.RepositoryGroupService;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
+import org.apache.maven.archiva.common.utils.FileUtil;
import org.codehaus.redback.rest.services.AbstractRestServicesTest;
+import java.io.File;
+
/**
* @author Olivier Lamy
*/
@@ -68,4 +73,16 @@ public abstract class AbstractArchivaRes
}
+
+ protected RepositoryGroupService getRepositoryGroupService()
+ {
+ return JAXRSClientFactory.create( "http://localhost:"; + port +
"/services/archivaServices/",
+ RepositoryGroupService.class );
+ }
+
+ protected ManagedRepository getTestManagedRepository()
+ {
+ String location = new File( FileUtil.getBasedir(), "target/test-repo"
).getAbsolutePath();
+ return new ManagedRepository( "TEST", "test", location, "default",
true, true, false, false, "2 * * * * ?" );
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java?rev=1165893&r1=1165892&r2=1165893&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java
Tue Sep 6 21:54:42 2011
@@ -88,10 +88,6 @@ public class ManagedRepositoriesServiceT
}
- private ManagedRepository getTestManagedRepository()
- {
- String location = new File( FileUtil.getBasedir(), "target/test-repo"
).getAbsolutePath();
- return new ManagedRepository( "TEST", "test", location, "default",
true, true, false, false, "2 * * * * ?" );
- }
+
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java?rev=1165893&r1=1165892&r2=1165893&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
Tue Sep 6 21:54:42 2011
@@ -75,7 +75,7 @@ public class RepositoriesServiceTest
}
- private ManagedRepository getTestManagedRepository()
+ protected ManagedRepository getTestManagedRepository()
{
String location = new File( FileUtil.getBasedir(), "target/test-repo"
).getAbsolutePath();
return new ManagedRepository( "TEST", "test", location, "default",
true, true, false, false, "2 * * * * ?" );
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java
(from r1165866,
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java&r1=1165866&r2=1165893&rev=1165893&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java
Tue Sep 6 21:54:42 2011
@@ -1,5 +1,4 @@
package org.apache.archiva.rest.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,65 +19,47 @@ package org.apache.archiva.rest.services
*/
import org.apache.archiva.rest.api.model.ManagedRepository;
+import org.apache.archiva.rest.api.model.RepositoryGroup;
import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
-import org.apache.archiva.rest.api.services.RepositoriesService;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
+import org.apache.archiva.rest.api.services.RepositoryGroupService;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.maven.archiva.common.utils.FileUtil;
import org.junit.Test;
-import java.io.File;
+import java.util.Arrays;
/**
* @author Olivier Lamy
*/
-public class RepositoriesServiceTest
+public class RepositoryGroupServiceTest
extends AbstractArchivaRestTest
{
-
- @Test( expected = ServerWebApplicationException.class )
- public void scanRepoKarmaFailed()
- throws Exception
- {
- RepositoriesService service = getRepositoriesService();
- try
- {
- service.scanRepository( "id", true );
- }
- catch ( ServerWebApplicationException e )
- {
- assertEquals( 403, e.getStatus() );
- throw e;
- }
- }
-
@Test
- public void scanRepo()
+ public void addAndDelete()
throws Exception
{
- RepositoriesService service = getRepositoriesService();
+ RepositoryGroupService service = getRepositoryGroupService();
WebClient.client( service ).header( "Authorization",
authorizationHeader );
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
+ assertTrue( service.getRepositoriesGroups().isEmpty() );
+
ManagedRepositoriesService managedRepositoriesService =
getManagedRepositoriesService();
WebClient.client( managedRepositoriesService ).header(
"Authorization", authorizationHeader );
- WebClient.getConfig( managedRepositoriesService
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
-
- String repoId =
managedRepositoriesService.getManagedRepositories().get( 0 ).getId();
+ WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
- assertTrue( service.scanRepository( repoId, true ) );
+ ManagedRepository managedRepository = getTestManagedRepository();
- log.info( "scanRepo call ok " );
+ managedRepositoriesService.addManagedRepository( managedRepository );
- assertTrue( service.alreadyScanning( repoId ) );
+ RepositoryGroup repositoryGroup = new RepositoryGroup( "one",
Arrays.asList( managedRepository.getId() ) );
- }
+ service.addRepositoryGroup( repositoryGroup );
+ assertFalse( service.getRepositoriesGroups().isEmpty() );
+ assertEquals( 1, service.getRepositoriesGroups().size() );
+ service.deleteRepositoryGroup( "one" );
- private ManagedRepository getTestManagedRepository()
- {
- String location = new File( FileUtil.getBasedir(), "target/test-repo"
).getAbsolutePath();
- return new ManagedRepository( "TEST", "test", location, "default",
true, true, false, false, "2 * * * * ?" );
+ assertTrue( service.getRepositoriesGroups().isEmpty() );
+ assertEquals( 0, service.getRepositoriesGroups().size() );
}
-
}
