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 2020/04/10 08:20:22 UTC

[syncope] branch master updated: [SYNCOPE-1497] Waiting for Wicket 9.0.0-M6, simplifying workaround for WICKET-6766

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new d50672f  [SYNCOPE-1497] Waiting for Wicket 9.0.0-M6, simplifying workaround for WICKET-6766
d50672f is described below

commit d50672f307a5718c027c0ea489822d243c56dcc2
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Apr 10 10:20:06 2020 +0200

    [SYNCOPE-1497] Waiting for Wicket 9.0.0-M6, simplifying workaround for WICKET-6766
---
 .../syncope/fit/console/AbstractConsoleITCase.java       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractConsoleITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractConsoleITCase.java
index cd168e7..7cdc599 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractConsoleITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractConsoleITCase.java
@@ -36,6 +36,7 @@ import org.apache.syncope.common.keymaster.client.self.SelfKeymasterClientContex
 import org.apache.syncope.common.rest.api.service.SyncopeService;
 import org.apache.syncope.fit.ui.AbstractUITCase;
 import org.apache.wicket.IPageManagerProvider;
+import org.apache.wicket.mock.MockPageManager;
 import org.apache.wicket.mock.MockPageStore;
 import org.apache.wicket.page.IManageablePage;
 import org.apache.wicket.page.PageManager;
@@ -106,21 +107,16 @@ public abstract class AbstractConsoleITCase extends AbstractUITCase {
 
         TESTER = new WicketTester(ctx.getBean(SyncopeWebApplication.class)) {
 
+            // Remove this method when upgrading to Wicket 9.0.0-M6 - see WICKET-6766
             @Override
             protected IPageManagerProvider newTestPageManagerProvider() {
-                return () -> new PageManager(new MockPageStore() {
+                return () -> new MockPageManager() {
 
                     @Override
-                    public IManageablePage getPage(final IPageContext context, final int id) {
-                        IManageablePage page = super.getPage(context, id);
-                        if (page == null) {
-                            page = getPages().size() > id
-                                    ? getPages().get(id)
-                                    : getPages().get(getPages().size() - 1);
-                        }
-                        return page;
+                    public boolean supportsVersioning() {
+                        return true;
                     }
-                });
+                };
             }
         };