You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/11/27 05:00:07 UTC
svn commit: r884741 - in /archiva/branches/MRM-1025/archiva-modules:
archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/
archiva-web/archiva-webapp/src...
Author: brett
Date: Fri Nov 27 04:00:05 2009
New Revision: 884741
URL: http://svn.apache.org/viewvc?rev=884741&view=rev
Log:
[MRM-1283] add tests for existing browse functionality before migrating to the content repository API
Added:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java (with props)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
- copied, changed from r884727, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/BrowseActionTest.xml
- copied, changed from r884032, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java?rev=884741&r1=884740&r2=884741&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java Fri Nov 27 04:00:05 2009
@@ -122,6 +122,7 @@
// Easier to do this here, vs doing it in the SQL query.
CollectionUtils.filter( groups, NotPredicate.getInstance( PredicateUtils.equalPredicate( groupId ) ) );
+ results.setSelectedRepositoryIds( observableRepositoryIds );
results.setGroupIds( groups );
results.setArtifacts( artifacts );
}
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?rev=884741&r1=884740&r2=884741&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java Fri Nov 27 04:00:05 2009
@@ -29,7 +29,10 @@
import org.apache.maven.archiva.database.browsing.BrowsingResults;
import org.apache.maven.archiva.database.browsing.RepositoryBrowsing;
import org.apache.maven.archiva.model.ArchivaProjectModel;
-import org.apache.maven.archiva.security.*;
+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;
/**
* Browse the repository.
@@ -145,6 +148,7 @@
if( isFirstVersion )
{
sharedModel = model;
+ sharedModel.setVersion( null );
}
else
{
Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java?rev=884741&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java Fri Nov 27 04:00:05 2009
@@ -0,0 +1,122 @@
+package org.apache.maven.archiva.web.action;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.List;
+
+import org.apache.archiva.metadata.repository.memory.TestMetadataResolver;
+import org.apache.maven.archiva.model.ArchivaProjectModel;
+import org.apache.maven.archiva.security.UserRepositories;
+import org.apache.maven.archiva.security.UserRepositoriesStub;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+
+public abstract class AbstractActionTestCase
+ extends PlexusInSpringTestCase
+{
+ protected static final String TEST_REPO = "test-repo";
+
+ protected TestMetadataResolver metadataResolver;
+
+ protected static final String TEST_GROUP_ID = "groupId";
+
+ protected static final String TEST_ARTIFACT_ID = "artifactId";
+
+ protected static final String TEST_PACKAGING = "packaging";
+
+ protected static final String TEST_ISSUE_URL = "http://jira.codehaus.org/browse/MRM";
+
+ protected static final String TEST_ISSUE_SYSTEM = "jira";
+
+ protected static final String TEST_CI_SYSTEM = "continuum";
+
+ protected static final String TEST_CI_URL = "http://vmbuild.apache.org/";
+
+ protected static final String TEST_URL = "url";
+
+ protected static final String TEST_NAME = "name";
+
+ protected static final String TEST_DESCRIPTION = "description";
+
+ protected static final String TEST_PARENT_GROUP_ID = "parentGroupId";
+
+ protected static final String TEST_PARENT_ARTIFACT_ID = "parentArtifactId";
+
+ protected static final String TEST_PARENT_VERSION = "parentVersion";
+
+ protected static final String TEST_ORGANIZATION_NAME = "organizationName";
+
+ protected static final String TEST_ORGANIZATION_URL = "organizationUrl";
+
+ protected static final String TEST_LICENSE_URL = "licenseUrl";
+
+ protected static final String TEST_LICENSE_NAME = "licenseName";
+
+ protected static final String TEST_LICENSE_URL_2 = "licenseUrl_2";
+
+ protected static final String TEST_LICENSE_NAME_2 = "licenseName_2";
+
+ protected static final String TEST_SCM_CONNECTION = "scmConnection";
+
+ protected static final String TEST_SCM_DEV_CONNECTION = "scmDevConnection";
+
+ protected static final String TEST_SCM_URL = "scmUrl";
+
+ protected void setObservableRepos( List<String> repoIds )
+ {
+ UserRepositoriesStub repos = (UserRepositoriesStub) lookup( UserRepositories.class );
+ repos.setObservableRepositoryIds( repoIds );
+ }
+
+ protected void assertDefaultModel( ArchivaProjectModel model, String version )
+ {
+ assertDefaultModel( model, TEST_GROUP_ID, TEST_ARTIFACT_ID, version );
+ }
+
+ protected void assertDefaultModel( ArchivaProjectModel model, String groupId, String artifactId, String version )
+ {
+ assertEquals( groupId, model.getGroupId() );
+ assertEquals( artifactId, model.getArtifactId() );
+ assertEquals( version, model.getVersion() );
+ assertEquals( TEST_URL, model.getUrl() );
+ assertEquals( TEST_NAME, model.getName() );
+ assertEquals( TEST_DESCRIPTION, model.getDescription() );
+ assertEquals( TEST_ORGANIZATION_NAME, model.getOrganization().getName() );
+ assertEquals( TEST_ORGANIZATION_URL, model.getOrganization().getUrl() );
+ assertEquals( 2, model.getLicenses().size() );
+ org.apache.maven.archiva.model.License l = model.getLicenses().get( 0 );
+ assertEquals( TEST_LICENSE_NAME, l.getName() );
+ assertEquals( TEST_LICENSE_URL, l.getUrl() );
+ l = model.getLicenses().get( 1 );
+ assertEquals( TEST_LICENSE_NAME_2, l.getName() );
+ assertEquals( TEST_LICENSE_URL_2, l.getUrl() );
+ assertEquals( TEST_ISSUE_SYSTEM, model.getIssueManagement().getSystem() );
+ assertEquals( TEST_ISSUE_URL, model.getIssueManagement().getUrl() );
+ assertEquals( TEST_CI_SYSTEM, model.getCiManagement().getSystem() );
+ assertEquals( TEST_CI_URL, model.getCiManagement().getUrl() );
+ assertEquals( TEST_SCM_CONNECTION, model.getScm().getConnection() );
+ assertEquals( TEST_SCM_DEV_CONNECTION, model.getScm().getDeveloperConnection() );
+ assertEquals( TEST_SCM_URL, model.getScm().getUrl() );
+
+ assertEquals( TEST_PACKAGING, model.getPackaging() );
+ assertEquals( TEST_PARENT_GROUP_ID, model.getParentProject().getGroupId() );
+ assertEquals( TEST_PARENT_ARTIFACT_ID, model.getParentProject().getArtifactId() );
+ assertEquals( TEST_PARENT_VERSION, model.getParentProject().getVersion() );
+ }
+}
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java (from r884727, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java&r1=884727&r2=884741&rev=884741&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java Fri Nov 27 04:00:05 2009
@@ -9,7 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -24,576 +24,389 @@
import java.util.List;
import com.opensymphony.xwork2.Action;
-import org.apache.archiva.metadata.model.CiManagement;
-import org.apache.archiva.metadata.model.Dependency;
-import org.apache.archiva.metadata.model.IssueManagement;
-import org.apache.archiva.metadata.model.License;
-import org.apache.archiva.metadata.model.MailingList;
-import org.apache.archiva.metadata.model.Organization;
-import org.apache.archiva.metadata.model.ProjectVersionMetadata;
-import org.apache.archiva.metadata.model.ProjectVersionReference;
-import org.apache.archiva.metadata.model.Scm;
-import org.apache.archiva.metadata.repository.memory.TestMetadataResolver;
-import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectFacet;
-import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectParent;
+import org.apache.maven.archiva.database.ArchivaDAO;
import org.apache.maven.archiva.database.ArchivaDatabaseException;
+import org.apache.maven.archiva.database.ArtifactDAO;
+import org.apache.maven.archiva.database.ProjectModelDAO;
+import org.apache.maven.archiva.database.browsing.BrowsingResults;
+import org.apache.maven.archiva.database.constraints.ArtifactsRelatedConstraint;
+import org.apache.maven.archiva.model.ArchivaArtifact;
+import org.apache.maven.archiva.model.ArchivaArtifactModel;
import org.apache.maven.archiva.model.ArchivaProjectModel;
-import org.apache.maven.archiva.security.UserRepositories;
-import org.apache.maven.archiva.security.UserRepositoriesStub;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.apache.maven.archiva.model.CiManagement;
+import org.apache.maven.archiva.model.IssueManagement;
+import org.apache.maven.archiva.model.License;
+import org.apache.maven.archiva.model.Organization;
+import org.apache.maven.archiva.model.Scm;
+import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.maven.archiva.web.action.admin.repositories.ArchivaDAOStub;
+import org.easymock.MockControl;
-public class ShowArtifactActionTest
- extends PlexusInSpringTestCase
+public class BrowseActionTest
+ extends AbstractActionTestCase
{
- private static final String ACTION_HINT = "showArtifactAction";
+ private static final String ACTION_HINT = "browseAction";
- private static final String TEST_GROUP_ID = "groupId";
+ private BrowseAction action;
- private static final String TEST_ARTIFACT_ID = "artifactId";
+ private ArchivaDAOStub archivaDao;
- private static final String TEST_VERSION = "version";
-
- private static final String TEST_PACKAGING = "packaging";
-
- private static final String TEST_ISSUE_URL = "http://jira.codehaus.org/browse/MRM";
-
- private static final String TEST_ISSUE_SYSTEM = "jira";
-
- private static final String TEST_CI_SYSTEM = "continuum";
-
- private static final String TEST_CI_URL = "http://vmbuild.apache.org/";
-
- private static final String TEST_URL = "url";
-
- private static final String TEST_NAME = "name";
-
- private static final String TEST_DESCRIPTION = "description";
-
- private static final String TEST_PARENT_GROUP_ID = "parentGroupId";
-
- private static final String TEST_PARENT_ARTIFACT_ID = "parentArtifactId";
-
- private static final String TEST_PARENT_VERSION = "parentVersion";
-
- private static final String TEST_ORGANIZATION_NAME = "organizationName";
-
- private static final String TEST_ORGANIZATION_URL = "organizationUrl";
-
- private static final String TEST_LICENSE_URL = "licenseUrl";
-
- private static final String TEST_LICENSE_NAME = "licenseName";
-
- private static final String TEST_LICENSE_URL_2 = "licenseUrl_2";
-
- private static final String TEST_LICENSE_NAME_2 = "licenseName_2";
-
- private static final String TEST_REPO = "test-repo";
-
- private static final String TEST_SCM_CONNECTION = "scmConnection";
-
- private static final String TEST_SCM_DEV_CONNECTION = "scmDevConnection";
-
- private static final String TEST_SCM_URL = "scmUrl";
-
- private static final String TEST_SNAPSHOT_VERSION = "1.0-SNAPSHOT";
-
- private static final String TEST_TS_SNAPSHOT_VERSION = "1.0-20091120.111111-1";
-
- private static final List<String> ALL_TEST_SNAPSHOT_VERSIONS =
- Arrays.asList( TEST_TS_SNAPSHOT_VERSION, "1.0-20091120.222222-2", "1.0-20091123.333333-3" );
-
- private static final String OTHER_TEST_REPO = "first-repo";
-
- private ShowArtifactAction action;
-
- private TestMetadataResolver metadataResolver;
+ private static final List<String> GROUPS =
+ Arrays.asList( "org.apache.archiva", "commons-lang", "org.apache.maven", "com.sun", "com.oracle" );
public void testInstantiation()
{
assertFalse( action == lookup( Action.class, ACTION_HINT ) );
}
- public void testGetArtifactUniqueRelease()
+ public void testBrowse()
{
- metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
- createProjectModel( TEST_VERSION ) );
-
- setActionParameters();
-
- String result = action.artifact();
+ archivaDao.setGroups( GROUPS );
- assertActionSuccess( action, result );
+ String result = action.browse();
+ assertSuccessResult( result );
- assertActionParameters( action );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model );
+ BrowsingResults results = action.getResults();
+ assertNotNull( results );
+ assertEquals( Arrays.asList( TEST_REPO ), results.getSelectedRepositoryIds() );
+ assertEquals( Arrays.asList( "com", "commons-lang", "org.apache" ), results.getGroupIds() );
+ assertNull( results.getArtifacts() );
+ assertNull( results.getSelectedArtifactId() );
+ assertNull( results.getSelectedGroupId() );
+ assertNull( results.getVersions() );
- assertEquals( TEST_REPO, action.getRepositoryId() );
-
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
- assertTrue( action.getSnapshotVersions().isEmpty() );
- }
-
- public void testGetArtifactUniqueSnapshot()
- {
- metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
- createProjectModel( TEST_SNAPSHOT_VERSION ) );
- metadataResolver.setArtifactVersions( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_SNAPSHOT_VERSION,
- ALL_TEST_SNAPSHOT_VERSIONS );
-
- action.setGroupId( TEST_GROUP_ID );
- action.setArtifactId( TEST_ARTIFACT_ID );
- action.setVersion( TEST_SNAPSHOT_VERSION );
-
- String result = action.artifact();
-
- assertActionSuccess( action, result );
-
- assertEquals( TEST_GROUP_ID, action.getGroupId() );
- assertEquals( TEST_ARTIFACT_ID, action.getArtifactId() );
- assertEquals( TEST_SNAPSHOT_VERSION, action.getVersion() );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model, TEST_SNAPSHOT_VERSION );
-
- assertEquals( TEST_REPO, action.getRepositoryId() );
-
- assertEquals( ALL_TEST_SNAPSHOT_VERSIONS, action.getSnapshotVersions() );
-
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
+ assertNull( action.getGroupId() );
+ assertNull( action.getArtifactId() );
+ assertNull( action.getRepositoryId() );
+ assertNull( action.getSharedModel() );
}
- public void testGetArtifactUniqueSnapshotTimestamped()
+ public void testBrowseNoObservableRepos()
{
- metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
- createProjectModel( TEST_TS_SNAPSHOT_VERSION ) );
- metadataResolver.setArtifactVersions( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_TS_SNAPSHOT_VERSION,
- ALL_TEST_SNAPSHOT_VERSIONS );
-
- action.setGroupId( TEST_GROUP_ID );
- action.setArtifactId( TEST_ARTIFACT_ID );
- action.setVersion( TEST_TS_SNAPSHOT_VERSION );
-
- String result = action.artifact();
-
- assertActionSuccess( action, result );
-
- assertEquals( TEST_GROUP_ID, action.getGroupId() );
- assertEquals( TEST_ARTIFACT_ID, action.getArtifactId() );
- assertEquals( TEST_TS_SNAPSHOT_VERSION, action.getVersion() );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model, TEST_TS_SNAPSHOT_VERSION );
-
- assertEquals( TEST_REPO, action.getRepositoryId() );
+ setObservableRepos( Collections.<String>emptyList() );
- assertEquals( Arrays.asList( ALL_TEST_SNAPSHOT_VERSIONS.get( 1 ), ALL_TEST_SNAPSHOT_VERSIONS.get( 2 ) ),
- action.getSnapshotVersions() );
+ String result = action.browse();
+ assertNoAccessResult( result );
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
+ assertNoOutputVariables();
}
- public void testGetMissingProject()
+ public void testBrowseGroupNoObservableRepos()
{
- setActionParameters();
-
- String result = action.artifact();
- assertError( result );
+ setObservableRepos( Collections.<String>emptyList() );
+ String selectedGroupId = "org";
- assertActionParameters( action );
- assertNoOutputFields();
+ action.setGroupId( selectedGroupId );
+ String result = action.browseGroup();
+ assertNoAccessResult( result );
+
+ assertEquals( selectedGroupId, action.getGroupId() );
+ assertNull( action.getResults() );
+ assertNull( action.getArtifactId() );
+ assertNull( action.getRepositoryId() );
+ assertNull( action.getSharedModel() );
}
- public void testGetArtifactNoObservableRepos()
+ public void testBrowseArtifactNoObservableRepos()
{
setObservableRepos( Collections.<String>emptyList() );
+ String selectedGroupId = "org.apache";
+ String selectedArtifactId = "apache";
- setActionParameters();
-
- String result = action.artifact();
-
- // Actually, it'd be better to have an error:
- assertError( result );
- assertActionParameters( action );
- assertNoOutputFields();
+ action.setGroupId( selectedGroupId );
+ action.setArtifactId( selectedArtifactId );
+ String result = action.browseArtifact();
+ assertNoAccessResult( result );
+
+ assertEquals( selectedGroupId, action.getGroupId() );
+ assertEquals( selectedArtifactId, action.getArtifactId() );
+ assertNull( action.getResults() );
+ assertNull( action.getRepositoryId() );
+ assertNull( action.getSharedModel() );
}
- public void testGetArtifactNotInObservableRepos()
+ public void testBrowseGroupNoGroupId()
{
- metadataResolver.setProjectVersion( OTHER_TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
- createProjectModel( TEST_VERSION ) );
-
- setActionParameters();
-
- String result = action.artifact();
- assertError( result );
-
- assertActionParameters( action );
- assertNoOutputFields();
+ String result = action.browseGroup();
+ assertErrorResult( result );
+ assertNoOutputVariables();
}
- public void testGetArtifactOnlySeenInSecondObservableRepo()
+ public void testBrowseGroupNoArtifacts()
{
- setObservableRepos( Arrays.asList( OTHER_TEST_REPO, TEST_REPO ) );
- metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
- createProjectModel( TEST_VERSION ) );
-
- setActionParameters();
+ String selectedGroupId = "org";
+ List<String> groups = Arrays.asList( "apache.archiva", "apache.maven" );
- String result = action.artifact();
+ archivaDao.setGroups( groups );
+ archivaDao.setArtifacts( Collections.<String>emptyList() );
+ action.setGroupId( selectedGroupId );
+ String result = action.browseGroup();
+ assertSuccessResult( result );
- assertActionSuccess( action, result );
+ BrowsingResults results = action.getResults();
+ assertNotNull( results );
+ assertEquals( Arrays.asList( TEST_REPO ), results.getSelectedRepositoryIds() );
+ assertEquals( groups, results.getGroupIds() );
+ assertEquals( Collections.<String>emptyList(), results.getArtifacts() );
+ assertNull( results.getSelectedArtifactId() );
+ assertEquals( selectedGroupId, results.getSelectedGroupId() );
+ assertNull( results.getVersions() );
- assertActionParameters( action );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model );
-
- assertEquals( TEST_REPO, action.getRepositoryId() );
-
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
- assertTrue( action.getSnapshotVersions().isEmpty() );
+ assertEquals( selectedGroupId, action.getGroupId() );
+ assertNull( action.getArtifactId() );
+ assertNull( action.getRepositoryId() );
+ assertNull( action.getSharedModel() );
}
- public void testGetArtifactSeenInBothObservableRepo()
+ public void testBrowseGroupWithArtifacts()
{
- 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 ) );
-
- setActionParameters();
-
- String result = action.artifact();
-
- assertActionSuccess( action, result );
-
- assertActionParameters( action );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model );
-
- assertEquals( TEST_REPO, action.getRepositoryId() );
+ String artifacts = "apache";
+ String selectedGroupId = "org.apache";
+ List<String> groups = Arrays.asList( "archiva", "maven" );
+
+ archivaDao.setGroups( groups );
+ archivaDao.setArtifacts( Collections.singletonList( artifacts ) );
+ action.setGroupId( selectedGroupId );
+ String result = action.browseGroup();
+ assertSuccessResult( result );
+
+ BrowsingResults results = action.getResults();
+ assertNotNull( results );
+ assertEquals( Arrays.asList( TEST_REPO ), results.getSelectedRepositoryIds() );
+ assertEquals( groups, results.getGroupIds() );
+ assertEquals( Collections.singletonList( artifacts ), results.getArtifacts() );
+ assertNull( results.getSelectedArtifactId() );
+ assertEquals( selectedGroupId, results.getSelectedGroupId() );
+ assertNull( results.getVersions() );
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
- assertTrue( action.getSnapshotVersions().isEmpty() );
+ assertEquals( selectedGroupId, action.getGroupId() );
+ assertNull( action.getArtifactId() );
+ assertNull( action.getRepositoryId() );
+ assertNull( action.getSharedModel() );
}
- public void testGetArtifactCanOnlyObserveInOneOfTwoRepos()
+ public void testBrowseArtifactNoGroupId()
{
- 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 ) );
-
- setActionParameters();
-
- String result = action.artifact();
-
- assertActionSuccess( action, result );
-
- assertActionParameters( action );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model );
+ String selectedArtifactId = "apache";
- assertEquals( TEST_REPO, action.getRepositoryId() );
+ action.setArtifactId( selectedArtifactId );
+ String result = action.browseArtifact();
+ assertErrorResult( result );
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
- assertTrue( action.getSnapshotVersions().isEmpty() );
+ assertNull( action.getResults() );
+ assertNull( action.getGroupId() );
+ assertEquals( selectedArtifactId, action.getArtifactId() );
+ assertNull( action.getRepositoryId() );
+ assertNull( action.getSharedModel() );
}
- public void testGetArtifactNoMavenFacet()
+ public void testBrowseArtifactNoArtifactId()
{
- ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
- versionMetadata.setId( TEST_VERSION );
- versionMetadata.setUrl( TEST_URL );
- versionMetadata.setName( TEST_NAME );
- versionMetadata.setDescription( TEST_DESCRIPTION );
-
- metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, versionMetadata );
-
- setActionParameters();
-
- String result = action.artifact();
+ String selectedGroupId = "org.apache";
- assertActionSuccess( action, result );
+ action.setGroupId( selectedGroupId );
+ String result = action.browseArtifact();
+ assertErrorResult( result );
- assertActionParameters( action );
- ArchivaProjectModel model = action.getModel();
- assertEquals( TEST_VERSION, model.getVersion() );
- assertEquals( TEST_URL, model.getUrl() );
- assertEquals( TEST_NAME, model.getName() );
- assertEquals( TEST_DESCRIPTION, model.getDescription() );
-
- assertEquals( TEST_REPO, action.getRepositoryId() );
-
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
- assertTrue( action.getSnapshotVersions().isEmpty() );
+ assertNull( action.getResults() );
+ assertEquals( selectedGroupId, action.getGroupId() );
+ assertNull( action.getArtifactId() );
+ assertNull( action.getRepositoryId() );
+ assertNull( action.getSharedModel() );
}
- public void testGetMailingLists()
+ public void testBrowseArtifact()
throws ArchivaDatabaseException
{
- ProjectVersionMetadata versionMetadata = createProjectModel( TEST_VERSION );
- MailingList ml1 = createMailingList( "Users List", "users" );
- MailingList ml2 = createMailingList( "Developers List", "dev" );
- versionMetadata.setMailingLists( Arrays.asList( ml1, ml2 ) );
- metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, versionMetadata );
-
- setActionParameters();
+ String selectedGroupId = "org.apache";
+ String selectedArtifactId = "apache";
- String result = action.mailingLists();
+ List<String> versions = Arrays.asList( "1", "2", "3", "4" );
+ archivaDao.setVersions( versions );
+ MockControl artifactDaoMockControl = createArtifactDaoMock( selectedGroupId, selectedArtifactId, versions );
+ MockControl projectDaoMockControl = createProjectDaoMock(
+ Arrays.asList( createProjectModel( selectedGroupId, selectedArtifactId, "1" ),
+ createProjectModel( selectedGroupId, selectedArtifactId, "2" ),
+ createProjectModel( selectedGroupId, selectedArtifactId, "3" ),
+ createProjectModel( selectedGroupId, selectedArtifactId, "4" ) ) );
+
+ action.setGroupId( selectedGroupId );
+ action.setArtifactId( selectedArtifactId );
+ String result = action.browseArtifact();
+ assertSuccessResult( result );
- assertActionSuccess( action, result );
+ artifactDaoMockControl.verify();
+ projectDaoMockControl.verify();
- assertActionParameters( action );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model );
+ assertEquals( selectedGroupId, action.getGroupId() );
+ assertEquals( selectedArtifactId, action.getArtifactId() );
+ assertNull( action.getRepositoryId() );
- assertNotNull( action.getMailingLists() );
- assertMailingList( action.getMailingLists().get( 0 ), "Users List", "users" );
- assertMailingList( action.getMailingLists().get( 1 ), "Developers List", "dev" );
+ BrowsingResults results = action.getResults();
+ assertNotNull( results );
+ assertEquals( Arrays.asList( TEST_REPO ), results.getSelectedRepositoryIds() );
+ assertNull( results.getGroupIds() );
+ assertNull( results.getArtifacts() );
+ assertEquals( selectedGroupId, results.getSelectedGroupId() );
+ assertEquals( selectedArtifactId, results.getSelectedArtifactId() );
+ assertEquals( versions, results.getVersions() );
- assertNull( action.getRepositoryId() );
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getSnapshotVersions() );
+ ArchivaProjectModel model = action.getSharedModel();
+ assertDefaultModel( model, selectedGroupId, selectedArtifactId, null );
}
- public void testGetDependencies()
+ public void testBrowseArtifactWithSnapshots()
throws ArchivaDatabaseException
{
- ProjectVersionMetadata versionMetadata = createProjectModel( TEST_VERSION );
- Dependency dependency1 = createDependencyBasic( "artifactId1" );
- Dependency dependency2 = createDependencyExtended( "artifactId2" );
- versionMetadata.setDependencies( Arrays.asList( dependency1, dependency2 ) );
- metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, versionMetadata );
-
- setActionParameters();
-
- String result = action.dependencies();
+ String selectedGroupId = "org.apache";
+ String selectedArtifactId = "apache";
- assertActionSuccess( action, result );
+ List<String> versions = Arrays.asList( "1", "2", "3", "4-SNAPSHOT", "4", "5-SNAPSHOT" );
+ archivaDao.setVersions( versions );
+ MockControl artifactDaoMockControl = createArtifactDaoMock( selectedGroupId, selectedArtifactId, versions );
+ MockControl projectDaoMockControl = createProjectDaoMock(
+ Arrays.asList( createProjectModel( selectedGroupId, selectedArtifactId, "1" ),
+ createProjectModel( selectedGroupId, selectedArtifactId, "2" ),
+ createProjectModel( selectedGroupId, selectedArtifactId, "3" ),
+ createProjectModel( selectedGroupId, selectedArtifactId, "4-SNAPSHOT" ),
+ createProjectModel( selectedGroupId, selectedArtifactId, "4" ),
+ createProjectModel( selectedGroupId, selectedArtifactId, "5-SNAPSHOT" ) ) );
+
+ action.setGroupId( selectedGroupId );
+ action.setArtifactId( selectedArtifactId );
+ String result = action.browseArtifact();
+ assertSuccessResult( result );
- assertActionParameters( action );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model );
-
- assertNotNull( action.getDependencies() );
- assertDependencyBasic( action.getDependencies().get( 0 ), "artifactId1" );
- assertDependencyExtended( action.getDependencies().get( 1 ), "artifactId2" );
-
- assertNull( action.getRepositoryId() );
- assertNull( action.getDependees() );
- assertNull( action.getMailingLists() );
- assertNull( action.getSnapshotVersions() );
- }
-
- public void testGetDependees()
- throws ArchivaDatabaseException
- {
- ProjectVersionMetadata versionMetadata = createProjectModel( TEST_VERSION );
- 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 ) );
-
- setActionParameters();
-
- String result = action.dependees();
-
- assertActionSuccess( action, result );
-
- assertActionParameters( action );
- ArchivaProjectModel model = action.getModel();
- assertDefaultModel( model );
-
- assertNotNull( action.getDependees() );
- assertCoordinate( action.getDependees().get( 0 ), "artifactId1" );
- assertCoordinate( action.getDependees().get( 1 ), "artifactId2" );
+ artifactDaoMockControl.verify();
+ projectDaoMockControl.verify();
+ assertEquals( selectedGroupId, action.getGroupId() );
+ assertEquals( selectedArtifactId, action.getArtifactId() );
assertNull( action.getRepositoryId() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
- assertNull( action.getSnapshotVersions() );
- }
- private ProjectVersionReference createReference( String projectId )
- {
- ProjectVersionReference reference = new ProjectVersionReference();
- reference.setNamespace( "groupId" );
- reference.setProjectId( projectId );
- reference.setProjectVersion( "version" );
- reference.setReferenceType( ProjectVersionReference.ReferenceType.DEPENDENCY );
- return reference;
- }
-
- private void assertCoordinate( ArchivaProjectModel dependee, String artifactId )
- {
- assertEquals( artifactId, dependee.getArtifactId() );
- assertEquals( "groupId", dependee.getGroupId() );
- assertEquals( "version", dependee.getVersion() );
- }
+ BrowsingResults results = action.getResults();
+ assertNotNull( results );
+ assertEquals( Arrays.asList( TEST_REPO ), results.getSelectedRepositoryIds() );
+ assertNull( results.getGroupIds() );
+ assertNull( results.getArtifacts() );
+ assertEquals( selectedGroupId, results.getSelectedGroupId() );
+ assertEquals( selectedArtifactId, results.getSelectedArtifactId() );
+ assertEquals( versions, results.getVersions() );
- private void assertDependencyBasic( org.apache.maven.archiva.model.Dependency dependency, String artifactId )
- {
- assertEquals( artifactId, dependency.getArtifactId() );
- assertEquals( "groupId", dependency.getGroupId() );
- assertEquals( "version", dependency.getVersion() );
+ ArchivaProjectModel model = action.getSharedModel();
+ assertDefaultModel( model, selectedGroupId, selectedArtifactId, null );
}
- private void assertDependencyExtended( org.apache.maven.archiva.model.Dependency dependency, String artifactId )
- {
- assertDependencyBasic( dependency, artifactId );
- assertEquals( true, dependency.isOptional() );
- assertEquals( "classifier", dependency.getClassifier() );
- assertEquals( "type", dependency.getType() );
- assertEquals( "scope", dependency.getScope() );
- assertEquals( "systemPath", dependency.getSystemPath() );
- }
+ // TODO: test with restricted observable repos
+ // not currently relevant since it is controlled at the DefaultRepositoryBrowsing level
+ // TODO: current behaviour is to ignore values that differ between models - instead, pick the latest and use that.
+ // Need to update the tests to verify this as models are currently the same
- private Dependency createDependencyExtended( String artifactId )
+ private void assertNoAccessResult( String result )
{
- Dependency dependency = createDependencyBasic( artifactId );
- dependency.setClassifier( "classifier" );
- dependency.setOptional( true );
- dependency.setScope( "scope" );
- dependency.setSystemPath( "systemPath" );
- dependency.setType( "type" );
- return dependency;
+ assertEquals( GlobalResults.ACCESS_TO_NO_REPOS, result );
+ assertEquals( 0, action.getActionErrors().size() );
+ assertEquals( 0, action.getActionMessages().size() );
}
- private Dependency createDependencyBasic( String artifactId )
+ private void assertSuccessResult( String result )
{
- Dependency dependency = new Dependency();
- dependency.setArtifactId( artifactId );
- dependency.setGroupId( "groupId" );
- dependency.setVersion( "version" );
- return dependency;
+ assertEquals( Action.SUCCESS, result );
+ assertEquals( 0, action.getActionErrors().size() );
+ assertEquals( 0, action.getActionMessages().size() );
}
- private void assertMailingList( org.apache.maven.archiva.model.MailingList mailingList, String name, String prefix )
+ private void assertErrorResult( String result )
{
- assertEquals( name, mailingList.getName() );
- assertEquals( prefix + "-post@", mailingList.getPostAddress() );
- assertEquals( prefix + "-subscribe@", mailingList.getSubscribeAddress() );
- assertEquals( prefix + "-unsubscribe@", mailingList.getUnsubscribeAddress() );
- assertEquals( prefix + "-archive-url", mailingList.getMainArchiveUrl() );
- assertEquals( Arrays.asList( "other-" + prefix + "-archive-url-1", "other-" + prefix + "-archive-url-2" ),
- mailingList.getOtherArchives() );
+ assertEquals( Action.ERROR, result );
+ assertEquals( 1, action.getActionErrors().size() );
+ assertEquals( 0, action.getActionMessages().size() );
}
- private MailingList createMailingList( String name, String prefix )
+ private void assertNoOutputVariables()
{
- MailingList ml1 = new MailingList();
- ml1.setName( name );
- ml1.setPostAddress( prefix + "-post@" );
- 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" ) );
- return ml1;
+ assertNull( action.getResults() );
+ assertNull( action.getGroupId() );
+ assertNull( action.getArtifactId() );
+ assertNull( action.getRepositoryId() );
+ assertNull( action.getSharedModel() );
}
- private void assertNoOutputFields()
+ private MockControl createArtifactDaoMock( String groupId, String artifactId, List<String> versions )
+ throws ArchivaDatabaseException
{
- assertNull( action.getModel() );
- assertNull( action.getDependees() );
- assertNull( action.getDependencies() );
- assertNull( action.getMailingLists() );
- assertTrue( action.getSnapshotVersions().isEmpty() );
- }
+ // testing deeper than normal with the mocks as we intend to replace RepositoryBrowsing, not just the database
+ // underneath it - those sections will be adjusted with a mock content repository later
+ MockControl control = MockControl.createNiceControl( ArtifactDAO.class );
+ ArtifactDAO dao = (ArtifactDAO) control.getMock();
+ archivaDao.setArtifactDao( dao );
- private void assertError( String result )
- {
- assertEquals( Action.ERROR, result );
- assertEquals( 1, action.getActionErrors().size() );
- }
+ for ( String v : versions )
+ {
+ ArtifactsRelatedConstraint c = new ArtifactsRelatedConstraint( groupId, artifactId, v );
+ dao.queryArtifacts( c );
+ control.setReturnValue( Collections.singletonList( createArtifact( groupId, artifactId, v ) ) );
+ }
- private void setObservableRepos( List<String> repoIds )
- {
- UserRepositoriesStub repos = (UserRepositoriesStub) lookup( UserRepositories.class );
- repos.setObservableRepositoryIds( repoIds );
+ control.replay();
+ return control;
}
- private void assertDefaultModel( ArchivaProjectModel model )
+ private ArchivaArtifact createArtifact( String groupId, String artifactId, String version )
{
- assertDefaultModel( model, TEST_VERSION );
+ return createArtifact( groupId, artifactId, version, TEST_REPO );
}
- private void assertDefaultModel( ArchivaProjectModel model, String version )
+ private ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String repoId )
{
- assertEquals( TEST_GROUP_ID, model.getGroupId() );
- assertEquals( TEST_ARTIFACT_ID, model.getArtifactId() );
- assertEquals( version, model.getVersion() );
- assertEquals( TEST_URL, model.getUrl() );
- assertEquals( TEST_NAME, model.getName() );
- assertEquals( TEST_DESCRIPTION, model.getDescription() );
- assertEquals( TEST_ORGANIZATION_NAME, model.getOrganization().getName() );
- assertEquals( TEST_ORGANIZATION_URL, model.getOrganization().getUrl() );
- assertEquals( 2, model.getLicenses().size() );
- org.apache.maven.archiva.model.License l = model.getLicenses().get( 0 );
- assertEquals( TEST_LICENSE_NAME, l.getName() );
- assertEquals( TEST_LICENSE_URL, l.getUrl() );
- l = model.getLicenses().get( 1 );
- assertEquals( TEST_LICENSE_NAME_2, l.getName() );
- assertEquals( TEST_LICENSE_URL_2, l.getUrl() );
- assertEquals( TEST_ISSUE_SYSTEM, model.getIssueManagement().getSystem() );
- assertEquals( TEST_ISSUE_URL, model.getIssueManagement().getUrl() );
- assertEquals( TEST_CI_SYSTEM, model.getCiManagement().getSystem() );
- assertEquals( TEST_CI_URL, model.getCiManagement().getUrl() );
- assertEquals( TEST_SCM_CONNECTION, model.getScm().getConnection() );
- assertEquals( TEST_SCM_DEV_CONNECTION, model.getScm().getDeveloperConnection() );
- assertEquals( TEST_SCM_URL, model.getScm().getUrl() );
-
- assertEquals( TEST_PACKAGING, model.getPackaging() );
- assertEquals( TEST_PARENT_GROUP_ID, model.getParentProject().getGroupId() );
- assertEquals( TEST_PARENT_ARTIFACT_ID, model.getParentProject().getArtifactId() );
- assertEquals( TEST_PARENT_VERSION, model.getParentProject().getVersion() );
+ ArchivaArtifactModel model = new ArchivaArtifactModel();
+ model.setGroupId( groupId );
+ model.setArtifactId( artifactId );
+ model.setVersion( version );
+ model.setRepositoryId( repoId );
+ return new ArchivaArtifact( model );
}
- private void setActionParameters()
+ private MockControl createProjectDaoMock( List<ArchivaProjectModel> projects )
+ throws ArchivaDatabaseException
{
- action.setGroupId( TEST_GROUP_ID );
- action.setArtifactId( TEST_ARTIFACT_ID );
- action.setVersion( TEST_VERSION );
- }
+ MockControl control = MockControl.createNiceControl( ProjectModelDAO.class );
+ ProjectModelDAO dao = (ProjectModelDAO) control.getMock();
+ archivaDao.setProjectDao( dao );
+
+ for ( ArchivaProjectModel project : projects )
+ {
+ control.expectAndReturn(
+ dao.getProjectModel( project.getGroupId(), project.getArtifactId(), project.getVersion() ), project );
+ }
- private void assertActionParameters( ShowArtifactAction action )
- {
- assertEquals( TEST_GROUP_ID, action.getGroupId() );
- assertEquals( TEST_ARTIFACT_ID, action.getArtifactId() );
- assertEquals( TEST_VERSION, action.getVersion() );
+ control.replay();
+ return control;
}
- private void assertActionSuccess( ShowArtifactAction action, String result )
+ protected void setUp()
+ throws Exception
{
- assertEquals( Action.SUCCESS, result );
- assertTrue( action.getActionErrors().isEmpty() );
- assertTrue( action.getActionMessages().isEmpty() );
+ super.setUp();
+ action = (BrowseAction) lookup( Action.class, ACTION_HINT );
+ archivaDao = (ArchivaDAOStub) lookup( ArchivaDAO.class, "jdo" );
}
- private ProjectVersionMetadata createProjectModel( String version )
+ protected ArchivaProjectModel createProjectModel( String groupId, String artifactId, String version )
{
- ProjectVersionMetadata model = new ProjectVersionMetadata();
- model.setId( version );
+ ArchivaProjectModel model = new ArchivaProjectModel();
+ model.setGroupId( groupId );
+ model.setArtifactId( artifactId );
+ model.setVersion( version );
+ model.setPackaging( TEST_PACKAGING );
model.setUrl( TEST_URL );
model.setName( TEST_NAME );
model.setDescription( TEST_DESCRIPTION );
+ VersionedReference parent = new VersionedReference();
+ parent.setGroupId( TEST_PARENT_GROUP_ID );
+ parent.setArtifactId( TEST_PARENT_ARTIFACT_ID );
+ parent.setVersion( TEST_PARENT_VERSION );
+ model.setParentProject( parent );
CiManagement ci = new CiManagement();
ci.setSystem( TEST_CI_SYSTEM );
ci.setUrl( TEST_CI_URL );
@@ -602,10 +415,10 @@
issue.setSystem( TEST_ISSUE_SYSTEM );
issue.setUrl( TEST_ISSUE_URL );
model.setIssueManagement( issue );
- Organization organization = new Organization();
- organization.setName( TEST_ORGANIZATION_NAME );
- organization.setUrl( TEST_ORGANIZATION_URL );
- model.setOrganization( organization );
+ Organization org = new Organization();
+ org.setName( TEST_ORGANIZATION_NAME );
+ org.setUrl( TEST_ORGANIZATION_URL );
+ model.setOrganization( org );
License l = new License();
l.setName( TEST_LICENSE_NAME );
l.setUrl( TEST_LICENSE_URL );
@@ -619,25 +432,6 @@
scm.setDeveloperConnection( TEST_SCM_DEV_CONNECTION );
scm.setUrl( TEST_SCM_URL );
model.setScm( scm );
-
- MavenProjectFacet mavenProjectFacet = new MavenProjectFacet();
- mavenProjectFacet.setGroupId( TEST_GROUP_ID );
- mavenProjectFacet.setArtifactId( TEST_ARTIFACT_ID );
- mavenProjectFacet.setPackaging( TEST_PACKAGING );
- MavenProjectParent parent = new MavenProjectParent();
- parent.setGroupId( TEST_PARENT_GROUP_ID );
- parent.setArtifactId( TEST_PARENT_ARTIFACT_ID );
- parent.setVersion( TEST_PARENT_VERSION );
- mavenProjectFacet.setParent( parent );
- model.addFacet( mavenProjectFacet );
return model;
}
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- action = (ShowArtifactAction) lookup( Action.class, ACTION_HINT );
- metadataResolver = (TestMetadataResolver) action.getMetadataResolver();
- }
-}
+}
\ No newline at end of file
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java?rev=884741&r1=884740&r2=884741&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java Fri Nov 27 04:00:05 2009
@@ -38,63 +38,14 @@
import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectParent;
import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.model.ArchivaProjectModel;
-import org.apache.maven.archiva.security.UserRepositories;
-import org.apache.maven.archiva.security.UserRepositoriesStub;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
public class ShowArtifactActionTest
- extends PlexusInSpringTestCase
+ extends AbstractActionTestCase
{
private static final String ACTION_HINT = "showArtifactAction";
- private static final String TEST_GROUP_ID = "groupId";
-
- private static final String TEST_ARTIFACT_ID = "artifactId";
-
private static final String TEST_VERSION = "version";
- private static final String TEST_PACKAGING = "packaging";
-
- private static final String TEST_ISSUE_URL = "http://jira.codehaus.org/browse/MRM";
-
- private static final String TEST_ISSUE_SYSTEM = "jira";
-
- private static final String TEST_CI_SYSTEM = "continuum";
-
- private static final String TEST_CI_URL = "http://vmbuild.apache.org/";
-
- private static final String TEST_URL = "url";
-
- private static final String TEST_NAME = "name";
-
- private static final String TEST_DESCRIPTION = "description";
-
- private static final String TEST_PARENT_GROUP_ID = "parentGroupId";
-
- private static final String TEST_PARENT_ARTIFACT_ID = "parentArtifactId";
-
- private static final String TEST_PARENT_VERSION = "parentVersion";
-
- private static final String TEST_ORGANIZATION_NAME = "organizationName";
-
- private static final String TEST_ORGANIZATION_URL = "organizationUrl";
-
- private static final String TEST_LICENSE_URL = "licenseUrl";
-
- private static final String TEST_LICENSE_NAME = "licenseName";
-
- private static final String TEST_LICENSE_URL_2 = "licenseUrl_2";
-
- private static final String TEST_LICENSE_NAME_2 = "licenseName_2";
-
- private static final String TEST_REPO = "test-repo";
-
- private static final String TEST_SCM_CONNECTION = "scmConnection";
-
- private static final String TEST_SCM_DEV_CONNECTION = "scmDevConnection";
-
- private static final String TEST_SCM_URL = "scmUrl";
-
private static final String TEST_SNAPSHOT_VERSION = "1.0-SNAPSHOT";
private static final String TEST_TS_SNAPSHOT_VERSION = "1.0-20091120.111111-1";
@@ -106,8 +57,6 @@
private ShowArtifactAction action;
- private TestMetadataResolver metadataResolver;
-
public void testInstantiation()
{
assertFalse( action == lookup( Action.class, ACTION_HINT ) );
@@ -524,48 +473,11 @@
assertEquals( 1, action.getActionErrors().size() );
}
- private void setObservableRepos( List<String> repoIds )
- {
- UserRepositoriesStub repos = (UserRepositoriesStub) lookup( UserRepositories.class );
- repos.setObservableRepositoryIds( repoIds );
- }
-
private void assertDefaultModel( ArchivaProjectModel model )
{
assertDefaultModel( model, TEST_VERSION );
}
- private void assertDefaultModel( ArchivaProjectModel model, String version )
- {
- assertEquals( TEST_GROUP_ID, model.getGroupId() );
- assertEquals( TEST_ARTIFACT_ID, model.getArtifactId() );
- assertEquals( version, model.getVersion() );
- assertEquals( TEST_URL, model.getUrl() );
- assertEquals( TEST_NAME, model.getName() );
- assertEquals( TEST_DESCRIPTION, model.getDescription() );
- assertEquals( TEST_ORGANIZATION_NAME, model.getOrganization().getName() );
- assertEquals( TEST_ORGANIZATION_URL, model.getOrganization().getUrl() );
- assertEquals( 2, model.getLicenses().size() );
- org.apache.maven.archiva.model.License l = model.getLicenses().get( 0 );
- assertEquals( TEST_LICENSE_NAME, l.getName() );
- assertEquals( TEST_LICENSE_URL, l.getUrl() );
- l = model.getLicenses().get( 1 );
- assertEquals( TEST_LICENSE_NAME_2, l.getName() );
- assertEquals( TEST_LICENSE_URL_2, l.getUrl() );
- assertEquals( TEST_ISSUE_SYSTEM, model.getIssueManagement().getSystem() );
- assertEquals( TEST_ISSUE_URL, model.getIssueManagement().getUrl() );
- assertEquals( TEST_CI_SYSTEM, model.getCiManagement().getSystem() );
- assertEquals( TEST_CI_URL, model.getCiManagement().getUrl() );
- assertEquals( TEST_SCM_CONNECTION, model.getScm().getConnection() );
- assertEquals( TEST_SCM_DEV_CONNECTION, model.getScm().getDeveloperConnection() );
- assertEquals( TEST_SCM_URL, model.getScm().getUrl() );
-
- assertEquals( TEST_PACKAGING, model.getPackaging() );
- assertEquals( TEST_PARENT_GROUP_ID, model.getParentProject().getGroupId() );
- assertEquals( TEST_PARENT_ARTIFACT_ID, model.getParentProject().getArtifactId() );
- assertEquals( TEST_PARENT_VERSION, model.getParentProject().getVersion() );
- }
-
private void setActionParameters()
{
action.setGroupId( TEST_GROUP_ID );
@@ -587,7 +499,15 @@
assertTrue( action.getActionMessages().isEmpty() );
}
- private ProjectVersionMetadata createProjectModel( String version )
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ action = (ShowArtifactAction) lookup( Action.class, ACTION_HINT );
+ metadataResolver = (TestMetadataResolver) action.getMetadataResolver();
+ }
+
+ protected ProjectVersionMetadata createProjectModel( String version )
{
ProjectVersionMetadata model = new ProjectVersionMetadata();
model.setId( version );
@@ -632,12 +552,4 @@
model.addFacet( mavenProjectFacet );
return model;
}
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- action = (ShowArtifactAction) lookup( Action.class, ACTION_HINT );
- metadataResolver = (TestMetadataResolver) action.getMetadataResolver();
- }
}
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java?rev=884741&r1=884740&r2=884741&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java Fri Nov 27 04:00:05 2009
@@ -12,6 +12,8 @@
import org.apache.maven.archiva.database.RepositoryContentStatisticsDAO;
import org.apache.maven.archiva.database.RepositoryProblemDAO;
import org.apache.maven.archiva.database.SimpleConstraint;
+import org.apache.maven.archiva.database.constraints.UniqueArtifactIdConstraint;
+import org.apache.maven.archiva.database.constraints.UniqueGroupIdConstraint;
import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
import org.apache.maven.archiva.model.RepositoryContentStatistics;
@@ -50,12 +52,24 @@
private List<String> versions;
+ private List<String> groups;
+
+ private List<String> artifacts;
+
public List<?> query( SimpleConstraint constraint )
{
if ( constraint instanceof UniqueVersionConstraint )
{
return versions;
}
+ else if ( constraint instanceof UniqueGroupIdConstraint )
+ {
+ return groups;
+ }
+ else if ( constraint instanceof UniqueArtifactIdConstraint )
+ {
+ return artifacts;
+ }
else
{
Assert.assertEquals( RepositoryContentStatistics.class, constraint.getResultClass() );
@@ -110,4 +124,14 @@
{
this.versions = versions;
}
+
+ public void setGroups( List<String> groups )
+ {
+ this.groups = groups;
+ }
+
+ public void setArtifacts( List<String> artifacts )
+ {
+ this.artifacts = artifacts;
+ }
}
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/BrowseActionTest.xml (from r884032, archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/BrowseActionTest.xml?p2=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/BrowseActionTest.xml&p1=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml&r1=884032&r2=884741&rev=884741&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/BrowseActionTest.xml Fri Nov 27 04:00:05 2009
@@ -7,7 +7,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
@@ -35,11 +35,5 @@
<role-hint>default</role-hint>
<implementation>org.apache.maven.archiva.security.UserRepositoriesStub</implementation>
</component>
- <component>
- <role>org.apache.archiva.metadata.repository.MetadataResolver</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.archiva.metadata.repository.memory.TestMetadataResolver</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
</components>
</plexus>