This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit b5e932ea2289796bf89282deddc3bbe80aabfc86 Author: Misagh Moayyed <[email protected]> AuthorDate: Fri Dec 6 18:49:28 2019 +0400 SYNCOPE-1511: Test fixes (#143) --- .../syncope/fit/console/AnyObjectsITCase.java | 2 +- .../apache/syncope/fit/console/GroupsITCase.java | 8 +- .../apache/syncope/fit/console/PoliciesITCase.java | 2 +- .../apache/syncope/fit/console/UsersITCase.java | 2 +- .../org/apache/syncope/fit/core/AuditITCase.java | 94 +++++++++++++--------- 5 files changed, 61 insertions(+), 47 deletions(-) diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyObjectsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyObjectsITCase.java index 534d523..e5533eb 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyObjectsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyObjectsITCase.java @@ -148,7 +148,7 @@ public class AnyObjectsITCase extends AbstractConsoleITCase { UTILITY_UI.getTester().executeAjaxEvent(component.getPageRelativePath(), Constants.ON_CLICK); UTILITY_UI.getTester().assertComponent(TAB_PANEL + "outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:" - + "actions:actions:actionRepeater:5:action:action", + + "actions:actions:actionRepeater:6:action:action", IndicatingOnConfirmAjaxLink.class); } } diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/GroupsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/GroupsITCase.java index 6d8589a..d486b74 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/GroupsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/GroupsITCase.java @@ -141,7 +141,7 @@ public class GroupsITCase extends AbstractConsoleITCase { UTILITY_UI.getTester().executeAjaxEvent(UTILITY_UI.getTester().getComponentFromLastRenderedPage(TAB_PANEL + "outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:" - + "actions:actions:actionRepeater:9:action:action"), Constants.ON_CLICK); + + "actions:actions:actionRepeater:10:action:action"), Constants.ON_CLICK); UTILITY_UI.getTester().assertInfoMessages("Operation successfully executed"); UTILITY_UI.getTester().cleanupFeedbackMessages(); @@ -233,11 +233,11 @@ public class GroupsITCase extends AbstractConsoleITCase { UTILITY_UI.getTester().getRequest().addParameter("confirm", "true"); UTILITY_UI.getTester().clickLink(UTILITY_UI.getTester().getComponentFromLastRenderedPage(TAB_PANEL + "outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:" - + "actions:actions:actionRepeater:9:action:action")); + + "actions:actions:actionRepeater:10:action:action")); UTILITY_UI.getTester().executeAjaxEvent(UTILITY_UI.getTester().getComponentFromLastRenderedPage(TAB_PANEL + "outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:" - + "actions:actions:actionRepeater:9:action:action"), Constants.ON_CLICK); + + "actions:actions:actionRepeater:10:action:action"), Constants.ON_CLICK); UTILITY_UI.getTester().assertInfoMessages("Operation successfully executed"); UTILITY_UI.getTester().cleanupFeedbackMessages(); @@ -255,6 +255,6 @@ public class GroupsITCase extends AbstractConsoleITCase { UTILITY_UI.getTester().executeAjaxEvent(component.getPageRelativePath(), Constants.ON_CLICK); UTILITY_UI.getTester().assertComponent(TAB_PANEL + "outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:" - + "actions:actions:actionRepeater:9:action:action", IndicatingOnConfirmAjaxLink.class); + + "actions:actions:actionRepeater:10:action:action", IndicatingOnConfirmAjaxLink.class); } } diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/PoliciesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/PoliciesITCase.java index b29dce1..e4b0cbc 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/PoliciesITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/PoliciesITCase.java @@ -837,7 +837,7 @@ public class PoliciesITCase extends AbstractConsoleITCase { UTILITY_UI.getTester().executeAjaxEvent(UTILITY_UI.getTester().getComponentFromLastRenderedPage( "body:content:body:container:content:tabbedPanel:panel:searchResult:outerObjectsRepeater:" - + "1:outer:container:content:togglePanelContainer:container:actions:actions:actionRepeater:9:" + + "1:outer:container:content:togglePanelContainer:container:actions:actions:actionRepeater:10:" + "action:action"), Constants.ON_CLICK); UTILITY_UI.getTester().assertInfoMessages("Operation successfully executed"); diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java index b5fc45e..4bd4091 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java @@ -582,7 +582,7 @@ public class UsersITCase extends AbstractConsoleITCase { UTILITY_UI.getTester().executeAjaxEvent(component.getPageRelativePath(), Constants.ON_CLICK); UTILITY_UI.getTester().assertComponent(TAB_PANEL + "outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:" - + "actions:actions:actionRepeater:9:action:action", IndicatingOnConfirmAjaxLink.class); + + "actions:actions:actionRepeater:10:action:action", IndicatingOnConfirmAjaxLink.class); } @Test diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java index cff5d47..70988ef 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java @@ -20,9 +20,7 @@ package org.apache.syncope.fit.core; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; @@ -41,9 +39,20 @@ import org.junit.jupiter.api.Test; public class AuditITCase extends AbstractITCase { - private static final int MAX_WAIT_SECONDS = 30; + private static final int MAX_WAIT_SECONDS = 50; private static AuditEntryTO query(final AuditQuery query, final int maxWaitSeconds, final boolean failIfEmpty) { + List<AuditEntryTO> results = query(query, maxWaitSeconds); + if (results.isEmpty()) { + if (failIfEmpty) { + fail("Timeout when executing query for key " + query.getEntityKey()); + } + return null; + } + return results.get(0); + } + + private static List<AuditEntryTO> query(final AuditQuery query, final int maxWaitSeconds) { int i = 0; List<AuditEntryTO> results = List.of(); do { @@ -51,35 +60,31 @@ public class AuditITCase extends AbstractITCase { Thread.sleep(1000); } catch (InterruptedException e) { } - results = auditService.search(query).getResult(); - i++; } while (results.isEmpty() && i < maxWaitSeconds); - if (results.isEmpty()) { - if (failIfEmpty) { - fail("Timeout when executing query for key " + query.getEntityKey()); - } - return null; - } - - return results.get(0); + return results; } @Test public void userReadAndSearchYieldsNoAudit() { - PagedResult<UserTO> users = userService.search( - new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).page(1).size(2).build()); - assertNotNull(users); - assertFalse(users.getResult().isEmpty()); - - users.getResult().forEach(user -> assertNotNull(userService.read(user.getKey()))); - - users.getResult().forEach(user -> { - AuditQuery query = new AuditQuery.Builder(user.getKey()).build(); - AuditEntryTO entry = query(query, MAX_WAIT_SECONDS, false); - assertNull(entry); - }); + UserTO userTO = createUser(UserITCase.getUniqueSample("[email protected]")).getEntity(); + assertNotNull(userTO.getKey()); + + AuditQuery query = new AuditQuery.Builder(userTO.getKey()).build(); + List<AuditEntryTO> entries = query(query, MAX_WAIT_SECONDS); + assertEquals(1, entries.size()); + + PagedResult<UserTO> usersTOs = userService.search( + new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM). + fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").equalTo(userTO.getUsername()). + query()). + build()); + assertNotNull(usersTOs); + assertFalse(usersTOs.getResult().isEmpty()); + + entries = query(query, MAX_WAIT_SECONDS); + assertEquals(1, entries.size()); } @Test @@ -127,18 +132,23 @@ public class AuditITCase extends AbstractITCase { @Test public void groupReadAndSearchYieldsNoAudit() { + GroupTO groupTO = createGroup(GroupITCase.getBasicSample("AuditGroupSearch")).getEntity(); + assertNotNull(groupTO.getKey()); + + AuditQuery query = new AuditQuery.Builder(groupTO.getKey()).build(); + List<AuditEntryTO> entries = query(query, MAX_WAIT_SECONDS); + assertEquals(1, entries.size()); + PagedResult<GroupTO> groups = groupService.search( - new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).build()); + new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM). + fiql(SyncopeClient.getGroupSearchConditionBuilder().is("name").equalTo(groupTO.getName()). + query()). + build()); assertNotNull(groups); assertFalse(groups.getResult().isEmpty()); - groups.getResult().forEach(groupTO -> assertNotNull(groupService.read(groupTO.getKey()))); - - groups.getResult().forEach(groupTO -> { - AuditQuery query = new AuditQuery.Builder(groupTO.getKey()).build(); - AuditEntryTO entry = query(query, MAX_WAIT_SECONDS, false); - assertNull(entry); - }); + entries = query(query, MAX_WAIT_SECONDS); + assertEquals(1, entries.size()); } @Test @@ -154,17 +164,21 @@ public class AuditITCase extends AbstractITCase { @Test public void anyObjectReadAndSearchYieldsNoAudit() { + AnyObjectTO anyObjectTO = createAnyObject(AnyObjectITCase.getSample("USA")).getEntity(); + assertNotNull(anyObjectTO); + + AuditQuery query = new AuditQuery.Builder(anyObjectTO.getKey()).build(); + List<AuditEntryTO> entries = query(query, MAX_WAIT_SECONDS); + assertEquals(1, entries.size()); + PagedResult<AnyObjectTO> anyObjects = anyObjectService.search( new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM). - fiql(SyncopeClient.getAnyObjectSearchConditionBuilder(getUUIDString()).query()). + fiql(SyncopeClient.getAnyObjectSearchConditionBuilder(anyObjectTO.getType()).query()). build()); assertNotNull(anyObjects); - assertTrue(anyObjects.getResult().isEmpty()); + assertFalse(anyObjects.getResult().isEmpty()); - anyObjects.getResult().forEach(anyObjectTO -> { - AuditQuery query = new AuditQuery.Builder(anyObjectTO.getKey()).build(); - AuditEntryTO entry = query(query, MAX_WAIT_SECONDS, false); - assertNull(entry); - }); + entries = query(query, MAX_WAIT_SECONDS); + assertEquals(1, entries.size()); } }
