Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)

137948 jvonka: REPO-1785: Get Audit App Info - minor code formatting & consistency fix 
   - noticed whilst verifying REPO-2585


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2017-07-12 12:11:43 +00:00
parent fa37e7b8f2
commit 03ec9fbbcf
2 changed files with 12 additions and 5 deletions

View File

@@ -99,10 +99,14 @@ public class AuditAppTest extends AbstractSingleNetworkSiteTest
final AuditApps auditAppsProxy = publicApiClient.auditApps();
String appId = null;
// Get one of the audit app ids (default tagging)
// Get one of the audit app ids
setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
ListResponse<AuditApp> apps = auditAppsProxy.getAuditApps(null, "Getting audit apps error ", HttpServletResponse.SC_OK);
appId = (apps.getList().size()>0) ? apps.getList().get(0).getId() : "tagging";
if (apps.getList().size() == 0)
{
fail("There are no audit applications to run this test against.");
}
appId = apps.getList().get(0).getId();
// Enable system audit
AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
@@ -140,10 +144,8 @@ public class AuditAppTest extends AbstractSingleNetworkSiteTest
// Positive tests
// Get audit application information
{
// Get the list of audit applications in the system
setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
// Get audit application info
AuditApp auditApp = auditAppsProxy.getAuditApp(appId);
validateAuditApplicationFields(auditApp);
}
@@ -251,7 +253,10 @@ public class AuditAppTest extends AbstractSingleNetworkSiteTest
//Get one of the audit app ids ( fail test if there are no audit apps in the system )
ListResponse<AuditApp> apps = publicApiClient.auditApps().getAuditApps(null, "Getting audit apps error ", HttpServletResponse.SC_OK);
if (apps.getList().size() == 0) fail("There are no audit applications to run this test against.");
if (apps.getList().size() == 0)
{
fail("There are no audit applications to run this test against.");
}
appId = apps.getList().get(0).getId();
// +ve