You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2008/10/25 20:34:09 UTC
svn commit: r707887 [2/2] - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry5/internal/
tapestry-core/src/main/java/org/apache/tapestry5/internal/services/
tapestry-core/src/main/java/org/apache/tapestry5/internal/structure...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractLinkTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractLinkTest.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractLinkTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractLinkTest.java Sat Oct 25 11:34:08 2008
@@ -96,14 +96,4 @@
assertEquals(writer.toString(), "<a href=\"/foo/bar.baz#wilma\">link text</a>");
assertSame(map.get(e), invocation);
}
-
- protected final void train_toURI(Link link, String URI)
- {
- expect(link.toURI()).andReturn(URI);
- }
-
- protected final ComponentInvocation mockComponentInvocation()
- {
- return newMock(ComponentInvocation.class);
- }
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java Sat Oct 25 11:34:08 2008
@@ -58,7 +58,7 @@
@Test
public void activation_context_for_root_index_page()
{
- open(BASE_URL + "it worked");
+ open(BASE_URL + "it$0020worked");
assertText("//h1", "Index");
@@ -80,5 +80,4 @@
// Fuckin Selenium
// assertAttribute("//a[2]/@href", "login");
}
-
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java Sat Oct 25 11:34:08 2008
@@ -804,7 +804,7 @@
clickAndWait("link=Null in context");
- assertTextPresent("Context values (which are added to the request URL) may not be null or blank.");
+ assertText("//li[1]", "NULL");
}
@Test
@@ -813,12 +813,12 @@
start("Page Context in Form");
assertTextSeries("//li[%d]", 1, "betty", "wilma", "context with spaces", "context/with/slashes");
- assertFieldValue("t:ac", "betty/wilma/context with spaces/context%2Fwith%2Fslashes");
+ assertFieldValue("t:ac", "betty/wilma/context$0020with$0020spaces/context$002fwith$002fslashes");
clickAndWait(SUBMIT);
assertTextSeries("//li[%d]", 1, "betty", "wilma", "context with spaces", "context/with/slashes");
- assertFieldValue("t:ac", "betty/wilma/context with spaces/context%2Fwith%2Fslashes");
+ assertFieldValue("t:ac", "betty/wilma/context$0020with$0020spaces/context$002fwith$002fslashes");
}
@Test
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java Sat Oct 25 11:34:08 2008
@@ -67,8 +67,8 @@
@DataProvider(name = "to_user_presentable")
public Object[][] to_user_presentable_data()
{
- return new Object[][] { { "hello", "Hello" }, { "userId", "User Id" }, { "useHTML", "Use HTML" },
- { "underscored_name", "Underscored Name" }, };
+ return new Object[][] {{"hello", "Hello"}, {"userId", "User Id"}, {"useHTML", "Use HTML"},
+ {"underscored_name", "Underscored Name"},};
}
@Test
@@ -358,42 +358,6 @@
}
@Test
- public void escape_percent_and_slash()
- {
- assertEquals(TapestryInternalUtils.escapePercentAndSlash("foo%bar/baz"), "foo%25bar%2Fbaz");
- }
-
- @Test
- public void unescape_percent_and_slash()
- {
- assertEquals(TapestryInternalUtils.unescapePercentAndSlash("foo%25bar%2Fbaz"), "foo%bar/baz");
- }
-
- @Test
- public void encode_alphanum_context()
- {
- String input = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
- String expected = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
- assertEquals(TapestryInternalUtils.encodeContext(input), expected);
- }
-
- @Test
- public void encode_unsafe_context()
- {
- String input = " !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~";
- String expected = "%20%21%22%23%24%2525%26%27%28%29*%2B%2C-.%252F%3A%3B%3C%3D%3E%3F%40%5B%5C%5D%5E_%60%7B%7C%7D%7E";
- assertEquals(TapestryInternalUtils.encodeContext(input), expected);
- }
-
- @Test
- public void encode_utf8_japanese_context()
- {
- String input = "\u65E5\u672C\u8A9E";
- String expected = "%E6%97%A5%E6%9C%AC%E8%AA%9E";
- assertEquals(TapestryInternalUtils.encodeContext(input), expected);
- }
-
- @Test
public void to_class_attribute_value_empty()
{
List<String> classes = Collections.emptyList();
@@ -408,6 +372,4 @@
assertEquals(TapestryInternalUtils.toClassAttributeValue(classes), "fred barney wilma");
}
-
-
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java Sat Oct 25 11:34:08 2008
@@ -29,10 +29,13 @@
{
private ContextValueEncoder contextValueEncoder;
+ private ContextPathEncoder contextPathEncoder;
+
@BeforeClass
public void setup()
{
contextValueEncoder = getService(ContextValueEncoder.class);
+ contextPathEncoder = getService(ContextPathEncoder.class);
}
@Test
@@ -137,7 +140,7 @@
"eventname",
new URLEventContext(
contextValueEncoder,
- new String[]{
+ new String[] {
"alpha",
"beta"}),
new EmptyEventContext());
@@ -154,8 +157,7 @@
replay();
- Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextValueEncoder
- );
+ Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextPathEncoder);
assertTrue(dispatcher.dispatch(request, response));
@@ -187,8 +189,7 @@
replay();
- Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextValueEncoder
- );
+ Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextPathEncoder);
assertTrue(dispatcher.dispatch(request, response));
@@ -245,8 +246,7 @@
replay();
- Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextValueEncoder
- );
+ Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextPathEncoder);
assertTrue(dispatcher.dispatch(request, response));
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationImplTest.java (from r704144, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationImplTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationImplTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java&r1=704144&r2=707887&rev=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationImplTest.java Sat Oct 25 11:34:08 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,37 +14,170 @@
package org.apache.tapestry5.internal.services;
-import org.testng.Assert;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.ContextPathEncoder;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-public class ComponentInvocationTest extends Assert
+public class ComponentInvocationImplTest extends InternalBaseTestCase
{
+ private ContextPathEncoder contextPathEncoder;
+
+ @BeforeClass
+ public void setup()
+ {
+ contextPathEncoder = getService(ContextPathEncoder.class);
+ }
+
@Test
- public void no_context()
+ public void no_event_context()
{
- ComponentInvocation invocation = new ComponentInvocationImpl(new OpaqueConstantTarget("abc"), new String[0],
- null);
- assertEquals(invocation.buildURI(false), "abc");
- assertEquals(invocation.buildURI(true), "abc");
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"), null,
+ null, false);
+ assertEquals(invocation.buildURI(), "abc");
+
+ assertEquals(invocation.getEventContext().getCount(), 0);
}
@Test
- public void context()
+ public void event_context()
{
- ComponentInvocation invocation = new ComponentInvocationImpl(new OpaqueConstantTarget("abc"),
- new String[] { "x", "123" }, null);
- assertEquals(invocation.buildURI(false), "abc/x/123");
- assertEquals(invocation.buildURI(true), "abc/x/123");
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"),
+ new Object[] {"x", 123}, null, false);
+ assertEquals(invocation.buildURI(), "abc/x/123");
}
@Test
- public void parameters()
+ public void event_context_and_parameters()
{
- ComponentInvocation invocation = new ComponentInvocationImpl(new OpaqueConstantTarget("abc"),
- new String[] { "x", "123" }, null);
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"),
+ new Object[] {"x", 123}, null, false);
invocation.addParameter("p1", "foo");
invocation.addParameter("p2", "bar");
- assertEquals(invocation.buildURI(false), "abc/x/123?p1=foo&p2=bar");
- assertEquals(invocation.buildURI(true), "abc/x/123");
+
+ assertEquals(invocation.buildURI(), "abc/x/123?p1=foo&p2=bar");
+
+ assertListsEquals(invocation.getParameterNames(), "p1", "p2");
+
+ assertEquals(invocation.getParameterValue("p1"), "foo");
+ assertEquals(invocation.getParameterValue("p2"), "bar");
+ }
+
+ @Test
+ public void uri_does_not_include_parameters_if_for_form()
+ {
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"),
+ new Object[] {"x", 123}, null, true);
+ invocation.addParameter("p1", "foo");
+ invocation.addParameter("p2", "bar");
+
+ assertEquals(invocation.buildURI(), "abc/x/123");
+ }
+
+ @Test
+ public void adding_duplicate_parmaeter_is_an_error()
+ {
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"),
+ new Object[] {"x", 123}, null, true);
+ invocation.addParameter("p1", "foo");
+
+ try
+ {
+ invocation.addParameter("p1", "bar");
+ unreachable();
+ }
+ catch (IllegalArgumentException ex)
+ {
+ assertEquals(ex.getMessage(),
+ "Parameter names are required to be unique. Parameter 'p1' already has the value 'foo'.");
+ }
+ }
+
+ @Test
+ public void get_unknown_parameter_returns_null()
+ {
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"),
+ new Object[] {"x", 123}, null, true);
+ invocation.addParameter("p1", "foo");
+
+
+ assertNull(invocation.getParameterValue("xyz"));
+ }
+
+ @Test
+ public void page_render_invocation_with_no_context()
+ {
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new PageRenderTarget("admin/Menu"),
+ null, null, false);
+
+ assertEquals(invocation.buildURI(), "admin/menu");
+
+ assertEquals(invocation.getPageActivationContext().getCount(), 0);
+ }
+
+ @Test
+ public void page_render_invocation_with_context()
+ {
+ PageRenderTarget target = new PageRenderTarget("admin/Menu");
+
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ target,
+ null,
+ new Object[] {1, 2, null, "why?"}, false);
+
+ assertEquals(invocation.buildURI(), "admin/menu/1/2/$N/why$003f");
+ assertSame(invocation.getTarget(), target);
+ }
+
+ @Test
+ public void event_invocation_with_action_and_page_activation_context()
+ {
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"),
+ new Object[] {1, 2},
+ new Object[] {3, 4},
+ false);
+
+ assertEquals(invocation.buildURI(), "abc/1/2?t:ac=3/4");
+ }
+
+ @Test
+ public void get_event_context()
+ {
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"),
+ new Object[] {1, 2, null, "", "hey!"},
+ new Object[] {3, 4},
+ false);
+
+ EventContext ec = invocation.getEventContext();
+
+ assertEquals(ec.getCount(), 5);
+ assertEquals(ec.get(Integer.class, 0), new Integer(1));
+ assertEquals(ec.get(String.class, 4), "hey!");
+ }
+
+ @Test
+ public void get_page_activation_context()
+ {
+ ComponentInvocation invocation = new ComponentInvocationImpl(contextPathEncoder,
+ new OpaqueConstantTarget("abc"),
+ null,
+ new Object[] {1, 2, null, "", "hey!"},
+ true);
+
+ EventContext ec = invocation.getPageActivationContext();
+
+ assertEquals(ec.getCount(), 5);
+ assertEquals(ec.get(Integer.class, 0), new Integer(1));
+ assertEquals(ec.get(String.class, 4), "hey!");
}
}
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java Sat Oct 25 11:34:08 2008
@@ -14,652 +14,302 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.ComponentEventCallback;
import org.apache.tapestry5.EventConstants;
import org.apache.tapestry5.Link;
import org.apache.tapestry5.internal.InternalConstants;
-import org.apache.tapestry5.internal.structure.ComponentPageElement;
import org.apache.tapestry5.internal.structure.Page;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
-import org.apache.tapestry5.internal.util.Holder;
-import org.apache.tapestry5.services.ContextValueEncoder;
+import org.apache.tapestry5.services.ContextPathEncoder;
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.Response;
-import org.easymock.EasyMock;
-import static org.easymock.EasyMock.*;
-import org.easymock.IAnswer;
-import org.testng.annotations.AfterClass;
+import org.easymock.Capture;
+import static org.easymock.EasyMock.capture;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class LinkFactoryImplTest extends InternalBaseTestCase
{
- private static final String ENCODED = "*encoded*";
-
- private static final String PAGE_LOGICAL_NAME = "sub/MyPage";
-
- private ContextValueEncoder contextValueEncoder;
+ private ContextPathEncoder contextPathEncoder;
@BeforeClass
public void setup()
{
- contextValueEncoder = getObject(ContextValueEncoder.class, null);
+ contextPathEncoder = getService(ContextPathEncoder.class);
}
- @AfterClass
- public void cleanup()
+ @Test
+ public void create_page_render_link()
{
- contextValueEncoder = null;
+ testPageLinkCreation("order/Edit", "/context/order/edit", false);
}
@Test
- public void action_link_root_context_no_ids()
+ public void create_page_render_link_for_index_page()
{
- testActionLink("", PAGE_LOGICAL_NAME, "foo.bar", "someaction", "/sub/mypage.foo.bar:someaction");
-
+ testPageLinkCreation("order/Index", "/context/order", false);
}
@Test
- public void action_link_root_context_with_ids()
+ public void create_page_render_link_for_index_page_with_context()
{
- testActionLink("", PAGE_LOGICAL_NAME, "foo.bar", "publish", "/sub/mypage.foo.bar:publish/fred/5", "fred", 5);
+ testPageLinkCreation("order/Index", "/context/order/99", false, 99);
}
@Test
- public void action_link_with_default_action()
+ public void create_page_render_link_to_root_index_page()
{
- testActionLink("", PAGE_LOGICAL_NAME, "foo.bar", EventConstants.ACTION, "/sub/mypage.foo.bar/fred/5",
- "fred", 5);
+ testPageLinkCreation("Index", "/context", false);
}
@Test
- public void page_level_event_always_includes_action()
+ public void creat_page_render_link_to_root_index_page_with_context()
{
- testActionLink("", PAGE_LOGICAL_NAME, "", EventConstants.ACTION, "/sub/mypage:action/barney/99",
- "barney", 99);
+ testPageLinkCreation("Index", "/context/202", false, 202);
}
+
@Test
- public void action_link_named_context_no_ids()
+ public void create_page_render_link_with_override_event_context()
{
- testActionLink("/fred", PAGE_LOGICAL_NAME, "foo.bar", "someaction", "/fred/sub/mypage.foo.bar:someaction");
+ testPageLinkCreation("order/Edit", "/context/order/edit/1/2", true, 1, 2);
}
- @SuppressWarnings("unchecked")
@Test
- public void page_link()
+ public void create_page_render_link_with_event_context_from_passivate()
{
- Request request = mockRequest();
- Response response = mockResponse();
- Page page = mockPage();
- ComponentPageElement rootElement = mockComponentPageElement();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- RequestSecurityManager securityManager = mockRequestSecurityManager();
-
- train_getLogicalName(page, PAGE_LOGICAL_NAME);
- train_getContextPath(request, "/barney");
-
- train_getRootElement(page, rootElement);
-
- final Holder<Link> holder = new Holder<Link>();
-
- train_triggerPassivateEventForPageLink(rootElement, listener, holder);
-
- train_getBaseURL(securityManager, page, null);
-
-
- train_encodeRedirectURL(response, "/barney/" + PAGE_LOGICAL_NAME.toLowerCase() + "/foo/bar", ENCODED);
-
- // This needs to be refactored a bit to be more testable.
-
- map.store(isA(Link.class), isA(ComponentInvocationImpl.class));
-
-
- replay();
-
- LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, contextValueEncoder,
- securityManager);
-
- factory.addListener(listener);
-
- Link link = factory.createPageRenderLink(page, false);
-
- assertEquals(link.toRedirectURI(), ENCODED);
-
- // Make sure the link was passed to the LinkFactoryListener
-
- assertSame(link, holder.get());
-
- verify();
+ testPageLinkCreation("order/Edit", "/context/order/edit/from/passivate", false, "from", "passivate");
}
@Test
- public void secure_page_link()
+ public void create_page_render_link_by_name()
{
- Request request = mockRequest();
- Response response = mockResponse();
- Page page = mockPage();
- ComponentPageElement rootElement = mockComponentPageElement();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- RequestSecurityManager securityManager = mockRequestSecurityManager();
-
- train_getLogicalName(page, PAGE_LOGICAL_NAME);
- train_getContextPath(request, "/barney");
-
- train_getRootElement(page, rootElement);
-
- final Holder<Link> holder = new Holder<Link>();
-
- train_triggerPassivateEventForPageLink(rootElement, listener, holder);
-
-
- train_getBaseURL(securityManager, page, "https://example.org");
-
+ String logicalName = "order/Edit";
- train_encodeRedirectURL(response,
- "https://example.org/barney/" + PAGE_LOGICAL_NAME.toLowerCase() + "/foo/bar",
- ENCODED);
+ String expectedURL = "/base/context/order/edit/3";
+ String encodedURL = "encoded:" + expectedURL;
- // This needs to be refactored a bit to be more testable.
-
- map.store(isA(Link.class), isA(ComponentInvocationImpl.class));
-
- replay();
-
- LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null,
- contextValueEncoder,
- securityManager);
-
- factory.addListener(listener);
-
- Link link = factory.createPageRenderLink(page, false);
-
- assertEquals(link.toRedirectURI(), ENCODED);
-
- // Make sure the link was passed to the LinkFactoryListener
-
- assertSame(link, holder.get());
-
- verify();
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void page_link_using_supplied_activation_context()
- {
- Request request = mockRequest();
- Response response = mockResponse();
Page page = mockPage();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
+ PageActivationContextCollector collector = mockPageActivationContextCollector();
RequestSecurityManager securityManager = mockRequestSecurityManager();
-
- train_getLogicalName(page, PAGE_LOGICAL_NAME);
- train_getContextPath(request, "/barney");
-
- Holder<Link> holder = new Holder<Link>();
-
- IAnswer<Void> createdPageLinkAnswer = newAnswerForCreatedLink(holder);
-
- listener.createdPageRenderLink(isA(Link.class));
- setAnswer(createdPageLinkAnswer);
-
- train_getBaseURL(securityManager, page, null);
-
-
- train_encodeRedirectURL(response, "/barney/" + PAGE_LOGICAL_NAME.toLowerCase() + "/biff/bazz", ENCODED);
-
- // This needs to be refactored a bit to be more testable.
-
- map.store(isA(Link.class), isA(ComponentInvocationImpl.class));
-
- replay();
-
- LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, contextValueEncoder,
- securityManager);
- factory.addListener(listener);
-
- Link link = factory.createPageRenderLink(page, false, "biff", "bazz");
-
- assertEquals(link.toRedirectURI(), ENCODED);
-
- // Make sure the link was passed to the LinkFactoryListener
-
- assertSame(link, holder.get());
-
- verify();
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void page_link_using_empty_activation_context_and_override()
- {
Request request = mockRequest();
Response response = mockResponse();
- Page page = mockPage();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
+ ComponentInvocationMap invocationMap = new NoOpComponentInvocationMap();
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- RequestSecurityManager securityManager = mockRequestSecurityManager();
-
- train_getLogicalName(page, PAGE_LOGICAL_NAME);
- train_getContextPath(request, "/barney");
-
- Holder<Link> holder = new Holder<Link>();
-
- IAnswer<Void> createdPageLinkAnswer = newAnswerForCreatedLink(holder);
+ RequestPageCache pageCache = mockRequestPageCache();
- listener.createdPageRenderLink(isA(Link.class));
- setAnswer(createdPageLinkAnswer);
+ train_get(pageCache, logicalName, page);
- train_getBaseURL(securityManager, page, null);
+ train_getLogicalName(page, logicalName);
- train_encodeRedirectURL(response, "/barney/" + PAGE_LOGICAL_NAME.toLowerCase(), ENCODED);
+ train_collectPageActivationContext(collector, page, 3);
- // This needs to be refactored a bit to be more testable.
+ train_getBaseURL(securityManager, page, "/base");
+ train_getContextPath(request, "/context");
- map.store(isA(Link.class), isA(ComponentInvocationImpl.class));
+ train_encodeURL(response, expectedURL, encodedURL);
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, contextValueEncoder,
- securityManager);
- factory.addListener(listener);
- Link link = factory.createPageRenderLink(page, true);
+ LinkFactory factory = new LinkFactoryImpl(request, response, invocationMap, pageCache, optimizer, null,
+ securityManager, contextPathEncoder, collector);
+
- assertEquals(link.toRedirectURI(), ENCODED);
+ Link link = factory.createPageRenderLink(logicalName, false);
- // Make sure the link was passed to the LinkFactoryListener
+ // Make sure the same link is returned.
- assertSame(link, holder.get());
+ assertEquals(link.toURI(), encodedURL);
verify();
}
- @Test
- public void page_link_by_name()
+ private void testPageLinkCreation(String logicalName, String expectedURL, boolean overrideContext,
+ Object... context)
{
- Request request = mockRequest();
- Response response = mockResponse();
+ String optimizedURL = "optimized:" + expectedURL;
+ String encodedURL = "encoded:" + expectedURL;
+
Page page = mockPage();
- ComponentPageElement rootElement = mockComponentPageElement();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPageCache cache = mockRequestPageCache();
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
+ PageActivationContextCollector collector = mockPageActivationContextCollector();
RequestSecurityManager securityManager = mockRequestSecurityManager();
-
- train_get(cache, PAGE_LOGICAL_NAME, page);
-
- train_getLogicalName(page, PAGE_LOGICAL_NAME);
- train_getContextPath(request, "/barney");
-
- train_getRootElement(page, rootElement);
-
- // Answer for triggerEvent() which returns a boolean.
- final Holder<Link> holder = new Holder<Link>();
-
- train_triggerPassivateEventForPageLink(rootElement, listener, holder);
-
- train_getBaseURL(securityManager, page, null);
-
- train_encodeRedirectURL(response, "/barney/" + PAGE_LOGICAL_NAME.toLowerCase() + "/foo/bar", ENCODED);
-
- // This needs to be refactored a bit to be more testable.
-
- map.store(isA(Link.class), isA(ComponentInvocationImpl.class));
-
- replay();
-
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, contextValueEncoder,
- securityManager);
- factory.addListener(listener);
-
- Link link = factory.createPageLink(PAGE_LOGICAL_NAME, false);
-
- assertEquals(link.toRedirectURI(), ENCODED);
-
- // Make sure the link was passed to the LinkFactoryListener
-
- assertSame(link, holder.get());
-
- verify();
- }
-
- @Test
- public void page_link_for_root_index()
- {
Request request = mockRequest();
Response response = mockResponse();
- Page page = mockPage();
- ComponentPageElement rootElement = mockComponentPageElement();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPageCache cache = mockRequestPageCache();
+ ComponentInvocationMap invocationMap = new NoOpComponentInvocationMap();
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- RequestSecurityManager securityManager = mockRequestSecurityManager();
-
- String logicalName = "Index";
-
- train_get(cache, logicalName, page);
+ Capture<Link> linkCapture = new Capture();
+ LinkFactoryListener listener = mockLinkFactoryListener();
train_getLogicalName(page, logicalName);
- train_getContextPath(request, "/barney");
-
- train_getRootElement(page, rootElement);
-
- // Answer for triggerEvent() which returns a boolean.
- final Holder<Link> holder = new Holder<Link>();
- train_triggerPassivateEventForPageLink(rootElement, listener, holder);
+ if (!overrideContext)
+ train_collectPageActivationContext(collector, page, context);
train_getBaseURL(securityManager, page, null);
+ train_getContextPath(request, "/context");
- train_encodeRedirectURL(response, "/barney/foo/bar", ENCODED);
- // This needs to be refactored a bit to be more testable.
+ train_optimizePath(optimizer, expectedURL, optimizedURL);
+ train_encodeURL(response, optimizedURL, encodedURL);
- map.store(isA(Link.class), isA(ComponentInvocationImpl.class));
+ listener.createdPageRenderLink(capture(linkCapture));
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, contextValueEncoder,
- securityManager);
- factory.addListener(listener);
-
- Link link = factory.createPageLink(logicalName, false);
-
- assertEquals(link.toRedirectURI(), ENCODED);
-
- // Make sure the link was passed to the LinkFactoryListener
- assertSame(link, holder.get());
+ LinkFactory factory = new LinkFactoryImpl(request, response, invocationMap, null, optimizer, null,
+ securityManager, contextPathEncoder, collector);
- verify();
- }
-
- @Test
- public void page_link_for_index_in_folder()
- {
- Request request = mockRequest();
- Response response = mockResponse();
- Page page = mockPage();
- ComponentPageElement rootElement = mockComponentPageElement();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPageCache cache = mockRequestPageCache();
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- RequestSecurityManager securityManager = mockRequestSecurityManager();
-
- String logicalName = "mylib/stuff/Index";
-
- train_get(cache, logicalName, page);
-
- train_getLogicalName(page, logicalName);
- train_getContextPath(request, "/barney");
-
- train_getRootElement(page, rootElement);
-
- // Answer for triggerEvent() which returns a boolean.
- final Holder<Link> holder = new Holder<Link>();
-
- train_triggerPassivateEventForPageLink(rootElement, listener, holder);
-
- train_getBaseURL(securityManager, page, null);
-
- train_encodeRedirectURL(response, "/barney/mylib/stuff/foo/bar", ENCODED);
-
- // This needs to be refactored a bit to be more testable.
-
- map.store(isA(Link.class), isA(ComponentInvocationImpl.class));
-
- replay();
-
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, contextValueEncoder,
- securityManager);
factory.addListener(listener);
- Link link = factory.createPageLink(logicalName, false);
+ Object[] passedContext = overrideContext ? context : new Object[0];
- assertEquals(link.toRedirectURI(), ENCODED);
+ Link link = factory.createPageRenderLink(page, overrideContext, passedContext);
- // Make sure the link was passed to the LinkFactoryListener
+ // Make sure the same link is returned.
- assertSame(link, holder.get());
+ assertSame(linkCapture.getValue(), link);
+
+ assertEquals(link.toURI(), encodedURL);
verify();
}
- @SuppressWarnings("unchecked")
- private void train_triggerPassivateEventForPageLink(ComponentPageElement rootElement, LinkFactoryListener listener,
- Holder<Link> holder)
+ @Test
+ public void simple_component_event_link()
{
- IAnswer<Boolean> triggerEventAnswer = newAnswerForPassivateEventTrigger();
-
- IAnswer<Void> createdPageLinkAnswer = newAnswerForCreatedLink(holder);
-
- // Intercept the call to handle component event, and let the IAnswer
- // do the work.
- expect(rootElement.triggerEvent(eq(EventConstants.PASSIVATE), (Object[]) isNull(),
- isA(ComponentEventCallback.class))).andAnswer(triggerEventAnswer);
-
- listener.createdPageRenderLink(isA(Link.class));
- setAnswer(createdPageLinkAnswer);
+ testEventLinkCreation("/context/order/edit.foo.bar?t:ac=a/b", "order/Edit", "foo.bar", EventConstants.ACTION,
+ false);
}
- @SuppressWarnings("unchecked")
- private void train_triggerPassivateEventForActionLink(ComponentPageElement rootElement,
- LinkFactoryListener listener, Holder<Link> holder)
+ @Test
+ public void component_event_link_with_context()
{
- IAnswer<Boolean> triggerEventAnswer = newAnswerForPassivateEventTrigger();
-
- IAnswer<Void> createdPageLinkAnswer = newAnswerForCreatedLink(holder);
-
- // Intercept the call to handle component event, and let the IAnswer
- // do the work.
-
- expect(rootElement.triggerEvent(eq(EventConstants.PASSIVATE), (Object[]) isNull(),
- isA(ComponentEventCallback.class))).andAnswer(triggerEventAnswer);
-
- listener.createComponentEventLink(isA(Link.class));
- setAnswer(createdPageLinkAnswer);
+ testEventLinkCreation("/context/order/edit.foo.bar/fred/barney?t:ac=a/b", "order/Edit", "foo.bar",
+ EventConstants.ACTION,
+ false, "fred", "barney");
}
- private IAnswer<Void> newAnswerForCreatedLink(final Holder<Link> holder)
+ @Test
+ public void component_event_link_for_form()
{
- return new IAnswer<Void>()
- {
- public Void answer() throws Throwable
- {
- Link link = (Link) EasyMock.getCurrentArguments()[0];
-
- holder.put(link);
+ Link link = testEventLinkCreation("/context/order/edit.foo.bar/fred/barney", "order/Edit", "foo.bar",
+ EventConstants.ACTION,
+ true, "fred", "barney");
- return null;
- }
- };
+ assertEquals(link.getParameterValue(InternalConstants.PAGE_CONTEXT_NAME), "a/b");
}
- private IAnswer<Boolean> newAnswerForPassivateEventTrigger()
+ @Test
+ public void component_event_from_other_page()
{
- return new IAnswer<Boolean>()
- {
- @SuppressWarnings("unchecked")
- public Boolean answer() throws Throwable
- {
- ComponentEventCallback handler = (ComponentEventCallback) EasyMock
- .getCurrentArguments()[2];
-
- handler.handleResult(new Object[] {"foo", "bar"});
+ String logicalName = "blocks/AppDisplay";
- return true;
- }
- };
- }
+ String expectedURL = "/base/context/order/view.gnip.gnop:myevent/3/5/9";
- @Test
- public void action_with_context_that_contains_periods()
- {
- Request request = mockRequest();
- Response response = mockResponse();
- Page page = mockPage();
- ComponentPageElement rootElement = mockComponentPageElement();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPageCache cache = mockRequestPageCache();
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
+ Page primaryPage = mockPage();
+ Page activePage = mockPage();
PageRenderQueue queue = mockPageRenderQueue();
+ PageActivationContextCollector collector = mockPageActivationContextCollector();
RequestSecurityManager securityManager = mockRequestSecurityManager();
-
- String optimizedPath = "/optimized/path";
-
- final Holder<Link> holder = new Holder<Link>();
-
- train_getLogicalName(page, "mypage");
- train_getContextPath(request, "");
-
- train_getBaseURL(securityManager, page, null);
-
- train_optimizePath(optimizer, "/mypage:myaction/1.2.3/4.5.6?t:ac=foo/bar", optimizedPath);
-
- train_getRootElement(page, rootElement);
- train_triggerPassivateEventForActionLink(rootElement, listener, holder);
-
- train_getRenderingPage(queue, page);
-
- // This needs to be refactored a bit to be more testable.
-
- map.store(isA(Link.class), isA(ComponentInvocation.class));
-
- train_encodeURL(response, "/optimized/path", ENCODED);
-
- replay();
-
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, queue,
- contextValueEncoder, securityManager);
- factory.addListener(listener);
-
- Link link = factory.createComponentEventLink(page, null, "myaction", false, "1.2.3", "4.5.6");
-
- assertEquals(link.toURI(), ENCODED);
- assertSame(link, holder.get());
-
- verify();
- }
-
- /**
- * For good measure, we're going to also test a security change.
- */
- @Test
- public void action_for_non_active_page()
- {
Request request = mockRequest();
Response response = mockResponse();
- Page containingPage = mockPage();
- Page activePage = mockPage();
- ComponentPageElement rootElement = mockComponentPageElement();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPageCache cache = mockRequestPageCache();
+ ComponentInvocationMap invocationMap = new NoOpComponentInvocationMap();
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- PageRenderQueue queue = mockPageRenderQueue();
- RequestSecurityManager securityManager = mockRequestSecurityManager();
- final Holder<Link> holder = new Holder<Link>();
-
- train_getLogicalName(containingPage, "MyPage");
- train_getContextPath(request, "");
-
-
- train_getRootElement(activePage, rootElement);
- train_triggerPassivateEventForActionLink(rootElement, listener, holder);
+ String encodedURL = "encoded:" + expectedURL;
train_getRenderingPage(queue, activePage);
- train_getLogicalName(activePage, "ActivePage");
+ train_getLogicalName(primaryPage, logicalName);
+ train_getLogicalName(activePage, "order/View");
+
+ train_collectPageActivationContext(collector, activePage, "x", "y");
- // This needs to be refactored a bit to be more testable.
+ train_getBaseURL(securityManager, activePage, "/base");
- map.store(isA(Link.class), isA(ComponentInvocation.class));
+ train_getContextPath(request, "/context");
- train_getBaseURL(securityManager, activePage, "http://example.org");
+ train_encodeURL(response, expectedURL, encodedURL);
- train_encodeURL(response, "http://example.org/activepage:myaction?t:ac=foo/bar&t:cp=mypage", ENCODED);
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, queue,
- contextValueEncoder, securityManager);
- factory.addListener(listener);
+ LinkFactory factory = new LinkFactoryImpl(request, response, invocationMap, null, optimizer, queue,
+ securityManager, contextPathEncoder, collector);
- Link link = factory.createComponentEventLink(containingPage, null, "myaction", false);
+ Link link = factory.createComponentEventLink(primaryPage, "gnip.gnop", "myevent", true, 3, 5, 9);
- assertEquals(link.toURI(), ENCODED);
- assertSame(link, holder.get());
+ assertEquals(link.toURI(), encodedURL);
verify();
- }
+ assertEquals(link.getParameterValue(InternalConstants.CONTAINER_PAGE_NAME), "blocks/appdisplay");
+ assertEquals(link.getParameterValue(InternalConstants.PAGE_CONTEXT_NAME), "x/y");
+ }
- @SuppressWarnings("unchecked")
- private void testActionLink(String contextPath, String logicalPageName, String nestedId, String eventName,
- String expectedURI, Object... context)
+ private Link testEventLinkCreation(String expectedURL, String logicalName, String nestedId, String eventType,
+ boolean forForm, Object... context)
{
+ Page primaryPage = mockPage();
+ Page activePage = primaryPage;
+ PageRenderQueue queue = mockPageRenderQueue();
+ PageActivationContextCollector collector = mockPageActivationContextCollector();
+ RequestSecurityManager securityManager = mockRequestSecurityManager();
Request request = mockRequest();
Response response = mockResponse();
- ComponentPageElement rootElement = mockComponentPageElement();
- Page page = mockPage();
- LinkFactoryListener listener = mockLinkFactoryListener();
- ComponentInvocationMap map = mockComponentInvocationMap();
- RequestPageCache cache = mockRequestPageCache();
+ ComponentInvocationMap invocationMap = new NoOpComponentInvocationMap();
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- PageRenderQueue queue = mockPageRenderQueue();
- RequestSecurityManager securityManager = mockRequestSecurityManager();
+ Capture<Link> linkCapture = new Capture();
+ LinkFactoryListener listener = mockLinkFactoryListener();
+ String optimizedURL = "optimized:" + expectedURL;
+ String encodedURL = "encoded:" + expectedURL;
- String optimizedPath = "/optimized/path";
+ train_getRenderingPage(queue, null);
- String generatedPath = String.format("%s?%s=foo/bar", expectedURI, InternalConstants.PAGE_CONTEXT_NAME);
+ train_getLogicalName(primaryPage, logicalName);
- final Holder<Link> holder = new Holder<Link>();
+ train_collectPageActivationContext(collector, primaryPage, "a", "b");
- train_getLogicalName(page, logicalPageName);
- train_getContextPath(request, contextPath);
+ train_getBaseURL(securityManager, activePage, null);
- train_optimizePath(optimizer, generatedPath, optimizedPath);
+ train_getContextPath(request, "/context");
- train_getRootElement(page, rootElement);
- train_triggerPassivateEventForActionLink(rootElement, listener, holder);
+ train_optimizePath(optimizer, expectedURL, optimizedURL);
+ train_encodeURL(response, optimizedURL, encodedURL);
- train_getRenderingPage(queue, page);
+ listener.createdComponentEventLink(capture(linkCapture));
- // This needs to be refactored a bit to be more testable.
+ replay();
- map.store(isA(Link.class), isA(ComponentInvocationImpl.class));
+ LinkFactory factory = new LinkFactoryImpl(request, response, invocationMap, null, optimizer, queue,
+ securityManager, contextPathEncoder, collector);
- train_getBaseURL(securityManager, page, null);
+ factory.addListener(listener);
- train_encodeURL(response, optimizedPath, ENCODED);
+ Link link = factory.createComponentEventLink(primaryPage, nestedId, eventType, forForm, context);
- replay();
+ // Make sure the same link is returned.
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, queue,
- contextValueEncoder, securityManager);
- factory.addListener(listener);
+ assertSame(linkCapture.getValue(), link);
- Link link = factory.createComponentEventLink(page, nestedId, eventName, false, context);
-
- assertEquals(link.toURI(), ENCODED);
- assertSame(link, holder.get());
+ assertEquals(link.toURI(), encodedURL);
verify();
+
+ return link;
}
+ protected final void train_collectPageActivationContext(PageActivationContextCollector collector, Page page,
+ Object... context)
+ {
+ expect(collector.collectPageActivationContext(page)).andReturn(context);
+ }
+
+ protected final PageActivationContextCollector mockPageActivationContextCollector()
+ {
+ return newMock(PageActivationContextCollector.class);
+ }
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java Sat Oct 25 11:34:08 2008
@@ -16,30 +16,41 @@
import org.apache.tapestry5.Link;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.ContextPathEncoder;
import org.apache.tapestry5.services.Response;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.Arrays;
-
public class LinkImplTest extends InternalBaseTestCase
{
- private static final String OPTIMIZED = "/optimized/path";
+ private static final String RAW_PATH = "foo/baz/path";
+
+ private static final String OPTIMIZED = "../baz/path";
private static final String ENCODED = "*encoded*";
+ private ContextPathEncoder contextPathEncoder;
+
+ @BeforeClass
+ public void setup()
+ {
+ contextPathEncoder = getService(ContextPathEncoder.class);
+ }
@Test
public void simple_redirect()
{
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
Response response = mockResponse();
+ ComponentInvocation invocation = mockComponentInvocation();
- train_encodeRedirectURL(response, "/foo/bar", ENCODED);
+ train_buildURI(invocation, RAW_PATH);
- replay();
+ train_encodeRedirectURL(response, "/base/context/" + RAW_PATH, ENCODED);
- Link link = new LinkImpl(response, optimizer, "/foo", "bar");
+ replay();
+ Link link = new LinkImpl(response, optimizer, "/base", "/context", invocation);
assertEquals(link.toRedirectURI(), ENCODED);
@@ -51,37 +62,18 @@
{
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
Response response = mockResponse();
+ ComponentInvocation invocation = mockComponentInvocation();
- train_optimizePath(optimizer, "/foo/bar", OPTIMIZED);
- train_encodeURL(response, OPTIMIZED, ENCODED);
-
- replay();
-
- Link link = new LinkImpl(response, optimizer, "/foo", "bar");
-
+ train_buildURI(invocation, RAW_PATH);
- assertEquals(link.toString(), ENCODED);
-
- verify();
- }
-
- @Test
- public void url_with_parameters()
- {
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- Response response = mockResponse();
-
- train_optimizePath(optimizer, "/foo/bar?barney=rubble&fred=flintstone", OPTIMIZED);
+ train_optimizePath(optimizer, "/bar/" + RAW_PATH, OPTIMIZED);
train_encodeURL(response, OPTIMIZED, ENCODED);
replay();
- Link link = new LinkImpl(response, optimizer, "/foo", "bar");
-
- link.addParameter("fred", "flintstone");
- link.addParameter("barney", "rubble");
+ Link link = new LinkImpl(response, optimizer, null, "/bar", invocation);
- assertEquals(link.toURI(), ENCODED);
+ assertEquals(link.toString(), ENCODED);
verify();
}
@@ -91,63 +83,15 @@
{
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
Response response = mockResponse();
+ ComponentInvocation invocation = mockComponentInvocation();
- replay();
-
- Link link = new LinkImpl(response, optimizer, "", "bar");
-
- link.addParameter("fred", "flintstone");
- link.addParameter("barney", "rubble");
-
- assertEquals(link.getParameterValue("fred"), "flintstone");
- assertEquals(link.getParameterValue("barney"), "rubble");
- assertNull(link.getParameterValue("wilma"));
-
- verify();
- }
-
- @Test
- public void parameter_names_must_be_unique()
- {
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- Response response = mockResponse();
+ train_getParameter(invocation, "fred", "flintstone");
replay();
- Link link = new LinkImpl(response, optimizer, "/foo", "bar");
-
- link.addParameter("fred", "flintstone");
- try
- {
- link.addParameter("fred", "flintstone");
- unreachable();
- }
- catch (IllegalArgumentException ex)
- {
- assertEquals(ex.getMessage(),
- "Parameter names are required to be unique. Parameter 'fred' already has the value 'flintstone'.");
- }
+ Link link = new LinkImpl(response, optimizer, "", "bar", invocation);
- verify();
- }
-
- @Test
- public void to_form_URI_does_not_include_parameters()
- {
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- Response response = mockResponse();
-
- train_optimizePath(optimizer, "/foo/bar", OPTIMIZED);
- train_encodeURL(response, OPTIMIZED, ENCODED);
-
- replay();
-
- Link link = new LinkImpl(response, optimizer, "/foo", "bar", true);
-
- link.addParameter("fred", "flintstone");
- link.addParameter("barney", "rubble");
-
- assertEquals(link.toURI(), ENCODED);
+ assertEquals(link.getParameterValue("fred"), "flintstone");
verify();
}
@@ -155,34 +99,34 @@
@Test
public void url_with_anchor()
{
- url_with_anchor("wilma", "/foo/bar#wilma");
+ try_with_anchor("wilma", "/context/" + RAW_PATH + "#wilma");
}
@Test
public void url_with_null_anchor()
{
- url_with_anchor(null, "/foo/bar");
+ try_with_anchor(null, "/context/" + RAW_PATH);
}
@Test
public void url_with_empty_anchor()
{
- url_with_anchor("", "/foo/bar");
+ try_with_anchor("", "/context/" + RAW_PATH);
}
- private void url_with_anchor(String anchor, String url)
+ private void try_with_anchor(String anchor, String url)
{
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
Response response = mockResponse();
+ ComponentInvocation invocation = mockComponentInvocation();
-
+ train_buildURI(invocation, RAW_PATH);
train_optimizePath(optimizer, url, OPTIMIZED);
train_encodeURL(response, OPTIMIZED, ENCODED);
-
replay();
- Link link = new LinkImpl(response, optimizer, "/foo", "bar");
+ Link link = new LinkImpl(response, optimizer, null, "/context", invocation);
link.setAnchor(anchor);
@@ -194,66 +138,25 @@
}
@Test
- public void url_with_anchor_and_parameters()
- {
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- Response response = mockResponse();
-
-
- train_optimizePath(optimizer, "/foo/bar?barney=rubble&fred=flintstone#wilma", OPTIMIZED);
- train_encodeURL(response, OPTIMIZED, ENCODED);
-
- replay();
-
- Link link = new LinkImpl(response, optimizer, "/foo", "bar");
-
- link.addParameter("fred", "flintstone");
- link.addParameter("barney", "rubble");
- link.setAnchor("wilma");
-
- assertEquals(link.toURI(), ENCODED);
-
- verify();
- }
-
-
- @Test
public void force_absolute_uri()
{
RequestPathOptimizer optimizer = mockRequestPathOptimizer();
Response response = mockResponse();
-
train_encodeURL(response, "/ctx/foo", ENCODED);
replay();
Link link = new LinkImpl(response, optimizer, null, "/ctx",
- new ComponentInvocationImpl(new OpaqueConstantTarget("foo"), new String[0], null),
- false);
+ new ComponentInvocationImpl(contextPathEncoder, new OpaqueConstantTarget("foo"), null,
+ null,
+ false)
+ );
assertEquals(link.toAbsoluteURI(), ENCODED);
verify();
}
-
- @Test
- public void parameter_names_are_returned_sorted()
- {
- RequestPathOptimizer optimizer = mockRequestPathOptimizer();
- Response response = mockResponse();
-
- replay();
-
- Link link = new LinkImpl(response, optimizer, "/foo", "bar");
-
- link.addParameter("fred", "flintstone");
- link.addParameter("barney", "rubble");
-
- assertEquals(link.getParameterNames(), Arrays.asList("barney", "fred"));
-
- verify();
- }
}
Added: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageActivationContextCollectorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageActivationContextCollectorImplTest.java?rev=707887&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageActivationContextCollectorImplTest.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageActivationContextCollectorImplTest.java Sat Oct 25 11:34:08 2008
@@ -0,0 +1,122 @@
+// Copyright 2008 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.internal.services;
+
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.easymock.EasyMock;
+import org.easymock.IAnswer;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+
+public class PageActivationContextCollectorImplTest extends InternalBaseTestCase
+{
+ private TypeCoercer coercer;
+
+ @BeforeClass
+ public void setup()
+ {
+ coercer = getService(TypeCoercer.class);
+ }
+
+ @Test
+ public void page_with_array_activation_context()
+ {
+ tryWithContext(new Object[] {3, "four", null, "$100"},
+ 3, "four", null, "$100");
+ }
+
+ @Test
+ public void page_with_single_value_context()
+ {
+ Object value = 99;
+
+ tryWithContext(value, value);
+ }
+
+ @Test
+ public void page_with_list_context()
+ {
+ tryWithContext(Arrays.asList(1, 2, 3),
+ 1, 2, 3);
+ }
+
+ @Test
+ public void page_with_empty_context()
+ {
+ tryWithContext(new String[0]);
+ }
+
+ @Test
+ public void page_with_no_context()
+ {
+ Page page = mockPage();
+ ComponentPageElement element = mockComponentPageElement();
+
+ train_getRootElement(page, element);
+
+ expect(element.triggerEvent(EasyMock.eq(EventConstants.PASSIVATE),
+ (Object[]) EasyMock.isNull(),
+ EasyMock.isA(ComponentEventCallback.class))).andReturn(false);
+
+ replay();
+
+ PageActivationContextCollector collector
+ = new PageActivationContextCollectorImpl(coercer);
+
+ Object[] actual = collector.collectPageActivationContext(page);
+
+ assertEquals(actual.length, 0);
+ }
+
+ private void tryWithContext(final Object context, Object... expected)
+ {
+ Page page = mockPage();
+ ComponentPageElement element = mockComponentPageElement();
+
+ train_getRootElement(page, element);
+
+ IAnswer answer = new IAnswer()
+ {
+ public Object answer() throws Throwable
+ {
+ Object[] args = EasyMock.getCurrentArguments();
+
+ ComponentEventCallback callback = (ComponentEventCallback) args[2];
+
+ return callback.handleResult(context);
+ }
+ };
+
+ expect(element.triggerEvent(EasyMock.eq(EventConstants.PASSIVATE),
+ (Object[]) EasyMock.isNull(),
+ EasyMock.isA(ComponentEventCallback.class))).andAnswer(answer);
+
+ replay();
+
+ PageActivationContextCollector collector
+ = new PageActivationContextCollectorImpl(coercer);
+
+ Object[] actual = collector.collectPageActivationContext(page);
+
+ assertArraysEqual(actual, expected);
+ }
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java Sat Oct 25 11:34:08 2008
@@ -30,12 +30,12 @@
public class PageRenderDispatcherTest extends InternalBaseTestCase
{
- private ContextValueEncoder contextValueEncoder;
+ private ContextPathEncoder contextPathEncoder;
@BeforeClass
public void setup()
{
- contextValueEncoder = getService(ContextValueEncoder.class);
+ contextPathEncoder = getService(ContextPathEncoder.class);
}
@Test
@@ -53,7 +53,7 @@
replay();
- Dispatcher d = new PageRenderDispatcher(resolver, handler, null);
+ Dispatcher d = new PageRenderDispatcher(resolver, handler, contextPathEncoder);
assertFalse(d.dispatch(request, response));
@@ -75,7 +75,7 @@
replay();
- Dispatcher d = new PageRenderDispatcher(resolver, handler, null);
+ Dispatcher d = new PageRenderDispatcher(resolver, handler, contextPathEncoder);
assertFalse(d.dispatch(request, response));
@@ -107,7 +107,7 @@
train_getRootElement(page, rootElement);
- train_triggerContextEvent(rootElement, EventConstants.ACTIVATE, new Object[] { "foo", "bar" }, false);
+ train_triggerContextEvent(rootElement, EventConstants.ACTIVATE, new Object[] {"foo", "bar"}, false);
renderer.renderPageResponse(page);
@@ -115,7 +115,7 @@
PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor, renderer);
- Dispatcher d = new PageRenderDispatcher(resolver, handler, contextValueEncoder);
+ Dispatcher d = new PageRenderDispatcher(resolver, handler, contextPathEncoder);
assertTrue(d.dispatch(request, response));
@@ -162,7 +162,7 @@
PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor, renderer);
- Dispatcher d = new PageRenderDispatcher(resolver, handler, null);
+ Dispatcher d = new PageRenderDispatcher(resolver, handler, contextPathEncoder);
assertTrue(d.dispatch(request, response));
@@ -204,7 +204,7 @@
train_get(cache, "foo/Bar", page);
train_getRootElement(page, rootElement);
- train_triggerContextEvent(rootElement, EventConstants.ACTIVATE, new Object[] { "zip", "zoom" }, false);
+ train_triggerContextEvent(rootElement, EventConstants.ACTIVATE, new Object[] {"zip", "zoom"}, false);
renderer.renderPageResponse(page);
@@ -212,7 +212,7 @@
PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor, renderer);
- Dispatcher d = new PageRenderDispatcher(resolver, handler, contextValueEncoder);
+ Dispatcher d = new PageRenderDispatcher(resolver, handler, contextPathEncoder);
assertTrue(d.dispatch(request, response));
Added: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java?rev=707887&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java Sat Oct 25 11:34:08 2008
@@ -0,0 +1,98 @@
+// Copyright 2008 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.internal.services;
+
+import junit.framework.AssertionFailedError;
+import org.apache.tapestry5.services.URLEncoder;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class URLEncoderImplTest extends Assert
+{
+ private final URLEncoder encoder = new URLEncoderImpl();
+
+ @DataProvider(name = "encoder_inputs")
+ public Object[][] encoder_inputs()
+ {
+ return new Object[][]
+ {
+ {"simple", "simple"},
+ {"lettersAndNumbers123456", "lettersAndNumbers123456"},
+ {"simplePunctuation-_.", "simplePunctuation-_."},
+ {"a-lone-$", "a-lone-$$"},
+ {"a-slash-/", "a-slash-$002f"},
+ {"a-space_ _", "a-space_$0020_"},
+ {"unicode-\u027C-", "unicode-$027c-"},
+ {null, URLEncoderImpl.ENCODED_NULL},
+ {"", URLEncoderImpl.ENCODED_BLANK}
+ };
+ }
+
+ @DataProvider(name = "failures")
+ public Object[][] failures()
+ {
+ return new Object[][]
+ {
+ {"trailing-dollar-$",
+ "Input string 'trailing-dollar-$' is not valid; the '$' character at position 17 should be followed by another '$' or a four digit hex number (a unicode value)."},
+ {"not-hex-after-$xyzq-",
+ "Input string 'not-hex-after-$xyzq-' is not valid; the '$' character at position 15 should be followed by another '$' or a four digit hex number (a unicode value)."},
+ {"not-enough-after-$-ab",
+ "Input string 'not-enough-after-$-ab' is not valid; the '$' character at position 18 should be followed by another '$' or a four digit hex number (a unicode value)."},
+ {"unsafe-@-",
+ "Input string 'unsafe-@-' is not valid; the character '@' at position 8 is not valid."}
+ };
+ }
+
+ @Test(dataProvider = "encoder_inputs")
+ public void encode(String input, String expectedOutput)
+
+ {
+ String output = encoder.encode(input);
+
+ assertEquals(output, expectedOutput);
+
+ if (input != null && input.equals(output))
+ assertSame(input, output, "When no change occurs, the input object should be passed through as is.");
+ }
+
+ @Test(dataProvider = "encoder_inputs")
+ public void decode(String expectedDecodedOutput, String encodedInput)
+
+ {
+ String output = encoder.decode(encodedInput);
+
+ assertEquals(output, expectedDecodedOutput);
+
+ if (encodedInput.equals(output))
+ assertSame(encodedInput, output,
+ "When no change occurs, the output object should be passed through as is.");
+ }
+
+ @Test(dataProvider = "failures")
+ public void decode_failures(String input, String expectedMessage)
+ {
+ try
+ {
+ encoder.decode(input);
+ throw new AssertionFailedError("This code should not be reachable.");
+ }
+ catch (IllegalArgumentException ex)
+ {
+ assertEquals(ex.getMessage(), expectedMessage);
+ }
+ }
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java Sat Oct 25 11:34:08 2008
@@ -651,4 +651,19 @@
{
return newMock(FieldComponent.class);
}
+
+ protected final ComponentInvocation mockComponentInvocation()
+ {
+ return newMock(ComponentInvocation.class);
+ }
+
+ protected final void train_buildURI(ComponentInvocation invocation, String URI)
+ {
+ expect(invocation.buildURI()).andReturn(URI);
+ }
+
+ protected void train_getParameter(ComponentInvocation invocation, String parameterName, String parameterValue)
+ {
+ expect(invocation.getParameterValue(parameterName)).andReturn(parameterValue).atLeastOnce();
+ }
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java Sat Oct 25 11:34:08 2008
@@ -104,7 +104,8 @@
* false)</li> <li>Collection to Boolean (false if empty)</li> <li>Object[] to List</li> <li>primitive[] to
* List</li> <li>Object to List (by wrapping as a singleton list)</li> <li>String to File</li> <li>String to {@link
* org.apache.tapestry5.ioc.util.TimeInterval}</li> <li>{@link org.apache.tapestry5.ioc.util.TimeInterval} to
- * Long</li> </ul>
+ * Long</li> <li>Object to Object[] (wrapping the object as an array)</li> <li>Collection to Object[] (via the
+ * toArray() method)</ul>
*/
@SuppressWarnings("unchecked")
public static void contributeTypeCoercer(Configuration<CoercionTuple> configuration)
@@ -317,6 +318,22 @@
return input.milliseconds();
}
});
+
+ add(configuration, Object.class, Object[].class, new Coercion<Object, Object[]>()
+ {
+ public Object[] coerce(Object input)
+ {
+ return new Object[] {input};
+ }
+ });
+
+ add(configuration, Collection.class, Object[].class, new Coercion<Collection, Object[]>()
+ {
+ public Object[] coerce(Collection input)
+ {
+ return input.toArray();
+ }
+ });
}
private static <S, T> void add(Configuration<CoercionTuple> configuration, Class<S> sourceType, Class<T> targetType,
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java?rev=707887&r1=707886&r2=707887&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java Sat Oct 25 11:34:08 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
package org.apache.tapestry5.ioc.internal.services;
import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.apache.tapestry5.ioc.util.TimeInterval;
import org.testng.annotations.AfterClass;
@@ -143,97 +144,97 @@
return new Object[][] {
// There's a lot of these!
- { this, String.class, toString() },
+ {this, String.class, toString()},
- { 55l, Integer.class, 55 },
+ {55l, Integer.class, 55},
- { "", Boolean.class, false },
+ {"", Boolean.class, false},
- { " ", Boolean.class, false },
+ {" ", Boolean.class, false},
- { "x", Boolean.class, true },
+ {"x", Boolean.class, true},
- { " z ", Boolean.class, true },
+ {" z ", Boolean.class, true},
- { "false", Boolean.class, false },
+ {"false", Boolean.class, false},
- { " False ", Boolean.class, false },
+ {" False ", Boolean.class, false},
- { null, Boolean.class, false },
+ {null, Boolean.class, false},
- { new Double(256), Integer.class, new Integer(256) },
+ {new Double(256), Integer.class, new Integer(256)},
- { new Double(22.7), Integer.class, new Integer(22) },
+ {new Double(22.7), Integer.class, new Integer(22)},
- { new Integer(0), Boolean.class, false },
+ {new Integer(0), Boolean.class, false},
- { new Long(32838), Boolean.class, true },
+ {new Long(32838), Boolean.class, true},
- { new Integer(127), Byte.class, new Byte("127") },
+ {new Integer(127), Byte.class, new Byte("127")},
- { new Double(58), Short.class, new Short("58") },
+ {new Double(58), Short.class, new Short("58")},
- { new Integer(33), Long.class, new Long(33) },
+ {new Integer(33), Long.class, new Long(33)},
- { new Integer(22), Float.class, new Float(22) },
+ {new Integer(22), Float.class, new Float(22)},
- { new Integer(1234), Double.class, new Double(1234) },
+ {new Integer(1234), Double.class, new Double(1234)},
- { floatValue, Double.class, floatValue.doubleValue() },
+ {floatValue, Double.class, floatValue.doubleValue()},
- { Collections.EMPTY_LIST, Boolean.class, false },
+ {Collections.EMPTY_LIST, Boolean.class, false},
- { Collections.singleton(this), Boolean.class, true },
+ {Collections.singleton(this), Boolean.class, true},
- { bigDecimalValue, BigDecimal.class, new BigDecimal(bigDecimalValue) },
+ {bigDecimalValue, BigDecimal.class, new BigDecimal(bigDecimalValue)},
- { new BigDecimal(bigDecimalValue), Double.class, 1.2345656748352436E49 },
+ {new BigDecimal(bigDecimalValue), Double.class, 1.2345656748352436E49},
- { bigIntegerValue, BigInteger.class, new BigInteger(bigIntegerValue) },
+ {bigIntegerValue, BigInteger.class, new BigInteger(bigIntegerValue)},
- { new BigInteger("12345678"), Long.class, 12345678l },
+ {new BigInteger("12345678"), Long.class, 12345678l},
- { -12345678l, BigInteger.class, new BigInteger("-12345678") },
+ {-12345678l, BigInteger.class, new BigInteger("-12345678")},
- { object, List.class, Collections.singletonList(object) },
+ {object, List.class, Collections.singletonList(object)},
- { null, Iterable.class, null },
+ {null, Iterable.class, null},
- { null, List.class, null },
+ {null, List.class, null},
- { null, Collection.class, null },
+ {null, Collection.class, null},
- { null, String.class, null },
+ {null, String.class, null},
- { new Object[] { "a", 123 }, List.class, Arrays.asList("a", 123) },
+ {new Object[] {"a", 123}, List.class, Arrays.asList("a", 123)},
- { new String[] { "a", "b" }, List.class, Arrays.asList("a", "b") },
+ {new String[] {"a", "b"}, List.class, Arrays.asList("a", "b")},
- { new byte[] { byte1, byte2 }, List.class, Arrays.asList(byte1, byte2) },
+ {new byte[] {byte1, byte2}, List.class, Arrays.asList(byte1, byte2)},
- { new short[] { short1, short2 }, List.class, Arrays.asList(short1, short2) },
+ {new short[] {short1, short2}, List.class, Arrays.asList(short1, short2)},
- { new int[] { 1, 2 }, List.class, Arrays.asList(1, 2) },
+ {new int[] {1, 2}, List.class, Arrays.asList(1, 2)},
- { new long[] { 123L, 321L }, List.class, Arrays.asList(123L, 321L) },
+ {new long[] {123L, 321L}, List.class, Arrays.asList(123L, 321L)},
- { new float[] { 3.4f, 7.777f }, List.class, Arrays.asList(3.4f, 7.777f) },
+ {new float[] {3.4f, 7.777f}, List.class, Arrays.asList(3.4f, 7.777f)},
- { new double[] { 3.4, 7.777 }, List.class, Arrays.asList(3.4, 7.777) },
+ {new double[] {3.4, 7.777}, List.class, Arrays.asList(3.4, 7.777)},
- { new char[] { 'a', 'b' }, List.class, Arrays.asList('a', 'b') },
+ {new char[] {'a', 'b'}, List.class, Arrays.asList('a', 'b')},
- { new boolean[] { true, false }, List.class, Arrays.asList(true, false) },
+ {new boolean[] {true, false}, List.class, Arrays.asList(true, false)},
- { "foo/bar/baz.txt", File.class, new File("foo/bar/baz.txt") },
+ {"foo/bar/baz.txt", File.class, new File("foo/bar/baz.txt")},
- { new TimeInterval("2 h"), Long.class, 2 * 60 * 60 * 1000l },
+ {new TimeInterval("2 h"), Long.class, 2 * 60 * 60 * 1000l},
- { "2 h", TimeInterval.class, new TimeInterval("120 m") },
+ {"2 h", TimeInterval.class, new TimeInterval("120 m")},
// null to arbitrary object is still null
- { null, XMLReader.class, null } };
+ {null, XMLReader.class, null}};
}
@Test(dataProvider = "explain_inputs")
@@ -246,13 +247,31 @@
public Object[][] explain_inputs()
{
return new Object[][] {
- { StringBuffer.class, Integer.class, "Object --> String, String --> Long, Long --> Integer" },
- { void.class, Map.class, "null --> null" }, { void.class, Boolean.class, "null --> Boolean" },
- { String[].class, List.class, "Object[] --> java.util.List" },
- { Float.class, Double.class, "Float --> Double" },
- { Double.class, BigDecimal.class, "Object --> String, String --> java.math.BigDecimal" },
-
+ {StringBuffer.class, Integer.class, "Object --> String, String --> Long, Long --> Integer"},
+ {void.class, Map.class, "null --> null"}, {void.class, Boolean.class, "null --> Boolean"},
+ {String[].class, List.class, "Object[] --> java.util.List"},
+ {Float.class, Double.class, "Float --> Double"},
+ {Double.class, BigDecimal.class, "Object --> String, String --> java.math.BigDecimal"},
};
}
+ @Test
+ public void object_to_object_array()
+ {
+ Object input = 51;
+
+ Object[] result = coercer.coerce(input, Object[].class);
+
+ assertArraysEqual(result, new Object[] {input});
+ }
+
+ @Test
+ public void collection_to_object_array()
+ {
+ List<String> input = CollectionFactory.newList("fred", "barney", "wilma");
+
+ Object[] result = coercer.coerce(input, Object[].class);
+
+ assertArraysEqual(result, input.toArray());
+ }
}