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

diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php
index d58ca4fe..2568f233 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php
@@ -6,39 +6,39 @@ class QuickstartWizard3TestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample3&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// step 1
-		$this->assertTextPresent('A Mini Survey');
-		$this->assertTextPresent('PRADO QuickStart Sample');
-		$this->click('ctl0_body_Wizard3_StudentCheckBox');
-		$this->clickAndWait('ctl0$body$Wizard3$ctl4$ctl0');
+		$this->assertContains('A Mini Survey', $this->source());
+		$this->assertContains('PRADO QuickStart Sample', $this->source());
+		$this->byId('ctl0_body_Wizard3_StudentCheckBox')->click();
+		$this->byName('ctl0$body$Wizard3$ctl4$ctl0')->click();
 
 		// step 2
-		$this->select('ctl0$body$Wizard3$DropDownList11', "label=Chemistry");
-		$this->clickAndWait('ctl0$body$Wizard3$ctl5$ctl1');
+		$this->select('ctl0$body$Wizard3$DropDownList11', "Chemistry");
+		$this->byName('ctl0$body$Wizard3$ctl5$ctl1')->click();
 
 		// step 3
-		$this->select('ctl0$body$Wizard3$DropDownList22', "label=Tennis");
-		$this->clickAndWait('ctl0$body$Wizard3$ctl6$ctl1');
+		$this->select('ctl0$body$Wizard3$DropDownList22', "Tennis");
+		$this->byName('ctl0$body$Wizard3$ctl6$ctl1')->click();
 
 		// step 4
-		$this->assertTextPresent('You are a college student');
-		$this->assertTextPresent('You are in major: Chemistry');
-		$this->assertTextPresent('Your favorite sport is: Tennis');
+		$this->assertContains('You are a college student', $this->source());
+		$this->assertContains('You are in major: Chemistry', $this->source());
+		$this->assertContains('Your favorite sport is: Tennis', $this->source());
 
 		// run the example again. this time we skip the page asking about major
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample3&notheme=true");
 
 		// step 1
-		$this->clickAndWait('ctl0$body$Wizard3$ctl4$ctl0');
+		$this->byName('ctl0$body$Wizard3$ctl4$ctl0')->click();
 
 		// step 3
-		$this->select('ctl0$body$Wizard3$DropDownList22', "label=Baseball");
-		$this->clickAndWait('ctl0$body$Wizard3$ctl6$ctl1');
+		$this->select('ctl0$body$Wizard3$DropDownList22', "Baseball");
+		$this->byName('ctl0$body$Wizard3$ctl6$ctl1')->click();
 
 		// step 4
-		$this->assertTextNotPresent('You are a college student');
-		$this->assertTextPresent('Your favorite sport is: Baseball');
+		$this->assertNotContains('You are a college student', $this->source());
+		$this->assertContains('Your favorite sport is: Baseball', $this->source());
 	}
 }