Author: olamy
Date: Fri Sep 9 14:40:15 2011
New Revision: 1167223
URL: http://svn.apache.org/viewvc?rev=1167223&view=rev
Log:
[MRM-1490] REST services : more unit test for LegacyArtifactPath and
LegacyArtifactPath
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java?rev=1167223&r1=1167222&r2=1167223&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
Fri Sep 9 14:40:15 2011
@@ -92,8 +92,12 @@ public class DefaultArchivaAdministratio
public RepositoryScanning getRepositoryScanning()
throws RepositoryAdminException
{
- return new BeanReplicator().replicateBean(
getArchivaConfiguration().getConfiguration().getRepositoryScanning(),
- RepositoryScanning.class );
+
+ RepositoryScanning repositoryScanning =
+ new BeanReplicator().replicateBean(
getArchivaConfiguration().getConfiguration().getRepositoryScanning(),
+ RepositoryScanning.class )
+
+ return repositoryScanning;
}
public void addFileTypePattern( String fileTypeId, String pattern,
AuditInformation auditInformation )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java?rev=1167223&r1=1167222&r2=1167223&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
Fri Sep 9 14:40:15 2011
@@ -18,6 +18,7 @@ package org.apache.archiva.rest.services
* under the License.
*/
+import net.sf.beanlib.provider.BeanTransformer;
import net.sf.beanlib.provider.replicator.BeanReplicator;
import org.apache.archiva.admin.repository.RepositoryAdminException;
import org.apache.archiva.admin.repository.admin.ArchivaAdministration;
@@ -97,8 +98,25 @@ public class DefaultArchivaAdministratio
{
try
{
- return new BeanReplicator().replicateBean(
archivaAdministration.getRepositoryScanning(),
-
RepositoryScanning.class );
+ BeanTransformer beanTransformer = new BeanTransformer()
+ {
+ @Override
+ protected <T> T createToInstance( Object from, Class<T>
toClass )
+ throws InstantiationException, IllegalAccessException,
SecurityException, NoSuchMethodException
+ {
+ if ( from.getClass().equals(
org.apache.maven.archiva.configuration.FileType.class ) )
+ {
+ return (T) new FileType();
+ }
+ return super.createToInstance( from, toClass );
+ }
+ };
+ BeanReplicator beanReplicator = new BeanReplicator(
beanTransformer );
+
+ RepositoryScanning repositoryScanning =
+ beanReplicator.replicateBean(
archivaAdministration.getRepositoryScanning(), RepositoryScanning.class );
+
+ return repositoryScanning;
}
catch ( RepositoryAdminException e )
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.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/ArchivaAdministrationServiceTest.java?rev=1167223&r1=1167222&r2=1167223&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
Fri Sep 9 14:40:15 2011
@@ -18,8 +18,12 @@ package org.apache.archiva.rest.services
* under the License.
*/
+import org.apache.archiva.rest.api.model.FileType;
+import org.apache.archiva.rest.api.model.LegacyArtifactPath;
import org.junit.Test;
+import java.util.Arrays;
+
/**
* @author Olivier Lamy
*/
@@ -33,4 +37,36 @@ public class ArchivaAdministrationServic
assertNotNull(
getArchivaAdministrationService().getLegacyArtifactPaths() );
assertFalse(
getArchivaAdministrationService().getLegacyArtifactPaths().isEmpty() );
}
+
+ @Test
+ public void addAndDeleteLegacyPath()
+ throws Exception
+ {
+ int initialSize =
getArchivaAdministrationService().getLegacyArtifactPaths().size();
+ LegacyArtifactPath legacyArtifactPath = new LegacyArtifactPath();
+ legacyArtifactPath.setArtifact( "foo" );
+ legacyArtifactPath.setPath( "bar" );
+ getArchivaAdministrationService().addLegacyArtifactPath(
legacyArtifactPath );
+ assertEquals( initialSize + 1,
getArchivaAdministrationService().getLegacyArtifactPaths().size() );
+
+ getArchivaAdministrationService().deleteLegacyArtifactPath( "bar" );
+ assertEquals( initialSize,
getArchivaAdministrationService().getLegacyArtifactPaths().size() );
+ }
+
+ @Test
+ public void addAndDeleteFileType()
+ throws Exception
+ {
+ int initialSize =
getArchivaAdministrationService().getRepositoryScanning().getFileTypes().size();
+ FileType fileType = new FileType();
+ fileType.setId( "foo" );
+ fileType.setPatterns( Arrays.asList( "foo", "bar" ) );
+ getArchivaAdministrationService().addFileType( fileType );
+ assertEquals( initialSize + 1,
+
getArchivaAdministrationService().getRepositoryScanning().getFileTypes().size()
);
+
+ assertNotNull( getArchivaAdministrationService().getFileType( "foo" )
);
+ assertEquals( Arrays.asList( "foo", "bar" ),
+ getArchivaAdministrationService().getFileType( "foo"
).getPatterns() );
+ }
}
