Repository: syncope Updated Branches: refs/heads/master 3b884e0c1 -> 73f7e0f24
http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java index 4a06ea1..aa9658b 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; 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.SecurityQuestions; +import org.apache.syncope.client.console.pages.Security; import org.apache.wicket.Component; import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink; import org.apache.wicket.markup.html.basic.Label; @@ -37,42 +37,44 @@ public class SecurityQuestionsITCase extends AbstractConsoleITCase { @BeforeEach public void login() { doLogin(ADMIN_UNAME, ADMIN_PWD); - TESTER.clickLink("body:configurationLI:configurationUL:securityquestionsLI:securityquestions"); - TESTER.assertRenderedPage(SecurityQuestions.class); + TESTER.clickLink("body:configurationLI:configurationUL:securityLI:security"); + TESTER.assertRenderedPage(Security.class); + TESTER.clickLink("body:content:tabbedPanel:tabs-container:tabs:3:link"); } private void createSecurityQuestion(final String name) { - TESTER.clickLink("body:content:securityQuestionPanel:container:content:add"); + TESTER.clickLink("body:content:tabbedPanel:panel:container:content:add"); TESTER.assertComponent( - "body:content:securityQuestionPanel:outerObjectsRepeater:0:outer", Modal.class); + "body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer", Modal.class); FormTester formTester = TESTER.newFormTester( - "body:content:securityQuestionPanel:outerObjectsRepeater:0:outer:form"); + "body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form"); formTester.setValue("content:securityQuestionDetailsPanel:container:form:content:textField", name); TESTER.clickLink( - "body:content:securityQuestionPanel:outerObjectsRepeater:0:outer:dialog:footer:inputs:0:submit"); + "body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:dialog:footer:inputs:0:submit"); TESTER.assertInfoMessages("Operation executed successfully"); TESTER.cleanupFeedbackMessages(); - TESTER.clickLink("body:configurationLI:configurationUL:securityquestionsLI:securityquestions"); + TESTER.clickLink("body:configurationLI:configurationUL:securityLI:security"); + TESTER.clickLink("body:content:tabbedPanel:tabs-container:tabs:3:link"); } @Test public void read() { Label label = (Label) TESTER.getComponentFromLastRenderedPage( - "body:content:securityQuestionPanel:container:content:searchContainer:resultTable:" + "body:content:tabbedPanel:panel:container:content:searchContainer:resultTable:" + "tablePanel:groupForm:checkgroup:dataTable:body:rows:1:cells:2:cell"); assertTrue(label.getDefaultModelObjectAsString().startsWith("What's your ")); - TESTER.executeAjaxEvent("body:content:securityQuestionPanel:container:content:searchContainer:resultTable:" + TESTER.executeAjaxEvent("body:content:tabbedPanel:panel:container:content:searchContainer:resultTable:" + "tablePanel:groupForm:checkgroup:dataTable:body:rows:1", Constants.ON_CLICK); TESTER.assertComponent( - "body:content:securityQuestionPanel:outerObjectsRepeater:1:outer:container:content:" + "body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:" + "togglePanelContainer:container:actions:actions:actionRepeater:0:action:action", IndicatingAjaxLink.class); } @@ -85,23 +87,23 @@ public class SecurityQuestionsITCase extends AbstractConsoleITCase { @Test public void update() { createSecurityQuestion("What's your preferred color?"); - Component result = findComponentByProp("content", "body:content:securityQuestionPanel:container:content:" + Component result = findComponentByProp("content", "body:content:tabbedPanel:panel:container:content:" + "searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", "What's your preferred color?"); assertNotNull(result); TESTER.executeAjaxEvent(result.getPageRelativePath(), Constants.ON_CLICK); - TESTER.clickLink("body:content:securityQuestionPanel:outerObjectsRepeater:1:outer:container:content:" + TESTER.clickLink("body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:" + "togglePanelContainer:container:actions:actions:actionRepeater:0:action:action"); FormTester formTester = TESTER.newFormTester( - "body:content:securityQuestionPanel:outerObjectsRepeater:0:outer:form"); + "body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form"); formTester.setValue("content:securityQuestionDetailsPanel:container:form:content:textField", "What's your preferred car?"); TESTER.clickLink( - "body:content:securityQuestionPanel:outerObjectsRepeater:0:outer:dialog:footer:inputs:0:submit"); + "body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:dialog:footer:inputs:0:submit"); TESTER.assertInfoMessages("Operation executed successfully"); TESTER.cleanupFeedbackMessages(); @@ -112,25 +114,25 @@ public class SecurityQuestionsITCase extends AbstractConsoleITCase { String name = "What's your preferred color?"; createSecurityQuestion(name); - Component result = findComponentByProp("content", "body:content:securityQuestionPanel:container:content:" + Component result = findComponentByProp("content", "body:content:tabbedPanel:panel:container:content:" + "searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", name); assertNotNull(result); TESTER.executeAjaxEvent(result.getPageRelativePath(), Constants.ON_CLICK); TESTER.getRequest().addParameter("confirm", "true"); - TESTER.clickLink("body:content:securityQuestionPanel:outerObjectsRepeater:1:outer:container:content:" + TESTER.clickLink("body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:" + "togglePanelContainer:container:actions:actions:actionRepeater:1:action:action"); TESTER.executeAjaxEvent(TESTER.getComponentFromLastRenderedPage( - "body:content:securityQuestionPanel:outerObjectsRepeater:1:outer:container:content:" + "body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:" + "togglePanelContainer:container:actions:actions:actionRepeater:1:action:action"), "onclick"); TESTER.assertInfoMessages("Operation executed successfully"); TESTER.cleanupFeedbackMessages(); assertNull(findComponentByProp("content", - "body:content:securityQuestionPanel:container:content:" + "body:content:tabbedPanel:panel:container:content:" + "searchContainer:resultTable:" + "tablePanel:groupForm:checkgroup:dataTable", name)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ApplicationITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ApplicationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ApplicationITCase.java index 5cc79b0..74b21be 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ApplicationITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ApplicationITCase.java @@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import java.util.Base64; import java.util.UUID; import java.util.stream.Collectors; import javax.ws.rs.core.Response; @@ -67,20 +66,17 @@ public class ApplicationITCase extends AbstractITCase { PrivilegeTO privilegeTO = new PrivilegeTO(); privilegeTO.setKey(UUID.randomUUID().toString()); - privilegeTO.setSpecMimeType("application/xml"); - privilegeTO.setSpec(Base64.getEncoder().encodeToString("<one/>".getBytes())); + privilegeTO.setSpec("{ \"one\": true }"); application.getPrivileges().add(privilegeTO); privilegeTO = new PrivilegeTO(); privilegeTO.setKey(UUID.randomUUID().toString()); - privilegeTO.setSpecMimeType("application/xml"); - privilegeTO.setSpec(Base64.getEncoder().encodeToString("<one><two/></one>".getBytes())); + privilegeTO.setSpec("{ \"two\": true }"); application.getPrivileges().add(privilegeTO); privilegeTO = new PrivilegeTO(); privilegeTO.setKey(UUID.randomUUID().toString()); - privilegeTO.setSpecMimeType("application/xml"); - privilegeTO.setSpec(Base64.getEncoder().encodeToString("<one><two><three/></two></one>".getBytes())); + privilegeTO.setSpec("{ \"three\": true }"); application.getPrivileges().add(privilegeTO); Response response = applicationService.create(application); http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/fit/core-reference/src/test/resources/console.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/resources/console.properties b/fit/core-reference/src/test/resources/console.properties index 43ee365..4d39cf0 100644 --- a/fit/core-reference/src/test/resources/console.properties +++ b/fit/core-reference/src/test/resources/console.properties @@ -37,15 +37,15 @@ flowableModelerDirectory=${flowable-modeler.directory} reconciliationReportKey=c3520ad9-179f-49e7-b315-d684d216dd97 -page.administration=org.apache.syncope.client.console.pages.Administration page.dashboard=org.apache.syncope.client.console.pages.Dashboard page.realms=org.apache.syncope.client.console.pages.Realms page.topology=org.apache.syncope.client.console.topology.Topology page.reports=org.apache.syncope.client.console.pages.Reports page.workflow=org.apache.syncope.client.console.pages.Workflow page.audit=org.apache.syncope.client.console.pages.Audit +page.implementations=org.apache.syncope.client.console.pages.Implementations page.logs=org.apache.syncope.client.console.pages.Logs -page.securityquestions=org.apache.syncope.client.console.pages.SecurityQuestions +page.security=org.apache.syncope.client.console.pages.Security page.types=org.apache.syncope.client.console.pages.Types page.policies=org.apache.syncope.client.console.pages.Policies page.notifications=org.apache.syncope.client.console.pages.Notifications http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 16c9e8b..d2a711d 100644 --- a/pom.xml +++ b/pom.xml @@ -386,7 +386,7 @@ under the License. <flowable.version>6.2.1</flowable.version> - <camel.version>2.21.0</camel.version> + <camel.version>2.20.2</camel.version> <slf4j.version>1.7.25</slf4j.version> <opensaml.version>3.3.0</opensaml.version> @@ -2209,8 +2209,8 @@ under the License. <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/</link> <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.9.pr1/</link> <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.9/</link> - <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.21.0/</link> - <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.21.0/</link> + <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.20.2/</link> + <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.20.2/</link> <link>https://ci.apache.org/projects/wicket/apidocs/8.x/</link> <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link> <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.6/</link>
