1 files changed, 10 insertions, 10 deletions

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