git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1295678 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M3
@@ -20,11 +20,11 @@ package org.apache.archiva.scheduler.repository; | |||
*/ | |||
import junit.framework.TestCase; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.TestRepositorySessionFactory; | |||
import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.codehaus.plexus.taskqueue.execution.TaskExecutor; | |||
import org.codehaus.plexus.util.FileUtils; | |||
import org.junit.After; | |||
@@ -55,11 +55,12 @@ public abstract class ArchivaRepositoryScanningTaskExecutorAbstractTest | |||
@Named( value = "taskExecutor#test-repository-scanning" ) | |||
protected TaskExecutor taskExecutor; | |||
@Inject @Named(value = "archivaConfiguration#test-repository-scanning") | |||
@Inject | |||
@Named( value = "archivaConfiguration#test-repository-scanning" ) | |||
protected ArchivaConfiguration archivaConfig; | |||
@Inject | |||
@Named(value = "repositoryStatisticsManager#test") | |||
@Named( value = "repositoryStatisticsManager#test" ) | |||
protected RepositoryStatisticsManager repositoryStatisticsManager; | |||
@Inject | |||
@@ -131,5 +132,5 @@ public abstract class ArchivaRepositoryScanningTaskExecutorAbstractTest | |||
super.tearDown(); | |||
} | |||
} |
@@ -29,14 +29,14 @@ import java.util.Collection; | |||
/** | |||
* ArchivaRepositoryScanningTaskExecutorPhase1Test | |||
* | |||
* | |||
* @version $Id: ArchivaRepositoryScanningTaskExecutorPhase1Test.java 1214303 2011-12-14 15:37:51Z olamy $ | |||
*/ | |||
@RunWith( SpringJUnit4ClassRunner.class ) | |||
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) | |||
public class ArchivaRepositoryScanningTaskExecutorPhase1Test | |||
extends ArchivaRepositoryScanningTaskExecutorAbstractTest | |||
{ | |||
{ | |||
// Split of ArchivaRepositoryScanningTaskExecutorTest should be executed first | |||
// to avoid testConsumer in unknown state if member of Phase2 all ready executed | |||
@Test | |||
@@ -46,14 +46,14 @@ public class ArchivaRepositoryScanningTaskExecutorPhase1Test | |||
RepositoryTask repoTask = new RepositoryTask(); | |||
repoTask.setRepositoryId( TEST_REPO_ID ); | |||
taskExecutor.executeTask( repoTask ); | |||
Collection<ArtifactReference> unprocessedResultList = testConsumer.getConsumed(); | |||
assertNotNull( unprocessedResultList ); | |||
assertEquals( "Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size() ); | |||
} | |||
} |
@@ -77,7 +77,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test | |||
File newArtifactGroup = new File( repoDir, "org/apache/archiva" ); | |||
assertFalse( "newArtifactGroup should not exist.", newArtifactGroup.exists() ); | |||
FileUtils.copyDirectoryStructure( new File( "target/test-classes/test-repo/org/apache/archiva" ), | |||
newArtifactGroup ); | |||
@@ -122,7 +122,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test | |||
File newArtifactGroup = new File( repoDir, "org/apache/archiva" ); | |||
assertFalse( "newArtifactGroup should not exist.", newArtifactGroup.exists() ); | |||
FileUtils.copyDirectoryStructure( new File( "target/test-classes/test-repo/org/apache/archiva" ), | |||
newArtifactGroup ); | |||
@@ -169,7 +169,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test | |||
File newArtifactGroup = new File( repoDir, "org/apache/archiva" ); | |||
assertFalse( "newArtifactGroup should not exist.", newArtifactGroup.exists() ); | |||
FileUtils.copyDirectoryStructure( new File( "target/test-classes/test-repo/org/apache/archiva" ), | |||
newArtifactGroup ); | |||