svn commit: r910393 - in /archiva/branches/MRM-1025/archiva-modules/archiva-web: archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/

[brett]

Author: brett
Date: Tue Feb 16 04:27:33 2010
New Revision: 910393

URL: http://svn.apache.org/viewvc?rev=910393&view=rev
Log:
correct test due to changed behaviour in audit log

Modified:
    
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
    
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java

Modified: 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java?rev=910393&r1=910392&r2=910393&view=diff
==============================================================================
--- 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
 (original)
+++ 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
 Tue Feb 16 04:27:33 2010
@@ -99,12 +99,11 @@
         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

Modified: 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.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/reports/ViewAuditLogReportAction.java?rev=910393&r1=910392&r2=910393&view=diff
==============================================================================
--- 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
 (original)
+++ 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
 Tue Feb 16 04:27:33 2010
@@ -187,6 +187,7 @@
         {
             // 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;
         }