Merge from 3.0 branch 871.

4 files changed, 6 insertions, 6 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php b/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
index a845402d..50f2545a 100644
--- a/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
@@ -29,8 +29,8 @@ class CheckBoxListTestCase extends SeleniumTestCase
 		$this->verifyTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", "");

 

 		// Databind to an integer-indexed array

-		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList1\$1' and @value='item 2']", "");

-		$this->verifyTextPresent("Your selection is: (Index: 1, Value: item 2, Text: item 2)", "");

+		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList1\$1' and @value='1']", "");

+		$this->verifyTextPresent("Your selection is: (Index: 1, Value: 1, Text: item 2)", "");

 

 		// Databind to an associative array:

 		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList2\$1' and @value='key 2']", "");

diff --git a/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php b/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
index cfb2047b..4c66236e 100644
--- a/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
@@ -35,7 +35,7 @@ class DropDownListTestCase extends SeleniumTestCase
 

 		// Databind to an integer-indexed array

 		$this->selectAndWait("ctl0\$body\$DBDropDownList1", "label=item 3");

-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: item 3, Text: item 3)", "");

+		$this->verifyTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", "");

 

 		// Databind to an associative array

 		$this->selectAndWait("ctl0\$body\$DBDropDownList2", "label=item 2");

diff --git a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
index 9862d1d1..c031c5fd 100644
--- a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
@@ -52,7 +52,7 @@ class ListBoxTestCase extends SeleniumTestCase
 

 		// Databind to an integer-indexed array

 		$this->selectAndWait("ctl0\$body\$DBListBox1[]", "label=item 3");

-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: item 3, Text: item 3)", "");

+		$this->verifyTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", "");

 

 		// Databind to an associative array

 		$this->selectAndWait("ctl0\$body\$DBListBox2[]", "label=item 2");

diff --git a/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php b/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php
index 04ac376c..82cae1bf 100644
--- a/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php
@@ -29,8 +29,8 @@ class RadioButtonListTestCase extends SeleniumTestCase
 		$this->verifyTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", "");

 

 		// Databind to an integer-indexed array

-		$this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList1' and @value='item 1']", "");

-		$this->verifyTextPresent("Your selection is: (Index: 0, Value: item 1, Text: item 1)", "");

+		$this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList1' and @value='0']", "");

+		$this->verifyTextPresent("Your selection is: (Index: 0, Value: 0, Text: item 1)", "");

 

 		// Databind to an associative array:

 		$this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList2' and @value='key 2']", "");