fixed test cases for datagrid.

3 files changed, 25 insertions, 25 deletions

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php
index 919200ff..ae810bdc 100644
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php
@@ -26,11 +26,11 @@ class DataGrid2TestCase extends SeleniumTestCase
 		$this->verifyTextPresent("\$38.49",'');

 

 		// verify in-stock

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl6@checked','regexp:true|checked');

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl6@disabled','regexp:true|disabled');

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl6@checked','regexp:true|checked');

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl6@checked','regexp:false|null');

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl6@disabled','regexp:true|disabled');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked','regexp:true|checked');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@disabled','regexp:true|disabled');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked','regexp:false|null');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@disabled','regexp:true|disabled');

 

 		// verify ratings

 		//$this->verifyElementPresent("//img[@src='images/star5.gif']",'');

@@ -40,9 +40,9 @@ class DataGrid2TestCase extends SeleniumTestCase
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Book Title']", "");

 		$this->verifyTextNotPresent('Head First Design Patterns','');

 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c3' and @value='In-stock']", "");

-		$this->verifyElementNotPresent('ctl0_body_DataGrid_ctl1_ctl6','');

+		$this->verifyElementNotPresent('ctl0_body_DataGrid_ctl1_ctl5','');

 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c3' and @value='In-stock']", "");

-		$this->verifyElementPresent('ctl0_body_DataGrid_ctl1_ctl6','');

+		$this->verifyElementPresent('ctl0_body_DataGrid_ctl1_ctl5','');

 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Book Title']", "");

 		$this->verifyTextPresent('Head First Design Patterns','');

 	}

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
index ddb1bd24..116830b0 100644
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
@@ -10,29 +10,29 @@ class DataGrid3TestCase extends SeleniumTestCase
 		$this->verifyTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", "");

 		$this->verifyTextPresent("Addison-Wesley Professional", "");

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

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl7@checked','regexp:true|checked');

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl7@disabled','regexp:true|disabled');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@checked','regexp:true|checked');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@disabled','regexp:true|disabled');

 		//$this->verifyElementPresent("//img[@src='images/star5.gif']",'');

 

 		// edit the 2nd row

-		$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");

-		$this->click("//input[@name='ctl0\$body\$DataGrid\$ctl2\$ctl10']", "");

-		$this->select("ctl0\$body\$DataGrid\$ctl2\$ctl11", "label=1");

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

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

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

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

+		$this->click("//input[@name='ctl0\$body\$DataGrid\$ctl2\$ctl7']", "");

+		$this->select("ctl0\$body\$DataGrid\$ctl2\$ctl9", "label=1");

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

 

 		// verify the 2nd row is saved

 		$this->verifyTextPresent("Design Pattern: Elements of Reusable Object-Oriented Software", "");

 		$this->verifyTextPresent("Addison Wesley Professional", "");

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

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl7@checked','regexp:false|null');

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl7@disabled','regexp:true|disabled');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@checked','regexp:false|null');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@disabled','regexp:true|disabled');

 		//$this->verifyElementPresent("//img[@src='images/star1.gif']",'');

 

 		// verify cancel editting the 3rd row

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

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

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

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

 

diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
index 36810a8d..1bc1697c 100644
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
@@ -10,20 +10,20 @@ class DataGrid4TestCase extends SeleniumTestCase
 		$this->verifyTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", "");

 		$this->verifyTextPresent("Addison-Wesley Professional", "");

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

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl6@checked','regexp:true|checked');

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl6@disabled','regexp:true|disabled');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@disabled','regexp:true|disabled');

 

 		// verify sorting

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

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl6@checked','regexp:false|null');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked','regexp:false|null');

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

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl6@checked','regexp:false|null');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked','regexp:false|null');

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

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl6@checked','regexp:false|null');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:false|null');

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

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl6@checked','regexp:false|null');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked','regexp:false|null');

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

-		$this->verifyAttribute('ctl0_body_DataGrid_ctl4_ctl6@checked','regexp:false|null');

+		$this->verifyAttribute('ctl0_body_DataGrid_ctl4_ctl5@checked','regexp:false|null');

 	}

 }