1 files changed, 15 insertions, 15 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
index f78e52c4..f67f5634 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
@@ -7,22 +7,22 @@ class QuickstartDataGrid4TestCase extends PradoGenericSelenium2Test
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample4&notheme=true&lang=en");
 
 		// verify the 2nd row of data
-		$this->assertTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", "");
-		$this->assertTextPresent("Addison-Wesley Professional", "");
-		$this->assertTextPresent("$47.04", "");
-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked');
-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@disabled','regexp:true|disabled');
+		$this->assertContains("Design Patterns: Elements of Reusable Object-Oriented Software", $this->source());
+		$this->assertContains("Addison-Wesley Professional", $this->source());
+		$this->assertContains("$47.04", $this->source());
+		$this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked');
+		$this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl5@disabled','regexp:true|disabled');
 
 		// verify sorting
-		$this->clickAndWait("link=Book Title", "");
-		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null);
-		$this->clickAndWait("link=Publisher", "");
-		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked', null);
-		$this->clickAndWait("link=Price", "");
-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked', null);
-		$this->clickAndWait("link=In-stock", "");
-		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null);
-		$this->clickAndWait("link=Rating", "");
-		$this->verifyAttribute('ctl0_body_DataGrid_ctl4_ctl5@checked', null);
+		$this->byLinkText("Book Title")->click();
+		$this->assertAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null);
+		$this->byLinkText("Publisher")->click();
+		$this->assertAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked', null);
+		$this->byLinkText("Price")->click();
+		$this->assertAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked', null);
+		$this->byLinkText("In-stock")->click();
+		$this->assertAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null);
+		$this->byLinkText("Rating")->click();
+		$this->assertAttribute('ctl0_body_DataGrid_ctl4_ctl5@checked', null);
 	}
 }