mirror of
https://github.com/apache/archiva.git
synced 2025-02-22 10:17:25 +00:00
fix compilation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170889 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy
parent
6e252d9a2d
commit
d29c648c8f
@ -290,7 +290,7 @@ public void testArtifactFoundInMultipleRepositories()
|
||||
|
||||
archivaConfigControl.replay();
|
||||
|
||||
// wait lucene flush.....
|
||||
// wait lucene flush.....SearchServiceImplTest
|
||||
Thread.sleep( 2000 );
|
||||
|
||||
SearchResults results = search.search( "user", selectedRepos, "archiva-search", null, null );
|
||||
|
||||
@ -142,7 +142,7 @@ public void testQuickSearchModelPackagingIsUsed()
|
||||
resultHit.setVersions( versions );
|
||||
resultHit.setRepositoryId( null );
|
||||
|
||||
results.addHit( SearchUtil.getHitId( ARCHIVA_TEST_GROUP_ID, "archiva-webapp" ), resultHit );
|
||||
results.addHit( SearchUtil.getHitId( ARCHIVA_TEST_GROUP_ID, "archiva-webapp", null, "war" ), resultHit );
|
||||
|
||||
SearchResultLimits limits = new SearchResultLimits( SearchResultLimits.ALL_PAGES );
|
||||
|
||||
@ -155,11 +155,9 @@ public void testQuickSearchModelPackagingIsUsed()
|
||||
facet.setPackaging( "war" );
|
||||
model.addFacet( facet );
|
||||
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectVersion( repositorySession,
|
||||
"repo1.mirror",
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
"archiva-webapp", "1.0" ),
|
||||
model );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectVersion( repositorySession, "repo1.mirror", ARCHIVA_TEST_GROUP_ID,
|
||||
"archiva-webapp", "1.0" ), model );
|
||||
|
||||
userReposControl.replay();
|
||||
searchControl.replay();
|
||||
@ -205,26 +203,23 @@ public void testQuickSearchDefaultPackagingIsUsed()
|
||||
resultHit.setArtifactId( ARCHIVA_TEST_ARTIFACT_ID );
|
||||
resultHit.setVersions( versions );
|
||||
|
||||
results.addHit( SearchUtil.getHitId( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID ), resultHit );
|
||||
results.addHit( SearchUtil.getHitId( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, null, "war" ),
|
||||
resultHit );
|
||||
|
||||
SearchResultLimits limits = new SearchResultLimits( SearchResultLimits.ALL_PAGES );
|
||||
|
||||
searchControl.expectAndDefaultReturn( search.search( "", observableRepoIds, "archiva", limits, null ),
|
||||
results );
|
||||
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectVersion( repositorySession,
|
||||
"repo1.mirror",
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" ), null );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectVersion( repositorySession, "repo1.mirror", ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ), null );
|
||||
|
||||
ProjectVersionMetadata model = new ProjectVersionMetadata();
|
||||
model.setId( "1.0" );
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectVersion( repositorySession,
|
||||
"public.releases",
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" ), model );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectVersion( repositorySession, "public.releases", ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ), model );
|
||||
|
||||
userReposControl.replay();
|
||||
searchControl.replay();
|
||||
@ -269,7 +264,8 @@ public void testQuickSearchArtifactRegularSearch()
|
||||
resultHit.setVersions( versions );
|
||||
resultHit.setRepositoryId( null );
|
||||
|
||||
results.addHit( SearchUtil.getHitId( resultHit.getGroupId(), resultHit.getArtifactId() ), resultHit );
|
||||
results.addHit( SearchUtil.getHitId( resultHit.getGroupId(), resultHit.getArtifactId(), null, "war" ),
|
||||
resultHit );
|
||||
|
||||
SearchResultLimits limits = new SearchResultLimits( SearchResultLimits.ALL_PAGES );
|
||||
|
||||
@ -282,11 +278,9 @@ public void testQuickSearchArtifactRegularSearch()
|
||||
facet.setPackaging( "jar" );
|
||||
model.addFacet( facet );
|
||||
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectVersion( repositorySession,
|
||||
"repo1.mirror",
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" ), model );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectVersion( repositorySession, "repo1.mirror", ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ), model );
|
||||
|
||||
userReposControl.replay();
|
||||
searchControl.replay();
|
||||
@ -343,8 +337,8 @@ public void testQuickSearchNoResults()
|
||||
public void testGetArtifactByChecksum()
|
||||
throws Exception
|
||||
{
|
||||
userReposControl.expectAndReturn( userRepos.getObservableRepositories(), Collections.singletonList(
|
||||
TEST_REPO ) );
|
||||
userReposControl.expectAndReturn( userRepos.getObservableRepositories(),
|
||||
Collections.singletonList( TEST_REPO ) );
|
||||
|
||||
Date whenGathered = new Date();
|
||||
|
||||
@ -379,16 +373,14 @@ public void testGetArtifactVersionsArtifactExists()
|
||||
observableRepoIds.add( "public.releases" );
|
||||
|
||||
userReposControl.expectAndReturn( userRepos.getObservableRepositories(), observableRepoIds );
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectVersions( repositorySession,
|
||||
"repo1.mirror",
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID ),
|
||||
Arrays.asList( "1.0", "1.1-beta-2", "1.2" ) );
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectVersions( repositorySession,
|
||||
"public.releases",
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID ),
|
||||
Arrays.asList( "1.1-beta-1", "1.1", "1.2.1-SNAPSHOT" ) );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectVersions( repositorySession, "repo1.mirror", ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID ),
|
||||
Arrays.asList( "1.0", "1.1-beta-2", "1.2" ) );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectVersions( repositorySession, "public.releases", ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID ),
|
||||
Arrays.asList( "1.1-beta-1", "1.1", "1.2.1-SNAPSHOT" ) );
|
||||
|
||||
userReposControl.replay();
|
||||
metadataResolverControl.replay();
|
||||
@ -402,16 +394,19 @@ public void testGetArtifactVersionsArtifactExists()
|
||||
assertEquals( 6, artifacts.size() );
|
||||
assertEquals( new Artifact( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.0", "pom" ),
|
||||
artifacts.get( 0 ) );
|
||||
assertEquals( new Artifact( "public.releases", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.1-beta-1",
|
||||
"pom" ), artifacts.get( 3 ) );
|
||||
assertEquals( new Artifact( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.1-beta-2",
|
||||
"pom" ), artifacts.get( 1 ) );
|
||||
assertEquals(
|
||||
new Artifact( "public.releases", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.1-beta-1", "pom" ),
|
||||
artifacts.get( 3 ) );
|
||||
assertEquals(
|
||||
new Artifact( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.1-beta-2", "pom" ),
|
||||
artifacts.get( 1 ) );
|
||||
assertEquals( new Artifact( "public.releases", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.1", "pom" ),
|
||||
artifacts.get( 4 ) );
|
||||
assertEquals( new Artifact( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.2", "pom" ),
|
||||
artifacts.get( 2 ) );
|
||||
assertEquals( new Artifact( "public.releases", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.2.1-SNAPSHOT", "pom" ), artifacts.get( 5 ) );
|
||||
assertEquals(
|
||||
new Artifact( "public.releases", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.2.1-SNAPSHOT", "pom" ),
|
||||
artifacts.get( 5 ) );
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -453,16 +448,15 @@ public void testGetDependenciesArtifactExists()
|
||||
model.addDependency( dependency );
|
||||
|
||||
userReposControl.expectAndReturn( userRepos.getObservableRepositories(), Collections.singletonList( repoId ) );
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectVersion( repositorySession, repoId,
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" ), model );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectVersion( repositorySession, repoId, ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ), model );
|
||||
|
||||
metadataResolverControl.replay();
|
||||
userReposControl.replay();
|
||||
|
||||
List<Dependency> dependencies = searchService.getDependencies( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" );
|
||||
List<Dependency> dependencies =
|
||||
searchService.getDependencies( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, "1.0" );
|
||||
|
||||
metadataResolverControl.verify();
|
||||
userReposControl.verify();
|
||||
@ -481,10 +475,9 @@ public void testGetDependenciesArtifactDoesNotExist()
|
||||
String repoId = "repo1.mirror";
|
||||
|
||||
userReposControl.expectAndReturn( userRepos.getObservableRepositories(), Collections.singletonList( repoId ) );
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectVersion( repositorySession, repoId,
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" ), null );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectVersion( repositorySession, repoId, ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ), null );
|
||||
|
||||
userReposControl.replay();
|
||||
metadataResolverControl.replay();
|
||||
@ -539,10 +532,9 @@ public void testGetDependees()
|
||||
dependeeModels.add( dependeeModel );
|
||||
|
||||
userReposControl.expectAndReturn( userRepos.getObservableRepositories(), observableRepoIds );
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectReferences( repositorySession, repoId,
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" ), dependeeModels );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectReferences( repositorySession, repoId, ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ), dependeeModels );
|
||||
|
||||
metadataResolverControl.replay();
|
||||
userReposControl.replay();
|
||||
@ -554,10 +546,10 @@ public void testGetDependees()
|
||||
|
||||
assertNotNull( dependees );
|
||||
assertEquals( 2, dependees.size() );
|
||||
assertEquals( new Artifact( repoId, ARCHIVA_TEST_GROUP_ID, "archiva-dependee-one", "1.0", "" ), dependees.get(
|
||||
0 ) );
|
||||
assertEquals( new Artifact( repoId, ARCHIVA_TEST_GROUP_ID, "archiva-dependee-two", "1.0", "" ), dependees.get(
|
||||
1 ) );
|
||||
assertEquals( new Artifact( repoId, ARCHIVA_TEST_GROUP_ID, "archiva-dependee-one", "1.0", "" ),
|
||||
dependees.get( 0 ) );
|
||||
assertEquals( new Artifact( repoId, ARCHIVA_TEST_GROUP_ID, "archiva-dependee-two", "1.0", "" ),
|
||||
dependees.get( 1 ) );
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -571,18 +563,14 @@ public void testGetDependeesArtifactDoesNotExist()
|
||||
// no longer differentiating between a project not being present and a project that is present but with
|
||||
// no references. If it is later determined to be needed, we will need to modify the metadata content repository
|
||||
userReposControl.expectAndReturn( userRepos.getObservableRepositories(), observableRepoIds );
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectReferences( repositorySession,
|
||||
"repo1.mirror",
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" ),
|
||||
Collections.<ProjectVersionReference>emptyList() );
|
||||
metadataResolverControl.expectAndReturn( metadataResolver.resolveProjectReferences( repositorySession,
|
||||
"public.releases",
|
||||
ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID,
|
||||
"1.0" ),
|
||||
Collections.<ProjectVersionReference>emptyList() );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectReferences( repositorySession, "repo1.mirror", ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ),
|
||||
Collections.<ProjectVersionReference>emptyList() );
|
||||
metadataResolverControl.expectAndReturn(
|
||||
metadataResolver.resolveProjectReferences( repositorySession, "public.releases", ARCHIVA_TEST_GROUP_ID,
|
||||
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ),
|
||||
Collections.<ProjectVersionReference>emptyList() );
|
||||
|
||||
userReposControl.replay();
|
||||
metadataResolverControl.replay();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user