You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2010/01/23 01:40:03 UTC
svn commit: r902322 [2/2] - in /wicket/trunk:
wicket-examples/src/main/java/org/apache/wicket/examples/hangman/
wicket/src/main/disabled/org/apache/wicket/protocol/http/
wicket/src/main/java/org/apache/wicket/markup/html/image/resource/
wicket/src/main...
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapperTest.java (from r901031, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java&r1=901031&r2=902322&rev=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapperTest.java Sat Jan 23 00:40:01 2010
@@ -18,246 +18,242 @@
import java.util.Locale;
-import org.apache.wicket.ng.request.IRequestHandler;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.ng.request.handler.resource.ResourceRequestHandler;
/**
* @author Matej Knopp
*/
-public class ResourceReferenceEncoderTest extends AbstractResourceReferenceEncoderTest
+public class ResourceReferenceMapperTest extends AbstractResourceReferenceMapperTest
{
- /**
- * Construct.
- */
- public ResourceReferenceEncoderTest()
- {
- }
-
- private final ResourceReferenceMapper encoder = new ResourceReferenceMapper()
- {
- @Override
- protected IMapperContext getContext()
- {
- return context;
- }
- };
-
- /**
- *
- */
- public void testDecode1()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource1, h.getResource());
- assertEquals(null, h.getLocale());
- assertEquals(null, h.getStyle());
- assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
- }
-
- /**
- *
- */
- public void testDecode1A()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?en");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource1, h.getResource());
- assertEquals(Locale.ENGLISH, h.getLocale());
- assertEquals(null, h.getStyle());
+ /**
+ * Construct.
+ */
+ public ResourceReferenceMapperTest()
+ {
+ }
+
+ private final ResourceReferenceMapper encoder = new ResourceReferenceMapper()
+ {
+ @Override
+ protected IMapperContext getContext()
+ {
+ return context;
+ }
+ };
+
+ /**
+ *
+ */
+ public void testDecode1()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource1, h.getResource());
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ }
+
+ /**
+ *
+ */
+ public void testDecode1A()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?en");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource1, h.getResource());
+ assertEquals(Locale.ENGLISH, h.getLocale());
+ assertEquals(null, h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
- }
-
- /**
- *
- */
- public void testDecode2()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?p1=v1&p2=v2");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource1, h.getResource());
- assertEquals(null, h.getLocale());
- assertEquals(null, h.getStyle());
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ }
+
+ /**
+ *
+ */
+ public void testDecode2()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?p1=v1&p2=v2");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource1, h.getResource());
+ assertEquals(null, h.getLocale());
+ assertEquals(null, h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
- }
-
- /**
- *
- */
- public void testDecode2A()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?-style&p1=v1&p2=v2");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource1, h.getResource());
- assertEquals(null, h.getLocale());
- assertEquals("style", h.getStyle());
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
+ assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ }
+
+ /**
+ *
+ */
+ public void testDecode2A()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?-style&p1=v1&p2=v2");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource1, h.getResource());
+ assertEquals(null, h.getLocale());
+ assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
- }
-
- /**
- *
- */
- public void testDecode3()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource2, h.getResource());
- assertEquals(new Locale("en", "en"), h.getLocale());
- assertEquals(null, h.getStyle());
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
+ assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ }
+
+ /**
+ *
+ */
+ public void testDecode3()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource2, h.getResource());
+ assertEquals(new Locale("en", "en"), h.getLocale());
+ assertEquals(null, h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
- }
-
- /**
- *
- */
- public void testDecode3A()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN-style");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource2, h.getResource());
- assertEquals(new Locale("en", "en"), h.getLocale());
- assertEquals("style", h.getStyle());
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ }
+
+ /**
+ *
+ */
+ public void testDecode3A()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN-style");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource2, h.getResource());
+ assertEquals(new Locale("en", "en"), h.getLocale());
+ assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
- }
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ }
- /**
+ /**
*
*/
- public void testDecode3B()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertNull(handler);
- }
+ public void testDecode3B()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertNull(handler);
+ }
- /**
+ /**
*
*/
- public void testDecode4()
- {
+ public void testDecode4()
+ {
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN&p1=v1&p2=v2");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource2, h.getResource());
- assertEquals(new Locale("en", "en"), h.getLocale());
- assertEquals(null, h.getStyle());
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource2, h.getResource());
+ assertEquals(new Locale("en", "en"), h.getLocale());
+ assertEquals(null, h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
- }
-
- /**
- *
- */
- public void testDecode5()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource3, h.getResource());
- assertEquals(null, h.getLocale());
- assertEquals("style", h.getStyle());
+ assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
+ assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ }
+
+ /**
+ *
+ */
+ public void testDecode5()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource3, h.getResource());
+ assertEquals(null, h.getLocale());
+ assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
- }
-
- /**
- *
- */
- public void testDecode6()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style&p1=v1&p2=v2");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource3, h.getResource());
- assertEquals(null, h.getLocale());
- assertEquals("style", h.getStyle());
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ }
+
+ /**
+ *
+ */
+ public void testDecode6()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style&p1=v1&p2=v2");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource3, h.getResource());
+ assertEquals(null, h.getLocale());
+ assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
- }
-
-
- /**
- *
- */
- public void testDecode7()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource4, h.getResource());
- assertEquals(Locale.ENGLISH, h.getLocale());
- assertEquals("style", h.getStyle());
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
+ assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ }
+
+
+ /**
+ *
+ */
+ public void testDecode7()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource4, h.getResource());
+ assertEquals(Locale.ENGLISH, h.getLocale());
+ assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
- }
-
- /**
- *
- */
- public void testDecode7A()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?sk");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertNull(handler);
- }
-
- /**
- *
- */
- public void testDecode8()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style&p1=v1&p2=v2");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
- assertEquals(resource4, h.getResource());
- assertEquals(Locale.ENGLISH, h.getLocale());
- assertEquals("style", h.getStyle());
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals(0, h.getPageParameters().getNamedParameterKeys().size());
+ }
+
+ /**
+ *
+ */
+ public void testDecode7A()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?sk");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertNull(handler);
+ }
+
+ /**
+ *
+ */
+ public void testDecode8()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style&p1=v1&p2=v2");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
+ assertEquals(resource4, h.getResource());
+ assertEquals(Locale.ENGLISH, h.getLocale());
+ assertEquals("style", h.getStyle());
assertEquals(null, h.getVariation());
- assertEquals(0, h.getPageParameters().getIndexedParamsCount());
- assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
- assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
- }
+ assertEquals(0, h.getPageParameters().getIndexedParamsCount());
+ assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
+ assertEquals("v2", h.getPageParameters().getNamedParameter("p2").toString());
+ }
- /**
+ /**
*
*/
public void testDecode9()
@@ -265,11 +261,11 @@
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference5?en--variation&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource5, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
- assertEquals("", h.getStyle());
+ assertEquals(null, h.getStyle());
assertEquals("variation", h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedParamsCount());
assertEquals("v1", h.getPageParameters().getNamedParameter("p1").toString());
@@ -284,8 +280,8 @@
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference6?en-style-variation&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler)handler;
+ assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource6, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
assertEquals("style", h.getStyle());
@@ -298,111 +294,111 @@
/**
*
*/
- public void testEncode1()
- {
- ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference1,
- null);
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/resource/" + CLASS_NAME + "/reference1", url.toString());
- }
-
- /**
- *
- */
- public void testEncode2()
- {
- PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "X");
- parameters.addNamedParameter("p1", "v1");
- parameters.addNamedParameter("p2", "v2");
- ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference1,
- parameters);
-
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/resource/" + CLASS_NAME + "/reference1?p1=v1&p2=v2", url.toString());
- }
-
- /**
- *
- */
- public void testEncode3()
- {
- ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference2,
- null);
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN", url.toString());
- }
-
- /**
- *
- */
- public void testEncode4()
- {
- PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "X");
- parameters.addNamedParameter("p1", "v1");
- parameters.addNamedParameter("p2", "v2");
- ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference2,
- parameters);
+ public void testEncode1()
+ {
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference1,
+ null);
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/resource/" + CLASS_NAME + "/reference1", url.toString());
+ }
+
+ /**
+ *
+ */
+ public void testEncode2()
+ {
+ PageParameters parameters = new PageParameters();
+ parameters.setIndexedParameter(0, "X");
+ parameters.addNamedParameter("p1", "v1");
+ parameters.addNamedParameter("p2", "v2");
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference1,
+ parameters);
+
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/resource/" + CLASS_NAME + "/reference1?p1=v1&p2=v2", url.toString());
+ }
- Url url = encoder.mapHandler(handler);
+ /**
+ *
+ */
+ public void testEncode3()
+ {
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference2,
+ null);
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN", url.toString());
+ }
+
+ /**
+ *
+ */
+ public void testEncode4()
+ {
+ PageParameters parameters = new PageParameters();
+ parameters.setIndexedParameter(0, "X");
+ parameters.addNamedParameter("p1", "v1");
+ parameters.addNamedParameter("p2", "v2");
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference2,
+ parameters);
+
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN&p1=v1&p2=v2",
url.toString());
- }
+ }
- /**
+ /**
*
*/
- public void testEncode5()
- {
- ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference3,
- null);
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/resource/" + CLASS_NAME + "/reference3?-style", url.toString());
- }
+ public void testEncode5()
+ {
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference3,
+ null);
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/resource/" + CLASS_NAME + "/reference3?-style", url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode6()
- {
- PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "X");
- parameters.addNamedParameter("p1", "v1");
- parameters.addNamedParameter("p2", "v2");
- ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference3,
- parameters);
+ public void testEncode6()
+ {
+ PageParameters parameters = new PageParameters();
+ parameters.setIndexedParameter(0, "X");
+ parameters.addNamedParameter("p1", "v1");
+ parameters.addNamedParameter("p2", "v2");
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference3,
+ parameters);
- Url url = encoder.mapHandler(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference3?-style&p1=v1&p2=v2",
url.toString());
- }
+ }
- /**
+ /**
*
*/
- public void testEncode7()
- {
- ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference4,
- null);
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/resource/" + CLASS_NAME + "/reference4?en-style", url.toString());
- }
+ public void testEncode7()
+ {
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference4,
+ null);
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/resource/" + CLASS_NAME + "/reference4?en-style", url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode8()
- {
- PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "X");
- parameters.addNamedParameter("p1", "v1");
- parameters.addNamedParameter("p2", "v2");
- ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference4,
- parameters);
+ public void testEncode8()
+ {
+ PageParameters parameters = new PageParameters();
+ parameters.setIndexedParameter(0, "X");
+ parameters.addNamedParameter("p1", "v1");
+ parameters.addNamedParameter("p2", "v2");
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference4,
+ parameters);
- Url url = encoder.mapHandler(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference4?en-style&p1=v1&p2=v2",
url.toString());
- }
+ }
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java Sat Jan 23 00:40:01 2010
@@ -16,11 +16,14 @@
*/
package org.apache.wicket.ng.request.mapper;
+import java.util.Locale;
+
+import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ng.MockPage;
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.listener.RequestListenerInterface;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
/**
@@ -63,12 +66,21 @@
return registry;
}
- private final ResourceReferenceRegistry registry = new ResourceReferenceRegistry();
+ private final ResourceReferenceRegistry registry = new ResourceReferenceRegistry()
+ {
+ @Override
+ protected ResourceReference createDefaultResourceReference(Class<?> scope, String name,
+ Locale locale, String style, String variation)
+ {
+ // Do not create package resource here because it requires "real" application
+ return null;
+ }
+ };
private boolean bookmarkable = true;
/**
- * Determines whether the newly created page will have bookarkable flag set
+ * Determines whether the newly created page will have bookmarkable flag set
*
* @param bookmarkable
*/
@@ -122,7 +134,7 @@
page.setPageId(++idCounter);
page.setBookmarkable(true);
page.setCreatedBookmarkable(true);
- page.getPageParametersNg().assign(pageParameters);
+ page.getPageParameters().assign(pageParameters);
return page;
}
catch (Exception e)
Added: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender$Page1.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender%24Page1.html?rev=902322&view=auto
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender$Page1.html (added)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender$Page1.html Sat Jan 23 00:40:01 2010
@@ -0,0 +1,6 @@
+<html>
+ <head></head>
+ <body>
+ <a wicket:id="link">This is a link</a>
+ </body>
+</html>
\ No newline at end of file
Propchange: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender$Page1.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java Sat Jan 23 00:40:01 2010
@@ -18,10 +18,11 @@
import junit.framework.TestCase;
-import org.apache.wicket.Page;
import org.apache.wicket.Request;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.ILinkListener;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.markup.html.link.ILinkListener;
import org.apache.wicket.ng.mock.MockApplication;
import org.apache.wicket.ng.mock.MockRequestCycle;
import org.apache.wicket.ng.mock.MockWebRequest;
@@ -31,33 +32,24 @@
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.mapper.MountedMapper;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
-import org.junit.Ignore;
-/**
- * TODO WICKET-NG needs to be reworked
- *
- * @author igor.vaynberg
- */
-@Ignore
public class TestPageRender extends TestCase
{
- public static class Page1 extends Page
+ public static class Page1 extends WebPage
{
private static final long serialVersionUID = 1L;
public Page1()
{
-// Link l;
-// add(l = new Link("link")
-// {
-// private static final long serialVersionUID = 1L;
-//
-// public void onLinkClicked()
-// {
-// System.out.println("Link clicked!");
-// }
-// });
-// l.setLabel("A Link!");
+ Link l;
+ add(l = new Link("link")
+ {
+ @Override
+ public void onClick()
+ {
+ System.out.println("Link clicked!");
+ }
+ });
}
};
@@ -75,7 +67,7 @@
app.getRequestCycleSettings().setRenderStrategy(RenderStrategy.ONE_PASS_RENDER);
// Mount the test page
- app.registerEncoder(new MountedMapper("first-test-page", Page1.class));
+ app.getRootRequestMapper().register(new MountedMapper("first-test-page", Page1.class));
// Construct request for first-test-page
Request request = new MockWebRequest(Url.parse("first-test-page"));
Added: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester$Page1.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester%24Page1.html?rev=902322&view=auto
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester$Page1.html (added)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester$Page1.html Sat Jan 23 00:40:01 2010
@@ -0,0 +1,6 @@
+<html>
+ <head></head>
+ <body>
+ <a wicket:id="link">This is a link</a>
+ </body>
+</html>
\ No newline at end of file
Propchange: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester$Page1.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester.java Sat Jan 23 00:40:01 2010
@@ -20,45 +20,45 @@
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.ng.markup.html.link.ILinkListener;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.ILinkListener;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.ng.ThreadContext;
import org.apache.wicket.ng.mock.WicketTester;
-import org.junit.Ignore;
-/**
- * TODO WICKET-NG needs to be reworked
- *
- */
-@Ignore
public class TestWicketTester extends TestCase
{
- public static class Page1 extends Page
+ public static class Page1 extends WebPage
{
private static final long serialVersionUID = 1L;
public Page1()
{
-// Link l;
-// add(l = new Link("link")
-// {
-// private static final long serialVersionUID = 1L;
-//
-// public void onLinkClicked()
-// {
-// System.out.println("Link clicked!");
-// }
-// });
-// l.setLabel("A Link!");
+ Link l;
+ add(l = new Link("link")
+ {
+ @Override
+ public void onClick()
+ {
+ System.out.println("Link clicked!");
+ }
+ });
}
-
-
};
public void testPageRender1()
{
WicketTester tester = new WicketTester();
- tester.startPage(new Page1());
+ // this is not too pretty but new Page1() needs Session.get() to be working for various
+ // reasons
+ ThreadContext old = ThreadContext.get(false);
+ ThreadContext.setSession(tester.getApplication().getSession());
+
+ Page page = new Page1();
+
+ tester.startPage(page);
System.out.println(tester.getLastResponse().getTextResponse());
@@ -67,5 +67,7 @@
tester.executeListener(c, ILinkListener.INTERFACE);
tester.destroy();
+
+ ThreadContext.restore(old);
}
}