syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmarte...@apache.org
Subject [2/4] syncope git commit: [SYNCOPE-962] Fixes
Date Fri, 28 Oct 2016 19:12:31 GMT
[SYNCOPE-962] Fixes


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

Branch: refs/heads/2_0_X
Commit: dd9e95ee13e26df87d5c29df1e62a9fbf260a8e7
Parents: 1bc21e3
Author: fmartelli <fabio.martelli@gmail.com>
Authored: Fri Oct 28 19:31:12 2016 +0200
Committer: fmartelli <fabio.martelli@gmail.com>
Committed: Fri Oct 28 19:31:12 2016 +0200

----------------------------------------------------------------------
 .../markup/html/bootstrap/dialog/BaseModal.html |  8 +-
 .../syncope/fit/console/AjaxBrowseITCase.java   | 93 ++++++++++++++++++++
 .../syncope/fit/console/BrowseITCase.java       | 91 -------------------
 3 files changed, 97 insertions(+), 95 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/dd9e95ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html
index 3068967..ddf2c9e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html
@@ -39,12 +39,12 @@ under the License.
           </form>
         </div>
         <div class="modal-footer" wicket:id="footer">
-          <wicket:fragment wicket:id="buttons">
+          <wicket:container wicket:id="buttons">
             <button type="button" wicket:id="button"></button>
-          </wicket:fragment>
-          <wicket:fragment wicket:id="inputs">
+          </wicket:container>
+          <wicket:container wicket:id="inputs">
             <button wicket:id="submit" class="btn btn-primary"><wicket:message key="submit"/></button>
-          </wicket:fragment>
+          </wicket:container>
         </div>
       </div>
     </div>

