Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

1 files changed, 36 insertions, 36 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php
index a3464702..3865e33d 100755
--- a/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php
@@ -1,58 +1,58 @@
 <?php
 
-class QuickstartTextBoxTestCase extends PradoGenericSeleniumTest
+class QuickstartTextBoxTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TTextBox.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TTextBox.Home&amp;notheme=true&amp;lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// a normal textbox
 		$this->type("ctl0\$body\$ctl0", "test");
 
 		// textbox with maxlength set
-		$this->verifyAttribute("ctl0\$body\$ctl1@size","4");
-		$this->verifyAttribute("ctl0\$body\$ctl1@maxlength","6");
+		$this->assertAttribute("ctl0\$body\$ctl1@size","4");
+		$this->assertAttribute("ctl0\$body\$ctl1@maxlength","6");
 		$this->type("ctl0\$body\$ctl1", "textte");
 
 		// vCard textboxes
-		$this->verifyAttribute("ctl0\$body\$ctl2@vcard_name","vCard.FirstName");
+		$this->assertAttribute("ctl0\$body\$ctl2@vcard_name","vCard.FirstName");
 		$this->type("ctl0\$body\$ctl2", "first");
-		$this->verifyAttribute("ctl0\$body\$ctl3@vcard_name","vCard.LastName");
+		$this->assertAttribute("ctl0\$body\$ctl3@vcard_name","vCard.LastName");
 		$this->type("ctl0\$body\$ctl3", "last");
 
 		// a disabled textbox
-		$this->verifyAttribute("ctl0\$body\$ctl4@disabled","regexp:true|disabled");
+		$this->assertAttribute("ctl0\$body\$ctl4@disabled","regexp:true|disabled");
 
 		// a read-only textbox
-		$this->verifyAttribute("ctl0\$body\$ctl5@readonly","regexp:true|readonly");
+		$this->assertAttribute("ctl0\$body\$ctl5@readonly","regexp:true|readonly");
 
 		// auto postback textbox, CausesValidation=false
-		$this->verifyValue("ctl0\$body\$ctl6", "change me");
-		$this->typeAndWait("ctl0\$body\$ctl6", "change mes");
-		$this->verifyValue("ctl0\$body\$ctl6", "text changed");
+		$this->assertValue("ctl0\$body\$ctl6", "change me");
+		$this->typeSpecial("ctl0\$body\$ctl6", "change mes");
+		$this->assertValue("ctl0\$body\$ctl6", "text changed");
 
 		// auto postback textbox, CausesValidation=true
-		$this->verifyNotVisible('ctl0_body_ctl7');
-		$this->type("ctl0\$body\$TextBox3", "test");
+		$this->assertNotVisible('ctl0_body_ctl7');
+		$this->typeSpecial("ctl0\$body\$TextBox3", "test");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl7');
-		$this->typeAndWait("ctl0\$body\$TextBox3", "non test");
-		$this->verifyNotVisible('ctl0_body_ctl7');
+		$this->assertVisible('ctl0_body_ctl7');
+		$this->typeSpecial("ctl0\$body\$TextBox3", "non test");
+		$this->assertNotVisible('ctl0_body_ctl7');
 
 		// submitting textbox with a button
 		$this->type("ctl0\$body\$TextBox1", "texttext");
-		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyValue("ctl0\$body\$TextBox1", "You just entered 'texttext'.");
+		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
+		$this->assertValue("ctl0\$body\$TextBox1", "You just entered 'texttext'.");
 
 		// SafeText
-		$this->verifyText("ctl0_body_Output","test");
-		$this->typeAndWait("ctl0\$body\$TextBox2","<a href=javascript:xxx>malicious code</a>");
-		$this->verifyText("ctl0_body_Output","malicious code");
+		$this->assertText("ctl0_body_Output","test");
+		$this->typeSpecial("ctl0\$body\$TextBox2","<a href=javascript:xxx>malicious code</a>");
+		$this->assertText("ctl0_body_Output","malicious code");
 
 		// password
-		$this->verifyAttribute("ctl0\$body\$ctl9@type","password");
+		$this->assertAttribute("ctl0\$body\$ctl9@type","password");
 
 		// ------------------multiline textbox----------------------
 
@@ -64,28 +64,28 @@ End of message
 ");
 
 		// a disabled multiline textbox
-		$this->verifyAttribute("ctl0\$body\$ctl12@disabled","regexp:true|disabled");
+		$this->assertAttribute("ctl0\$body\$ctl12@disabled","regexp:true|disabled");
 
 		// a read-only multiline textbox
-		$this->verifyAttribute("ctl0\$body\$ctl13@readonly","regexp:true|readonly");
-		$this->verifyAttribute("ctl0\$body\$ctl13@wrap","off");
+		$this->assertAttribute("ctl0\$body\$ctl13@readonly","regexp:true|readonly");
+		$this->assertAttribute("ctl0\$body\$ctl13@wrap","off");
 
 		// auto postback textbox
-		$this->verifyValue("ctl0\$body\$ctl14", "change me");
-		$this->typeAndWait("ctl0\$body\$ctl14", "change mes");
-		$this->verifyValue("ctl0\$body\$ctl14", "text changed");
-		$this->verifyValue("ctl0\$body\$ctl10", "This is a\nmultiline\ntextbox.");
-		$this->verifyValue("ctl0\$body\$ctl11", "This is a multiline text box.
+		$this->assertValue("ctl0\$body\$ctl14", "change me");
+		$this->typeSpecial("ctl0\$body\$ctl14", "change mes");
+		$this->assertValue("ctl0\$body\$ctl14", "text changed");
+		$this->assertValue("ctl0\$body\$ctl10", "This is a\nmultiline\ntextbox.");
+		$this->assertValue("ctl0\$body\$ctl11", "This is a multiline text box.
 In HTML, it is displayed as a textarea.
 End of message
 ");
 
 		// textbox associated with a validator
-		$this->verifyNotVisible('ctl0_body_ctl15');
-		$this->type("ctl0\$body\$MultiTextBox3", "demo");
+		$this->assertNotVisible('ctl0_body_ctl15');
+		$this->typeSpecial("ctl0\$body\$MultiTextBox3", "demo");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl15');
-		$this->typeAndWait("ctl0\$body\$MultiTextBox3", "non demo");
-		$this->verifyNotVisible('ctl0_body_ctl15');
+		$this->assertVisible('ctl0_body_ctl15');
+		$this->typeSpecial("ctl0\$body\$MultiTextBox3", "non demo");
+		$this->assertNotVisible('ctl0_body_ctl15');
 	}
 }