You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/05/13 11:41:13 UTC
[syncope] branch 2_1_X updated: Fix console tests
This is an automated email from the ASF dual-hosted git repository.
ilgrosso 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 5be460d Fix console tests
5be460d is described below
commit 5be460dc8163db3380df1447148430885035f49d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed May 13 13:09:30 2020 +0200
Fix console tests
---
.../console/panels/search/UserSearchPanelTest.java | 38 ++++++++++++----------
.../syncope/fit/console/LinkedAccountsITCase.java | 29 +++++++----------
2 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/client/console/src/test/java/org/apache/syncope/client/console/panels/search/UserSearchPanelTest.java b/client/console/src/test/java/org/apache/syncope/client/console/panels/search/UserSearchPanelTest.java
index 60d529d..acd757e 100644
--- a/client/console/src/test/java/org/apache/syncope/client/console/panels/search/UserSearchPanelTest.java
+++ b/client/console/src/test/java/org/apache/syncope/client/console/panels/search/UserSearchPanelTest.java
@@ -21,44 +21,48 @@ package org.apache.syncope.client.console.panels.search;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
import org.apache.syncope.client.console.AbstractAdminTest;
+import org.apache.syncope.client.console.commons.Constants;
+import org.apache.wicket.Component;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.tester.FormTester;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class UserSearchPanelTest extends AbstractAdminTest {
@Test
public void test() {
- List<SearchClause> clauses = new ArrayList<>();
SearchClause clause = new SearchClause();
- clauses.add(clause);
clause.setComparator(SearchClause.Comparator.EQUALS);
clause.setType(SearchClause.Type.ATTRIBUTE);
clause.setProperty("username");
TESTER.startComponentInPage(new UserSearchPanel.Builder(
- new ListModel<>(clauses)).required(true).enableSearch().build("content"));
+ new ListModel<>(Arrays.asList(clause))).required(true).enableSearch().build("content"));
FormTester formTester = TESTER.newFormTester("content:searchFormContainer:search:multiValueContainer:innerForm");
- Assertions.assertNotNull(formTester.getForm().get("content:view:0:panel:container:property:textField"));
+ assertEquals("username", formTester.getForm().
+ get("content:view:0:panel:container:property:textField").getDefaultModelObjectAsString());
+ assertNull(formTester.getForm().
+ get("content:view:0:panel:container:value:textField").getDefaultModelObject());
formTester.setValue("content:view:0:panel:container:property:textField", "firstname");
+ TESTER.executeAjaxEvent(formTester.getForm().
+ get("content:view:0:panel:container:property:textField"), Constants.ON_KEYDOWN);
formTester.setValue("content:view:0:panel:container:value:textField", "vincenzo");
- assertEquals("username", formTester.getForm().
- get("content:view:0:panel:container:property:textField").getDefaultModelObjectAsString());
- assertNull(formTester.getForm().get("content:view:0:panel:container:value:textField").
- getDefaultModelObject());
- formTester.submit(formTester.getForm().get("content:view:0:panel:container:operatorContainer:operator:search"));
- assertEquals("firstname", formTester.getForm().get(
- "content:view:0:panel:container:property:textField").getDefaultModelObjectAsString());
- assertEquals("vincenzo", formTester.getForm().get("content:view:0:panel:container:value:textField").
- getDefaultModelObjectAsString());
+ TESTER.executeAjaxEvent(formTester.getForm().
+ get("content:view:0:panel:container:value:textField"), Constants.ON_KEYDOWN);
- }
+ Component searchButton = formTester.getForm().
+ get("content:view:0:panel:container:operatorContainer:operator:search");
+ TESTER.clickLink(searchButton);
+ TESTER.executeAjaxEvent(searchButton.getPageRelativePath(), Constants.ON_CLICK);
+ assertEquals("firstname", formTester.getForm().
+ get("content:view:0:panel:container:property:textField").getDefaultModelObjectAsString());
+ assertEquals("vincenzo", formTester.getForm().
+ get("content:view:0:panel:container:value:textField").getDefaultModelObjectAsString());
+ }
}
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LinkedAccountsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LinkedAccountsITCase.java
index 7d0ac33..bb8d58e 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LinkedAccountsITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LinkedAccountsITCase.java
@@ -39,8 +39,6 @@ import org.apache.syncope.common.rest.api.service.UserService;
import org.apache.syncope.fit.core.UserITCase;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.repeater.OddEvenItem;
import org.apache.wicket.util.tester.FormTester;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -112,7 +110,6 @@ public class LinkedAccountsITCase extends AbstractConsoleITCase {
@Test
public void createLinkedAccountAndMergeWithUser() {
-
// Locate and select first user
TESTER.clickLink("body:realmsLI:realms");
TESTER.clickLink("body:content:body:container:content:tabbedPanel:tabs-container:tabs:1:link");
@@ -137,18 +134,18 @@ public class LinkedAccountsITCase extends AbstractConsoleITCase {
type.setModelValue(new String[] { "ATTRIBUTE" });
type.setDefaultModelObject(SearchClause.Type.ATTRIBUTE);
- TextField<?> property = (TextField<?>) TESTER.getComponentFromLastRenderedPage(
- USER_SEARCH_FORM + "content:view:0:panel:container:property:textField");
- assertNotNull(property);
- property.setModelValue(new String[] { "username" });
-
- TextField<?> value = (TextField<?>) TESTER.getComponentFromLastRenderedPage(
- USER_SEARCH_FORM + "content:view:0:panel:container:value:textField");
- assertNotNull(value);
- value.setModelValue(new String[] { user.getUsername() });
+ formTester.setValue("content:view:0:panel:container:property:textField", "username");
+ TESTER.executeAjaxEvent(formTester.getForm().
+ get("content:view:0:panel:container:property:textField"), Constants.ON_KEYDOWN);
+ formTester.setValue("content:view:0:panel:container:value:textField", user.getUsername());
+ TESTER.executeAjaxEvent(formTester.getForm().
+ get("content:view:0:panel:container:value:textField"), Constants.ON_KEYDOWN);
TESTER.cleanupFeedbackMessages();
- formTester.submit("content:view:0:panel:container:operatorContainer:operator:search");
+ Component searchButton = formTester.getForm().
+ get("content:view:0:panel:container:operatorContainer:operator:search");
+ TESTER.clickLink(searchButton);
+ TESTER.executeAjaxEvent(searchButton.getPageRelativePath(), Constants.ON_CLICK);
TESTER.assertNoErrorMessage();
// Locate result in data table
@@ -156,10 +153,6 @@ public class LinkedAccountsITCase extends AbstractConsoleITCase {
TAB_PANEL + SEARCH_PANEL + RESULT_DATA_TABLE, user.getUsername());
TESTER.executeAjaxEvent(comp.getPageRelativePath(), Constants.ON_CLICK);
- UserTO userTO = (UserTO) ((OddEvenItem) TESTER.getComponentFromLastRenderedPage(TAB_PANEL + SEARCH_PANEL
- + RESULT_DATA_TABLE + "body:rows:1")).getModel().getObject();
- assertNotNull(userTO);
-
// Select user
TESTER.clickLink(TAB_PANEL + SEARCH_PANEL + SELECT_USER_ACTION);
@@ -196,7 +189,7 @@ public class LinkedAccountsITCase extends AbstractConsoleITCase {
}
}
// User must include merged accounts now
- UserTO verdi = userService.read(UserTO.class.cast(verdiUserComponent.getDefaultModelObject()).getKey());
+ UserTO verdi = userService.read("verdi");
assertFalse(verdi.getLinkedAccounts().isEmpty());
}
}