http://git-wip-us.apache.org/repos/asf/syncope/blob/dd9e95ee/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
new file mode 100644
index 0000000..8ac8558
--- /dev/null
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.fit.console;
+
+import org.apache.syncope.client.console.pages.Dashboard;
+import org.apache.syncope.client.console.pages.Login;
+import org.apache.syncope.client.console.pages.Logs;
+import org.apache.syncope.client.console.pages.Notifications;
+import org.apache.syncope.client.console.pages.Policies;
+import org.apache.syncope.client.console.pages.Realms;
+import org.apache.syncope.client.console.pages.Reports;
+import org.apache.syncope.client.console.pages.Roles;
+import org.apache.syncope.client.console.pages.SecurityQuestions;
+import org.apache.syncope.client.console.pages.Types;
+import org.apache.syncope.client.console.pages.Workflow;
+import org.apache.syncope.client.console.topology.Topology;
+import org.junit.Test;
+
+// Please, keep the class name as is in order to respect the execution order. It seems that
from wicket 7.5.0 the 
+// session creted never expire and the unsuccessfulLogin test fail
+public class AjaxBrowseITCase extends AbstractConsoleITCase {
+
+    @Test
+    public void loginPage() {
+        TESTER.startPage(Login.class);
+        TESTER.assertRenderedPage(Login.class);
+    }
+
+    @Test
+    public void successfulLogin() {
+        doLogin(ADMIN_UNAME, ADMIN_PWD);
+        TESTER.assertRenderedPage(Dashboard.class);
+    }
+
+    @Test
+    public void unsuccessfulLogin() {
+        doLogin(ADMIN_UNAME, ADMIN_PWD + 1);
+        TESTER.assertRenderedPage(Login.class);
+    }
+
+    @Test
+    public void browsingBookmarkablePageLink() {
+        doLogin(ADMIN_UNAME, ADMIN_PWD);
+
+        TESTER.assertRenderedPage(Dashboard.class);
+
+        TESTER.clickLink("body:realmsLI:realms");
+        TESTER.assertRenderedPage(Realms.class);
+
+        TESTER.clickLink("body:topologyLI:topology");
+        TESTER.assertRenderedPage(Topology.class);
+
+        TESTER.clickLink("body:reportsLI:reports");
+        TESTER.assertRenderedPage(Reports.class);
+
+        TESTER.clickLink("body:configurationLI:configurationUL:workflowLI:workflow");
+        TESTER.assertRenderedPage(Workflow.class);
+
+        TESTER.clickLink("body:configurationLI:configurationUL:logsLI:logs");
+        TESTER.assertRenderedPage(Logs.class);
+
+        TESTER.clickLink("body:configurationLI:configurationUL:securityquestionsLI:securityquestions");
+        TESTER.assertRenderedPage(SecurityQuestions.class);
+
+        TESTER.clickLink("body:configurationLI:configurationUL:typesLI:types");
+        TESTER.assertRenderedPage(Types.class);
+
+        TESTER.clickLink("body:configurationLI:configurationUL:rolesLI:roles");
+        TESTER.assertRenderedPage(Roles.class);
+
+        TESTER.clickLink("body:configurationLI:configurationUL:policiesLI:policies");
+        TESTER.assertRenderedPage(Policies.class);
+
+        TESTER.clickLink("body:configurationLI:configurationUL:notificationsLI:notifications");
+        TESTER.assertRenderedPage(Notifications.class);
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/dd9e95ee/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BrowseITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BrowseITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BrowseITCase.java
deleted file mode 100644
index 5a3c0d8..0000000
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BrowseITCase.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.fit.console;
-
-import org.apache.syncope.client.console.pages.Dashboard;
-import org.apache.syncope.client.console.pages.Login;
-import org.apache.syncope.client.console.pages.Logs;
-import org.apache.syncope.client.console.pages.Notifications;
-import org.apache.syncope.client.console.pages.Policies;
-import org.apache.syncope.client.console.pages.Realms;
-import org.apache.syncope.client.console.pages.Reports;
-import org.apache.syncope.client.console.pages.Roles;
-import org.apache.syncope.client.console.pages.SecurityQuestions;
-import org.apache.syncope.client.console.pages.Types;
-import org.apache.syncope.client.console.pages.Workflow;
-import org.apache.syncope.client.console.topology.Topology;
-import org.junit.Test;
-
-public class BrowseITCase extends AbstractConsoleITCase {
-
-    @Test
-    public void loginPage() {
-        TESTER.startPage(Login.class);
-        TESTER.assertRenderedPage(Login.class);
-    }
-
-    @Test
-    public void successfulLogin() {
-        doLogin(ADMIN_UNAME, ADMIN_PWD);
-        TESTER.assertRenderedPage(Dashboard.class);
-    }
-
-    @Test
-    public void unsuccessfulLogin() {
-        doLogin(ADMIN_UNAME, ADMIN_PWD + 1);
-        TESTER.assertRenderedPage(Login.class);
-    }
-
-    @Test
-    public void browsingBookmarkablePageLink() {
-        doLogin(ADMIN_UNAME, ADMIN_PWD);
-
-        TESTER.assertRenderedPage(Dashboard.class);
-
-        TESTER.clickLink("body:realmsLI:realms");
-        TESTER.assertRenderedPage(Realms.class);
-
-        TESTER.clickLink("body:topologyLI:topology");
-        TESTER.assertRenderedPage(Topology.class);
-
-        TESTER.clickLink("body:reportsLI:reports");
-        TESTER.assertRenderedPage(Reports.class);
-
-        TESTER.clickLink("body:configurationLI:configurationUL:workflowLI:workflow");
-        TESTER.assertRenderedPage(Workflow.class);
-
-        TESTER.clickLink("body:configurationLI:configurationUL:logsLI:logs");
-        TESTER.assertRenderedPage(Logs.class);
-
-        TESTER.clickLink("body:configurationLI:configurationUL:securityquestionsLI:securityquestions");
-        TESTER.assertRenderedPage(SecurityQuestions.class);
-
-        TESTER.clickLink("body:configurationLI:configurationUL:typesLI:types");
-        TESTER.assertRenderedPage(Types.class);
-
-        TESTER.clickLink("body:configurationLI:configurationUL:rolesLI:roles");
-        TESTER.assertRenderedPage(Roles.class);
-
-        TESTER.clickLink("body:configurationLI:configurationUL:policiesLI:policies");
-        TESTER.assertRenderedPage(Policies.class);
-
-        TESTER.clickLink("body:configurationLI:configurationUL:notificationsLI:notifications");
-        TESTER.assertRenderedPage(Notifications.class);
-    }
-}


Mime
View raw message