This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 4fce918 SYNCOPE-1511: Test fixes (#143)
4fce918 is described below
commit 4fce9183125366654e18f4a1a25f2bbd17f2c838
Author: Misagh Moayyed <[email protected]>
AuthorDate: Fri Dec 6 18:49:28 2019 +0400
SYNCOPE-1511: Test fixes (#143)
* Fix tests cases
* adjustments after review
* improv performance of audit tests
---
.../syncope/fit/console/AnyObjectsITCase.java | 2 +-
.../apache/syncope/fit/console/GroupsITCase.java | 10 +--
.../apache/syncope/fit/console/PoliciesITCase.java | 2 +-
.../apache/syncope/fit/console/UsersITCase.java | 2 +-
.../org/apache/syncope/fit/core/AuditITCase.java | 97 ++++++++++++----------
5 files changed, 63 insertions(+), 50 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 a40cb6d..7ebfc38 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
@@ -141,7 +141,7 @@ public class AnyObjectsITCase extends AbstractConsoleITCase
{
TESTER.executeAjaxEvent(component.getPageRelativePath(),
Constants.ON_CLICK);
TESTER.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 daac35d..8e8bc70 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
@@ -128,11 +128,11 @@ public class GroupsITCase extends AbstractConsoleITCase {
TESTER.executeAjaxEvent(component.getPageRelativePath(),
Constants.ON_CLICK);
TESTER.getRequest().addParameter("confirm", "true");
TESTER.clickLink(TAB_PANEL +
"outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:"
- + "actions:actions:actionRepeater:9:action:action");
+ + "actions:actions:actionRepeater:10:action:action");
TESTER.executeAjaxEvent(TESTER.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);
TESTER.assertInfoMessages("Operation executed successfully");
TESTER.cleanupFeedbackMessages();
@@ -217,11 +217,11 @@ public class GroupsITCase extends AbstractConsoleITCase {
TESTER.getRequest().addParameter("confirm", "true");
TESTER.clickLink(TESTER.getComponentFromLastRenderedPage(TAB_PANEL
+
"outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:"
- + "actions:actions:actionRepeater:9:action:action"));
+ + "actions:actions:actionRepeater:10:action:action"));
TESTER.executeAjaxEvent(TESTER.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);
TESTER.assertInfoMessages("Operation executed successfully");
TESTER.cleanupFeedbackMessages();
@@ -239,6 +239,6 @@ public class GroupsITCase extends AbstractConsoleITCase {
TESTER.executeAjaxEvent(component.getPageRelativePath(),
Constants.ON_CLICK);
TESTER.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 0837b9e..a4e84af 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
@@ -784,7 +784,7 @@ public class PoliciesITCase extends AbstractConsoleITCase {
TESTER.executeAjaxEvent(TESTER.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);
TESTER.assertInfoMessages("Operation executed successfully");
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 6f571d4..ff0be0f 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
@@ -551,7 +551,7 @@ public class UsersITCase extends AbstractConsoleITCase {
TESTER.executeAjaxEvent(component.getPageRelativePath(),
Constants.ON_CLICK);
TESTER.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 f4f075b..e3ceffa 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.Collections;
@@ -42,9 +40,20 @@ import org.apache.syncope.fit.AbstractITCase;
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 = Collections.emptyList();
do {
@@ -52,36 +61,30 @@ 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());
-
- for (UserTO user : users.getResult()) {
- assertNotNull(userService.read(user.getKey()));
- }
- for (UserTO user : users.getResult()) {
- AuditQuery query = new AuditQuery.Builder(user.getKey()).build();
- AuditEntryTO entry = query(query, MAX_WAIT_SECONDS, false);
- assertNull(entry);
- }
+ UserTO userTO =
createUser(UserITCase.getUniqueSampleTO("[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
@@ -129,18 +132,22 @@ public class AuditITCase extends AbstractITCase {
@Test
public void groupReadAndSearchYieldsNoAudit() {
+ GroupTO groupTO =
createGroup(GroupITCase.getBasicSampleTO("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());
- for (GroupTO groupTO : groups.getResult()) {
- assertNotNull(groupService.read(groupTO.getKey()));
- }
- for (GroupTO groupTO : groups.getResult()) {
- 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
@@ -156,16 +163,22 @@ public class AuditITCase extends AbstractITCase {
@Test
public void anyObjectReadAndSearchYieldsNoAudit() {
+ AnyObjectTO anyObjectTO = AnyObjectITCase.getSampleTO("USA");
+ anyObjectTO = createAnyObject(anyObjectTO).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());
- for (AnyObjectTO anyObjectTO : anyObjects.getResult()) {
- AuditQuery query = new
AuditQuery.Builder(anyObjectTO.getKey()).build();
- AuditEntryTO entry = query(query, MAX_WAIT_SECONDS, false);
- assertNull(entry);
- }
+ assertFalse(anyObjects.getResult().isEmpty());
+
+ entries = query(query, MAX_WAIT_SECONDS);
+ assertEquals(1, entries.size());
}
}
