Started cleaning tests' selenium2 compatibility layer

(cherry picked from commit 4ce02f6973aa40c313364b5ff7990f2244309790)

Conflicts:
	tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
	tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
	tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
	tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php
	tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php
	tests/FunctionalTests/validators/tests/DatePickerTestCase.php

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php
index fa565abb..41d3463e 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php
@@ -6,37 +6,37 @@ class QuickstartWizard4TestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample4&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// step 1
-		$this->assertTextPresent('Step 1 of 3');
-		$this->select('ctl0_body_Wizard1_DropDownList1', "label=Cyan");
-		$this->clickAndWait('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton');
+		$this->assertContains('Step 1 of 3', $this->source());
+		$this->select('ctl0_body_Wizard1_DropDownList1', "Cyan");
+		$this->byId('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton')->click();
 
 		// step 3
-		$this->assertTextPresent('Step 3 of 3');
-		$this->assertTextPresent('Thank you for completing this survey.');
-		$this->clickAndWait('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
+		$this->assertContains('Step 3 of 3', $this->source());
+		$this->assertContains('Thank you for completing this survey.', $this->source());
+		$this->byId('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton')->click();
 
 		// step 1
 		$this->assertSelected('ctl0_body_Wizard1_DropDownList1', "Cyan");
-		$this->select('ctl0_body_Wizard1_DropDownList1', "label=Black");
-		$this->clickAndWait('ctl0_body_Wizard1_ctl4_ctl0');
+		$this->select('ctl0_body_Wizard1_DropDownList1', "Black");
+		$this->byId('ctl0_body_Wizard1_ctl4_ctl0')->click();
 
 		// step 2
-		$this->assertTextPresent('Step 2 of 3');
-		$this->assertTextPresent('Your favorite color is: Black');
-		$this->clickAndWait('ctl0_body_Wizard1_ctl5_ctl0');
+		$this->assertContains('Step 2 of 3', $this->source());
+		$this->assertContains('Your favorite color is: Black', $this->source());
+		$this->byId('ctl0_body_Wizard1_ctl5_ctl0')->click();
 
 		// step 1
-		$this->assertTextPresent('Step 1 of 3');
+		$this->assertContains('Step 1 of 3', $this->source());
 		$this->assertSelected('ctl0_body_Wizard1_DropDownList1', "Black");
-		$this->clickAndWait('ctl0_body_Wizard1_ctl4_ctl0');
+		$this->byId('ctl0_body_Wizard1_ctl4_ctl0')->click();
 
 		// step 2
-		$this->clickAndWait('ctl0_body_Wizard1_ctl5_ctl1');
+		$this->byId('ctl0_body_Wizard1_ctl5_ctl1')->click();
 
 		// step 3
-		$this->assertTextPresent('Step 3 of 3');
+		$this->assertContains('Step 3 of 3', $this->source());
 	}
 }