[MRM-1355] merge test for audit log username setting from branch, with adjustments

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@918887 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
index f4119959fe52d67054af9e537918c0db3ca6b04a..6c265b225065e84b7674bbca4084d689c911d39d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
@@ -22,16 +22,19 @@ package org.apache.maven.archiva.webdav;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
 import net.sf.ehcache.CacheManager;
 
+import org.apache.archiva.repository.audit.TestAuditListener;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.webdav.DavSessionProvider;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.repository.audit.AuditListener;
 import org.apache.maven.archiva.security.ArchivaRoleConstants;
 import org.apache.maven.archiva.security.ServletAuthenticator;
 import org.codehaus.plexus.redback.authentication.AuthenticationException;
@@ -347,6 +350,8 @@ public class RepositoryServletSecurityTest
         archivaDavResourceFactory.setHttpAuth( httpAuth );
         archivaDavResourceFactory.setServletAuth( servletAuth );
 
+        TestAuditListener listener = new TestAuditListener();
+        archivaDavResourceFactory.addAuditListener( listener );
         servlet.setResourceFactory( archivaDavResourceFactory );
 
         AuthenticationResult result = new AuthenticationResult();
@@ -376,6 +381,8 @@ public class RepositoryServletSecurityTest
         servletAuthControl.verify();
 
         // assertEquals(HttpServletResponse.SC_CREATED, response.getResponseCode());
+
+        assertEquals( "admin", listener.getEvents().get( 0 ).getUserId() );
     }
 
     // test get with invalid user, and guest has read access to repo

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java
new file mode 100644 (file)
index 0000000..52a6a14
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java
@@ -0,0 +1,42 @@
+package org.apache.archiva.repository.audit;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.archiva.repository.audit.AuditEvent;
+import org.apache.maven.archiva.repository.audit.AuditListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestAuditListener
+    implements AuditListener
+{
+    public List<AuditEvent> getEvents()
+    {
+        return events;
+    }
+
+    private List<AuditEvent> events = new ArrayList<AuditEvent>();
+
+    public void auditEvent( AuditEvent event )
+    {
+        events.add( event );
+    }
+}