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

Backports for Prado 3.2.4

1 files changed, 31 insertions, 31 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php b/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
index eae8ab36..cb01e948 100755
--- a/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
@@ -1,65 +1,65 @@
 <?php
 
-class QuickstartDropDownListTestCase extends PradoGenericSeleniumTest
+class QuickstartDropDownListTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDropDownList.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDropDownList.Home&amp;notheme=true&amp;lang=en");
 
-		$this->verifyTitle("PRADO QuickStart Sample", "");
+		$this->assertEquals("PRADO QuickStart Sample", $this->title());
 
 		// dropdown list with default settings
-		$this->verifyElementPresent("ctl0\$body\$ctl0");
+		$this->assertElementPresent("ctl0\$body\$ctl0");
 
 		// dropdown list with initial options
-		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl1"), array('item 1', 'item 2', 'item 3', 'item 4')); 
+		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl1"), array('item 1', 'item 2', 'item 3', 'item 4'));
 		$this->assertSelected("ctl0\$body\$ctl1","item 2");
 
 		// dropdown list with customized styles
-		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl2"), array('item 1', 'item 2', 'item 3', 'item 4')); 
+		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl2"), array('item 1', 'item 2', 'item 3', 'item 4'));
 		$this->assertSelected("ctl0\$body\$ctl2","item 2");
 
 		// a disabled dropdown list
-		$this->verifyAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled");
+		$this->assertAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled");
 
 		// an auto postback dropdown list
-		$this->verifyTextNotPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
-		$this->selectAndWait("ctl0\$body\$ctl4", "label=item 3");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
+		$this->assertNotContains("Your selection is: (Index: 2, Value: value 3, Text: item 3)", $this->source());
+		$this->selectAndWait("ctl0\$body\$ctl4", "item 3");
+		$this->assertContains("Your selection is: (Index: 2, Value: value 3, Text: item 3)", $this->source());
 
 		// a single selection list box upon postback
-		$this->select("ctl0\$body\$DropDownList1", "label=item 4");
-		$this->verifyTextNotPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
-		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
+		$this->select("ctl0\$body\$DropDownList1", "item 4");
+		$this->assertNotContains("Your selection is: (Index: 3, Value: value 4, Text: item 4)", $this->source());
+		$this->byXPath("//input[@type='submit' and @value='Submit']")->click();
+		$this->assertContains("Your selection is: (Index: 3, Value: value 4, Text: item 4)", $this->source());
 
 		// Databind to an integer-indexed array
-		$this->selectAndWait("ctl0\$body\$DBDropDownList1", "label=item 3");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", "");
+		$this->selectAndWait("ctl0\$body\$DBDropDownList1", "item 3");
+		$this->assertContains("Your selection is: (Index: 2, Value: 2, Text: item 3)", $this->source());
 
 		// Databind to an associative array
-		$this->selectAndWait("ctl0\$body\$DBDropDownList2", "label=item 2");
-		$this->verifyTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
+		$this->selectAndWait("ctl0\$body\$DBDropDownList2", "item 2");
+		$this->assertContains("Your selection is: (Index: 1, Value: key 2, Text: item 2)", $this->source());
 
 		// Databind with DataTextField and DataValueField specified
-		$this->selectAndWait("ctl0\$body\$DBDropDownList3", "label=Cary");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
+		$this->selectAndWait("ctl0\$body\$DBDropDownList3", "Cary");
+		$this->assertContains("Your selection is: (Index: 2, Value: 003, Text: Cary)", $this->source());
 
 		// dropdown list is being validated
-		$this->verifyNotVisible('ctl0_body_ctl6');
-		$this->click("id=ctl0_body_ctl7", "");
-		$this->verifyVisible('ctl0_body_ctl6');
-		$this->select("ctl0\$body\$VDropDownList1", "label=item 2");
-		$this->clickAndWait("id=ctl0_body_ctl7", "");
-		$this->verifyNotVisible('ctl0_body_ctl6');
+		$this->assertNotVisible('ctl0_body_ctl6');
+		$this->byId("ctl0_body_ctl7")->click();
+		$this->assertVisible('ctl0_body_ctl6');
+		$this->select("ctl0\$body\$VDropDownList1", "item 2");
+		$this->byId("ctl0_body_ctl7")->click();
+		$this->assertNotVisible('ctl0_body_ctl6');
 
 		// dropdown list causing validation
-		$this->verifyNotVisible('ctl0_body_ctl8');
-		$this->select("ctl0\$body\$VDropDownList2", "label=Disagree");
+		$this->assertNotVisible('ctl0_body_ctl8');
+		$this->select("ctl0\$body\$VDropDownList2", "Disagree");
 		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl8');
+		$this->assertVisible('ctl0_body_ctl8');
 		$this->type("ctl0\$body\$TextBox", "test");
-		$this->selectAndWait("ctl0\$body\$VDropDownList2", "label=Agree");
-		$this->verifyNotVisible('ctl0_body_ctl8');
+		$this->selectAndWait("ctl0\$body\$VDropDownList2", "Agree");
+		$this->assertNotVisible('ctl0_body_ctl8');
 	}
 }