Author: jbq
Date: Fri Feb 23 03:29:03 2007
New Revision: 510909
URL: http://svn.apache.org/viewvc?view=rev&rev=510909
Log:
WICKET-280 Allow to access html resources if they are not associated with a
java class
Reactivate testClickResourceLink() and add a test for blocked HTML
Added:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.java
- copied, changed from r510636,
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.java
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/test.html
Removed:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/WicketTesterTest.java
Added:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.html?view=auto&rev=510909
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.html
(added)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.html
Fri Feb 23 03:29:03 2007
@@ -0,0 +1 @@
+<a wicket:id="link">Link</a>
Copied:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.java
(from r510636,
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.java?view=diff&rev=510909&p1=incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.java&r1=510636&p2=incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.java&r2=510909
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/BlockedResourceLinkPage.java
Fri Feb 23 03:29:03 2007
@@ -25,15 +25,15 @@
*
* @author frankbille
*/
-public class MockResourceLinkPage extends WebPage
+public class BlockedResourceLinkPage extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public MockResourceLinkPage()
+ public BlockedResourceLinkPage()
{
- add(new ResourceLink("link", new
ResourceReference(MockResourceLinkPage.class, "MockResourceLinkPage.html")));
+ add(new ResourceLink("link", new
ResourceReference(BlockedResourceLinkPage.class,
"BlockedResourceLinkPage.html")));
}
}
Added:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.html?view=auto&rev=510909
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.html
(added)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/MockResourceLinkPage.html
Fri Feb 23 03:29:03 2007
@@ -0,0 +1 @@
+<a wicket:id="link">Link</a>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/WicketTesterTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/WicketTesterTest.java?view=diff&rev=510909&r1=510908&r2=510909
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/WicketTesterTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/WicketTesterTest.java
Fri Feb 23 03:29:03 2007
@@ -27,9 +27,11 @@
import wicket.ajax.AjaxEventBehavior;
import wicket.ajax.AjaxRequestTarget;
import wicket.ajax.markup.html.AjaxLink;
+import wicket.markup.html.PackageResource.PackageResourceBlockedException;
import wicket.markup.html.basic.Label;
import wicket.markup.html.form.TextField;
import wicket.markup.html.link.Link;
+import wicket.request.target.coding.IRequestTargetUrlCodingStrategy;
import wicket.util.tester.MockPageWithFormAndAjaxFormSubmitBehavior.Pojo;
import wicket.util.tester.apps_1.Book;
import wicket.util.tester.apps_1.CreateBook;
@@ -332,17 +334,26 @@
* Test that clickLink on a ResourceLink with a ResourceReference on it
* works.
*
- * FIXME this test should be activated again once a proper solution to
- * <b>WICKET-280 Allow to access html resources</b> is found
+ * <p>See also WICKET-280 Allow to access html resources</p>
*/
- public void bugTestClickResourceLink()
+ public void testClickResourceLink()
{
- WicketTester tester = new WicketTester();
+ try
+ {
+ tester.startPage(BlockedResourceLinkPage.class);
+ fail("Accessing " + BlockedResourceLinkPage.class + "
should have raised a " + PackageResourceBlockedException.class);
+ }
+ catch(PackageResourceBlockedException e)
+ {
+
+ }
tester.startPage(MockResourceLinkPage.class);
-
tester.clickLink("link");
-
- tester.destroy();
+ assertNull(getRequestCodingStrategy());
+ }
+ IRequestTargetUrlCodingStrategy getRequestCodingStrategy() {
+ String relativePath =
tester.getApplication().getWicketFilter().getRelativePath(tester.getServletRequest());
+ return
tester.getApplication().getRequestCycleProcessor().getRequestCodingStrategy().urlCodingStrategyForPath(relativePath);
}
}
Added:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/test.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/test.html?view=auto&rev=510909
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/test.html
(added)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/util/tester/test.html
Fri Feb 23 03:29:03 2007
@@ -0,0 +1 @@
+This is a test!
