http://git-wip-us.apache.org/repos/asf/syncope/blob/4da5dccc/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java index a5ba6a0..44518de 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java @@ -181,16 +181,17 @@ public class RealmsITCase extends AbstractConsoleITCase { TESTER.clickLink(component.getPageRelativePath() + ":actions:actionRepeater:0:action:action"); TESTER.assertLabel("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:0:value:oldAttribute:field-label", "__NAME__"); + + "secondLevelContainer:second:remoteObject:propView:0:value:leftAttribute:field-label", "__NAME__"); TESTER.assertModelValue("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:0:value:oldAttribute:textField", null); + + "secondLevelContainer:second:remoteObject:propView:0:value:leftAttribute:textField", null); TESTER.assertLabel("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:0:value:newAttribute:field-label", "__NAME__"); + + "secondLevelContainer:second:remoteObject:propView:0:value:rightAttribute:field-label", "__NAME__"); TESTER.assertModelValue("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:0:value:newAttribute:textField", "ou=even,o=isp"); + + "secondLevelContainer:second:remoteObject:propView:0:value:rightAttribute:textField", + "ou=even,o=isp"); TESTER.clickLink("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" + "secondLevelContainer:back"); @@ -226,16 +227,16 @@ public class RealmsITCase extends AbstractConsoleITCase { TESTER.clickLink(component.getPageRelativePath() + ":actions:actionRepeater:0:action:action"); TESTER.assertLabel("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:4:value:oldAttribute:field-label", "ou"); + + "secondLevelContainer:second:remoteObject:propView:4:value:leftAttribute:field-label", "ou"); TESTER.assertModelValue("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:4:value:oldAttribute:textField", "even"); + + "secondLevelContainer:second:remoteObject:propView:4:value:leftAttribute:textField", "even"); TESTER.assertLabel("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:4:value:newAttribute:field-label", "ou"); + + "secondLevelContainer:second:remoteObject:propView:4:value:rightAttribute:field-label", "ou"); TESTER.assertModelValue("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:4:value:newAttribute:textField", null); + + "secondLevelContainer:second:remoteObject:propView:4:value:rightAttribute:textField", null); TESTER.clickLink("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" + "secondLevelContainer:back");
http://git-wip-us.apache.org/repos/asf/syncope/blob/4da5dccc/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java index ff417f6..7a99aaf 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java @@ -84,7 +84,7 @@ public class TopologyITCase extends AbstractConsoleITCase { Component component = findComponentByProp("key", "body:resources", "ws-target-resource-1"); assertNotNull(component); TESTER.executeAjaxEvent(component.getPageRelativePath() + ":res", Constants.ON_CLICK); - TESTER.clickLink("body:toggle:container:content:togglePanelContainer:container:actions:status"); + TESTER.clickLink("body:toggle:container:content:togglePanelContainer:container:actions:reconciliation"); TESTER.assertComponent("body:toggle:outerObjectsRepeater:1:outer", Modal.class); http://git-wip-us.apache.org/repos/asf/syncope/blob/4da5dccc/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java index 703799f..c8fd044 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java @@ -30,7 +30,7 @@ import org.apache.syncope.common.lib.to.AnyObjectTO; import org.apache.syncope.common.lib.to.AttrTO; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; -import org.apache.syncope.common.lib.to.ReconciliationStatus; +import org.apache.syncope.common.lib.to.ReconStatus; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.UnmatchingRule; import org.apache.syncope.fit.AbstractITCase; @@ -60,7 +60,7 @@ public class ReconciliationITCase extends AbstractITCase { "SELECT id FROM testPRINTER WHERE printername=?", printer.getName()).size()); // 3. verify reconciliation status - ReconciliationStatus status = + ReconStatus status = reconciliationService.status(AnyTypeKind.ANY_OBJECT, printer.getName(), "resource-db-scripted"); assertNotNull(status); assertNotNull(status.getOnSyncope()); @@ -110,7 +110,7 @@ public class ReconciliationITCase extends AbstractITCase { printer.getKey(), printer.getName(), "Nowhere", false, new Date()); // 3. verify reconciliation status - ReconciliationStatus status = + ReconStatus status = reconciliationService.status(AnyTypeKind.ANY_OBJECT, printer.getName(), "resource-db-scripted"); assertNotNull(status); assertNotNull(status.getOnSyncope());