From b0bf4f1689275f0137ed3520f2b855e63017987f Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Tue, 16 Feb 2010 04:27:33 +0000 Subject: [PATCH] correct test due to changed behaviour in audit log git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@910393 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/web/test/AuditLogsReportTest.java | 9 ++++----- .../web/action/reports/ViewAuditLogReportAction.java | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) 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 1a1d6314b..99ab2f038 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 @@ -99,12 +99,11 @@ public class AuditLogsReportTest submit(); assertAuditLogsReportPage(); - assertTextPresent( "Results" ); + assertTextPresent( "If you specify an artifact ID, you must specify a group ID" ); + assertTextNotPresent( "Results" ); assertTextNotPresent( "No audit logs found." ); - assertTextPresent( "testAddArtifactValidValues-1.0.jar" ); - assertTextPresent( "Uploaded File" ); - assertTextPresent( "internal" ); - assertTextPresent( "admin" ); + assertTextNotPresent( "testAddArtifactValidValues-1.0.jar" ); + assertTextNotPresent( "Uploaded File" ); } // TODO: add test for adding via WebDAV diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java index 26433e15e..6af402d93 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java @@ -187,6 +187,7 @@ public class ViewAuditLogReportAction { // Until we store the full artifact metadata in the audit event, we can't query by these individually addActionError( "If you specify an artifact ID, you must specify a group ID" ); + auditLogs = null; return INPUT; } -- 2.39.5