Fix tests

work around stale references by explicitly waiting

1 files changed, 67 insertions, 60 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php
index 3df22ff8..66630581 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php
@@ -8,106 +8,113 @@ class QuickstartDataGrid5TestCase extends PradoGenericSelenium2Test
 
 		// verify if all required texts are present
 		// verify column headers
-		$this->assertContains('id', $this->source());
-		$this->assertContains('name', $this->source());
-		$this->assertContains('quantity', $this->source());
-		$this->assertContains('price', $this->source());
-		$this->assertContains('imported', $this->source());
+		$this->assertSourceContains('id');
+		$this->assertSourceContains('name');
+		$this->assertSourceContains('quantity');
+		$this->assertSourceContains('price');
+		$this->assertSourceContains('imported');
 
-		$this->assertContains('ITN001', $this->source());
-		$this->assertContains('ITN002', $this->source());
-		$this->assertContains('ITN003', $this->source());
-		$this->assertContains('ITN004', $this->source());
-		$this->assertContains('ITN005', $this->source());
-		$this->assertNotContains('ITN006', $this->source());
+		$this->assertSourceContains('ITN001');
+		$this->assertSourceContains('ITN002');
+		$this->assertSourceContains('ITN003');
+		$this->assertSourceContains('ITN004');
+		$this->assertSourceContains('ITN005');
+		$this->assertSourceNotContains('ITN006');
 
 		// verify paging
 		$this->byLinkText("2")->click();
-		$this->assertContains('ITN006', $this->source());
-		$this->assertContains('ITN007', $this->source());
-		$this->assertContains('ITN008', $this->source());
-		$this->assertContains('ITN009', $this->source());
-		$this->assertContains('ITN010', $this->source());
-		$this->assertNotContains('ITN011', $this->source());
-		$this->assertNotContains('ITN005', $this->source());
+		$this->assertSourceContains('ITN006');
+		$this->assertSourceContains('ITN007');
+		$this->assertSourceContains('ITN008');
+		$this->assertSourceContains('ITN009');
+		$this->assertSourceContains('ITN010');
+		$this->assertSourceNotContains('ITN011');
+		$this->assertSourceNotContains('ITN005');
 
 		$this->byLinkText("4")->click();
-		$this->assertContains('ITN016', $this->source());
-		$this->assertContains('ITN017', $this->source());
-		$this->assertContains('ITN018', $this->source());
-		$this->assertContains('ITN019', $this->source());
-		$this->assertNotContains('ITN015', $this->source());
+		$this->assertSourceContains('ITN016');
+		$this->assertSourceContains('ITN017');
+		$this->assertSourceContains('ITN018');
+		$this->assertSourceContains('ITN019');
+		$this->assertSourceNotContains('ITN015');
 
 		$this->byLinkText("1")->click();
-		$this->assertContains('ITN001', $this->source());
-		$this->assertContains('ITN002', $this->source());
-		$this->assertContains('ITN003', $this->source());
-		$this->assertContains('ITN004', $this->source());
-		$this->assertContains('ITN005', $this->source());
-		$this->assertNotContains('ITN006', $this->source());
+		$this->assertSourceContains('ITN001');
+		$this->assertSourceContains('ITN002');
+		$this->assertSourceContains('ITN003');
+		$this->assertSourceContains('ITN004');
+		$this->assertSourceContains('ITN005');
+		$this->assertSourceNotContains('ITN006');
 
 		// show top pager
 		$this->byXPath("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Top']")->click();
+		$this->pause(50);
 		$this->byId("ctl0_body_DataGrid_ctl8_ctl3")->click();
+		$this->pause(50);
 		$this->byLinkText("1")->click();
+		$this->pause(50);
 		// hide top pager
 		$this->byXPath("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Top']")->click();
+		$this->pause(50);
 
 		// change next prev caption
 		$this->type("ctl0\$body\$NextPageText", "Next Page");
+		$this->pause(50);
 		$this->type("ctl0\$body\$PrevPageText", "Prev Page");
 		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
 
 		// verify next prev paging
-		$this->assertContains('ITN001', $this->source());
-		$this->assertNotContains('ITN006', $this->source());
+		$this->assertSourceContains('ITN001');
+		$this->assertSourceNotContains('ITN006');
 		$this->byLinkText("Next Page")->click();
