Author: hlship
Date: Tue Aug 9 17:58:36 2011
New Revision: 1155446
URL: http://svn.apache.org/viewvc?rev=1155446&view=rev
Log:
Fix (I hope) a couple of broken tests
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/TreeTests.groovy
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy?rev=1155446&r1=1155445&r2=1155446&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
Tue Aug 9 17:58:36 2011
@@ -62,7 +62,7 @@ class AlertsTests extends SeleniumTestCa
click "//input[@value='Ajax Update']"
- sleep 100
+ sleep 200
assertTextPresent "ajax error until"
@@ -87,7 +87,13 @@ class AlertsTests extends SeleniumTestCa
sleep 100
- assertTextPresent "ajax error single"
+ waitForCSSSelectedElementToAppear "div.t-error"
+
+ // Ah, Selenium, I love you. You make my day go so quicky. In any
case, this should work
+ // clear as day, but doesn't, so it's commented out. I guess this just
goes to manual
+ // testing.
+
+ assertText "css=div.t-error div.t-message-container", "ajax error
single"
click "link=Dismiss all"
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/TreeTests.groovy
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/TreeTests.groovy?rev=1155446&r1=1155445&r2=1155446&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/TreeTests.groovy
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/TreeTests.groovy
Tue Aug 9 17:58:36 2011
@@ -31,6 +31,8 @@ class TreeTests extends SeleniumTestCase
//Click on Games
click "//div[@class='t-tree-container
test-hook']/ul/li[2]/span[@class='t-tree-icon']"
+ sleep 25 // See if that helps with the intermittent test suite
failures on the CI server
+
waitForAjaxRequestsToComplete PAGE_LOAD_TIMEOUT
assertTextPresent "Board Games"
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java?rev=1155446&r1=1155445&r2=1155446&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
Tue Aug 9 17:58:36 2011
@@ -1055,12 +1055,10 @@ public class CoreBehaviorsTests extends
click("link=ajax");
- waitForCSSSelectedElementToAppear("div.t-console div");
+ waitForCSSSelectedElementToAppear("div.t-console div.t-err");
- // I've seen this fail, rarely. Appears to be a timing issue. Screen
shot includes "faded" values for the console, so we could be checking too soon
- // or too late.
-
- assertTextPresent("Communication with the server failed: Request event
'action' (on component UnhandledEventDemo:ajax) was not handled; you must
provide a matching event handler method in the component or in one of its
containers.");
+ assertText(
+ "css=div.t-err", "Communication with the server failed:
Request event 'action' (on component UnhandledEventDemo:ajax) was not handled;
you must provide a matching event handler method in the component or in one of
its containers.");
}
/**
