Started cleaning tests' selenium2 compatibility layer

1 files changed, 15 insertions, 15 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
index efe2829d..4f4ca60a 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
@@ -7,23 +7,23 @@ class QuickstartDataGrid1TestCase extends PradoGenericSelenium2Test
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample1&notheme=true&lang=en");
 
 		// verify if all required texts are present
-		$this->assertTextPresent('id','');
-		$this->assertTextPresent('name','');
-		$this->assertTextPresent('quantity','');
-		$this->assertTextPresent('price','');
-		$this->assertTextPresent('imported','');
-		$this->assertTextPresent('ITN001','');
-		$this->assertTextPresent('Motherboard','');
-		$this->assertTextPresent('100','');
-		$this->assertTextPresent('true','');
-		$this->assertTextPresent('ITN019','');
-		$this->assertTextPresent('Speaker','');
-		$this->assertTextPresent('35','');
-		$this->assertTextPresent('65','');
-		$this->assertTextPresent('false','');
+		$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->assertContains('ITN001', $this->source());
+		$this->assertContains('Motherboard', $this->source());
+		$this->assertContains('100', $this->source());
+		$this->assertContains('true', $this->source());
+		$this->assertContains('ITN019', $this->source());
+		$this->assertContains('Speaker', $this->source());
+		$this->assertContains('35', $this->source());
+		$this->assertContains('65', $this->source());
+		$this->assertContains('false', $this->source());
 
 		// verify specific table tags
 		$this->assertElementPresent("ctl0_body_DataGrid");
-		$this->verifyAttribute("ctl0_body_DataGrid@cellpadding","2");
+		$this->assertAttribute("ctl0_body_DataGrid@cellpadding","2");
 	}
 }