Started cleaning tests' selenium2 compatibility layer

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php
index f228de83..f5a4a979 100755
--- a/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php
@@ -6,28 +6,28 @@ class QuickstartButtonTestCase extends PradoGenericSelenium2Test
 	{
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TButton.Home&notheme=true&lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// a regular button
-		$this->clickAndWait("//input[@type='submit' and @value='text']", "");
+		$this->byXPath("//input[@type='submit' and @value='text']")->click();
 
 		// a click button
 		$this->assertElementNotPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
-		$this->clickAndWait("//input[@type='submit' and @value='click me']", "");
+		$this->byXPath("//input[@type='submit' and @value='click me']")->click();
 		$this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
 
 		// a command button
 		$this->assertElementNotPresent("//input[@type='submit' and @value=\"Name: test, Param: value\"]");
-		$this->clickAndWait("//input[@type='submit' and @value='click me']", "");
+		$this->byXPath("//input[@type='submit' and @value='click me']")->click();
 		$this->assertElementPresent("//input[@type='submit' and @value=\"Name: test, Param: value\"]");
 
 		// a button causing validation
 		$this->assertNotVisible('ctl0_body_ctl3');
-		$this->click("//input[@type='submit' and @value='submit']", "");
+		$this->byXPath("//input[@type='submit' and @value='submit']")->click();
 //		$this->pause(1000);
 		$this->assertVisible('ctl0_body_ctl3');
 		$this->type("ctl0\$body\$TextBox", "test");
-		$this->clickAndWait("//input[@type='submit' and @value='submit']", "");
+		$this->byXPath("//input[@type='submit' and @value='submit']")->click();
 		$this->assertNotVisible('ctl0_body_ctl3');
 	}
 }