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 [1/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...
Author: knopp
Date: Sat Jan 23 00:40:01 2010
New Revision: 902322
URL: http://svn.apache.org/viewvc?rev=902322&view=rev
Log:
more good stuff
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java (contents, props changed)
- copied, changed from r901031, wicket/trunk/wicket/src/main/disabled/org/apache/wicket/protocol/http/MockServletContext.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractMapperTest.java
- copied, changed from r901031, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractEncoderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapperTest.java
- copied, changed from r901031, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceEncoderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java
- copied, changed from r901031, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapperTest.java
- copied, changed from r901031, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender$Page1.html (with props)
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester$Page1.html (with props)
Removed:
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/protocol/http/MockServletContext.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractEncoderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceEncoderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestWicketTester.java
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java Sat Jan 23 00:40:01 2010
@@ -24,6 +24,7 @@
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* The main guess page for the hangman application.
@@ -93,7 +94,13 @@
}
};
- link.add(new Image("image", letter.getSharedImageResource()));
+ PageParameters parameters = new PageParameters();
+ parameters.setNamedParameter(Letter.PARAMETER_LETTER, letter.asString());
+ if (letter.isGuessed())
+ {
+ parameters.setNamedParameter(Letter.PARAMETER_GUESSED, true);
+ }
+ link.add(new Image("image", Letter.LETTER_RESOURCE_REFERENCE, parameters));
listItem.add(link);
// append id attribute to link for unit tests
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java Sat Jan 23 00:40:01 2010
@@ -71,27 +71,53 @@
return false;
}
- /**
- * @return ResourceReference token for this letter
- */
- public ResourceReference getSharedImageResource()
+ static String PARAMETER_GUESSED = "guessed";
+ static String PARAMETER_LETTER = "letter";
+
+ static ResourceReference LETTER_RESOURCE_REFERENCE = new ResourceReference(Letter.class,
+ "letter")
{
- return new ResourceReference(Letter.class, asString() +
- (isGuessed() ? "_enabled" : "_disabled"))
+ /**
+ * @see org.apache.wicket.ng.resource.ResourceReference#getResource()
+ */
+ @Override
+ public IResource getResource()
{
- @Override
- public IResource getResource()
+ return new ButtonResource();
+ }
+ };
+
+ /**
+ * Simple resource implementation that checks for "guessed" parameter and delegates to
+ * {@link DefaultButtonImageResource}.
+ *
+ * @author Matej Knopp
+ */
+ private static class ButtonResource implements IResource
+ {
+ /**
+ * @see org.apache.wicket.ng.resource.IResource#respond(org.apache.wicket.ng.resource.IResource.Attributes)
+ */
+ public void respond(Attributes attributes)
+ {
+ // request parameter for the resource
+ boolean guessed = attributes.getParameters()
+ .getNamedParameter(PARAMETER_GUESSED)
+ .toBoolean(false);
+ String letter = attributes.getParameters()
+ .getNamedParameter(PARAMETER_LETTER)
+ .toString();
+
+ // delegate to another resource
+ DefaultButtonImageResource buttonResource = new DefaultButtonImageResource(30, 30,
+ letter);
+
+ if (guessed)
{
- // Lazy loading of shared resource
- final DefaultButtonImageResource buttonResource = new DefaultButtonImageResource(
- 30, 30, asString());
- if (!isGuessed())
- {
- buttonResource.setColor(Color.GRAY);
- }
- return buttonResource;
+ buttonResource.setColor(Color.GRAY);
}
- };
+ buttonResource.respond(attributes);
+ }
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Sat Jan 23 00:40:01 2010
@@ -30,7 +30,6 @@
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.ng.resource.IResource;
-import org.apache.wicket.ng.resource.PackageResource;
import org.apache.wicket.ng.resource.PackageResourceReference;
import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.ng.resource.IResource.Attributes;
@@ -185,16 +184,6 @@
component.getApplication().getResourceReferenceRegistry().registerResourceReference(
resourceReference);
// Bind the reference to the application
-
- // Then dereference the resource
- resource = resourceReference.getResource();
-
- if (resource instanceof PackageResource)
- {
- // TODO NG - deal with this
- // it's really ugly how resource pushes locale to resource reference :-|
- // resourceReference.setLocale(((PackageResource)resource).getLocale());
- }
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockApplication.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockApplication.java Sat Jan 23 00:40:01 2010
@@ -16,7 +16,10 @@
*/
package org.apache.wicket.ng.mock;
+import javax.servlet.ServletContext;
+
import org.apache.wicket.Page;
+import org.apache.wicket.Session;
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.cycle.RequestCycleContext;
@@ -25,6 +28,7 @@
import org.apache.wicket.ng.request.handler.impl.render.WebRenderPageRequestHandlerDelegate;
import org.apache.wicket.pageStore.IPageManager;
import org.apache.wicket.pageStore.IPageManagerContext;
+import org.apache.wicket.protocol.http.MockServletContext;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.session.ISessionStore;
@@ -89,4 +93,35 @@
return new MockSessionStore();
}
+ public Session getSession()
+ {
+ return getSessionStore().lookup(null);
+ }
+
+ private MockServletContext mockServletContext;
+
+ @Override
+ public ServletContext getServletContext()
+ {
+ return mockServletContext;
+ }
+
+ @Override
+ public final String getInitParameter(String key)
+ {
+ return null;
+ }
+
+ @Override
+ protected void internalInit()
+ {
+ // TODO NG What should the proper path be
+ mockServletContext = new MockServletContext(this, "");
+ super.internalInit();
+ }
+
+ public void destroy()
+ {
+ internalDestroy();
+ }
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java Sat Jan 23 00:40:01 2010
@@ -24,6 +24,7 @@
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Page;
import org.apache.wicket.RequestListenerInterface;
+import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ng.ThreadContext;
import org.apache.wicket.ng.request.IRequestMapper;
@@ -34,6 +35,7 @@
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
/**
@@ -68,6 +70,9 @@
application.setName("WicketTesterApplication");
application.set();
application.initApplication();
+
+ Session session = new WebSession(new MockWebRequest(Url.parse("/")));
+ getApplication().getSessionStore().bind(null, session);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java Sat Jan 23 00:40:01 2010
@@ -213,6 +213,56 @@
}
/**
+ * Represents a named parameter entry. There can be multiple {@link NamedParameterPair}s in
+ * {@link PageParameters} that have same key.
+ *
+ * @author Matej Knopp
+ */
+ public static class NamedParameterPair
+ {
+ private final String key;
+ private final String value;
+
+ private NamedParameterPair(String key, String value)
+ {
+ this.key = key;
+ this.value = value;
+ }
+
+ /**
+ * @return key
+ */
+ public String getKey()
+ {
+ return key;
+ }
+
+ /**
+ * @return value
+ */
+ public String getValue()
+ {
+ return value;
+ }
+ };
+
+ /**
+ * @return All named parameters in exact order.
+ */
+ public List<NamedParameterPair> getNamedParameters()
+ {
+ List<NamedParameterPair> res = new ArrayList<NamedParameterPair>();
+ if (namedParameters != null)
+ {
+ for (Entry e : namedParameters)
+ {
+ res.add(new NamedParameterPair(e.key, e.value));
+ }
+ }
+ return Collections.unmodifiableList(res);
+ }
+
+ /**
* Removes named parameter with given name.
*
* @param name
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java Sat Jan 23 00:40:01 2010
@@ -16,9 +16,12 @@
*/
package org.apache.wicket.ng.request.handler.resource;
+import java.util.Locale;
+
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.resource.IResource;
import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.lang.Checks;
@@ -88,4 +91,36 @@
{
new ResourceRequestHandler(getResourceReference().getResource(), getPageParameters()).respond(requestCycle);
}
+
+ /**
+ * @return reference locale
+ */
+ public Locale getLocale()
+ {
+ return getResourceReference().getLocale();
+ }
+
+ /**
+ * @return resource
+ */
+ public IResource getResource()
+ {
+ return getResourceReference().getResource();
+ }
+
+ /**
+ * @return style
+ */
+ public String getStyle()
+ {
+ return getResourceReference().getStyle();
+ }
+
+ /**
+ * @return variation
+ */
+ public String getVariation()
+ {
+ return getResourceReference().getVariation();
+ }
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java Sat Jan 23 00:40:01 2010
@@ -65,6 +65,18 @@
}
};
+ private static String nonEmpty(String s)
+ {
+ if (Strings.isEmpty(s))
+ {
+ return null;
+ }
+ else
+ {
+ return s;
+ }
+ }
+
/**
*
* @param attributes
@@ -83,12 +95,12 @@
locale = parseLocale(split[0]);
if (split.length == 2)
{
- style = split[1];
+ style = nonEmpty(split[1]);
}
else if (split.length == 3)
{
- style = split[1];
- variation = split[2];
+ style = nonEmpty(split[1]);
+ variation = nonEmpty(split[2]);
}
}
return new ResourceReference.UrlAttributes(locale, style, variation);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java Sat Jan 23 00:40:01 2010
@@ -95,6 +95,7 @@
ResourceReference res = getContext().getResourceReferenceRegistry()
.getResourceReference(scope, name.toString(), attributes.getLocale(),
attributes.getStyle(), attributes.getVariation(), true);
+
if (res != null)
{
return new ResourceReferenceRequestHandler(res, pageParameters);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java Sat Jan 23 00:40:01 2010
@@ -16,13 +16,10 @@
*/
package org.apache.wicket.ng.request.mapper.parameters;
-import java.util.List;
-
import org.apache.wicket.Request;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.Url.QueryParameter;
import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.util.string.StringValue;
/**
* Simple encoder with direct indexed/named parameters mapping.
@@ -72,17 +69,10 @@
url.getSegments().add(pageParameters.getIndexedParameter(i).toString());
}
- for (String key : pageParameters.getNamedParameterKeys())
+ for (PageParameters.NamedParameterPair pair : pageParameters.getNamedParameters())
{
- List<StringValue> values = pageParameters.getNamedParameters(key);
- if (values != null)
- {
- for (StringValue value : values)
- {
- QueryParameter param = new QueryParameter(key, value.toString());
- url.getQueryParameters().add(param);
- }
- }
+ QueryParameter param = new QueryParameter(pair.getKey(), pair.getValue());
+ url.getQueryParameters().add(param);
}
return url;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java Sat Jan 23 00:40:01 2010
@@ -245,24 +245,35 @@
private ResourceReference addDefaultResourceReference(Class<?> scope, String name,
Locale locale, String style, String variation)
{
- Key key = new Key(scope.getName(), name, locale, style, variation);
- if (autoAddedQueue.size() > getAutoAddedCapacity())
- {
- Key first = autoAddedQueue.remove();
- map.remove(first);
- }
- autoAddedQueue.add(key);
-
ResourceReference reference = createDefaultResourceReference(scope, name, locale, style,
variation);
- registerResourceReference(reference);
+
+ if (reference != null)
+ {
+ Key key = new Key(scope.getName(), name, locale, style, variation);
+ if (autoAddedQueue.size() > getAutoAddedCapacity())
+ {
+ Key first = autoAddedQueue.remove();
+ map.remove(first);
+ }
+ autoAddedQueue.add(key);
+
+ registerResourceReference(reference);
+ }
return reference;
}
protected ResourceReference createDefaultResourceReference(Class<?> scope, String name,
Locale locale, String style, String variation)
{
- return new PackageResourceReference(scope, name, locale, style, variation);
+ if (PackageResource.exists(scope, name, locale, style, variation))
+ {
+ return new PackageResourceReference(scope, name, locale, style, variation);
+ }
+ else
+ {
+ return null;
+ }
}
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java (from r901031, wicket/trunk/wicket/src/main/disabled/org/apache/wicket/protocol/http/MockServletContext.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java&p1=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/protocol/http/MockServletContext.java&r1=901031&r2=902322&rev=902322&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Sat Jan 23 00:40:01 2010
@@ -121,12 +121,6 @@
}
/**
- * The cached application key. Will be set in {@link #setWicketFilter(WicketFilter)} based on
- * the filter name.
- */
- private String applicationKey;
-
- /**
* Map of buffered responses that are in progress per session. Buffered responses are
* temporarily stored
*/
@@ -152,16 +146,11 @@
/**
* @see org.apache.wicket.Application#getApplicationKey()
*/
+ @Deprecated
@Override
public final String getApplicationKey()
{
- if (applicationKey == null)
- {
- throw new IllegalStateException("the application key does not seem to"
- + " be set properly or this method is called before WicketServlet is"
- + " set, which leads to the wrong behavior");
- }
- return applicationKey;
+ return getName();
}
/**
@@ -171,7 +160,7 @@
* the key to search for
* @return the value of the filter init parameter
*/
- public final String getInitParameter(String key)
+ public String getInitParameter(String key)
{
if (wicketFilter != null)
{
@@ -364,7 +353,6 @@
public final void setWicketFilter(final WicketFilter wicketFilter)
{
this.wicketFilter = wicketFilter;
- applicationKey = wicketFilter.getFilterConfig().getFilterName();
}
/**
@@ -524,17 +512,6 @@
}
/**
- * Set the application key value
- *
- * @param applicationKey
- * Unique application key (typically the filter name).
- */
- protected final void setApplicationKey(String applicationKey)
- {
- this.applicationKey = applicationKey;
- }
-
- /**
* Add a buffered response to the redirect buffer.
*
* @param sessionId
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java Sat Jan 23 00:40:01 2010
@@ -49,13 +49,13 @@
public IRequestableComponent get(String path)
{
MockComponent c = new MockComponent();
- if (Strings.isEmpty(getPath()))
+ if (Strings.isEmpty(getPageRelativePath()))
{
c.setPath(path);
}
else
{
- c.setPath(getPath() + ":" + path);
+ c.setPath(getPageRelativePath() + ":" + path);
}
c.setPage(getPage());
c.setId(Strings.lastPathComponent(path, ':'));
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/RequestHandlerStackTest.java Sat Jan 23 00:40:01 2010
@@ -18,8 +18,8 @@
import junit.framework.TestCase;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Response;
-import org.apache.wicket.ng.request.IRequestHandler;
/**
*
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractMapperTest.java (from r901031, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractEncoderTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractEncoderTest.java&r1=901031&r2=902322&rev=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractMapperTest.java Sat Jan 23 00:40:01 2010
@@ -17,25 +17,24 @@
package org.apache.wicket.ng.request.mapper;
import java.util.Locale;
-import java.util.Map;
import junit.framework.TestCase;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.markup.html.link.ILinkListener;
+import org.apache.wicket.RequestListenerInterface;
+import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.listener.RequestListenerInterface;
/**
* @author Matej Knopp
*/
-public abstract class AbstractEncoderTest extends TestCase
+public abstract class AbstractMapperTest extends TestCase
{
/**
* Construct.
*/
- public AbstractEncoderTest()
+ public AbstractMapperTest()
{
}
@@ -63,48 +62,6 @@
{
return null;
}
-
- @Override
- public String getParameter(String key)
- {
- return null;
- }
-
- @Override
- public Map<String, String[]> getParameterMap()
- {
- return null;
- }
-
- @Override
- public String[] getParameters(String key)
- {
- return null;
- }
-
- @Override
- public String getPath()
- {
- return null;
- }
-
- @Override
- public String getQueryString()
- {
- return null;
- }
-
- @Override
- public String getRelativePathPrefixToContextRoot()
- {
- return null;
- }
-
- @Override
- public String getRelativePathPrefixToWicketHandler()
- {
- return null;
- }
};
}
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapperTest.java (from r901031, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceEncoderTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceEncoderTest.java&r1=901031&r2=902322&rev=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapperTest.java Sat Jan 23 00:40:01 2010
@@ -24,13 +24,13 @@
/**
* @author Matej Knopp
*/
-public abstract class AbstractResourceReferenceEncoderTest extends AbstractEncoderTest
+public abstract class AbstractResourceReferenceMapperTest extends AbstractMapperTest
{
/**
* Construct.
*/
- public AbstractResourceReferenceEncoderTest()
+ public AbstractResourceReferenceMapperTest()
{
}
@@ -42,7 +42,7 @@
{
}
};
-
+
protected final IResource resource2 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -51,7 +51,7 @@
{
}
};
-
+
protected final IResource resource3 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -60,7 +60,7 @@
{
}
};
-
+
protected final IResource resource4 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -69,7 +69,7 @@
{
}
};
-
+
protected final IResource resource5 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -88,10 +88,22 @@
}
};
- protected String CLASS_NAME = AbstractResourceReferenceEncoderTest.class.getName();
+ protected String CLASS_NAME = AbstractResourceReferenceMapperTest.class.getName();
protected ResourceReference reference1 = new ResourceReference(
- AbstractResourceReferenceEncoderTest.class, "reference1", null, null, null)
+ AbstractResourceReferenceMapperTest.class, "reference1", null, null, null)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public IResource getResource()
+ {
+ return resource1;
+ };
+ };
+
+ protected ResourceReference reference1_a = new ResourceReference(
+ AbstractResourceReferenceMapperTest.class, "reference1", Locale.ENGLISH, null, null)
{
private static final long serialVersionUID = 1L;
@@ -101,9 +113,21 @@
return resource1;
};
};
-
+
+ protected ResourceReference reference1_b = new ResourceReference(
+ AbstractResourceReferenceMapperTest.class, "reference1", null, "style", null)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public IResource getResource()
+ {
+ return resource1;
+ };
+ };
+
protected ResourceReference reference2 = new ResourceReference(
- AbstractResourceReferenceEncoderTest.class, "reference2/name2", new Locale("en", "en"),
+ AbstractResourceReferenceMapperTest.class, "reference2/name2", new Locale("en", "en"),
null, null)
{
private static final long serialVersionUID = 1L;
@@ -114,9 +138,22 @@
return resource2;
};
};
-
+
+ protected ResourceReference reference2_a = new ResourceReference(
+ AbstractResourceReferenceMapperTest.class, "reference2/name2", new Locale("en", "en"),
+ "style", null)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public IResource getResource()
+ {
+ return resource2;
+ };
+ };
+
protected ResourceReference reference3 = new ResourceReference(
- AbstractResourceReferenceEncoderTest.class, "reference3", null, "style", null)
+ AbstractResourceReferenceMapperTest.class, "reference3", null, "style", null)
{
private static final long serialVersionUID = 1L;
@@ -126,9 +163,9 @@
return resource3;
};
};
-
+
protected ResourceReference reference4 = new ResourceReference(
- AbstractResourceReferenceEncoderTest.class, "reference4", Locale.ENGLISH, "style", null)
+ AbstractResourceReferenceMapperTest.class, "reference4", Locale.ENGLISH, "style", null)
{
private static final long serialVersionUID = 1L;
@@ -140,11 +177,11 @@
};
protected ResourceReference reference5 = new ResourceReference(
- AbstractResourceReferenceEncoderTest.class, "reference5", Locale.ENGLISH, null, "variation")
+ AbstractResourceReferenceMapperTest.class, "reference5", Locale.ENGLISH, null, "variation")
{
private static final long serialVersionUID = 1L;
- @Override
+ @Override
public IResource getResource()
{
return resource5;
@@ -152,7 +189,7 @@
};
protected ResourceReference reference6 = new ResourceReference(
- AbstractResourceReferenceEncoderTest.class, "reference6", Locale.ENGLISH, "style",
+ AbstractResourceReferenceMapperTest.class, "reference6", Locale.ENGLISH, "style",
"variation")
{
private static final long serialVersionUID = 1L;
@@ -170,7 +207,10 @@
super.setUp();
context.getResourceReferenceRegistry().registerResourceReference(reference1);
+ context.getResourceReferenceRegistry().registerResourceReference(reference1_a);
+ context.getResourceReferenceRegistry().registerResourceReference(reference1_b);
context.getResourceReferenceRegistry().registerResourceReference(reference2);
+ context.getResourceReferenceRegistry().registerResourceReference(reference2_a);
context.getResourceReferenceRegistry().registerResourceReference(reference3);
context.getResourceReferenceRegistry().registerResourceReference(reference4);
context.getResourceReferenceRegistry().registerResourceReference(reference5);
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java (from r901031, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java&r1=901031&r2=902322&rev=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java Sat Jan 23 00:40:01 2010
@@ -16,17 +16,17 @@
*/
package org.apache.wicket.ng.request.mapper;
+import org.apache.wicket.IRequestHandler;
+import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.ng.MockPage;
-import org.apache.wicket.ng.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.component.IRequestableComponent;
import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
+import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
@@ -35,370 +35,370 @@
/**
* @author Matej Knopp
*/
-public class BookmarkableEncoderTest extends AbstractEncoderTest
+public class BookmarkableMapperTest extends AbstractMapperTest
{
- /**
- * Construct.
- */
- public BookmarkableEncoderTest()
- {
- }
+ /**
+ * Construct.
+ */
+ public BookmarkableMapperTest()
+ {
+ }
- private BookmarkableMapper encoder = new BookmarkableMapper()
- {
- @Override
- protected IMapperContext getContext()
- {
- return context;
- }
- };
+ private final BookmarkableMapper encoder = new BookmarkableMapper()
+ {
+ @Override
+ protected IMapperContext getContext()
+ {
+ return context;
+ }
+ };
- private static final String PAGE_CLASS_NAME = MockPage.class.getName();
+ private static final String PAGE_CLASS_NAME = MockPage.class.getName();
- /**
+ /**
*
*/
- public void testDecode1()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME);
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ public void testDecode1()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
- IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
- assertEquals(0, page.getPageParametersNg().getIndexedParamsCount());
- assertTrue(page.getPageParametersNg().getNamedParameterKeys().isEmpty());
- }
+ assertTrue(handler instanceof RenderPageRequestHandler);
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
+ assertEquals(0, page.getPageParameters().getIndexedParamsCount());
+ assertTrue(page.getPageParameters().getNamedParameterKeys().isEmpty());
+ }
- /**
+ /**
*
*/
- public void testDecode2()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/indexed1?a=b&b=c");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ public void testDecode2()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/indexed1?a=b&b=c");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
- IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
+ assertTrue(handler instanceof RenderPageRequestHandler);
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
- PageParameters p = page.getPageParametersNg();
- assertEquals(1, p.getIndexedParamsCount());
- assertEquals("indexed1", p.getIndexedParameter(0).toString());
+ PageParameters p = page.getPageParameters();
+ assertEquals(1, p.getIndexedParamsCount());
+ assertEquals("indexed1", p.getIndexedParameter(0).toString());
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
- }
+ assertEquals(2, p.getNamedParameterKeys().size());
+ assertEquals("b", p.getNamedParameter("a").toString());
+ assertEquals("c", p.getNamedParameter("b").toString());
+ }
- /**
+ /**
*
*/
- public void testDecode3()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ public void testDecode3()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
- IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- checkPage(page, 15);
- }
+ assertTrue(handler instanceof RenderPageRequestHandler);
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ checkPage(page, 15);
+ }
- /**
+ /**
*
*/
- public void testDecode4()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ public void testDecode4()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
- IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- checkPage(page, 15);
+ assertTrue(handler instanceof RenderPageRequestHandler);
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ checkPage(page, 15);
- PageParameters p = page.getPageParametersNg();
- assertEquals(2, p.getIndexedParamsCount());
- assertEquals("i1", p.getIndexedParameter(0).toString());
- assertEquals("i2", p.getIndexedParameter(1).toString());
+ PageParameters p = page.getPageParameters();
+ assertEquals(2, p.getIndexedParamsCount());
+ assertEquals("i1", p.getIndexedParameter(0).toString());
+ assertEquals("i2", p.getIndexedParameter(1).toString());
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
- }
+ assertEquals(2, p.getNamedParameterKeys().size());
+ assertEquals("b", p.getNamedParameter("a").toString());
+ assertEquals("c", p.getNamedParameter("b").toString());
+ }
- /**
+ /**
*
*/
- public void testDecode5()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-ILinkListener-foo-bar");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ public void testDecode5()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-ILinkListener-foo-bar");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertTrue(handler instanceof ListenerInterfaceRequestHandler);
- ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
+ ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- IRequestablePage page = h.getPage();
- checkPage(page, 15);
+ IRequestablePage page = h.getPage();
+ checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
- assertEquals("foo:bar", h.getComponent().getPath());
- assertNull(h.getBehaviorIndex());
- }
+ assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
+ assertEquals("foo:bar", h.getComponent().getPageRelativePath());
+ assertNull(h.getBehaviorIndex());
+ }
- /**
+ /**
*
*/
- public void testDecode6()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ public void testDecode6()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
+ "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
- ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
+ assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- IRequestablePage page = h.getPage();
- checkPage(page, 15);
+ IRequestablePage page = h.getPage();
+ checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
- assertEquals("foo:bar", h.getComponent().getPath());
+ assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
+ assertEquals("foo:bar", h.getComponent().getPageRelativePath());
- PageParameters p = page.getPageParametersNg();
- assertEquals(2, p.getIndexedParamsCount());
- assertEquals("i1", p.getIndexedParameter(0).toString());
- assertEquals("i2", p.getIndexedParameter(1).toString());
+ PageParameters p = page.getPageParameters();
+ assertEquals(2, p.getIndexedParamsCount());
+ assertEquals("i1", p.getIndexedParameter(0).toString());
+ assertEquals("i2", p.getIndexedParameter(1).toString());
- assertEquals(2, p.getNamedParameterKeys().size());
- assertEquals("b", p.getNamedParameter("a").toString());
- assertEquals("c", p.getNamedParameter("b").toString());
- }
+ assertEquals(2, p.getNamedParameterKeys().size());
+ assertEquals("b", p.getNamedParameter("a").toString());
+ assertEquals("c", p.getNamedParameter("b").toString());
+ }
- /**
+ /**
*
*/
- public void testDecode7()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "?15-ILinkListener.4-foo-bar");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ public void testDecode7()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
+ "?15-ILinkListener.4-foo-bar");
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertTrue(handler instanceof ListenerInterfaceRequestHandler);
- ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
+ ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- IRequestablePage page = h.getPage();
- checkPage(page, 15);
+ IRequestablePage page = h.getPage();
+ checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
- assertEquals("foo:bar", h.getComponent().getPath());
- assertEquals((Object)4, h.getBehaviorIndex());
- }
+ assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
+ assertEquals("foo:bar", h.getComponent().getPageRelativePath());
+ assertEquals((Object)4, h.getBehaviorIndex());
+ }
- /**
+ /**
*
*/
- public void testDecode8()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
+ public void testDecode8()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
+ "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
- context.setNextPageRenderCount(5);
+ context.setNextPageRenderCount(5);
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
- ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
+ assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- IRequestablePage page = h.getPage();
- assertEquals(page.getRenderCount(), 5);
- }
+ IRequestablePage page = h.getPage();
+ assertEquals(page.getRenderCount(), 5);
+ }
- /**
+ /**
*
*/
- public void testDecode9()
- {
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
+ public void testDecode9()
+ {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
+ "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
- context.setNextPageRenderCount(6);
+ context.setNextPageRenderCount(6);
- try
- {
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ try
+ {
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((IPageRequestHandler)handler).getPage();
+ ((IPageRequestHandler)handler).getPage();
- // should never get here
- assertFalse(true);
- }
- catch (StalePageException e)
- {
+ // should never get here
+ assertFalse(true);
+ }
+ catch (StalePageException e)
+ {
- }
- }
+ }
+ }
- /**
+ /**
*
*/
- public void testEncode1()
- {
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParameters());
- provider.setPageSource(context);
- IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME, url.toString());
- }
+ public void testEncode1()
+ {
+ DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParameters());
+ provider.setPageSource(context);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME, url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode2()
- {
- PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
- provider.setPageSource(context);
- IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c", url.toString());
- }
+ public void testEncode2()
+ {
+ PageParameters parameters = new PageParameters();
+ parameters.setIndexedParameter(0, "i1");
+ parameters.setIndexedParameter(1, "i2");
+ parameters.setNamedParameter("a", "b");
+ parameters.setNamedParameter("b", "c");
+ DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
+ provider.setPageSource(context);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c", url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode3()
- {
- PageParameters parameters = new PageParameters();
- parameters.setIndexedParameter(0, "i1");
- parameters.setIndexedParameter(1, "i2");
- parameters.setNamedParameter("a", "b");
- parameters.setNamedParameter("b", "c");
+ public void testEncode3()
+ {
+ PageParameters parameters = new PageParameters();
+ parameters.setIndexedParameter(0, "i1");
+ parameters.setIndexedParameter(1, "i2");
+ parameters.setNamedParameter("a", "b");
+ parameters.setNamedParameter("b", "c");
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
- provider.setPageSource(context);
- IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.mapHandler(handler);
+ DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
+ provider.setPageSource(context);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c", url.toString());
- }
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c", url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode4()
- {
- MockPage page = new MockPage(15);
- page.getPageParametersNg().setIndexedParameter(0, "i1");
- page.getPageParametersNg().setIndexedParameter(1, "i2");
- page.getPageParametersNg().setNamedParameter("a", "b");
- page.getPageParametersNg().setNamedParameter("b", "c");
- page.setCreatedBookmarkable(true);
+ public void testEncode4()
+ {
+ MockPage page = new MockPage(15);
+ page.getPageParameters().setIndexedParameter(0, "i1");
+ page.getPageParameters().setIndexedParameter(1, "i2");
+ page.getPageParameters().setNamedParameter("a", "b");
+ page.getPageParameters().setNamedParameter("b", "c");
+ page.setCreatedBookmarkable(true);
- IPageProvider provider = new DefaultPageProvider(page);
- IRequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.mapHandler(handler);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
+ Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c", url.toString());
- }
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c", url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode5()
- {
- MockPage page = new MockPage(15);
- page.getPageParametersNg().setIndexedParameter(0, "i1");
- page.getPageParametersNg().setIndexedParameter(1, "i2");
- page.getPageParametersNg().setNamedParameter("a", "b");
- page.getPageParametersNg().setNamedParameter("b", "c");
+ public void testEncode5()
+ {
+ MockPage page = new MockPage(15);
+ page.getPageParameters().setIndexedParameter(0, "i1");
+ page.getPageParameters().setIndexedParameter(1, "i2");
+ page.getPageParameters().setNamedParameter("a", "b");
+ page.getPageParameters().setNamedParameter("b", "c");
- page.setCreatedBookmarkable(false);
+ page.setCreatedBookmarkable(false);
- IPageProvider provider = new DefaultPageProvider(page);
- IRequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.mapHandler(handler);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
+ Url url = encoder.mapHandler(handler);
- // never allow bookmarkable render url for page that has not been created by bookmarkable
- // URL
+ // never allow bookmarkable render url for page that has not been created by bookmarkable
+ // URL
- assertNull(url);
- }
+ assertNull(url);
+ }
- /**
+ /**
*
*/
- public void testEncode6()
- {
- MockPage page = new MockPage(15);
- page.getPageParametersNg().setIndexedParameter(0, "i1");
- page.getPageParametersNg().setIndexedParameter(1, "i2");
- page.getPageParametersNg().setNamedParameter("a", "b");
- page.getPageParametersNg().setNamedParameter("b", "c");
+ public void testEncode6()
+ {
+ MockPage page = new MockPage(15);
+ page.getPageParameters().setIndexedParameter(0, "i1");
+ page.getPageParameters().setIndexedParameter(1, "i2");
+ page.getPageParameters().setNamedParameter("a", "b");
+ page.getPageParameters().setNamedParameter("b", "c");
- // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
- // as this explicitely says the url must be bookmarkable
- page.setCreatedBookmarkable(false);
+ // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
+ // as this explicitely says the url must be bookmarkable
+ page.setCreatedBookmarkable(false);
- IRequestableComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
- PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE);
+ PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
+ ILinkListener.INTERFACE);
- Url url = encoder.mapHandler(handler);
+ Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
- }
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
+ "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode7()
- {
- MockPage page = new MockPage(15);
- page.getPageParametersNg().setIndexedParameter(0, "i1");
- page.getPageParametersNg().setIndexedParameter(1, "i2");
- page.getPageParametersNg().setNamedParameter("a", "b");
- page.getPageParametersNg().setNamedParameter("b", "c");
+ public void testEncode7()
+ {
+ MockPage page = new MockPage(15);
+ page.getPageParameters().setIndexedParameter(0, "i1");
+ page.getPageParameters().setIndexedParameter(1, "i2");
+ page.getPageParameters().setNamedParameter("a", "b");
+ page.getPageParameters().setNamedParameter("b", "c");
- // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
- // as this explicitely says the url must be bookmarkable
- page.setCreatedBookmarkable(false);
+ // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
+ // as this explicitely says the url must be bookmarkable
+ page.setCreatedBookmarkable(false);
- IRequestableComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
- PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE, 4);
+ PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
+ ILinkListener.INTERFACE, 4);
- Url url = encoder.mapHandler(handler);
+ Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c", url.toString());
- }
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
+ "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c", url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode8()
- {
- MockPage page = new MockPage(15);
- page.setBookmarkable(true);
- page.setCreatedBookmarkable(true);
- page.setPageStateless(true);
+ public void testEncode8()
+ {
+ MockPage page = new MockPage(15);
+ page.setBookmarkable(true);
+ page.setCreatedBookmarkable(true);
+ page.setPageStateless(true);
- IPageProvider provider = new DefaultPageProvider(page);
- IRequestHandler handler = new RenderPageRequestHandler(provider);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.mapHandler(handler);
+ Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME, url.toString());
- }
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME, url.toString());
+ }
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java Sat Jan 23 00:40:01 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.ng.request.mapper;
+import org.apache.wicket.IRequestHandler;
+import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.ng.MockPage;
-import org.apache.wicket.ng.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.IRequestableComponent;
@@ -36,7 +36,7 @@
/**
* @author Matej Knopp
*/
-public class MountedMapperTest extends AbstractEncoderTest
+public class MountedMapperTest extends AbstractMapperTest
{
/**
@@ -76,8 +76,8 @@
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- assertEquals(0, page.getPageParametersNg().getIndexedParamsCount());
- assertTrue(page.getPageParametersNg().getNamedParameterKeys().isEmpty());
+ assertEquals(0, page.getPageParameters().getIndexedParamsCount());
+ assertTrue(page.getPageParameters().getNamedParameterKeys().isEmpty());
}
/**
@@ -91,7 +91,7 @@
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- PageParameters p = page.getPageParametersNg();
+ PageParameters p = page.getPageParameters();
assertEquals(1, p.getIndexedParamsCount());
assertEquals("indexed1", p.getIndexedParameter(0).toString());
@@ -125,7 +125,7 @@
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
- PageParameters p = page.getPageParametersNg();
+ PageParameters p = page.getPageParameters();
assertEquals(2, p.getIndexedParamsCount());
assertEquals("i1", p.getIndexedParameter(0).toString());
assertEquals("i2", p.getIndexedParameter(1).toString());
@@ -151,7 +151,7 @@
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
- assertEquals("foo:bar", h.getComponent().getPath());
+ assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertNull(h.getBehaviorIndex());
}
@@ -170,9 +170,9 @@
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
- assertEquals("foo:bar", h.getComponent().getPath());
+ assertEquals("foo:bar", h.getComponent().getPageRelativePath());
- PageParameters p = page.getPageParametersNg();
+ PageParameters p = page.getPageParameters();
assertEquals(2, p.getIndexedParamsCount());
assertEquals("i1", p.getIndexedParameter(0).toString());
assertEquals("i2", p.getIndexedParameter(1).toString());
@@ -198,7 +198,7 @@
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
- assertEquals("foo:bar", h.getComponent().getPath());
+ assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertEquals((Object)4, h.getBehaviorIndex());
}
@@ -269,8 +269,7 @@
*/
public void testEncode1()
{
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class,
- new PageParameters());
+ DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -319,10 +318,10 @@
public void testEncode4()
{
MockPage page = new MockPage(15);
- page.getPageParametersNg().setIndexedParameter(0, "i1");
- page.getPageParametersNg().setIndexedParameter(1, "i2");
- page.getPageParametersNg().setNamedParameter("a", "b");
- page.getPageParametersNg().setNamedParameter("b", "c");
+ page.getPageParameters().setIndexedParameter(0, "i1");
+ page.getPageParameters().setIndexedParameter(1, "i2");
+ page.getPageParameters().setNamedParameter("a", "b");
+ page.getPageParameters().setNamedParameter("b", "c");
page.setCreatedBookmarkable(true);
IPageProvider provider = new DefaultPageProvider(page);
@@ -338,10 +337,10 @@
public void testEncode5()
{
MockPage page = new MockPage(15);
- page.getPageParametersNg().setIndexedParameter(0, "i1");
- page.getPageParametersNg().setIndexedParameter(1, "i2");
- page.getPageParametersNg().setNamedParameter("a", "b");
- page.getPageParametersNg().setNamedParameter("b", "c");
+ page.getPageParameters().setIndexedParameter(0, "i1");
+ page.getPageParameters().setIndexedParameter(1, "i2");
+ page.getPageParameters().setNamedParameter("a", "b");
+ page.getPageParameters().setNamedParameter("b", "c");
page.setCreatedBookmarkable(false);
@@ -362,10 +361,10 @@
public void testEncode6()
{
MockPage page = new MockPage(15);
- page.getPageParametersNg().setIndexedParameter(0, "i1");
- page.getPageParametersNg().setIndexedParameter(1, "i2");
- page.getPageParametersNg().setNamedParameter("a", "b");
- page.getPageParametersNg().setNamedParameter("b", "c");
+ page.getPageParameters().setIndexedParameter(0, "i1");
+ page.getPageParameters().setIndexedParameter(1, "i2");
+ page.getPageParameters().setNamedParameter("a", "b");
+ page.getPageParameters().setNamedParameter("b", "c");
page.setRenderCount(4);
// shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
@@ -389,10 +388,10 @@
public void testEncode7()
{
MockPage page = new MockPage(15);
- page.getPageParametersNg().setIndexedParameter(0, "i1");
- page.getPageParametersNg().setIndexedParameter(1, "i2");
- page.getPageParametersNg().setNamedParameter("a", "b");
- page.getPageParametersNg().setNamedParameter("b", "c");
+ page.getPageParameters().setIndexedParameter(0, "i1");
+ page.getPageParameters().setIndexedParameter(1, "i2");
+ page.getPageParameters().setNamedParameter("a", "b");
+ page.getPageParameters().setNamedParameter("b", "c");
page.setRenderCount(5);
// shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
@@ -475,10 +474,10 @@
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- assertEquals(0, page.getPageParametersNg().getIndexedParamsCount());
- assertTrue(page.getPageParametersNg().getNamedParameterKeys().size() == 2);
- assertEquals("p1", page.getPageParametersNg().getNamedParameter("param1").toString());
- assertEquals("p2", page.getPageParametersNg().getNamedParameter("param2").toString());
+ assertEquals(0, page.getPageParameters().getIndexedParamsCount());
+ assertTrue(page.getPageParameters().getNamedParameterKeys().size() == 2);
+ assertEquals("p1", page.getPageParameters().getNamedParameter("param1").toString());
+ assertEquals("p2", page.getPageParameters().getNamedParameter("param2").toString());
}
/**
@@ -492,15 +491,15 @@
assertTrue(handler instanceof RenderPageRequestHandler);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
- PageParameters p = page.getPageParametersNg();
+ PageParameters p = page.getPageParameters();
assertEquals(1, p.getIndexedParamsCount());
assertEquals("indexed1", p.getIndexedParameter(0).toString());
assertEquals(4, p.getNamedParameterKeys().size());
assertEquals("b", p.getNamedParameter("a").toString());
assertEquals("c", p.getNamedParameter("b").toString());
- assertEquals("p1", page.getPageParametersNg().getNamedParameter("param1").toString());
- assertEquals("p2", page.getPageParametersNg().getNamedParameter("param2").toString());
+ assertEquals("p1", page.getPageParameters().getNamedParameter("param1").toString());
+ assertEquals("p2", page.getPageParameters().getNamedParameter("param2").toString());
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java?rev=902322&r1=902321&r2=902322&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java Sat Jan 23 00:40:01 2010
@@ -16,15 +16,15 @@
*/
package org.apache.wicket.ng.request.mapper;
+import org.apache.wicket.IRequestHandler;
+import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.ng.MockPage;
-import org.apache.wicket.ng.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.IRequestableComponent;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
+import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
@@ -32,180 +32,180 @@
*
* @author Matej Knopp
*/
-public class PageInstanceMapperTest extends AbstractEncoderTest
+public class PageInstanceMapperTest extends AbstractMapperTest
{
- /**
- *
- * Construct.
- */
- public PageInstanceMapperTest()
- {
- }
+ /**
+ *
+ * Construct.
+ */
+ public PageInstanceMapperTest()
+ {
+ }
- private PageInstanceMapper encoder = new PageInstanceMapper()
- {
- @Override
- protected IMapperContext getContext()
- {
- return context;
- }
- };
+ private final PageInstanceMapper encoder = new PageInstanceMapper()
+ {
+ @Override
+ protected IMapperContext getContext()
+ {
+ return context;
+ }
+ };
- /**
+ /**
*
*/
- public void testDecode1()
- {
- Url url = Url.parse("wicket/page?4");
+ public void testDecode1()
+ {
+ Url url = Url.parse("wicket/page?4");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof RenderPageRequestHandler);
- RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
- checkPage(h.getPage(), 4);
- }
+ RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
+ checkPage(h.getPage(), 4);
+ }
- /**
+ /**
*
*/
- public void testDecode2()
- {
- Url url = Url.parse("wicket/page/ingore/me?4&a=3&b=3");
+ public void testDecode2()
+ {
+ Url url = Url.parse("wicket/page/ingore/me?4&a=3&b=3");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof RenderPageRequestHandler);
- RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
- checkPage(h.getPage(), 4);
- }
+ RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
+ checkPage(h.getPage(), 4);
+ }
- /**
+ /**
*
*/
- public void testDecode3()
- {
- Url url = Url.parse("wicket/page?4-ILinkListener-a-b-c");
+ public void testDecode3()
+ {
+ Url url = Url.parse("wicket/page?4-ILinkListener-a-b-c");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ListenerInterfaceRequestHandler);
- ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- checkPage(h.getPage(), 4);
- assertEquals(h.getComponent().getPath(), "a:b:c");
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
- assertNull(h.getBehaviorIndex());
- }
+ ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
+ checkPage(h.getPage(), 4);
+ assertEquals(h.getComponent().getPageRelativePath(), "a:b:c");
+ assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
+ assertNull(h.getBehaviorIndex());
+ }
- /**
+ /**
*
*/
- public void testDecode4()
- {
- Url url = Url.parse("wickett/pagee?4-ILinkListener-a:b-c");
+ public void testDecode4()
+ {
+ Url url = Url.parse("wickett/pagee?4-ILinkListener-a:b-c");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertNull(handler);
- }
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertNull(handler);
+ }
- /**
+ /**
*
*/
- public void testDecode5()
- {
- Url url = Url.parse("wicket/page?abc");
+ public void testDecode5()
+ {
+ Url url = Url.parse("wicket/page?abc");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertNull(handler);
- }
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertNull(handler);
+ }
- /**
+ /**
*
*/
- public void testDecode6()
- {
- Url url = Url.parse("wicket/page?4-ILinkListener.5-a-b-c");
+ public void testDecode6()
+ {
+ Url url = Url.parse("wicket/page?4-ILinkListener.5-a-b-c");
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ListenerInterfaceRequestHandler);
- ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- checkPage(h.getPage(), 4);
- assertEquals(h.getComponent().getPath(), "a:b:c");
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
- assertEquals((Object)5, h.getBehaviorIndex());
- }
+ ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
+ checkPage(h.getPage(), 4);
+ assertEquals(h.getComponent().getPageRelativePath(), "a:b:c");
+ assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
+ assertEquals((Object)5, h.getBehaviorIndex());
+ }
- /**
+ /**
*
*/
- public void testDecode7()
- {
- Url url = Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
+ public void testDecode7()
+ {
+ Url url = Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
- context.setNextPageRenderCount(6);
+ context.setNextPageRenderCount(6);
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ assertTrue(handler instanceof ListenerInterfaceRequestHandler);
- ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- assertEquals(6, h.getPage().getRenderCount());
- }
+ ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
+ assertEquals(6, h.getPage().getRenderCount());
+ }
- /**
+ /**
*
*/
- public void testDecode8()
- {
- Url url = Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
+ public void testDecode8()
+ {
+ Url url = Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
- context.setNextPageRenderCount(8);
+ context.setNextPageRenderCount(8);
- try
- {
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ try
+ {
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((IPageRequestHandler)handler).getPage();
+ ((IPageRequestHandler)handler).getPage();
- // should never get here
- assertFalse(true);
- }
- catch (StalePageException e)
- {
+ // should never get here
+ assertFalse(true);
+ }
+ catch (StalePageException e)
+ {
- }
- }
+ }
+ }
- /**
+ /**
*
*/
- public void testEncode1()
- {
- MockPage page = new MockPage(15);
- IPageProvider provider = new DefaultPageProvider(page);
- IRequestHandler handler = new RenderPageRequestHandler(provider);
+ public void testEncode1()
+ {
+ MockPage page = new MockPage(15);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/page?15", url.toString());
- }
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/page?15", url.toString());
+ }
- /**
+ /**
*
*/
- public void testEncode2()
- {
- MockPage page = new MockPage(15);
- page.setRenderCount(5);
+ public void testEncode2()
+ {
+ MockPage page = new MockPage(15);
+ page.setRenderCount(5);
- IRequestableComponent c = page.get("a:b:c");
+ IRequestableComponent c = page.get("a:b:c");
- PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE);
+ PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
+ IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
+ ILinkListener.INTERFACE);
- Url url = encoder.mapHandler(handler);
- assertEquals("wicket/page?15-5.ILinkListener-a-b-c", url.toString());
- }
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/page?15-5.ILinkListener-a-b-c", url.toString());
+ }
}