Started cleaning tests' selenium2 compatibility layer

1 files changed, 6 insertions, 6 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\"]", "");