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, 16 insertions, 16 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php b/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php
index 0b272428..f5b58b48 100755
--- a/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php
@@ -1,36 +1,36 @@
 <?php
 
-class QuickstartBulletedListTestCase extends PradoGenericSeleniumTest
+class QuickstartBulletedListTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TBulletedList.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TBulletedList.Home&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
-		$this->verifyTextPresent('item 1','');
-		$this->verifyTextPresent('item 2','');
-		$this->verifyTextPresent('item 3','');
-		$this->verifyTextPresent('item 4','');
-		$this->verifyTextPresent('google','');
-		$this->verifyTextPresent('yahoo','');
-		$this->verifyTextPresent('amazon','');
+		$this->assertTextPresent('item 1','');
+		$this->assertTextPresent('item 2','');
+		$this->assertTextPresent('item 3','');
+		$this->assertTextPresent('item 4','');
+		$this->assertTextPresent('google','');
+		$this->assertTextPresent('yahoo','');
+		$this->assertTextPresent('amazon','');
 
 		// verify order list starting from 5
-		$this->verifyElementPresent("//ol[@start='5']");
+		$this->assertElementPresent("//ol[@start='5']");
 
 		// unable to verify styles
 
 		// verify hyperlink list
-		$this->verifyElementPresent("//a[@href='http://www.google.com/']");
-		$this->verifyElementPresent("//a[@href='http://www.yahoo.com/']");
-		$this->verifyElementPresent("//a[@href='http://www.amazon.com/']");
+		$this->assertElementPresent("//a[@href='http://www.google.com/']");
+		$this->assertElementPresent("//a[@href='http://www.yahoo.com/']");
+		$this->assertElementPresent("//a[@href='http://www.amazon.com/']");
 
 		// verify linkbutton list
 		$this->clickAndWait("id=ctl0_body_ctl40", "");
-		$this->verifyTextPresent("You clicked google : http://www.google.com/.", "");
+		$this->assertTextPresent("You clicked google : http://www.google.com/.", "");
 		$this->clickAndWait("id=ctl0_body_ctl41", "");
-		$this->verifyTextPresent("You clicked yahoo : http://www.yahoo.com/.", "");
+		$this->assertTextPresent("You clicked yahoo : http://www.yahoo.com/.", "");
 		$this->clickAndWait("id=ctl0_body_ctl42", "");
-		$this->verifyTextPresent("You clicked amazon : http://www.amazon.com/.", "");
+		$this->assertTextPresent("You clicked amazon : http://www.amazon.com/.", "");
 	}
 }