Merged /archiva/trunk:r909071-909464

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@909470 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-02-12 15:53:49 +00:00
commit 4903f8dd2d
3 changed files with 30 additions and 2 deletions

View File

@ -81,7 +81,7 @@ SNAPSHOT_GROUPID=org.apache.archiva
SNAPSHOT_ARTIFACTID=archiva-test
SNAPSHOT_VERSION=1.0-SNAPSHOT
SNAPSHOT_PACKAGING=jar
SNAPSHOT_ARTIFACTFILEPATH=test
SNAPSHOT_ARTIFACTFILEPATH=src/test/it-resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar
SNAPSHOT_REPOSITORYID=snapshots
# REPOSITORIES
@ -106,3 +106,8 @@ NETWORKPROXY_PASSWORD=admin123
# Browse - MRM-1278 test
SNAPSHOTS_REPOSITORY=snapshots
RELEASES_REPOSITORY=releases
# Audit Log Report - MRM-1304
AUDITLOG_GROUPID=group.id
AUDITLOG_EXPECTED_ARTIFACT=group/id/test/1.0/test-1.0.jar

View File

@ -161,4 +161,27 @@ public void testViewAuditLogsViewAuditEventsForManageableRepositoriesOnly()
clickLinkWithText( "Logout" );
login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) );
}
@Test (dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload")
public void testViewAuditLogsReportForGroupId()
{
String groupId = getProperty("AUDITLOG_GROUPID");
String artifactId = getProperty("ARTIFACTID");
String version = getProperty("VERSION");
String packaging = getProperty("PACKAGING");
String repositoryId = getProperty("REPOSITORYID");
String expectedArtifact = getProperty("AUDITLOG_EXPECTED_ARTIFACT");
addArtifact( groupId, artifactId, version, packaging, getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ), repositoryId );
goToAuditLogReports();
selectValue( "repository", repositoryId );
setFieldValue( "groupId", groupId );
submit();
assertAuditLogsReportPage();
assertTextPresent( expectedArtifact );
assertTextPresent( repositoryId );
}
}

View File

@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-parent</artifactId>
<version>5</version>
<version>6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<name>Archiva</name>