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 2018/06/25 13:19:20 UTC
syncope git commit: [SYNCOPE-681] Fix console tests
Repository: syncope
Updated Branches:
refs/heads/master 8e6ed9601 -> 5ddca9dfb
[SYNCOPE-681] Fix console tests
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5ddca9df
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5ddca9df
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5ddca9df
Branch: refs/heads/master
Commit: 5ddca9dfb2b027f534ce9cdab2bb1b51fce72487
Parents: 8e6ed96
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 25 15:19:13 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 25 15:19:13 2018 +0200
----------------------------------------------------------------------
.../test/resources/domains/MasterContent.xml | 2 +-
.../fit/console/AbstractTypesITCase.java | 14 +++--
.../fit/console/AnyTypeClassesITCase.java | 2 +-
.../syncope/fit/console/SchemasITCase.java | 63 ++++++++++++--------
4 files changed, 49 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/5ddca9df/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
index d82ad86..86b9b4d 100644
--- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
@@ -1438,7 +1438,7 @@ $$ }
<AnyAbout id="a328f2e6-25e9-4cc1-badf-7425d7be4b39" anyType_id="USER" notification_id="e00945b5-1184-4d43-8e45-4318a8dcdfd4" filter="token!=$null"/>
<Notification_events notification_id="e00945b5-1184-4d43-8e45-4318a8dcdfd4" event="[CUSTOM]:[]:[]:[requestPasswordReset]:[SUCCESS]"/>
<Task DTYPE="NotificationTask" id="e1e520f0-2cbd-4e11-9a89-ea58a0f957e7" notification_id="e00945b5-1184-4d43-8e45-4318a8dcdfd4"
- sender="admin@prova.org" subject="Notification for SYNCOPE-81"
+ sender="admin@prova.org" subject="Notification for SYNCOPE-81" executed="0"
textBody="NOTIFICATION-81" htmlBody="NOTIFICATION-81" traceLevel="ALL"/>
<NotificationTask_recipients notificationTask_id="e1e520f0-2cbd-4e11-9a89-ea58a0f957e7" address="recipient@prova.org"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/5ddca9df/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
index bf8ebff..d3f74c7 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
@@ -19,6 +19,7 @@
package org.apache.syncope.fit.console;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.pages.Types;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.AjaxFallbackDataTable;
import org.apache.wicket.util.tester.FormTester;
@@ -94,13 +95,16 @@ public abstract class AbstractTypesITCase extends AbstractConsoleITCase {
"body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer",
Modal.class);
- final FormTester formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ FormTester formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
- formTester.setValue("content:details:form:key:textField", key);
- formTester.setValue("content:details:form:type:dropDownChoiceField", "3");
+ formTester.setValue("content:form:view:details:key:textField", key);
+ formTester.setValue("content:form:view:details:type:dropDownChoiceField", "3");
+ TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:accordionPanel:tabs:0:"
+ + "body:content:outerObjectsRepeater:0:outer:form:content:form:buttons:next", Constants.ON_CLICK);
- TESTER.clickLink("body:content:tabbedPanel:panel:"
- + "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:dialog:footer:inputs:0:submit");
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ + "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
+ formTester.submit("content:form:buttons:finish");
TESTER.assertInfoMessages("Operation executed successfully");
http://git-wip-us.apache.org/repos/asf/syncope/blob/5ddca9df/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java
index 1885bf3..a6fea22 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java
@@ -96,7 +96,7 @@ public class AnyTypeClassesITCase extends AbstractTypesITCase {
TESTER.clickLink("body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:"
+ "togglePanelContainer:container:actions:actions:actionRepeater:0:action:action");
- final FormTester formTester = TESTER.newFormTester(
+ FormTester formTester = TESTER.newFormTester(
"body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form");
formTester.setValue(
"content:anyTypeClassDetailsPanel:form:container:plainSchemas:paletteField:recorder", plainSchema);
http://git-wip-us.apache.org/repos/asf/syncope/blob/5ddca9df/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
index 50aaefa..42ec236 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
@@ -51,7 +51,7 @@ public class SchemasITCase extends AbstractTypesITCase {
TESTER.assertComponent(
"body:content:tabbedPanel:"
+ "panel:accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:"
- + "form:content:kindForm:kind:dropDownChoiceField", DropDownChoice.class);
+ + "form:content:form:view:kind:dropDownChoiceField", DropDownChoice.class);
}
@Test
@@ -64,13 +64,16 @@ public class SchemasITCase extends AbstractTypesITCase {
"body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer",
Modal.class);
- final FormTester formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ FormTester formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
- formTester.setValue("content:details:form:key:textField", "zBoolean");
- formTester.setValue("content:details:form:type:dropDownChoiceField", "3");
+ formTester.setValue("content:form:view:details:key:textField", "zBoolean");
+ formTester.setValue("content:form:view:details:type:dropDownChoiceField", "3");
+ TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:accordionPanel:tabs:0:"
+ + "body:content:outerObjectsRepeater:0:outer:form:content:form:buttons:next", Constants.ON_CLICK);
- TESTER.clickLink("body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:"
- + "outer:dialog:footer:inputs:0:submit");
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ + "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
+ formTester.submit("content:form:buttons:finish");
TESTER.assertInfoMessages("Operation executed successfully");
@@ -95,15 +98,18 @@ public class SchemasITCase extends AbstractTypesITCase {
TESTER.assertComponent(
"body:content:tabbedPanel:"
+ "panel:accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:"
- + "form:content:kindForm:kind:dropDownChoiceField", DropDownChoice.class);
+ + "form:content:form:view:kind:dropDownChoiceField", DropDownChoice.class);
FormTester formTester = TESTER.newFormTester(
"body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
- formTester.setValue("content:details:form:multivalue:checkboxField", "true");
+ formTester.setValue("content:form:view:details:multivalue:checkboxField", "true");
+
+ TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:accordionPanel:tabs:0:"
+ + "body:content:outerObjectsRepeater:0:outer:form:content:form:buttons:next", Constants.ON_CLICK);
- TESTER.clickLink("body:content:tabbedPanel:panel:"
- + "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:dialog:footer:inputs:0:submit",
- true);
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ + "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
+ formTester.submit("content:form:buttons:finish");
TESTER.assertInfoMessages("Operation executed successfully");
}
@@ -120,13 +126,16 @@ public class SchemasITCase extends AbstractTypesITCase {
"body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer",
Modal.class);
- final FormTester formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ FormTester formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
- formTester.setValue("content:details:form:key:textField", schemaName);
- formTester.setValue("content:details:form:type:dropDownChoiceField", "0");
+ formTester.setValue("content:form:view:details:key:textField", schemaName);
+ formTester.setValue("content:form:view:details:type:dropDownChoiceField", "0");
+ TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:accordionPanel:tabs:0:"
+ + "body:content:outerObjectsRepeater:0:outer:form:content:form:buttons:next", Constants.ON_CLICK);
- TESTER.clickLink("body:content:tabbedPanel:panel:"
- + "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:dialog:footer:inputs:0:submit");
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ + "accordionPanel:tabs:0:body:content:outerObjectsRepeater:0:outer:form");
+ formTester.submit("content:form:buttons:finish");
TESTER.assertInfoMessages("Operation executed successfully");;
@@ -170,21 +179,25 @@ public class SchemasITCase extends AbstractTypesITCase {
"body:content:tabbedPanel:panel:accordionPanel:tabs:2:body:content:outerObjectsRepeater:0:outer",
Modal.class);
- final FormTester formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ FormTester formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ "accordionPanel:tabs:2:body:content:outerObjectsRepeater:0:outer:form");
- formTester.setValue("content:details:form:resource:dropDownChoiceField", "0");
+ formTester.setValue("content:form:view:details:resource:dropDownChoiceField", "0");
TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:"
+ "accordionPanel:tabs:2:body:content:outerObjectsRepeater:0:outer:form:"
- + "content:details:form:resource:dropDownChoiceField", Constants.ON_CHANGE);
+ + "content:form:view:details:resource:dropDownChoiceField", Constants.ON_CHANGE);
+
+ formTester.setValue("content:form:view:details:key:textField", "mynewvir");
+ formTester.setValue("content:form:view:details:resource:dropDownChoiceField", "0");
+ formTester.setValue("content:form:view:details:anyType:dropDownChoiceField", "0");
+ formTester.setValue("content:form:view:details:extAttrName:textField", "virattr");
- formTester.setValue("content:details:form:key:textField", "mynewvir");
- formTester.setValue("content:details:form:resource:dropDownChoiceField", "0");
- formTester.setValue("content:details:form:anyType:dropDownChoiceField", "0");
- formTester.setValue("content:details:form:extAttrName:textField", "virattr");
+ TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:accordionPanel:tabs:2:"
+ + "body:content:outerObjectsRepeater:0:outer:form:content:form:buttons:next", Constants.ON_CLICK);
- TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:accordionPanel:tabs:2:body:content:"
- + "outerObjectsRepeater:0:outer:dialog:footer:inputs:0:submit", Constants.ON_CLICK);
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:"
+ + "accordionPanel:tabs:2:body:content:outerObjectsRepeater:0:outer:form");
+ formTester.submit("content:form:buttons:finish");
TESTER.assertInfoMessages("Operation executed successfully");
TESTER.cleanupFeedbackMessages();