1 files changed, 17 insertions, 15 deletions

diff --git a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php
index 312b8443..c032c084 100755
--- a/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveCheckBoxListTestCase.php
@@ -1,55 +1,57 @@
 <?php
 
-class ActiveCheckBoxListTestCase extends PradoGenericSeleniumTest
+class ActiveCheckBoxListTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("active-controls/index.php?page=TActiveCheckBoxListTest");
-		$this->verifyTextPresent("TActiveCheckBoxList Test Case");
+		$base='ctl0_Content_';
+		$this->url("active-controls/index.php?page=TActiveCheckBoxListTest");
+		$this->assertContains("TActiveCheckBoxList Test Case", $this->source());
 
-		$this->assertText("label1", "Label 1");
+		$this->assertText("{$base}label1", "Label 1");
 
-		$this->click("button1");
+		$this->byId("{$base}button1")->click();
 		$this->pause(800);
 		$this->assertCheckBoxes(array(1,2,3));
 
-		$this->click("button2");
+		$this->byId("{$base}button2")->click();
 		$this->pause(800);
 		$this->assertCheckBoxes(array());
 
 
-		$this->click("button3");
+		$this->byId("{$base}button3")->click();
 		$this->pause(800);
 		$this->assertCheckBoxes(array(0));
 
 
-		$this->click("button4");
+		$this->byId("{$base}button4")->click();
 		$this->pause(800);
 		$this->assertCheckBoxes(array(4));
 
 
-		$this->click("button5");
+		$this->byId("{$base}button5")->click();
 		$this->pause(800);
 		$this->assertCheckBoxes(array(1,4));
 
-		$this->click("list1_c2");
+		$this->byId("{$base}list1_c2")->click();
 		$this->pause(800);
-		$this->assertText("label1", "Selection: value 2, value 3, value 5");
+		$this->assertText("{$base}label1", "Selection: value 2, value 3, value 5");
 
-		$this->click("list1_c2");
+		$this->byId("{$base}list1_c2")->click();
 		$this->pause(800);
-		$this->assertText("label1", "Selection: value 2, value 5");
+		$this->assertText("{$base}label1", "Selection: value 2, value 5");
 
 	}
 
 	function assertCheckBoxes($checks, $total = 5)
 	{
+		$base='ctl0_Content_';
 		for($i = 0; $i < $total; $i++)
 		{
 			if(in_array($i, $checks))
-				$this->assertChecked("list1_c{$i}");
+				$this->assertTrue($this->byId("{$base}list1_c{$i}")->selected());
 			else
-				$this->assertNotChecked("list1_c{$i}");
+				$this->assertFalse($this->byId("{$base}list1_c{$i}")->selected());
 		}
 	}
 }