Author: brett
Date: Fri Nov 27 04:35:59 2009
New Revision: 884742
URL: http://svn.apache.org/viewvc?rev=884742&view=rev
Log:
add test cases for the browse action
Merged from: r884741
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
- copied, changed from r884741,
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
- copied unchanged from r884741,
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/BrowseActionTest.xml
- copied unchanged from r884741,
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/BrowseActionTest.xml
Modified:
archiva/trunk/ (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
(props changed)
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
(props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
(props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
(props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
Propchange: archiva/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 27 04:35:59 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025:882046,882457
+/archiva/branches/MRM-1025:882046,882457,884741
/archiva/branches/MRM-541:686983-687034
/archiva/branches/archiva-search-improvements:723609-726925
/archiva/branches/archiva-struts2:699795-705848
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 27 04:35:59 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:882046,882457
+/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:882046,882457,884741
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:699795-705848
Modified:
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java?rev=884742&r1=884741&r2=884742&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
(original)
+++
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
Fri Nov 27 04:35:59 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?rev=884742&r1=884741&r2=884742&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
Fri Nov 27 04:35:59 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
{
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 27 04:35:59 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:882046,882457
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:882046,882457,884741
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:699795-705848
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 27 04:35:59 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:882046,882457
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:882046,882457,884741
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:699795-705848
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 27 04:35:59 2009
@@ -1,4 +1,4 @@
-/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:882046,882457
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:882046,882457,884741
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:699795-705848
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
(from r884741,
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/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java&r1=884741&r2=884742&rev=884742&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
Fri Nov 27 04:35:59 2009
@@ -21,7 +21,6 @@
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;
@@ -32,8 +31,6 @@
{
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";
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=884742&r1=884741&r2=884742&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
Fri Nov 27 04:35:59 2009
@@ -45,58 +45,12 @@
import org.easymock.MockControl;
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 ShowArtifactAction action;
private static final String TEST_SNAPSHOT_VERSION = "1.0-SNAPSHOT";
@@ -385,47 +339,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_PACKAGING, model.getPackaging() );
- 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() );
- 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_PARENT_GROUP_ID,
model.getParentProject().getGroupId() );
- assertEquals( TEST_PARENT_ARTIFACT_ID,
model.getParentProject().getArtifactId() );
- assertEquals( TEST_PARENT_VERSION,
model.getParentProject().getVersion() );
- 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() );
- }
-
private void setActionParameters()
{
action.setGroupId( TEST_GROUP_ID );
Modified:
archiva/trunk/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/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java?rev=884742&r1=884741&r2=884742&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
Fri Nov 27 04:35:59 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;
+ }
}
