REPO-2156 / MNT-16748: Failing to extract auditing entries from SearchService using Share, CMIS.

- Added two JUnit tests that test that the audit records are added when using SearchService query(SearchParameters): one in the AuditMethodInterceptorTest and another one in AuditWebScriptTest that is using the Rest-API get audit method to query the audit
- Refactored also an existing test in AuditMethodInterceptorTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/repo/audit/AuditMethodInterceptorTest.java

@@ -45,6 +45,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
@@ -201,9 +202,9 @@ public class AuditMethodInterceptorTest extends TestCase
 
     /**
      * Test for <a href="https://issues.alfresco.com/jira/browse/MNT-16748">MNT-16748</a> <br>
-     * Use {@link SearchService} to perform a query.
+     * Use {@link SearchService#query(StoreRef, String, String)} to perform a query.
      */
-    public void testAuditSearchService_MNT16748() throws Exception
+    public void testAuditSearchServiceQuery() throws Exception
     {
         // Run as admin
         AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
@@ -215,12 +216,48 @@ public class AuditMethodInterceptorTest extends TestCase
             @Override
             public ResultSet execute() throws Throwable
             {
-                return searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_XPATH, "/company_home");
+                return searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_XPATH, "/app:company_home");
             }
 
         }, true, false);
 
-        // Search for audit
+        // Check the audit entries
+        checkAuditEntries(APPLICATION_NAME_MNT_16748, SearchService.LANGUAGE_XPATH, "/app:company_home", 1);
+    }
+
+    /**
+     * Test for <a href="https://issues.alfresco.com/jira/browse/MNT-16748">MNT-16748</a> <br>
+     * Use {@link SearchService#query(SearchParameters)} to perform a query.
+     */
+    public void testAuditSearchServiceSearchParametersQuery() throws Exception
+    {
+        // Run as admin
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+
+        // Create SearchParameters to be used in query
+        SearchParameters sp = new SearchParameters();
+        sp.setLanguage(SearchService.LANGUAGE_XPATH);
+        sp.setQuery("/app:company_home/app:dictionary");
+        sp.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+
+        // Perform a search
+        @SuppressWarnings("unused")
+        ResultSet rs = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<ResultSet>()
+        {
+            @Override
+            public ResultSet execute() throws Throwable
+            {
+                return searchService.query(sp);
+            }
+
+        }, true, false);
+
+        // Check the audit entries
+        checkAuditEntries(APPLICATION_NAME_MNT_16748, SearchService.LANGUAGE_XPATH, "/app:company_home/app:dictionary", 1);
+    }
+
+    private void checkAuditEntries(String applicationName, String language, String query, int resultsNumber)
+    {
         final StringBuilder sb = new StringBuilder();
         final MutableInt rowCount = new MutableInt();
         AuditQueryCallback callback = new AuditQueryCallback()
@@ -257,21 +294,20 @@ public class AuditMethodInterceptorTest extends TestCase
         AuditQueryParameters params = new AuditQueryParameters();
         params.setForward(true);
         params.setUser(AuthenticationUtil.getAdminUserName());
-        params.setApplicationName(APPLICATION_NAME_MNT_16748);
+        params.setApplicationName(applicationName);
 
         rowCount.setValue(0);
         auditComponent.auditQuery(callback, params, Integer.MAX_VALUE);
 
-        assertEquals("Incorrect number of audit entries", 1, rowCount.intValue());
+        assertEquals("Incorrect number of audit entries", resultsNumber, rowCount.intValue());
-        assertTrue(
+        assertTrue("The requested language should be in the audit entry.",
-                "The requested language should be in the audit entry.",
+                sb.toString().contains(language));
-                sb.toString().contains(SearchService.LANGUAGE_XPATH));
+        assertTrue("The used query should be in the audit entry.",
-        assertTrue(
+                sb.toString().contains(query));
-                "The requested language should be in the audit entry.",
-                sb.toString().contains("/company_home"));
         if (logger.isDebugEnabled())
         {
             logger.debug(sb.toString());
         }
     }
+
 }

source/test-resources/alfresco/testaudit/alfresco-audit-test-mnt-16748.xml

@@ -40,6 +40,8 @@
                         dataSource="/searchaudit/query/args/language" dataTrigger="/searchaudit/query/no-error" />
             <RecordValue key="queryX" dataExtractor="simpleValue"
                         dataSource="/searchaudit/query/args/query" dataTrigger="/searchaudit/query/no-error" />
+            <RecordValue key="searchParametersX" dataExtractor="simpleValue"
+                        dataSource="/searchaudit/query/args/searchParameters" dataTrigger="/searchaudit/query/no-error" />
         </AuditPath>
     </Application>