Started cleaning tests' selenium2 compatibility layer

(cherry picked from commit 4ce02f6973aa40c313364b5ff7990f2244309790)

Conflicts:
	tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
	tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
	tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
	tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php
	tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php
	tests/FunctionalTests/validators/tests/DatePickerTestCase.php

1 files changed, 27 insertions, 27 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
index 99bb0509..11910ba5 100755
--- a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
@@ -8,74 +8,74 @@ class QuickstartListBoxTestCase extends PradoGenericSelenium2Test
 		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TListBox.Home&notheme=true&lang=en");
 
 		// a default single selection listbox
-		$this->verifyAttribute("ctl0\$body\$ctl0@size","4");
+		$this->assertAttribute("ctl0\$body\$ctl0@size","4");
 
 		// single selection list box with initial options
 		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl1"), array('item 1', 'item 2', 'item 3', 'item 4'));
 		$this->assertSelected("ctl0\$body\$ctl1","item 2");
 
 		// a single selection list box with customized style
-		$this->verifyAttribute("ctl0\$body\$ctl2@size","3");
+		$this->assertAttribute("ctl0\$body\$ctl2@size","3");
 		$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 list box
-		$this->verifyAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled");
+		$this->assertAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled");
 
 		// an auto postback single selection list box
-		$this->assertTextNotPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
-		$this->selectAndWait("ctl0\$body\$ctl4", "label=item 3");
-		$this->assertTextPresent("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\$ListBox1", "label=item 4");
-		$this->assertTextNotPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
-		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->assertTextPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
+		$this->select("ctl0\$body\$ListBox1", "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());
 
 		// a multiple selection list box
-		$this->verifyAttribute("ctl0\$body\$ctl6[]@size","4");
-		$this->verifyAttribute("ctl0\$body\$ctl6[]@multiple","regexp:true|multiple");
+		$this->assertAttribute("ctl0\$body\$ctl6[]@size","4");
+		$this->assertAttribute("ctl0\$body\$ctl6[]@multiple","regexp:true|multiple");
 
 		// a multiple selection list box with initial options
-		$this->verifyAttribute("ctl0\$body\$ctl7[]@multiple","regexp:true|multiple");
+		$this->assertAttribute("ctl0\$body\$ctl7[]@multiple","regexp:true|multiple");
 		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl7[]"), array('item 1', 'item 2', 'item 3', 'item 4'));
 
 		// multiselection list box's behavior upon postback
-		$this->addSelection("ctl0\$body\$ListBox2[]", "label=item 3");
-		$this->clickAndWait("name=ctl0\$body\$ctl8", "");
+		$this->addSelection("ctl0\$body\$ListBox2[]", "item 3");
+		$this->byName("ctl0\$body\$ctl8")->click();
 		$this->assertText("ctl0_body_MultiSelectionResult2","Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 3, Value: value 4, Text: item 4)");
 
 		// Auto postback multiselection list box
-		$this->addSelection("ctl0\$body\$ctl9[]", "label=item 1");
+		$this->addSelection("ctl0\$body\$ctl9[]", "item 1");
 		$this->assertText("ctl0_body_MultiSelectionResult","Your selection is: (Index: 0, Value: value 1, Text: item 1)(Index: 1, Value: value 2, Text: item 2)(Index: 3, Value: value 4, Text: item 4)");
 
 		// Databind to an integer-indexed array
-		$this->selectAndWait("ctl0\$body\$DBListBox1[]", "label=item 3");
-		$this->assertTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", "");
+		$this->selectAndWait("ctl0\$body\$DBListBox1[]", "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\$DBListBox2[]", "label=item 2");
-		$this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
+		$this->selectAndWait("ctl0\$body\$DBListBox2[]", "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\$DBListBox3[]", "label=Cary");
-		$this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
+		$this->selectAndWait("ctl0\$body\$DBListBox3[]", "Cary");
+		$this->assertContains("Your selection is: (Index: 2, Value: 003, Text: Cary)", $this->source());
 
 		// List box is being validated
 		$this->assertNotVisible('ctl0_body_ctl10');
-		$this->click("id=ctl0_body_ctl11", "");
+		$this->byId("ctl0_body_ctl11")->click();
 		$this->assertVisible('ctl0_body_ctl10');
-		$this->select("ctl0\$body\$VListBox1", "label=item 2");
-		$this->clickAndWait("id=ctl0_body_ctl11", "");
+		$this->select("ctl0\$body\$VListBox1", "item 2");
+		$this->byId("ctl0_body_ctl11")->click();
 		$this->assertNotVisible('ctl0_body_ctl10');
 
 		// List box causing validation
 		$this->assertNotVisible('ctl0_body_ctl12');
-		$this->select("ctl0\$body\$VListBox2", "label=Agree");
+		$this->select("ctl0\$body\$VListBox2", "Agree");
 		$this->assertVisible('ctl0_body_ctl12');
 		$this->type("ctl0\$body\$TextBox", "test");
-		$this->selectAndWait("ctl0\$body\$VListBox2", "label=Disagree");
+		$this->selectAndWait("ctl0\$body\$VListBox2", "Disagree");
 		$this->assertNotVisible('ctl0_body_ctl12');
 	}
 }