From fdf9f04c24fdd81f544da3cd02b36d2ce15e1205 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Tue, 23 Mar 2021 10:27:10 +0200 Subject: [PATCH] revert unnecessary changes --- .../rest/rm/community/audit/AuditLoginEventsTests.java | 6 +++--- .../src/test/resources/log4j.properties | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java index 2cbf62fedc..02f40b5c2e 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java @@ -73,6 +73,7 @@ public class AuditLoginEventsTests extends BaseRMRestTest assertTrue("The list of events is not filtered by " + LOGIN_UNSUCCESSFUL.event, auditEntries.stream().allMatch(auditEntry -> auditEntry.getEvent().equals(LOGIN_UNSUCCESSFUL.eventDisplayName))); } + /** * Given I have tried to login using valid credentials * When I view the RM audit filtered by Login successful event @@ -81,15 +82,14 @@ public class AuditLoginEventsTests extends BaseRMRestTest @Test public void filterByLoginSuccessful() throws Exception { - //rmAuditService.clearAuditLog(); restClient.authenticateUser(getAdminUser()); restClient.withCoreAPI().getSites(); - STEP("Get the list of audit entries for the login unsuccessful event."); + STEP("Get the list of audit entries for the login successful event."); List auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), LOGIN_SUCCESSFUL); - STEP("Check the audit log contains only the entries for the login unsuccessful event."); + STEP("Check the audit log contains only the entries for the login successful event."); assertTrue("The list of events is not filtered by " + LOGIN_SUCCESSFUL.event, auditEntries.stream().allMatch(auditEntry -> auditEntry.getEvent().equals(LOGIN_SUCCESSFUL.eventDisplayName))); } diff --git a/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties b/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties index fcf7b84121..e01a70def8 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties +++ b/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties @@ -1,5 +1,5 @@ # Root logger option -log4j.rootLogger=INFO, file, stdout +log4j.rootLogger=INFO, file # Direct log messages to a log file log4j.appender.file=org.apache.log4j.RollingFileAppender @@ -9,8 +9,3 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n log4j.logger.com.example=debug -##Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n