You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2020/04/10 06:57:13 UTC
[wicket] branch master updated: WICKET-6766 same page manager setup
for tests as in Wicket 8
This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new 771c957 WICKET-6766 same page manager setup for tests as in Wicket 8
771c957 is described below
commit 771c957a337937ef501a32ead39c0094c5543d8f
Author: Sven Meier <sv...@apache.org>
AuthorDate: Fri Apr 10 08:49:22 2020 +0200
WICKET-6766 same page manager setup for tests as in Wicket 8
---
.../org/apache/wicket/mock/MockPageManager.java | 2 +-
.../wicket/util/tester/BaseWicketTester.java | 5 ++--
.../wicket/devutils/pagestore/PageStorePage.java | 29 ++++++++++++++--------
3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java b/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java
index 9c5216a..11ad207 100644
--- a/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java
+++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java
@@ -35,7 +35,7 @@ public class MockPageManager implements IPageManager
@Override
public boolean supportsVersioning()
{
- return false;
+ return true;
}
@Override
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 01b1e29..254ae38 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -92,11 +92,10 @@ import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.markup.parser.XmlPullParser;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.mock.MockApplication;
-import org.apache.wicket.mock.MockPageStore;
+import org.apache.wicket.mock.MockPageManager;
import org.apache.wicket.mock.MockRequestParameters;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.page.IPageManager;
-import org.apache.wicket.page.PageManager;
import org.apache.wicket.protocol.http.AjaxEnclosureListener;
import org.apache.wicket.protocol.http.IMetaDataBufferingWebResponse;
import org.apache.wicket.protocol.http.WebApplication;
@@ -2785,7 +2784,7 @@ public class BaseWicketTester
@Override
public IPageManager get()
{
- return new PageManager(new MockPageStore());
+ return new MockPageManager();
}
}
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/pagestore/PageStorePage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/pagestore/PageStorePage.java
index 0714fd7..63aed02 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/pagestore/PageStorePage.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/pagestore/PageStorePage.java
@@ -54,18 +54,27 @@ public class PageStorePage extends DevUtilsPage
return false;
}
+ /**
+ * Helper to find the {@link IPersistentPageStore} of the application.
+ *
+ * @return store or <code>null</code> if not available
+ */
public static IPersistentPageStore getPersistentPageStore() {
- IPageStore store = Session.get().getPageManager().getPageStore();
- while (true) {
- if (store instanceof IPersistentPageStore) {
- return (IPersistentPageStore)store;
- }
-
- if (store instanceof DelegatingPageStore) {
- store = ((DelegatingPageStore)store).getDelegate();
- } else {
- break;
+ try {
+ IPageStore store = Session.get().getPageManager().getPageStore();
+ while (true) {
+ if (store instanceof IPersistentPageStore) {
+ return (IPersistentPageStore)store;
+ }
+
+ if (store instanceof DelegatingPageStore) {
+ store = ((DelegatingPageStore)store).getDelegate();
+ } else {
+ break;
+ }
}
+ } catch (UnsupportedOperationException ex) {
+ // no page store
}
return null;