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 2013/03/05 09:34:37 UTC
git commit: completed revert of WICKET-4441
Updated Branches:
refs/heads/wicket-1.5.x 03695569f -> af491a85a
completed revert of WICKET-4441
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/af491a85
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/af491a85
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/af491a85
Branch: refs/heads/wicket-1.5.x
Commit: af491a85aa94f85f5451657bfdcd73b33f1e4758
Parents: 0369556
Author: svenmeier <sv...@apache.org>
Authored: Tue Mar 5 09:33:17 2013 +0100
Committer: svenmeier <sv...@apache.org>
Committed: Tue Mar 5 09:33:17 2013 +0100
----------------------------------------------------------------------
.../request/mapper/BookmarkableMapperTest.java | 12 +++-------
.../wicket/request/mapper/MountedMapperTest.java | 12 +++-------
.../wicket/request/mapper/PackageMapperTest.java | 13 +++--------
.../wicket/request/mapper/TestMapperContext.java | 16 ++------------
4 files changed, 15 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/af491a85/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
index e6f3cc1..3521e60 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
@@ -112,14 +112,13 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- context.setCurrentPageParameters(((RenderPageRequestHandler)handler).getPageParameters());
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
+ assertEquals(0, p.getIndexedCount());
- assertEquals(2, p.getNamedKeys().size());
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -155,7 +154,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- context.setCurrentPageParameters(h.getPageParameters());
IRequestablePage page = h.getPage();
checkPage(page, 15);
@@ -163,9 +161,9 @@ public class BookmarkableMapperTest extends AbstractMapperTest
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
+ assertEquals(0, p.getIndexedCount());
- assertEquals(2, p.getNamedKeys().size());
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -205,7 +203,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- context.setCurrentPageParameters(h.getPageParameters());
IRequestablePage page = h.getPage();
assertEquals(page.getRenderCount(), 5);
@@ -222,7 +219,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest
context.setNextPageRenderCount(6);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- context.setCurrentPageParameters(((ListenerInterfaceRequestHandler)handler).getPageParameters());
((IPageRequestHandler)handler).getPage();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/af491a85/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
index ed9eddb..3f0df87 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
@@ -156,14 +156,13 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- context.setCurrentPageParameters(((RenderPageRequestHandler)handler).getPageParameters());
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
+ assertEquals(0, p.getIndexedCount());
- assertEquals(2, p.getNamedKeys().size());
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -178,7 +177,6 @@ public class MountedMapperTest extends AbstractMapperTest
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- context.setCurrentPageParameters(h.getPageParameters());
IRequestablePage page = h.getPage();
checkPage(page, 15);
@@ -198,7 +196,6 @@ public class MountedMapperTest extends AbstractMapperTest
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- context.setCurrentPageParameters(h.getPageParameters());
IRequestablePage page = h.getPage();
checkPage(page, 15);
@@ -206,9 +203,9 @@ public class MountedMapperTest extends AbstractMapperTest
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
+ assertEquals(0, p.getIndexedCount());
- assertEquals(2, p.getNamedKeys().size());
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -223,7 +220,6 @@ public class MountedMapperTest extends AbstractMapperTest
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- context.setCurrentPageParameters(h.getPageParameters());
IRequestablePage page = h.getPage();
checkPage(page, 15);
http://git-wip-us.apache.org/repos/asf/wicket/blob/af491a85/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
index 23a854b..4f34841 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
@@ -156,15 +156,13 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
-
- context.setCurrentPageParameters(((RenderPageRequestHandler)handler).getPageParameters());
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
+ assertEquals(0, p.getIndexedCount());
- assertEquals(2, p.getNamedKeys().size());
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -199,7 +197,6 @@ public class PackageMapperTest extends AbstractMapperTest
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- context.setCurrentPageParameters(h.getPageParameters());
IRequestablePage page = h.getPage();
checkPage(page, 15);
@@ -208,9 +205,9 @@ public class PackageMapperTest extends AbstractMapperTest
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
+ assertEquals(0, p.getIndexedCount());
- assertEquals(2, p.getNamedKeys().size());
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -248,7 +245,6 @@ public class PackageMapperTest extends AbstractMapperTest
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- context.setCurrentPageParameters(h.getPageParameters());
IRequestablePage page = h.getPage();
assertEquals(page.getRenderCount(), 5);
@@ -265,7 +261,6 @@ public class PackageMapperTest extends AbstractMapperTest
context.setNextPageRenderCount(6);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- context.setCurrentPageParameters(((ListenerInterfaceRequestHandler)handler).getPageParameters());
((IPageRequestHandler)handler).getPage();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/af491a85/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
index af3d4c1..bfb2870 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
@@ -50,7 +50,6 @@ public class TestMapperContext implements IMapperContext
PageStoreManager pageManager;
private String appName;
private boolean createMockPageIfInstanceNotFound = true;
- private PageParameters currentPageParameters = null;
/**
* Construct.
@@ -166,11 +165,6 @@ public class TestMapperContext implements IMapperContext
page.setCreatedBookmarkable(createdBookmarkable);
page.setRenderCount(nextPageRenderCount);
requestablePage = page;
- if (currentPageParameters != null)
- {
- page.getPageParameters().overwriteWith(currentPageParameters);
- currentPageParameters = null;
- }
}
return requestablePage;
@@ -183,7 +177,8 @@ public class TestMapperContext implements IMapperContext
{
try
{
- MockPage page = (MockPage)pageClass.newInstance();
+ MockPage page;
+ page = (MockPage)pageClass.newInstance();
page.setPageId(++idCounter);
page.setBookmarkable(true);
page.setCreatedBookmarkable(true);
@@ -214,12 +209,6 @@ public class TestMapperContext implements IMapperContext
return MockPage.class;
}
- public TestMapperContext setCurrentPageParameters(PageParameters parameters)
- {
- this.currentPageParameters = parameters;
- return this;
- }
-
/**
*
* Adapts {@link PageProvider} to this {@link IMapperContext}
@@ -228,6 +217,7 @@ public class TestMapperContext implements IMapperContext
*/
public class TestPageProvider extends PageProvider
{
+
/**
* Construct.
*