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

3 files changed, 32 insertions, 32 deletions

diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php
index dce8f144..9d816978 100755
--- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php
@@ -6,29 +6,29 @@ class QuickstartActiveButtonTestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveButton.Home&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
-		$this->assertTextPresent('TActiveButton Samples (AJAX)');
+		$this->assertContains('TActiveButton Samples (AJAX)', $this->source());
 
 		// a click button
 		$this->assertElementNotPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
-		$this->click("//input[@type='submit' and @value='click me']", "");
+		$this->byXPath("//input[@type='submit' and @value='click me']")->click();
 		$this->pause(800);
 		$this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
 
 		// a command button
 		$this->assertElementNotPresent("//input[@type='submit' and @value=\"Name: test, Param: value using callback\"]");
-		$this->click("//input[@type='submit' and @value='click me']", "");
+		$this->byXPath("//input[@type='submit' and @value='click me']")->click();
 		$this->pause(800);
 		$this->assertElementPresent("//input[@type='submit' and @value=\"Name: test, Param: value using callback\"]");
 
 		// a button causing validation
 		$this->assertNotVisible('ctl0_body_ctl2');
-		$this->click("//input[@type='submit' and @value='submit']", "");
+		$this->byXPath("//input[@type='submit' and @value='submit']")->click();
 		$this->pause(800);
 		$this->assertVisible('ctl0_body_ctl2');
 		$this->type("ctl0\$body\$TextBox", "test");
-		$this->click("//input[@type='submit' and @value='submit']", "");
+		$this->byXPath("//input[@type='submit' and @value='submit']")->click();
 		$this->pause(800);
 		$this->assertNotVisible('ctl0_body_ctl2');
 		$this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked using callback\"]", "");
diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php
index 64643d9d..9e537abd 100755
--- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php
@@ -7,51 +7,51 @@ class QuickstartActiveCheckBoxTestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveCheckBox.Home&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
-		$this->assertTextPresent('TActiveCheckBox Samples (AJAX)');
+		$this->assertContains('TActiveCheckBox Samples (AJAX)', $this->source());
 
 
 		// an auto postback checkbox
-		$this->assertTextNotPresent("ctl0_body_ctl0 clicked using callback");
-		$this->click("//input[@name='ctl0\$body\$ctl0']");
+		$this->assertNotContains("ctl0_body_ctl0 clicked using callback", $this->source());
+		$this->byXPath("//input[@name='ctl0\$body\$ctl0']")->click();
 		$this->pause(800);
-		$this->assertChecked("//input[@name='ctl0\$body\$ctl0']");
-		$this->assertTextPresent("ctl0_body_ctl0 clicked using callback");
-		$this->click("//input[@name='ctl0\$body\$ctl0']");
+		$this->assertTrue($this->byXPath("//input[@name='ctl0\$body\$ctl0']")->selected());
+		$this->assertContains("ctl0_body_ctl0 clicked using callback", $this->source());
+		$this->byXPath("//input[@name='ctl0\$body\$ctl0']")->click();
 		$this->pause(800);
-		$this->assertTextPresent("ctl0_body_ctl0 clicked using callback");
-		$this->assertNotChecked("//input[@name='ctl0\$body\$ctl0']");
+		$this->assertContains("ctl0_body_ctl0 clicked using callback", $this->source());
+		$this->assertFalse($this->byXPath("//input[@name='ctl0\$body\$ctl0']")->selected());
 
 		// a checkbox causing validation on a textbox
 		$this->assertNotVisible('ctl0_body_ctl1');
-		$this->click("//input[@name='ctl0\$body\$ctl2']");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click();
 		$this->assertVisible('ctl0_body_ctl1');
-		$this->click("//input[@name='ctl0\$body\$ctl2']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click();
 		$this->assertVisible('ctl0_body_ctl3');
 		$this->type("ctl0\$body\$TextBox", "test");
-		$this->click("//input[@name='ctl0\$body\$ctl2']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click();
 		$this->pause(800);
 		$this->assertNotVisible('ctl0_body_ctl1');
-		$this->assertTextPresent("ctl0_body_ctl2 clicked using callback");
+		$this->assertContains("ctl0_body_ctl2 clicked using callback", $this->source());
 
 		// a checkbox validated by a required field validator
-		$this->assertNotChecked("//input[@name='ctl0\$body\$CheckBox']");
+		$this->assertFalse($this->byXPath("//input[@name='ctl0\$body\$CheckBox']")->selected());
 		$this->assertNotVisible('ctl0_body_ctl4');
-		$this->click("//input[@type='submit' and @value='Submit']", "");
+		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
 		$this->assertVisible('ctl0_body_ctl4');
-		$this->click("//input[@name='ctl0\$body\$CheckBox']", "");
-		$this->assertChecked("//input[@name='ctl0\$body\$CheckBox']");
-		$this->click("//input[@type='submit' and @value='Submit']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$CheckBox']")->click();
+		$this->assertTrue($this->byXPath("//input[@name='ctl0\$body\$CheckBox']")->selected());
+		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
 		$this->pause(800);
 		$this->assertNotVisible('ctl0_body_ctl4');
-		$this->assertTextPresent("ctl0_body_CheckBox clicked");
+		$this->assertContains("ctl0_body_CheckBox clicked", $this->source());
 
 		// a checkbox validated by a required field validator using AutoPostBack
-		$this->assertChecked("//input[@name='ctl0\$body\$CheckBox2']");
+		$this->assertTrue($this->byXPath("//input[@name='ctl0\$body\$CheckBox2']")->selected());
 		$this->assertNotVisible('ctl0_body_ctl5');
-		$this->click("//input[@name='ctl0\$body\$CheckBox2']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$CheckBox2']")->click();
 		$this->assertVisible('ctl0_body_ctl5');
-		$this->assertChecked("//input[@name='ctl0\$body\$CheckBox2']");
+		$this->assertTrue($this->byXPath("//input[@name='ctl0\$body\$CheckBox2']")->selected());
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php
index dba29133..7cb29382 100755
--- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php
+++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php
@@ -6,14 +6,14 @@ class QuickstartActiveCustomValidatorTestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveCustomValidator.Home&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
-		$this->assertTextPresent('TActiveCustomValidator Samples (AJAX)');
+		$this->assertContains('TActiveCustomValidator Samples (AJAX)', $this->source());
 
 		$base = 'ctl0_body_';
 
 		$this->assertNotVisible($base.'validator1');
-		$this->click($base.'button1');
+		$this->byId($base.'button1')->click();
 		$this->pause(800);
 		$this->assertVisible($base.'validator1');
 
@@ -25,7 +25,7 @@ class QuickstartActiveCustomValidatorTestCase extends PradoGenericSelenium2Test
 		$this->pause(800);
 		$this->assertVisible($base.'validator1');
 
-		$this->click($base.'button1');
+		$this->byId($base.'button1')->click();
 		$this->pause(800);
 		$this->assertNotVisible($base.'validator1');
 	}