Ported all tests from Selenium1 (RC) to Selenium2 (WebDriver) using a compatibility layer

(cherry picked from commit 82774aa0a41562a325f31c901584ec01c8238573)

Conflicts:
	tests/FunctionalTests/active-controls/tests/AutoCompleteTestCase.php
	tests/FunctionalTests/active-controls/tests/CustomTemplateTestCase.php
	tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
	tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
	tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
	tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php

1 files changed, 10 insertions, 10 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
index 702b997e..f78e52c4 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
@@ -1,28 +1,28 @@
 <?php
 
-class QuickstartDataGrid4TestCase extends PradoGenericSeleniumTest
+class QuickstartDataGrid4TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample4&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample4&amp;notheme=true&amp;lang=en");
 
 		// verify the 2nd row of data
-		$this->verifyTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", "");
-		$this->verifyTextPresent("Addison-Wesley Professional", "");
-		$this->verifyTextPresent("$47.04", "");
+		$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');
 
 		// verify sorting
 		$this->clickAndWait("link=Book Title", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl1_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null);
 		$this->clickAndWait("link=Publisher", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl6_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked', null);
 		$this->clickAndWait("link=Price", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl2_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked', null);
 		$this->clickAndWait("link=In-stock", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl1_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null);
 		$this->clickAndWait("link=Rating", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl4_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl4_ctl5@checked', null);
 	}
 }