-		$this->assertNotContains('ITN005', $this->source());
-		$this->assertContains('ITN006', $this->source());
-		$this->assertNotContains('ITN011', $this->source());
+		$this->assertSourceNotContains('ITN005');
+		$this->assertSourceContains('ITN006');
+		$this->assertSourceNotContains('ITN011');
 		$this->byLinkText("Next Page")->click();
-		$this->assertNotContains('ITN010', $this->source());
-		$this->assertContains('ITN011', $this->source());
-		$this->assertNotContains('ITN016', $this->source());
+		$this->assertSourceNotContains('ITN010');
+		$this->assertSourceContains('ITN011');
+		$this->assertSourceNotContains('ITN016');
 		$this->byLinkText("Next Page")->click();
-		$this->assertNotContains('ITN015', $this->source());
-		$this->assertContains('ITN016', $this->source());
+		$this->assertSourceNotContains('ITN015');
+		$this->assertSourceContains('ITN016');
 		$this->byLinkText("Prev Page")->click();
-		$this->assertNotContains('ITN010', $this->source());
-		$this->assertContains('ITN011', $this->source());
-		$this->assertNotContains('ITN016', $this->source());
+		$this->assertSourceNotContains('ITN010');
+		$this->assertSourceContains('ITN011');
+		$this->assertSourceNotContains('ITN016');
 		$this->byLinkText("Prev Page")->click();
-		$this->assertNotContains('ITN005', $this->source());
-		$this->assertContains('ITN006', $this->source());
-		$this->assertNotContains('ITN011', $this->source());
+		$this->assertSourceNotContains('ITN005');
+		$this->assertSourceContains('ITN006');
+		$this->assertSourceNotContains('ITN011');
 		$this->byLinkText("Prev Page")->click();
-		$this->assertContains('ITN001', $this->source());
-		$this->assertNotContains('ITN006', $this->source());
+		$this->assertSourceContains('ITN001');
+		$this->assertSourceNotContains('ITN006');
 
 		// change button count
 		$this->type("ctl0\$body\$PageButtonCount", "2");
 		$this->byName("ctl0\$body\$ctl6")->click();
+		$this->pause(50);
 		$this->byLinkText("Next Page")->click();
-		$this->assertNotContains('ITN010', $this->source());
-		$this->assertContains('ITN011', $this->source());
-		$this->assertNotContains('ITN016', $this->source());
+		$this->assertSourceNotContains('ITN010');
+		$this->assertSourceContains('ITN011');
+		$this->assertSourceNotContains('ITN016');
 		$this->byLinkText("4")->click();
-		$this->assertNotContains('ITN015', $this->source());
-		$this->assertContains('ITN016', $this->source());
+		$this->assertSourceNotContains('ITN015');
+		$this->assertSourceContains('ITN016');
 		$this->byLinkText("Prev Page")->click();
-		$this->assertNotContains('ITN005', $this->source());
-		$this->assertContains('ITN006', $this->source());
-		$this->assertNotContains('ITN011', $this->source());
+		$this->assertSourceNotContains('ITN005');
+		$this->assertSourceContains('ITN006');
+		$this->assertSourceNotContains('ITN011');
 
 		$this->type("ctl0\$body\$PageButtonCount", "10");
 		$this->byName("ctl0\$body\$ctl6")->click();
 		$this->type("ctl0\$body\$PageSize", "2");
+		$this->pause(50);
 		$this->byName("ctl0\$body\$ctl8")->click();
-		$this->assertContains('ITN001', $this->source());
-		$this->assertContains('ITN002', $this->source());
-		$this->assertNotContains('ITN003', $this->source());
+		$this->assertSourceContains('ITN001');
+		$this->assertSourceContains('ITN002');
+		$this->assertSourceNotContains('ITN003');
 		$this->byLinkText("10")->click();
-		$this->assertContains('ITN019', $this->source());
-		$this->assertNotContains('ITN018', $this->source());
+		$this->assertSourceContains('ITN019');
+		$this->assertSourceNotContains('ITN018');
 	}
 }