1 files changed, 26 insertions, 26 deletions

diff --git a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
index f8b54eb0..249f5ae8 100755
--- a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
+++ b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
@@ -1,54 +1,54 @@
 <?php
 
-class RequiredFieldTestCase extends PradoGenericSeleniumTest
+class RequiredFieldTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = "ctl0_Content_";
-		$this->open("validators/index.php?page=RequiredFieldValidator");
-		$this->assertTextPresent("RequiredFieldValidator Tests");
+		$this->url("validators/index.php?page=RequiredFieldValidator");
+		$this->assertContains("RequiredFieldValidator Tests", $this->source());
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
-		$this->click("{$base}submit1");
+		$this->byId("{$base}submit1")->click();
 		$this->assertVisible("{$base}validator1");
 		$this->assertVisible("{$base}validator2");
 		$this->type("{$base}text1", "testing");
-		$this->click("{$base}submit1");
+		$this->byId("{$base}submit1")->click();
 		$this->assertNotVisible("{$base}validator1");
-		$this->click("{$base}submit2");
+		$this->byId("{$base}submit2")->click();
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
 		$this->assertVisible("{$base}validator3");
 		$this->assertVisible("{$base}validator4");
 		$this->type("{$base}text2", "testing2");
-		$this->click("{$base}submit2");
+		$this->byId("{$base}submit2")->click();
 		$this->assertNotVisible("{$base}validator3");
-		$this->click("{$base}submit3");
+		$this->byId("{$base}submit3")->click();
 		$this->assertVisible("{$base}summary3");
-		$this->clickAndWait("{$base}submit4");
+		$this->byId("{$base}submit4")->click();
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
 		$this->assertNotVisible("{$base}validator3");
 		$this->assertNotVisible("{$base}validator4");
-		$this->click("{$base}submit1");
+		$this->byId("{$base}submit1")->click();
 		$this->assertVisible("{$base}validator2");
-		$this->click("{$base}check1");
-		$this->click("{$base}submit2");
+		$this->byId("{$base}check1")->click();
+		$this->byId("{$base}submit2")->click();
 		$this->assertVisible("{$base}validator4");
-		$this->clickAndWait("{$base}submit1");
+		$this->byId("{$base}submit1")->click();
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
 		$this->type("{$base}text1");
-		$this->click("{$base}check1");
-		$this->click("{$base}submit1");
+		$this->byId("{$base}check1")->click();
+		$this->byId("{$base}submit1")->click();
 		$this->assertVisible("{$base}validator1");
 		$this->assertVisible("{$base}validator2");
-		$this->click("{$base}check2");
-		$this->clickAndWait("{$base}submit2");
+		$this->byId("{$base}check2")->click();
+		$this->byId("{$base}submit2")->click();
 
 		$this->type("{$base}text1", "Hello");
-		$this->click("{$base}check1");
-		$this->click("{$base}submit2");
+		$this->byId("{$base}check1")->click();
+		$this->byId("{$base}submit2")->click();
 
 		$this->assertNotVisible("{$base}validator5");
 		$this->assertNotVisible("{$base}validator6");
@@ -56,14 +56,14 @@ class RequiredFieldTestCase extends PradoGenericSeleniumTest
 		$this->assertNotVisible("{$base}validator8");
 		$this->type("{$base}text1");
 		$this->type("{$base}text2");
-		$this->click("{$base}check1");
-		$this->click("{$base}check2");
-		$this->click("{$base}submit3");
+		$this->byId("{$base}check1")->click();
+		$this->byId("{$base}check2")->click();
+		$this->byId("{$base}submit3")->click();
 		$this->assertVisible("{$base}validator5");
 		$this->assertVisible("{$base}validator6");
 		$this->assertVisible("{$base}validator7");
 		$this->assertVisible("{$base}validator8");
-		$this->clickAndWait("{$base}submit4");
+		$this->byId("{$base}submit4")->click();
 		$this->assertNotVisible("{$base}validator5");
 		$this->assertNotVisible("{$base}validator6");
 		$this->assertNotVisible("{$base}validator7");
@@ -73,10 +73,10 @@ class RequiredFieldTestCase extends PradoGenericSeleniumTest
 	function testInitialValue()
 	{
 		$base = "ctl0_Content_";
-		$this->open("validators/index.php?page=RequiredFieldValidator");
-		$this->assertTextPresent("InitialValue Test");
+		$this->url("validators/index.php?page=RequiredFieldValidator");
+		$this->assertContains("InitialValue Test", $this->source());
 		$this->assertNotVisible("{$base}validator9");
-		$this->click("{$base}submit5");
+		$this->byId("{$base}submit5")->click();
 		$this->pause(250);
 		$this->assertVisible("{$base}validator9");
 		$this->type("{$base}text5", "adasd");