You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by ml...@apache.org on 2013/08/07 19:37:53 UTC
git commit: fix tests
Updated Branches:
refs/heads/master 6460e445c -> 80d22da5e
fix tests
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/80d22da5
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/80d22da5
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/80d22da5
Branch: refs/heads/master
Commit: 80d22da5e8968e637dab5a711d64de9ca6fe9a27
Parents: 6460e44
Author: Massimo Lusetti <ml...@apache.org>
Authored: Wed Aug 7 19:37:41 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Wed Aug 7 19:37:41 2013 +0200
----------------------------------------------------------------------
.../org/apache/tapestry5/integration/app1/pages/Index.java | 3 ++-
.../tapestry5/integration/app1/pages/PageContextInForm.java | 9 +--------
2 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/80d22da5/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
index 0735233..d5cd730 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
@@ -318,7 +318,8 @@ public class Index
new Item("pagelinkcontext", "PageLink Context Demo",
"passing explicit context in a page render link"),
- new Item("pagecontextinform", "Page Context in Form", "passivate/activate page context in Form"),
+ new Item("pagecontextinform", "Page Context in Form", "passivate/activate page context in Form",
+ "betty", "wilma", "context with spaces", "context/with/slashes"),
new Item("ValidBeanEditorDemo", "Client Validation Demo", "BeanEditor with validation enabled"),
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/80d22da5/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
index b42f14a..3265a33 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
@@ -27,14 +27,7 @@ public class PageContextInForm
Object[] onPassivate()
{
- if (activationContext != null)
- {
- return activationContext;
- }
- else
- {
- return new Object[] { "betty", "wilma", "context with spaces", "context/with/slashes" };
- }
+ return activationContext;
}
public Object[] getActivationContext()