Copied:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
(from r820910,
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/encoder/ResourceReferenceEncoderTest.java)
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java?p2=wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java&p1=wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/encoder/ResourceReferenceEncoderTest.java&r1=820910&r2=820916&rev=820916&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/encoder/ResourceReferenceEncoderTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
Fri Oct 2 07:28:07 2009
@@ -14,335 +14,349 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.encoder;
+package org.apache.wicket.request.mapper;
import java.util.Locale;
import org.apache.wicket.PageParameters;
-import org.apache.wicket.request.RequestHandler;
+import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
+import org.apache.wicket.request.mapper.MapperContext;
+import org.apache.wicket.request.mapper.ResourceReferenceMapper;
/**
* @author Matej Knopp
*/
public class ResourceReferenceEncoderTest extends
AbstractResourceReferenceEncoderTest
{
- /**
- * Construct.
+ /**
+ * Construct.
+ */
+ public ResourceReferenceEncoderTest()
+ {
+ }
+
+ private final ResourceReferenceMapper encoder = new
ResourceReferenceMapper()
+ {
+ @Override
+ protected MapperContext getContext()
+ {
+ return context;
+ }
+ };
+
+ /**
+ *
+ */
+ public void testDecode1()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1");
+ IRequestHandler handler = encoder.map(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 testDecode1A()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference1?en");
+ IRequestHandler handler = encoder.map(getRequest(url));
+ assertTrue(handler instanceof ResourceRequestHandler);
+ ResourceRequestHandler h = (ResourceRequestHandler)handler;
+ assertEquals(resource1, h.getResource());
+ assertEquals(Locale.ENGLISH, 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.map(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("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.map(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 testDecode3()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN");
+ IRequestHandler handler = encoder.map(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(0, h.getPageParameters().getNamedParameterKeys().size());
+ }
+
+ /**
+ *
+ */
+ public void testDecode3A()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN-style");
+ IRequestHandler handler = encoder.map(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 testDecode3B()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2");
+ IRequestHandler handler = encoder.map(getRequest(url));
+ assertNull(handler);
+ }
+
+ /**
+ *
+ */
+ public void testDecode4()
+ {
+ Url url = Url
+ .parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN&p1=v1&p2=v2");
+ IRequestHandler handler = encoder.map(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("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.map(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.map(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("v1",
h.getPageParameters().getNamedParameter("p1").toString());
+ assertEquals("v2",
h.getPageParameters().getNamedParameter("p2").toString());
+ }
+
+
+ /**
+ *
*/
- public ResourceReferenceEncoderTest()
- {
- }
-
- private final ResourceReferenceEncoder encoder = new
ResourceReferenceEncoder()
- {
- @Override
- protected EncoderContext getContext()
- {
- return context;
- }
- };
-
- /**
- *
- */
- public void testDecode1()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference1");
- RequestHandler handler = encoder.decode(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 testDecode1A()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference1?en");
- RequestHandler handler = encoder.decode(getRequest(url));
- assertTrue(handler instanceof ResourceRequestHandler);
- ResourceRequestHandler h = (ResourceRequestHandler) handler;
- assertEquals(resource1, h.getResource());
- assertEquals(Locale.ENGLISH, 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");
- RequestHandler handler = encoder.decode(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("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");
- RequestHandler handler = encoder.decode(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 testDecode3()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN");
- RequestHandler handler = encoder.decode(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(0,
h.getPageParameters().getNamedParameterKeys().size());
- }
-
- /**
- *
- */
- public void testDecode3A()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN-style");
- RequestHandler handler = encoder.decode(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 testDecode3B()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2");
- RequestHandler handler = encoder.decode(getRequest(url));
- assertNull(handler);
- }
-
- /**
- *
- */
- public void testDecode4()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN&p1=v1&p2=v2");
- RequestHandler handler = encoder.decode(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("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");
- RequestHandler handler = encoder.decode(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");
- RequestHandler handler = encoder.decode(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("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");
- RequestHandler handler = encoder.decode(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");
- RequestHandler handler = encoder.decode(getRequest(url));
- assertNull(handler);
- }
-
- /**
- *
- */
- public void testDecode8()
- {
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference4?en-style&p1=v1&p2=v2");
- RequestHandler handler = encoder.decode(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 testEncode1()
- {
- ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference1, null);
- Url url = encoder.encode(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.encode(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.encode(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.encode(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.encode(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);
-
- Url url = encoder.encode(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.encode(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);
-
- Url url = encoder.encode(handler);
- assertEquals("wicket/resource/" + CLASS_NAME +
"/reference4?en-style&p1=v1&p2=v2", url.toString());
- }
+ public void testDecode7()
+ {
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference4?en-style");
+ IRequestHandler handler = encoder.map(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.map(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.map(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 testEncode1()
+ {
+ ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference1,
+ null);
+ Url url = encoder.map(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.map(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.map(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.map(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.map(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);
+
+ Url url = encoder.map(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.map(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);
+
+ Url url = encoder.map(handler);
+ assertEquals("wicket/resource/" + CLASS_NAME +
"/reference4?en-style&p1=v1&p2=v2", url
+ .toString());
+ }
}
Propchange:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
(from r820910,
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/encoder/TestEncoderContext.java)
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java?p2=wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java&p1=wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/encoder/TestEncoderContext.java&r1=820910&r2=820916&rev=820916&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/encoder/TestEncoderContext.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
Fri Oct 2 07:28:07 2009
@@ -14,135 +14,136 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.encoder;
+package org.apache.wicket.request.mapper;
-import org.apache.wicket.MockPage;
-import org.apache.wicket.resource.ResourceReferenceRegistry;
import org.apache.wicket.IPage;
+import org.apache.wicket.MockPage;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.request.mapper.MapperContext;
+import org.apache.wicket.resource.ResourceReferenceRegistry;
/**
* Simple {...@link EncoderContext} implementation for testing purposes
*
* @author Matej Knopp
*/
-public class TestEncoderContext implements EncoderContext
+public class TestMapperContext implements MapperContext
{
- /**
- * Construct.
- */
- public TestEncoderContext()
- {
- }
-
- public String getBookmarkableIdentifier()
- {
- return "bookmarkable";
- }
-
- public String getNamespace()
- {
- return "wicket";
- }
-
- public String getPageIdentifier()
- {
- return "page";
- }
-
- public String getResourceIdentifier()
- {
- return "resource";
- }
-
- public ResourceReferenceRegistry getResourceReferenceRegistry()
- {
- return registry;
- }
-
- private ResourceReferenceRegistry registry = new
ResourceReferenceRegistry();
-
- private boolean bookmarkable = true;
-
- /**
- * Determines whether the newly created page will have bookarkable flag
set
- *
- * @param bookmarkable
- */
- public void setBookmarkable(boolean bookmarkable)
- {
- this.bookmarkable = bookmarkable;
- }
-
- private boolean createdBookmarkable = true;
-
- /**
- * Determines whether the newly created page will have
createdBookmarkable flag set
- *
- * @param createdBookmarkable
- */
- public void setCreatedBookmarkable(boolean createdBookmarkable)
- {
- this.createdBookmarkable = createdBookmarkable;
- }
-
- private int nextPageRenderCount = 0;
-
- /**
- *
- * @param nextPageRenderCount
- */
- public void setNextPageRenderCount(int nextPageRenderCount)
- {
- this.nextPageRenderCount = nextPageRenderCount;
- }
-
- public IPage getPageInstance(int pageId)
- {
- MockPage page = new MockPage();
- page.setPageId(pageId);
- page.setBookmarkable(bookmarkable);
- page.setCreatedBookmarkable(createdBookmarkable);
- page.setRenderCount(nextPageRenderCount);
- return page;
- }
-
- int idCounter = 0;
-
- public IPage newPageInstance(Class<? extends IPage> pageClass,
PageParameters pageParameters)
- {
- try
- {
- MockPage page;
- page = (MockPage)pageClass.newInstance();
- page.setPageId(++idCounter);
- page.setBookmarkable(true);
- page.setCreatedBookmarkable(true);
- page.getPageParameters().assign(pageParameters);
- return page;
- }
- catch (Exception e)
- {
- throw new WicketRuntimeException(e);
- }
- }
-
- public RequestListenerInterface
requestListenerInterfaceFromString(String interfaceName)
- {
- return RequestListenerInterface.forName(interfaceName);
- }
-
- public String requestListenerInterfaceToString(RequestListenerInterface
listenerInterface)
- {
- return listenerInterface.getName();
- }
-
- public Class<? extends IPage> getHomePageClass()
- {
- return MockPage.class;
- }
+ /**
+ * Construct.
+ */
+ public TestMapperContext()
+ {
+ }
+
+ public String getBookmarkableIdentifier()
+ {
+ return "bookmarkable";
+ }
+
+ public String getNamespace()
+ {
+ return "wicket";
+ }
+
+ public String getPageIdentifier()
+ {
+ return "page";
+ }
+
+ public String getResourceIdentifier()
+ {
+ return "resource";
+ }
+
+ public ResourceReferenceRegistry getResourceReferenceRegistry()
+ {
+ return registry;
+ }
+
+ private ResourceReferenceRegistry registry = new
ResourceReferenceRegistry();
+
+ private boolean bookmarkable = true;
+
+ /**
+ * Determines whether the newly created page will have bookarkable flag set
+ *
+ * @param bookmarkable
+ */
+ public void setBookmarkable(boolean bookmarkable)
+ {
+ this.bookmarkable = bookmarkable;
+ }
+
+ private boolean createdBookmarkable = true;
+
+ /**
+ * Determines whether the newly created page will have createdBookmarkable
flag set
+ *
+ * @param createdBookmarkable
+ */
+ public void setCreatedBookmarkable(boolean createdBookmarkable)
+ {
+ this.createdBookmarkable = createdBookmarkable;
+ }
+
+ private int nextPageRenderCount = 0;
+
+ /**
+ *
+ * @param nextPageRenderCount
+ */
+ public void setNextPageRenderCount(int nextPageRenderCount)
+ {
+ this.nextPageRenderCount = nextPageRenderCount;
+ }
+
+ public IPage getPageInstance(int pageId)
+ {
+ MockPage page = new MockPage();
+ page.setPageId(pageId);
+ page.setBookmarkable(bookmarkable);
+ page.setCreatedBookmarkable(createdBookmarkable);
+ page.setRenderCount(nextPageRenderCount);
+ return page;
+ }
+
+ int idCounter = 0;
+
+ public IPage newPageInstance(Class< ? extends IPage> pageClass,
PageParameters pageParameters)
+ {
+ try
+ {
+ MockPage page;
+ page = (MockPage)pageClass.newInstance();
+ page.setPageId(++idCounter);
+ page.setBookmarkable(true);
+ page.setCreatedBookmarkable(true);
+ page.getPageParameters().assign(pageParameters);
+ return page;
+ }
+ catch (Exception e)
+ {
+ throw new WicketRuntimeException(e);
+ }
+ }
+
+ public RequestListenerInterface requestListenerInterfaceFromString(String
interfaceName)
+ {
+ return RequestListenerInterface.forName(interfaceName);
+ }
+
+ public String requestListenerInterfaceToString(RequestListenerInterface
listenerInterface)
+ {
+ return listenerInterface.getName();
+ }
+
+ public Class< ? extends IPage> getHomePageClass()
+ {
+ return MockPage.class;
+ }
}
Propchange:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java?rev=820916&r1=820910&r2=820916&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
Fri Oct 2 07:28:07 2009
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.encoder.info;
+package org.apache.wicket.request.mapper.info;
+
+import org.apache.wicket.request.mapper.info.ComponentInfo;
import junit.framework.TestCase;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java?rev=820916&r1=820910&r2=820916&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
Fri Oct 2 07:28:07 2009
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.encoder.info;
+package org.apache.wicket.request.mapper.info;
-import org.apache.wicket.request.encoder.info.PageComponentInfo;
+import org.apache.wicket.request.mapper.info.PageComponentInfo;
import junit.framework.TestCase;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/test/TestPageRender.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/test/TestPageRender.java?rev=820916&r1=820915&r2=820916&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/test/TestPageRender.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/test/TestPageRender.java
Fri Oct 2 07:28:07 2009
@@ -9,11 +9,11 @@
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.mock.MockRequest;
import org.apache.wicket.mock.MockRequestCycle;
+import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
-import org.apache.wicket.request.encoder.MountedEncoder;
import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.handler.impl.ListenerInterfaceRequestHandler;
-import org.apache.wicket.request.request.Request;
+import org.apache.wicket.request.mapper.MountedMapper;
import org.apache.wicket.request.response.Response;
import org.apache.wicket.request.response.StringResponse;
@@ -57,7 +57,7 @@
app.initApplication();
// Mount the test page
- app.registerEncoder(new MountedEncoder("first-test-page",
Page1.class));
+ app.registerEncoder(new MountedMapper("first-test-page",
Page1.class));
// Construct request for first-test-page
Request request = new MockRequest(Url.parse("first-test-page"));
