Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

optimize io consume by not deleting/copying artifacts for all tests 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197181 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-11-03 15:19:21 +00:00
parent d3fe5410c7
commit 44885020d8
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
View File

@ -87,8 +87,9 @@ public class NexusIndexerConsumer
@Inject
public NexusIndexerConsumer(
@Named( value = "archivaTaskScheduler#indexing" ) ArchivaTaskScheduler<ArtifactIndexingTask> scheduler,
@Named(value = "archivaConfiguration") ArchivaConfiguration configuration, FileTypes filetypes, PlexusSisuBridge plexusSisuBridge,
MavenIndexerUtils mavenIndexerUtils, ManagedRepositoryAdmin managedRepositoryAdmin )
@Named( value = "archivaConfiguration" ) ArchivaConfiguration configuration, FileTypes filetypes,
PlexusSisuBridge plexusSisuBridge, MavenIndexerUtils mavenIndexerUtils,
ManagedRepositoryAdmin managedRepositoryAdmin )
throws PlexusSisuBridgeException
{
this.configuration = configuration;

57
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
View File

@ -53,7 +53,7 @@ public class SearchServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}
File targetRepo = createAndIndexRepo( testRepoId );
createAndIndexRepo( testRepoId );
SearchService searchService = getSearchService( authorizationHeader );
@ -68,7 +68,7 @@ public class SearchServiceTest
artifacts.size() == 6 );
log.info( "artifacts for commons-logging size {} search {}", artifacts.size(), artifacts );
deleteTestRepo( testRepoId, targetRepo );
deleteTestRepo( testRepoId );
}
@Test
@ -83,7 +83,7 @@ public class SearchServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}
File targetRepo = createAndIndexRepo( testRepoId );
createAndIndexRepo( testRepoId );
// START SNIPPET: searchservice-artifact-versions
SearchService searchService = getSearchService( authorizationHeader );
@ -97,7 +97,7 @@ public class SearchServiceTest
artifacts.size() == 13 );
log.info( "artifacts for commons-logging size {} search {}", artifacts.size(), artifacts );
deleteTestRepo( testRepoId, targetRepo );
deleteTestRepo( testRepoId );
}
@Test
@ -112,7 +112,7 @@ public class SearchServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}
File targetRepo = createAndIndexRepo( testRepoId );
createAndIndexRepo( testRepoId );
SearchService searchService = getSearchService( authorizationHeader );
@ -130,7 +130,7 @@ public class SearchServiceTest
artifacts.size() == 2 );
log.info( "artifacts for commons-logging size {} search {}", artifacts.size(), artifacts );
deleteTestRepo( testRepoId, targetRepo );
deleteTestRepo( testRepoId );
}
@Test
@ -145,7 +145,7 @@ public class SearchServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}
File targetRepo = createAndIndexRepo( testRepoId );
createAndIndexRepo( testRepoId );
SearchService searchService = getSearchService( authorizationHeader );
@ -161,7 +161,7 @@ public class SearchServiceTest
" not 1 results for Bundle Symbolic Name org.apache.karaf.features.command but " + artifacts.size() + ":"
+ artifacts, artifacts.size() == 1 );
deleteTestRepo( testRepoId, targetRepo );
deleteTestRepo( testRepoId );
}
@Test
@ -176,7 +176,7 @@ public class SearchServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}
File targetRepo = createAndIndexRepo( testRepoId );
createAndIndexRepo( testRepoId );
SearchService searchService = getSearchService( authorizationHeader );
@ -190,7 +190,7 @@ public class SearchServiceTest
" not 2 results for Bundle Symbolic Name org.apache.karaf.features.core but " + artifacts.size() + ":"
+ artifacts, artifacts.size() == 2 );
deleteTestRepo( testRepoId, targetRepo );
deleteTestRepo( testRepoId );
}
@Test
@ -205,7 +205,7 @@ public class SearchServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}
File targetRepo = createAndIndexRepo( testRepoId );
createAndIndexRepo( testRepoId );
SearchService searchService = getSearchService( authorizationHeader );
@ -218,8 +218,8 @@ public class SearchServiceTest
assertTrue( " not 1 results for Bundle ExportPackage org.apache.karaf.features.command.completers but "
+ artifacts.size() + ":" + artifacts, artifacts.size() == 1 );
log.info( "artifcat url " + artifacts.get( 0 ).getUrl() );
deleteTestRepo( testRepoId, targetRepo );
log.info( "artifact url " + artifacts.get( 0 ).getUrl() );
deleteTestRepo( testRepoId );
}
@Test
@ -234,7 +234,7 @@ public class SearchServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}
File targetRepo = createAndIndexRepo( testRepoId );
createAndIndexRepo( testRepoId );
SearchService searchService = getSearchService( authorizationHeader );
@ -243,42 +243,43 @@ public class SearchServiceTest
assertFalse( groupIds.isEmpty() );
assertTrue( groupIds.contains( "commons-cli" ) );
assertTrue( groupIds.contains( "org.apache.felix" ) );
deleteTestRepo( testRepoId, targetRepo );
deleteTestRepo( testRepoId );
}
private File createAndIndexRepo( String testRepoId )
private void createAndIndexRepo( String testRepoId )
throws Exception
{
if ( getManagedRepositoriesService( authorizationHeader ).getManagedRepository( testRepoId ) != null )
{
getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( testRepoId, true );
getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( testRepoId, false );
}
File targetRepo = new File( "target/test-origin-repo" );
if ( targetRepo.exists() )
{
FileUtils.deleteDirectory( targetRepo );
}
assertFalse( targetRepo.exists() );
FileUtils.copyDirectory( new File( "src/test/repo-with-osgi" ), targetRepo );
//File targetRepo = new File( "target/test-origin-repo" );
//if ( targetRepo.exists() )
//{
// FileUtils.deleteDirectory( targetRepo );
//}
//assertFalse( targetRepo.exists() );
//FileUtils.copyDirectory( new File( "src/test/repo-with-osgi" ), targetRepo );
ManagedRepository managedRepository = new ManagedRepository();
managedRepository.setId( testRepoId );
managedRepository.setName( "test repo" );
managedRepository.setLocation( targetRepo.getPath() );
managedRepository.setLocation( new File( "src/test/repo-with-osgi" ).getPath() );
managedRepository.setIndexDirectory( "target/.index-" + Long.toString( new Date().getTime() ) );
ManagedRepositoriesService service = getManagedRepositoriesService( authorizationHeader );
service.addManagedRepository( managedRepository );
getRoleManagementService( authorizationHeader ).assignTemplatedRole(ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, testRepoId, "admin" );
getRoleManagementService( authorizationHeader ).assignTemplatedRole(
ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, testRepoId, "admin" );
getRepositoriesService( authorizationHeader ).scanRepositoryNow( testRepoId, true );
return targetRepo;
//return targetRepo;
}
private void deleteTestRepo( String id, File targetRepo )
private void deleteTestRepo( String id )
throws Exception
{
if ( getManagedRepositoriesService( authorizationHeader ).getManagedRepository( id ) != null )