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:08 UTC
[syncope] branch master updated: Fix console tests
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
The following commit(s) were added to refs/heads/master by this push:
new d984ebb Fix console tests
d984ebb is described below
commit d984ebbd48013427be797f9c46169d5580c9b81e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed May 13 13:09:30 2020 +0200
Fix console tests
---
.../console/panels/search/UserSearchPanelTest.java | 25 ++++++++++++-------
.../syncope/fit/console/LinkedAccountsITCase.java | 28 +++++++++-------------
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/client/idrepo/console/src/test/java/org/apache/syncope/client/console/panels/search/UserSearchPanelTest.java b/client/idrepo/console/src/test/java/org/apache/syncope/client/console/panels/search/UserSearchPanelTest.java
index fc72af0..3c382f4 100644
--- a/client/idrepo/console/src/test/java/org/apache/syncope/client/console/panels/search/UserSearchPanelTest.java
+++ b/client/idrepo/console/src/test/java/org/apache/syncope/client/console/panels/search/UserSearchPanelTest.java
@@ -19,11 +19,12 @@
package org.apache.syncope.client.console.panels.search;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.List;
import org.apache.syncope.client.console.AbstractAdminTest;
+import org.apache.syncope.client.ui.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.Test;
@@ -43,17 +44,25 @@ public class UserSearchPanelTest extends AbstractAdminTest {
FormTester formTester = TESTER.newFormTester(
"content:searchFormContainer:search:multiValueContainer:innerForm");
- assertNotNull(formTester.getForm().get("content:view:0:panel:container:property:textField"));
-
- formTester.setValue("content:view:0:panel:container:property:textField", "firstname");
- 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());
+
+ 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");
+ 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 75787d8..fac17db 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
@@ -40,8 +40,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;
@@ -136,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
@@ -155,10 +153,6 @@ public class LinkedAccountsITCase extends AbstractConsoleITCase {
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);
@@ -195,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());
}
}