diff options
author | Brett Porter <brett@apache.org> | 2010-02-12 15:53:49 +0000 |
---|---|---|
committer | Brett Porter <brett@apache.org> | 2010-02-12 15:53:49 +0000 |
commit | 4903f8dd2dfaefb448e0a318117ff4db7db5275b (patch) | |
tree | e26ecaa02f97903c58cdcf14cb74e9178c1c2887 /archiva-modules | |
parent | 5bb1dbf6f2c01958fc22bab0e0a9b584fa588fa3 (diff) | |
parent | ea24dec5aa2caeb782af16cddf89d392206b8d94 (diff) | |
download | archiva-4903f8dd2dfaefb448e0a318117ff4db7db5275b.tar.gz archiva-4903f8dd2dfaefb448e0a318117ff4db7db5275b.zip |
Merged /archiva/trunk:r909071-909464
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@909470 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
2 files changed, 29 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties index 778d802e5..beb2ab7d0 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties @@ -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 + diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java index fdc26b789..1a1d6314b 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java @@ -161,4 +161,27 @@ public class AuditLogsReportTest 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 ); + } } |