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/08 02:25:03 UTC
[1/3] git commit: Keep fixing broken tests
Updated Branches:
refs/heads/5.4-js-rewrite df118f70c -> 65ae8fbe8
Keep fixing broken 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/65ae8fbe
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/65ae8fbe
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/65ae8fbe
Branch: refs/heads/5.4-js-rewrite
Commit: 65ae8fbe8c511816c837c6a7f0578a5fad0fe02a
Parents: ce83b16
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Dec 7 17:24:47 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Dec 7 17:24:47 2012 -0800
----------------------------------------------------------------------
tapestry-core/src/test/app1/DateFieldDemo.tml | 4 +-
.../tapestry5/integration/app1/FormTests.java | 39 +++++++++------
2 files changed, 25 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/65ae8fbe/tapestry-core/src/test/app1/DateFieldDemo.tml
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/app1/DateFieldDemo.tml b/tapestry-core/src/test/app1/DateFieldDemo.tml
index 1e95c09..b26f872 100644
--- a/tapestry-core/src/test/app1/DateFieldDemo.tml
+++ b/tapestry-core/src/test/app1/DateFieldDemo.tml
@@ -6,14 +6,14 @@
<t:form>
<t:errors/>
- <div class="control-group">
+ <div class="control-group x-birthday">
<t:label for="birthday"/>
<div class="controls">
<t:datefield format="d MMM yyyy" hidetextfield="true" t:id="birthday"/>
</div>
</div>
- <div class="control-group">
+ <div class="control-group x-impact">
<t:label for="asteroidImpact"/>
<div class="controls">
<t:datefield t:id="asteroidImpact"/>
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/65ae8fbe/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 deae5be..d66993b 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
@@ -243,7 +243,9 @@ public class FormTests extends TapestryCoreTestCase
type("asteroidImpact", "<script>alert('T5 is great'); </script>");
- click("id=asteroidImpact-trigger");
+ click("css=.x-impact .btn");
+
+ // This appears to be a legitimate bug introduced in 5.4:
assertTextPresent("Unparseable date: \"<script>alert('T5 is great'); </script>\"");
}
@@ -259,7 +261,8 @@ public class FormTests extends TapestryCoreTestCase
//start with a known date...
type("asteroidImpact", "05/28/2035");
- click("id=asteroidImpact-trigger");
+ click("css=.x-impact .btn");
+
waitForCSSSelectedElementToAppear("div.datePicker");
assertEquals(getText("css=td.selected"), "28");
@@ -290,7 +293,8 @@ public class FormTests extends TapestryCoreTestCase
//4) Pressing the "None" button should always close the popup and result in no date.
//#3
- click("id=asteroidImpact-trigger");
+ click("css=.x-impact .btn");
+
waitForCSSSelectedElementToAppear("div.datePicker");
click("css=button.todayButton");
waitForInvisible(pickerGoneSelector);
@@ -299,7 +303,8 @@ public class FormTests extends TapestryCoreTestCase
assertFieldValue("asteroidImpact", new SimpleDateFormat("M/d/yyyy").format(new Date()));
//#2...
- click("id=asteroidImpact-trigger");
+ click("css=.x-impact .btn");
+
waitForCSSSelectedElementToAppear("div.datePicker");
click("css=button.nextButton");
waitForCondition(selectedGoneCondition, PAGE_LOAD_TIMEOUT);
@@ -313,13 +318,16 @@ public class FormTests extends TapestryCoreTestCase
assertFieldValue("asteroidImpact", value);
//#4...
- click("id=asteroidImpact-trigger");
+
+ click("css=.x-impact .btn");
+
waitForCSSSelectedElementToAppear("div.datePicker");
click("css=button.noneButton");
waitForInvisible(pickerGoneSelector);
assertFieldValue("asteroidImpact", "");
- click("id=asteroidImpact-trigger");
+ click("css=.x-impact .btn");
+
waitForCSSSelectedElementToAppear("div.datePicker");
assertFalse(isElementPresent("css=td.selected"));
click("css=button.noneButton");
@@ -331,19 +339,20 @@ public class FormTests extends TapestryCoreTestCase
@Test
public void datefield_clickoutside_closes()
{
+ openLinks("DateField Demo", "Reset Page State", "english");
+
waitForPageInitialized();
- openLinks("DateField Demo", "Reset Page State", "english");
type("asteroidImpact", "05/28/2046");
- click("id=asteroidImpact-trigger");
+ click("css=.x-impact .btn");
waitForCSSSelectedElementToAppear("div.datePicker");
- click("id=asteroidImpact");
+ click("css=.x-impact .btn");
waitForInvisible("css=div.datePicker");
//also make sure that clicking the month label /doesn't/ close the picker
- click("id=asteroidImpact-trigger");
+ click("css=.x-impact .btn");
waitForCSSSelectedElementToAppear("div.datePicker");
click("css=a.topLabel");
waitForCSSSelectedElementToAppear("div.labelPopup");
@@ -353,12 +362,10 @@ public class FormTests extends TapestryCoreTestCase
//It's basically impossible to express "wait until the popup doesn't disappear"
//Instead, we take advantage of knowing that the datepicker disappears with this bug /almost/
//immediately after picking the month label, so we sleep the test for a few seconds to provide
- //ammple time for the bug to manifest.
- try
- {
- Thread.sleep(1500);
- } catch (Exception e)
- {/*Ignore the interrupted exception */}
+ //ammple time for the bug to manifest.
+
+ sleep(100);
+
assertTrue(isVisible("css=div.datePicker"));
}