1 files changed, 13 insertions, 13 deletions

diff --git a/tests/FunctionalTests/validators/tests/ButtonTestCase.php b/tests/FunctionalTests/validators/tests/ButtonTestCase.php
index 898c6ff3..90265156 100755
--- a/tests/FunctionalTests/validators/tests/ButtonTestCase.php
+++ b/tests/FunctionalTests/validators/tests/ButtonTestCase.php
@@ -13,51 +13,51 @@ class ButtonTestCase extends PradoGenericSelenium2Test
 		$this->assertNotVisible('ctl0_Content_ctl4');
 
 		// verify the first validator shows the error
-		$this->click("ctl0_Content_ctl1");
+		$this->byId("ctl0_Content_ctl1")->click();
 		$this->assertVisible('ctl0_Content_ctl0');
 		$this->assertNotVisible('ctl0_Content_ctl2');
 		$this->assertNotVisible('ctl0_Content_ctl4');
 
 		// verify the first validation is passed
 		$this->pause(500);
-		$this->assertTextNotPresent('Button1 is clicked');
+		$this->assertNotContains('Button1 is clicked', $this->source());
 		$this->type("ctl0_Content_TextBox1", "test");
-		$this->clickAndWait("ctl0_Content_ctl1");
+		$this->byId("ctl0_Content_ctl1")->click();
 		$this->assertNotVisible('ctl0_Content_ctl0');
 		$this->assertNotVisible('ctl0_Content_ctl2');
 		$this->assertNotVisible('ctl0_Content_ctl4');
-		$this->assertTextPresent('Button1 is clicked and valid');
+		$this->assertContains('Button1 is clicked and valid', $this->source());
 
 		// verify the second validator shows the error
-		$this->click("ctl0_Content_ctl3");
+		$this->byId("ctl0_Content_ctl3")->click();
 		$this->assertNotVisible('ctl0_Content_ctl0');
 		$this->assertVisible('ctl0_Content_ctl2');
 		$this->assertNotVisible('ctl0_Content_ctl4');
 
 		// verify the second validation is passed
 		$this->pause(500);
-		$this->assertTextNotPresent('Button2 is clicked');
+		$this->assertNotContains('Button2 is clicked', $this->source());
 		$this->type("ctl0_Content_TextBox2", "test");
-		$this->clickAndWait("ctl0_Content_ctl3");
+		$this->byId("ctl0_Content_ctl3")->click();
 		$this->assertNotVisible('ctl0_Content_ctl0');
 		$this->assertNotVisible('ctl0_Content_ctl2');
 		$this->assertNotVisible('ctl0_Content_ctl4');
-		$this->assertTextPresent('Button2 is clicked and valid');
+		$this->assertContains('Button2 is clicked and valid', $this->source());
 
 		// verify the third validator shows the error
-		$this->clickAndWait("ctl0_Content_ctl5");
+		$this->byId("ctl0_Content_ctl5")->click();
 		$this->assertNotVisible('ctl0_Content_ctl0');
 		$this->assertNotVisible('ctl0_Content_ctl2');
 		$this->assertVisible('ctl0_Content_ctl4');
 
 		// verify the third validation is passed
-		$this->assertTextPresent('Button3 is clicked');
-		$this->assertTextNotPresent('Button3 is clicked and valid');
+		$this->assertContains('Button3 is clicked', $this->source());
+		$this->assertNotContains('Button3 is clicked and valid', $this->source());
 		$this->type("ctl0_Content_TextBox3", "test");
-		$this->clickAndWait("ctl0_Content_ctl5");
+		$this->byId("ctl0_Content_ctl5")->click();
 		$this->assertNotVisible('ctl0_Content_ctl0');
 		$this->assertNotVisible('ctl0_Content_ctl2');
 		$this->assertNotVisible('ctl0_Content_ctl4');
-		$this->assertTextPresent('Button3 is clicked and valid');
+		$this->assertContains('Button3 is clicked and valid', $this->source());
 	}
 }