Started cleaning tests' selenium2 compatibility layer

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php
index 1bacecb0..ca89b3a0 100755
--- a/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php
@@ -6,48 +6,48 @@ class QuickstartCheckBoxTestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBox.Home&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// a regular checkbox
-		$this->click("//input[@name='ctl0\$body\$ctl0']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl0']")->click();
 
 		// a checkbox 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 checkbox
-		$this->assertTextNotPresent("I'm clicked");
-		$this->clickAndWait("//input[@name='ctl0\$body\$ctl2']", "");
-		$this->assertTextPresent("I'm clicked");
-		$this->clickAndWait("//input[@name='ctl0\$body\$ctl2']", "");
-		$this->assertTextPresent("I'm clicked");
+		$this->assertNotContains("I'm clicked", $this->source());
+		$this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click();
+		$this->assertContains("I'm clicked", $this->source());
+		$this->byXPath("//input[@name='ctl0\$body\$ctl2']")->click();
+		$this->assertContains("I'm clicked", $this->source());
 
 		// a checkbox causing validation on a textbox
 		$this->assertNotVisible('ctl0_body_ctl3');
-		$this->click("//input[@name='ctl0\$body\$ctl4']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl4']")->click();
 //		$this->pause(1000);
 		$this->assertVisible('ctl0_body_ctl3');
-		$this->click("//input[@name='ctl0\$body\$ctl4']", "");
+		$this->byXPath("//input[@name='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']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$ctl4']")->click();
 		$this->assertNotVisible('ctl0_body_ctl3');
 
 		// a checkbox 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\$CheckBox']", "");
-		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$CheckBox']")->click();
+		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
 		$this->assertNotVisible('ctl0_body_ctl6');
 
 		// a checkbox validated by a required field validator using AutoPostBack
 		$this->assertNotVisible('ctl0_body_ctl7');
-		$this->click("//input[@name='ctl0\$body\$CheckBox2']", "");
+		$this->byXPath("//input[@name='ctl0\$body\$CheckBox2']")->click();
 //		$this->pause(1000);
 		$this->assertVisible('ctl0_body_ctl7');
-//		$this->clickAndWait("//input[@name='ctl0\$body\$CheckBox2' and @value='ctl0\$body\$CheckBox2']", "");
+//		$this->byXPath("//input[@name='ctl0\$body\$CheckBox2' and @value='ctl0\$body\$CheckBox2']")->click();
 //		$this->assertNotVisible('ctl0_body_ctl7');
 	}
 }