You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/12/16 02:17:33 UTC
[20/50] git commit: Fix broken test
Fix broken test
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/df118f70
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/df118f70
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/df118f70
Branch: refs/heads/master
Commit: df118f70c140ea4a3bea2aa81cdf361e86fada58
Parents: c27b96e
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Wed Dec 5 17:24:03 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Wed Dec 5 17:24:03 2012 -0800
----------------------------------------------------------------------
.../tapestry5/integration/app1/FormTests.java | 8 ++++----
.../integration/app1/pages/DisabledFields.java | 9 +++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/df118f70/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
index 4634874..3bb2e19 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
@@ -456,13 +456,13 @@ public class FormTests extends TapestryCoreTestCase
"//input[@id='datefield']",
- "//select[@id='palette-avail']",
+ "//div[@class='t-palette']//input[@type='hidden']",
- "//button[@id='palette-select']",
+ "//div[@class='t-palette-available']//select",
- "//button[@id='palette-deselect']",
+ "//div[@class='t-palette-selected']//select",
- "//select[@id='palette']",
+ "//div[@class='t-palette-controls']//button",
"//input[@id='submit_0']"};
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/df118f70/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java
index a8061af..6b74fe8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.beaneditor.Validate;
import org.apache.tapestry5.corelib.components.Submit;
import org.apache.tapestry5.internal.services.StringValueEncoder;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -34,6 +35,14 @@ public class DisabledFields
private List<String> values;
+ void onPrepare()
+ {
+ if (values == null)
+ {
+ values = new ArrayList<String>();
+ }
+ }
+
@InjectComponent
@Property
private Submit submit;