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

diff --git a/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php b/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
index 6ab6329b..781701cf 100755
--- a/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
@@ -8,10 +8,10 @@ class QuickstartCheckBoxListTestCase extends PradoGenericSelenium2Test
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBoxList.Home&notheme=true&lang=en");
 
 		// Check box list with default settings:
-		$this->click("//input[@name='ctl0\$body\$ctl0\$c0' and @value='value 1']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl0\$c0' and @value='value 1']")->click();
 
 		// Check box list with customized cellpadding, cellspacing, color and text alignment:
-		$this->click("//input[@name='ctl0\$body\$ctl1\$c1' and @value='value 2']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl1\$c1' and @value='value 2']")->click();
 
 		// *** Currently unable to test the following cases:
 		// Check box list with vertical (default) repeat direction
@@ -20,33 +20,33 @@ class QuickstartCheckBoxListTestCase extends PradoGenericSelenium2Test
 		// Check box list with flow layout and horizontal repeat direction:
 
 		// Check box list's behavior upon postback
-		$this->click("//input[@name='ctl0\$body\$CheckBoxList\$c2' and @value='value 3']", "");
-		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->assertTextPresent("Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 4, Value: value 5, Text: item 5)", "");
+		$this->byXPath("//input[@name='ctl0\$body\$CheckBoxList\$c2' and @value='value 3']")->click();
+		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
+		$this->assertContains("Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 4, Value: value 5, Text: item 5)", $this->source());
 
 		// Auto postback check box list
-		$this->clickAndWait("//input[@name='ctl0\$body\$ctl7\$c1' and @value='value 2']", "");
-		$this->assertTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl7\$c1' and @value='value 2']")->click();
+		$this->assertContains("Your selection is: (Index: 4, Value: value 5, Text: item 5)", $this->source());
 
 		// Databind to an integer-indexed array
-		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList1\$c1' and @value='1']", "");
-		$this->assertTextPresent("Your selection is: (Index: 1, Value: 1, Text: item 2)", "");
+		$this->byXPath("//input[@name='ctl0\$body\$DBCheckBoxList1\$c1' and @value='1']")->click();
+		$this->assertContains("Your selection is: (Index: 1, Value: 1, Text: item 2)", $this->source());
 
 		// Databind to an associative array:
-		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList2\$c1' and @value='key 2']", "");
-		$this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
+		$this->byXPath("//input[@name='ctl0\$body\$DBCheckBoxList2\$c1' and @value='key 2']")->click();
+		$this->assertContains("Your selection is: (Index: 1, Value: key 2, Text: item 2)", $this->source());
 
 		// Databind with DataTextField and DataValueField specified
-		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList3\$c2' and @value='003']", "");
-		$this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
+		$this->byXPath("//input[@name='ctl0\$body\$DBCheckBoxList3\$c2' and @value='003']")->click();
+		$this->assertContains("Your selection is: (Index: 2, Value: 003, Text: Cary)", $this->source());
 
 		// CheckBox list causing validation
 		$this->assertNotVisible('ctl0_body_ctl8');
-		$this->click("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']")->click();
 //		$this->pause(1000);
 		$this->assertVisible('ctl0_body_ctl8');
 		$this->type("ctl0\$body\$TextBox", "test");
-		$this->clickAndWait("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']")->click();
 		$this->assertNotVisible('ctl0_body_ctl8');
 	}
 }