Merge from 3.0 till 868.

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
index 095d455a..b92cc9f5 100644
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
@@ -15,7 +15,7 @@ class DataGrid3TestCase extends SeleniumTestCase
 		//$this->verifyElementPresent("//img[@src='images/star5.gif']",'');

 

 		// edit the 2nd row

-		$this->clickAndWait("id=ctl0_body_DataGrid_ctl2_ctl9", "");

+		$this->clickAndWait("id=ctl0_body_DataGrid_ctl2_ctl8", "");

 		$this->type("ctl0\$body\$DataGrid\$ctl2\$ctl7", "Design Pattern: Elements of Reusable Object-Oriented Software");

 		$this->type("ctl0\$body\$DataGrid\$ctl2\$ctl8", "Addison Wesley Professional");

 		$this->type("ctl0\$body\$DataGrid\$ctl2\$ctl9", "\$57.04");

@@ -32,18 +32,18 @@ class DataGrid3TestCase extends SeleniumTestCase
 		//$this->verifyElementPresent("//img[@src='images/star1.gif']",'');

 

 		// verify cancel editting the 3rd row

-		$this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl9", "");

+		$this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl8", "");

 		$this->clickAndWait("link=Cancel", "");

 		$this->verifyTextPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", "");

 

 		// verify deleting

-		$this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl10", "");

+		$this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl9", "");

 		$this->verifyConfirmation("Are you sure?");

 		$this->verifyTextNotPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", "");

 

 		$this->verifyTextPresent("Extreme Programming Explained : Embrace Change",'');

 		$this->chooseCancelOnNextConfirmation();

-		$this->click("id=ctl0_body_DataGrid_ctl5_ctl10", "");

+		$this->click("id=ctl0_body_DataGrid_ctl6_ctl9", "");

 		$this->verifyConfirmation("Are you sure?");

 		$this->verifyTextPresent("Extreme Programming Explained : Embrace Change",'');

 	}

diff --git a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
index e29aabc8..9b6e98d2 100644
--- a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
@@ -19,7 +19,7 @@ class DataList2TestCase extends SeleniumTestCase
 		$this->verifyTextPresent("\$150", "");

 

 		// verify editting an item

-		$this->clickAndWait("id=ctl0_body_DataList_ctl5_ctl4", "");

+		$this->clickAndWait("id=ctl0_body_DataList_ctl5_ctl0", "");

 		$this->type("ctl0\$body\$DataList\$ctl5\$ProductQuantity", "11");

 		$this->type("ctl0\$body\$DataList\$ctl5\$ProductPrice", "140.99");

 		$this->click("//input[@name='ctl0\$body\$DataList\$ctl5\$ProductImported' and @value='ctl0\$body\$DataList\$ctl5\$ProductImported']", "");

@@ -31,7 +31,7 @@ class DataList2TestCase extends SeleniumTestCase
 		$this->verifyTextPresent("11", "");

 

 		// verify editting another item

-		$this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl2", "");

+		$this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl1", "");

 		$this->type("ctl0\$body\$DataList\$ctl3\$ProductName", "Hard Drive");

 		$this->type("ctl0\$body\$DataList\$ctl3\$ProductQuantity", "23");

 		$this->click("//input[@name='ctl0\$body\$DataList\$ctl3\$ProductImported' and @value='ctl0\$body\$DataList\$ctl3\$ProductImported']", "");

@@ -43,10 +43,10 @@ class DataList2TestCase extends SeleniumTestCase
 		$this->verifyTextPresent("Harddrive 	", "");

 

 		// verify item deletion

-		$this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl5", "");

+		$this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl1", "");

 		$this->verifyConfirmation("Are you sure?");

 		$this->chooseCancelOnNextConfirmation();

-		$this->click("id=ctl0_body_DataList_ctl5_ctl3", "");

+		$this->click("id=ctl0_body_DataList_ctl5_ctl2", "");

 		$this->verifyConfirmation("Are you sure?");

 		$this->verifyTextPresent("Motherboard ", "");

 		$this->verifyTextPresent("CPU ", "");