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

diff --git a/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php
index da58ce3a..214b1596 100755
--- a/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php
@@ -6,51 +6,51 @@ class QuickstartRadioButtonTestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButton.Home&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// a regular radiobutton
-		$this->click("//input[@name='ctl0\$body\$ctl0' and @value='ctl0\$body\$ctl0']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl0' and @value='ctl0\$body\$ctl0']")->click();
 
 		// a radiobutton with customized value
-		$this->click("//input[@name='ctl0\$body\$ctl1' and @value='value']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl1' and @value='value']")->click();
 
 		// an auto postback radiobutton
-		$this->assertTextNotPresent("I'm clicked");
-		$this->clickAndWait("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", "");
-		$this->assertTextPresent("I'm clicked");
-		$this->click("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", "");
-		$this->assertTextPresent("I'm clicked");
+		$this->assertNotContains("I'm clicked", $this->source());
+		$this->byXPath("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']")->click();
+		$this->assertContains("I'm clicked", $this->source());
+		$this->byXPath("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']")->click();
+		$this->assertContains("I'm clicked", $this->source());
 
 		// a radiobutton causing validation on a textbox
 		$this->assertNotVisible('ctl0_body_ctl3');
-		$this->click("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']")->click();
 		$this->pause(1000);
 		$this->assertVisible('ctl0_body_ctl3');
-		$this->click("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']")->click();
 		$this->pause(1000);
 		$this->assertVisible('ctl0_body_ctl3');
 		$this->type("ctl0\$body\$TextBox", "test");
-		$this->clickAndWait("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']")->click();
 		$this->assertNotVisible('ctl0_body_ctl3');
 
 		// a radiobutton validated by a required field validator
 		$this->assertNotVisible('ctl0_body_ctl6');
-		$this->click("//input[@type='submit' and @value='Submit']", "");
+		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
 		$this->pause(1000);
 		$this->assertVisible('ctl0_body_ctl6');
-		$this->click("//input[@name='ctl0\$body\$RadioButton' and @value='ctl0\$body\$RadioButton']", "");
-		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$RadioButton' and @value='ctl0\$body\$RadioButton']")->click();
+		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
 		$this->assertNotVisible('ctl0_body_ctl6');
 
 		// a radiobutton group
-		$this->clickAndWait("name=ctl0\$body\$ctl7", "");
-		$this->assertTextPresent("Your selection is empty");
-		$this->click("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio2']", "");
-		$this->clickAndWait("name=ctl0\$body\$ctl7", "");
-		$this->assertTextPresent("Your selection is 2");
-		$this->click("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio3']", "");
-		$this->click("//input[@name='ctl0\$body\$Radio4' and @value='ctl0\$body\$Radio4']", "");
-		$this->clickAndWait("name=ctl0\$body\$ctl7", "");
-		$this->assertTextPresent("Your selection is 34");
+		$this->byName("ctl0\$body\$ctl7")->click();
+		$this->assertContains("Your selection is empty", $this->source());
+		$this->byXPath("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio2']")->click();
+		$this->byName("ctl0\$body\$ctl7")->click();
+		$this->assertContains("Your selection is 2", $this->source());
+		$this->byXPath("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio3']")->click();
+		$this->byXPath("//input[@name='ctl0\$body\$Radio4' and @value='ctl0\$body\$Radio4']")->click();
+		$this->byName("ctl0\$body\$ctl7")->click();
+		$this->assertContains("Your selection is 34", $this->source());
 	}
 }