Author: ivaynberg
Date: Mon Feb 22 06:32:39 2010
New Revision: 912493
URL: http://svn.apache.org/viewvc?rev=912493&view=rev
Log:
more unit test fixes
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java?rev=912493&r1=912492&r2=912493&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
Mon Feb 22 06:32:39 2010
@@ -32,6 +32,8 @@
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
+import
org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.ClientInfo;
import org.apache.wicket.util.lang.Checks;
@@ -53,6 +55,7 @@
* @see #replaceAllRequestHandlers(IRequestHandler)
*
* @author Matej Knopp
+ * @author igor.vaynberg
*/
public class RequestCycle extends RequestHandlerStack
{
@@ -363,6 +366,32 @@
}
/**
+ * Returns a {...@link Url} for the resource reference
+ *
+ * @param reference
+ * resource reference
+ * @param params
+ * parameters for the resource or {...@code null} if none
+ * @return {...@link Url} for the reference
+ */
+ public Url urlFor(ResourceReference reference, PageParameters params)
+ {
+ return urlFor(new ResourceReferenceRequestHandler(reference,
params));
+ }
+
+ /**
+ * Returns a {...@link Url} for the resource reference
+ *
+ * @param reference
+ * reference
+ * @return {...@link Url} for the reference
+ */
+ public Url urlFor(ResourceReference reference)
+ {
+ return urlFor(reference, null);
+ }
+
+ /**
* Returns the rendered URL for the request handler or
<code>null</code> if the handler couldn't
* have been rendered.
* <p>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java?rev=912493&r1=912492&r2=912493&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
Mon Feb 22 06:32:39 2010
@@ -16,40 +16,27 @@
*/
package org.apache.wicket;
+import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.ng.resource.PackageResourceReference;
import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.util.value.ValueMap;
/**
* @author jcompagner
*/
public class SharedResourceUrlTest extends WicketTestCase
{
-
- /**
- * Construct.
- *
- * @param name
- */
- public SharedResourceUrlTest(String name)
- {
- super(name);
- }
-
/**
* @throws Exception
*/
public void testResourceReferenceUrl() throws Exception
{
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
-
- ResourceReference rr = new ResourceReference("test");
- CharSequence url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test",
url);
-
- rr = new ResourceReference(SharedResourceUrlTest.class, "test");
- url = cycle.urlFor(rr);
-
assertEquals("resources/org.apache.wicket.SharedResourceUrlTest/test", url);
+ ResourceReference rr = new PackageResourceReference("test");
+ CharSequence url =
tester.getRequestCycle().urlFor(rr).toString();
+
assertEquals("wicket/resource/org.apache.wicket.Application/test", url);
+
+ rr = new PackageResourceReference(SharedResourceUrlTest.class,
"test");
+ url = tester.getRequestCycle().urlFor(rr).toString();
+
assertEquals("wicket/resource/org.apache.wicket.SharedResourceUrlTest/test",
url);
}
/**
@@ -57,16 +44,14 @@
*/
public void testResourceReferenceWithParamsUrl() throws Exception
{
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
-
- ResourceReference rr = new ResourceReference("test");
- CharSequence url = cycle.urlFor(rr, new ValueMap("param=value",
""));
-
assertEquals("resources/org.apache.wicket.Application/test?param=value", url);
-
- rr = new ResourceReference(SharedResourceUrlTest.class, "test");
- url = cycle.urlFor(rr, new ValueMap("param=value", ""));
-
assertEquals("resources/org.apache.wicket.SharedResourceUrlTest/test?param=value",
url);
+ ResourceReference rr = new PackageResourceReference("test");
+ CharSequence url = tester.getRequestCycle().urlFor(rr,
+ new PageParameters("param=value", "")).toString();
+
assertEquals("wicket/resource/org.apache.wicket.Application/test?param=value",
url);
+
+ rr = new PackageResourceReference(SharedResourceUrlTest.class,
"test");
+ url = tester.getRequestCycle().urlFor(rr, new
PageParameters("param=value", "")).toString();
+
assertEquals("wicket/resource/org.apache.wicket.SharedResourceUrlTest/test?param=value",
url);
}
}
