You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2016/03/03 16:34:59 UTC

syncope git commit: [SYNCOPE-752] Add console test for roles

Repository: syncope
Updated Branches:
  refs/heads/master f56135868 -> 0d76a0f0b


[SYNCOPE-752] Add console test for roles


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0d76a0f0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0d76a0f0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0d76a0f0

Branch: refs/heads/master
Commit: 0d76a0f0bb0514de7f785368a3e7d226b626764e
Parents: f561358
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Thu Mar 3 16:34:47 2016 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Thu Mar 3 16:34:47 2016 +0100

----------------------------------------------------------------------
 .../apache/syncope/fit/console/RolesITCase.java | 51 +++++++++++---------
 1 file changed, 29 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/0d76a0f0/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
index b8af0a4..0112f7d 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
@@ -25,7 +25,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
 import org.apache.syncope.client.console.pages.Roles;
 import org.apache.wicket.Component;
 import org.apache.wicket.util.tester.FormTester;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -34,27 +33,13 @@ import org.junit.runners.MethodSorters;
 @FixMethodOrder(MethodSorters.JVM)
 public class RolesITCase extends AbstractConsoleITCase<String> {
 
-    @Before
-    public void login() {
-        doLogin(ADMIN_UNAME, ADMIN_PWD);
-        wicketTester.clickLink("body:configurationLI:configurationUL:rolesLI:roles");
-        wicketTester.assertRenderedPage(Roles.class);
-    }
-
-    @Test
-    public void read() {
-        Assert.assertNull(findComponentByProp(KEY, "body:content:rolesPanel:container:content:searchContainer:"
-                + "resultTable:tablePanel:groupForm:checkgroup:dataTable", "OTHER"));
-    }
-
-    @Test
-    public void create() {
+    private void createRole(final String name) {
         wicketTester.clickLink("body:content:rolesPanel:container:content:add");
 
         wicketTester.assertComponent("body:content:rolesPanel:modal", Modal.class);
 
         FormTester formTester = wicketTester.newFormTester("body:content:rolesPanel:modal:form");
-        formTester.setValue("content:form:view:key:textField", "testRole");
+        formTester.setValue("content:form:view:key:textField", name);
         formTester.submit("content:form:buttons:next");
 
         formTester = wicketTester.newFormTester("body:content:rolesPanel:modal:form");
@@ -67,21 +52,42 @@ public class RolesITCase extends AbstractConsoleITCase<String> {
 
         wicketTester.assertInfoMessages("Operation executed successfully");
         wicketTester.cleanupFeedbackMessages();
+        
+        wicketTester.clickLink("body:configurationLI:configurationUL:rolesLI:roles");
+    }
+
+    @Before
+    public void login() {
+        doLogin(ADMIN_UNAME, ADMIN_PWD);
+        wicketTester.clickLink("body:configurationLI:configurationUL:rolesLI:roles");
+        wicketTester.assertRenderedPage(Roles.class);
+    }
+
+    @Test
+    public void read() {
+        assertNull(findComponentByProp(KEY, "body:content:rolesPanel:container:content:searchContainer:"
+                + "resultTable:tablePanel:groupForm:checkgroup:dataTable", "OTHER"));
+    }
+
+    @Test
+    public void create() {
+        createRole("testRole");
     }
 
     @Test
     public void update() {
+        createRole("updateRole");
         Component result = findComponentByProp(KEY, "body:content:rolesPanel:container:content:searchContainer:"
-                + "resultTable:tablePanel:groupForm:checkgroup:dataTable", "testRole");
+                + "resultTable:tablePanel:groupForm:checkgroup:dataTable", "updateRole");
 
         wicketTester.assertLabel(
-                result.getPageRelativePath() + ":cells:1:cell", "testRole");
+                result.getPageRelativePath() + ":cells:1:cell", "updateRole");
 
         wicketTester.clickLink(
                 result.getPageRelativePath() + ":cells:4:cell:panelEdit:editLink");
 
         FormTester formTester = wicketTester.newFormTester("body:content:rolesPanel:modal:form");
-        formTester.setValue("content:form:view:key:textField", "testRole");
+        formTester.setValue("content:form:view:key:textField", "updateRole");
         formTester.submit("content:form:buttons:next");
 
         formTester = wicketTester.newFormTester("body:content:rolesPanel:modal:form");
@@ -98,11 +104,12 @@ public class RolesITCase extends AbstractConsoleITCase<String> {
 
     @Test
     public void delete() {
+        createRole("deleteRole");
         Component result = findComponentByProp(KEY, "body:content:rolesPanel:container:content:searchContainer:"
-                + "resultTable:tablePanel:groupForm:checkgroup:dataTable", "testRole");
+                + "resultTable:tablePanel:groupForm:checkgroup:dataTable", "deleteRole");
 
         wicketTester.assertLabel(
-                result.getPageRelativePath() + ":cells:1:cell", "testRole");
+                result.getPageRelativePath() + ":cells:1:cell", "deleteRole");
 
         wicketTester.getRequest().addParameter("confirm", "true");
         wicketTester.clickLink(