Author: olamy
Date: Fri Jun 29 06:58:39 2012
New Revision: 1355247
URL: http://svn.apache.org/viewvc?rev=1355247&view=rev
Log:
avoid failing on cleaning test repo in unit tests: jackrabbit fail if deleting
a repo with stale items
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/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=1355247&r1=1355246&r2=1355247&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
Fri Jun 29 06:58:39 2012
@@ -21,6 +21,7 @@ package org.apache.archiva.rest.services
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.common.utils.FileUtil;
+import org.apache.archiva.redback.rest.services.AbstractRestServicesTest;
import org.apache.archiva.rest.api.services.ArchivaAdministrationService;
import org.apache.archiva.rest.api.services.BrowseService;
import org.apache.archiva.rest.api.services.CommonServices;
@@ -38,7 +39,6 @@ import org.apache.commons.lang.StringUti
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
-import org.apache.archiva.redback.rest.services.AbstractRestServicesTest;
import org.junit.Before;
import javax.ws.rs.core.MediaType;
@@ -344,13 +344,29 @@ public abstract class AbstractArchivaRes
if ( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( TARGET_REPO_ID ) != null )
{
- getManagedRepositoriesService( authorizationHeader
).deleteManagedRepository( TARGET_REPO_ID, true );
- assertNull( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( TARGET_REPO_ID ) );
+ try
+ {
+ getManagedRepositoriesService( authorizationHeader
).deleteManagedRepository( TARGET_REPO_ID, true );
+ assertNull(
+ getManagedRepositoriesService( authorizationHeader
).getManagedRepository( TARGET_REPO_ID ) );
+ }
+ catch ( Exception e )
+ {
+ log.warn( "skip issue while cleaning test repository: this can
cause test failure", e );
+ }
}
if ( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( SOURCE_REPO_ID ) != null )
{
- getManagedRepositoriesService( authorizationHeader
).deleteManagedRepository( SOURCE_REPO_ID, true );
- assertNull( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( SOURCE_REPO_ID ) );
+ try
+ {
+ getManagedRepositoriesService( authorizationHeader
).deleteManagedRepository( SOURCE_REPO_ID, true );
+ assertNull(
+ getManagedRepositoriesService( authorizationHeader
).getManagedRepository( SOURCE_REPO_ID ) );
+ }
+ catch ( Exception e )
+ {
+ log.warn( "skip issue while cleaning test repository: this can
cause test failure", e );
+ }
}
}
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=1355247&r1=1355246&r2=1355247&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
Fri Jun 29 06:58:39 2012
@@ -383,7 +383,6 @@ public class RepositoriesServiceTest
repositoriesService.deleteArtifact( artifact );
-
artifacts =
browseService.getArtifactDownloadInfos(
"org.apache.archiva.redback.components", "spring-quartz",
"2.0-SNAPSHOT",
SNAPSHOT_REPO_ID );
@@ -425,8 +424,7 @@ public class RepositoriesServiceTest
getManagedRepositoriesService( authorizationHeader
).deleteManagedRepository( SNAPSHOT_REPO_ID, true );
assertNull( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( SNAPSHOT_REPO_ID ) );
}
- ManagedRepository managedRepository =
- getTestManagedRepository( SNAPSHOT_REPO_ID, "repo-with-snapshots"
);
+ ManagedRepository managedRepository = getTestManagedRepository(
SNAPSHOT_REPO_ID, "repo-with-snapshots" );
/*managedRepository.setId( SNAPSHOT_REPO_ID );
managedRepository.setLocation( );
managedRepository.setCronExpression( "* * * * * ?" );*/
@@ -442,8 +440,16 @@ public class RepositoriesServiceTest
if ( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( SNAPSHOT_REPO_ID ) != null )
{
- getManagedRepositoriesService( authorizationHeader
).deleteManagedRepository( SNAPSHOT_REPO_ID, true );
- assertNull( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( SNAPSHOT_REPO_ID ) );
+ try
+ {
+ getManagedRepositoriesService( authorizationHeader
).deleteManagedRepository( SNAPSHOT_REPO_ID, true );
+ assertNull(
+ getManagedRepositoriesService( authorizationHeader
).getManagedRepository( SNAPSHOT_REPO_ID ) );
+ }
+ catch ( Exception e )
+ {
+ log.warn( "skip issue while cleaning test repository: this can
cause test failure", e );
+ }
}
}
