Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E8F96D40 for ; Tue, 14 Jun 2011 16:40:21 +0000 (UTC) Received: (qmail 77672 invoked by uid 500); 14 Jun 2011 16:40:21 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 77630 invoked by uid 500); 14 Jun 2011 16:40:21 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 77623 invoked by uid 99); 14 Jun 2011 16:40:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jun 2011 16:40:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jun 2011 16:40:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3E2C623889E0; Tue, 14 Jun 2011 16:39:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1135689 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src: main/java/org/apache/maven/archiva/web/action/ test/java/org/apache/archiva/metadata/repository/memory/ test/java/org/apache/maven/archiva/web/action/ Date: Tue, 14 Jun 2011 16:39:59 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110614163959.3E2C623889E0@eris.apache.org> Author: olamy Date: Tue Jun 14 16:39:58 2011 New Revision: 1135689 URL: http://svn.apache.org/viewvc?rev=1135689&view=rev Log: fix junit ShowArtifactActionTest Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java?rev=1135689&r1=1135688&r2=1135689&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java Tue Jun 14 16:39:58 2011 @@ -19,15 +19,14 @@ package org.apache.maven.archiva.web.act * under the License. */ -import java.util.Collections; -import java.util.List; - import org.apache.maven.archiva.security.AccessDeniedException; import org.apache.maven.archiva.security.ArchivaSecurityException; import org.apache.maven.archiva.security.PrincipalNotFoundException; import org.apache.maven.archiva.security.UserRepositories; import javax.inject.Inject; +import java.util.Collections; +import java.util.List; public class AbstractRepositoryBasedAction extends AbstractActionSupport @@ -42,7 +41,8 @@ public class AbstractRepositoryBasedActi { try { - return userRepositories.getObservableRepositoryIds( getPrincipal() ); + List ids = userRepositories.getObservableRepositoryIds( getPrincipal() ); + return ids == null ? Collections.emptyList() : ids; } catch ( PrincipalNotFoundException e ) { Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java?rev=1135689&r1=1135688&r2=1135689&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java Tue Jun 14 16:39:58 2011 @@ -59,7 +59,9 @@ public class TestMetadataResolver String repoId, String namespace, String projectId, String projectVersion ) { - return references.get( createMapKey( repoId, namespace, projectId, projectVersion ) ); + Collection projectVersionReferences = + references.get( createMapKey( repoId, namespace, projectId, projectVersion ) ); + return projectVersionReferences; } public Collection resolveRootNamespaces( RepositorySession repositorySession, String repoId ) @@ -106,8 +108,8 @@ public class TestMetadataResolver public Collection resolveArtifacts( RepositorySession repositorySession, String repoId, String namespace, String projectId, String projectVersion ) { - List artifacts = this.artifacts.get( createMapKey( repoId, namespace, projectId, - projectVersion ) ); + List artifacts = + this.artifacts.get( createMapKey( repoId, namespace, projectId, projectVersion ) ); return ( artifacts != null ? artifacts : Collections.emptyList() ); } Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java?rev=1135689&r1=1135688&r2=1135689&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java Tue Jun 14 16:39:58 2011 @@ -27,7 +27,6 @@ import org.apache.archiva.metadata.model import org.apache.archiva.metadata.model.ProjectVersionReference; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.RepositorySession; -import org.apache.archiva.metadata.repository.RepositorySessionFactory; import org.apache.archiva.metadata.repository.memory.TestMetadataResolver; import org.apache.archiva.metadata.repository.memory.TestRepositorySessionFactory; import org.apache.archiva.metadata.repository.storage.maven2.MavenArtifactFacet; @@ -63,9 +62,10 @@ public class ShowArtifactActionTest private ShowArtifactAction action; - private static final List TEST_SNAPSHOT_ARTIFACTS = Arrays.asList( createArtifact( - TEST_TS_SNAPSHOT_VERSION ), createArtifact( "1.0-20091120.222222-2", "20091120.222222", 2 ), createArtifact( - "1.0-20091123.333333-3", "20091123.333333", 3 ) ); + private static final List TEST_SNAPSHOT_ARTIFACTS = + Arrays.asList( createArtifact( TEST_TS_SNAPSHOT_VERSION ), + createArtifact( "1.0-20091120.222222-2", "20091120.222222", 2 ), + createArtifact( "1.0-20091123.333333-3", "20091123.333333", 3 ) ); private static final long TEST_SIZE = 12345L; @@ -78,8 +78,8 @@ public class ShowArtifactActionTest public void testGetArtifactUniqueRelease() { - metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_VERSION ) ); + metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_VERSION ) ); setActionParameters(); @@ -101,8 +101,8 @@ public class ShowArtifactActionTest public void testGetArtifactUniqueSnapshot() { - metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_SNAPSHOT_VERSION ) ); + metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_SNAPSHOT_VERSION ) ); metadataResolver.setArtifacts( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_SNAPSHOT_VERSION, TEST_SNAPSHOT_ARTIFACTS ); @@ -131,8 +131,8 @@ public class ShowArtifactActionTest public void testGetArtifactUniqueSnapshotTimestamped() { - metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_SNAPSHOT_VERSION ) ); + metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_SNAPSHOT_VERSION ) ); metadataResolver.setArtifacts( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_SNAPSHOT_VERSION, TEST_SNAPSHOT_ARTIFACTS ); @@ -172,8 +172,8 @@ public class ShowArtifactActionTest public void testGetArtifactNotInObservableRepos() { - metadataResolver.setProjectVersion( OTHER_TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_VERSION ) ); + metadataResolver.setProjectVersion( OTHER_TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_VERSION ) ); setActionParameters(); @@ -187,8 +187,8 @@ public class ShowArtifactActionTest public void testGetArtifactOnlySeenInSecondObservableRepo() { setObservableRepos( Arrays.asList( OTHER_TEST_REPO, TEST_REPO ) ); - metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_VERSION ) ); + metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_VERSION ) ); setActionParameters(); @@ -211,10 +211,10 @@ public class ShowArtifactActionTest public void testGetArtifactSeenInBothObservableRepo() { setObservableRepos( Arrays.asList( TEST_REPO, OTHER_TEST_REPO ) ); - metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_VERSION ) ); - metadataResolver.setProjectVersion( OTHER_TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_VERSION ) ); + metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_VERSION ) ); + metadataResolver.setProjectVersion( OTHER_TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_VERSION ) ); setActionParameters(); @@ -237,10 +237,10 @@ public class ShowArtifactActionTest public void testGetArtifactCanOnlyObserveInOneOfTwoRepos() { setObservableRepos( Arrays.asList( TEST_REPO ) ); - metadataResolver.setProjectVersion( OTHER_TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_VERSION ) ); - metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, createProjectModel( - TEST_VERSION ) ); + metadataResolver.setProjectVersion( OTHER_TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_VERSION ) ); + metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, + createProjectModel( TEST_VERSION ) ); setActionParameters(); @@ -354,8 +354,8 @@ public class ShowArtifactActionTest metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, versionMetadata ); ProjectVersionReference dependee1 = createReference( "artifactId1" ); ProjectVersionReference dependee2 = createReference( "artifactId2" ); - metadataResolver.setProjectReferences( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION, Arrays.asList( - dependee1, dependee2 ) ); + metadataResolver.setProjectReferences( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION, + Arrays.asList( dependee1, dependee2 ) ); setActionParameters(); @@ -478,8 +478,8 @@ public class ShowArtifactActionTest assertEquals( artifact.getVersion(), actual.getVersion() ); assertEquals( TEST_TYPE, actual.getType() ); assertEquals( "12.06 K", actual.getSize() ); - assertEquals( artifact.getNamespace() + "/" + artifact.getProject() + "/" + TEST_SNAPSHOT_VERSION + "/" + - artifact.getId(), actual.getPath() ); + assertEquals( artifact.getNamespace() + "/" + artifact.getProject() + "/" + TEST_SNAPSHOT_VERSION + "/" + + artifact.getId(), actual.getPath() ); } } @@ -581,8 +581,8 @@ public class ShowArtifactActionTest ml1.setSubscribeAddress( prefix + "-subscribe@" ); ml1.setUnsubscribeAddress( prefix + "-unsubscribe@" ); ml1.setMainArchiveUrl( prefix + "-archive-url" ); - ml1.setOtherArchives( Arrays.asList( "other-" + prefix + "-archive-url-1", - "other-" + prefix + "-archive-url-2" ) ); + ml1.setOtherArchives( + Arrays.asList( "other-" + prefix + "-archive-url-1", "other-" + prefix + "-archive-url-2" ) ); return ml1; } @@ -638,12 +638,12 @@ public class ShowArtifactActionTest RepositorySession repositorySession = mock( RepositorySession.class ); when( repositorySession.getResolver() ).thenReturn( metadataResolver ); when( repositorySession.getRepository() ).thenReturn( repo ); - //TestRepositorySessionFactory repositorySessionFactory = (TestRepositorySessionFactory) lookup( - // RepositorySessionFactory.class ); - TestRepositorySessionFactory repositorySessionFactory = new TestRepositorySessionFactory(); + TestRepositorySessionFactory repositorySessionFactory = + applicationContext.getBean( "repositorySessionFactory#test", TestRepositorySessionFactory.class ); repositorySessionFactory.setRepositorySession( repositorySession ); RepositoryContentFactory factory = mock( RepositoryContentFactory.class ); + action.setRepositoryFactory( factory ); ManagedRepositoryConfiguration config = new ManagedRepositoryConfiguration(); @@ -659,5 +659,8 @@ public class ShowArtifactActionTest Configuration configuration = new Configuration(); configuration.addManagedRepository( config ); when( archivaConfig.getConfiguration() ).thenReturn( configuration ); + + when( factory.getArchivaConfiguration() ).thenReturn( archivaConfig ); + } }