Started cleaning tests' selenium2 compatibility layer

1 files changed, 8 insertions, 8 deletions

diff --git a/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php
index 8818f78e..1830f5ab 100755
--- a/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveListBoxTestCase.php
@@ -6,33 +6,33 @@ class ActiveListBoxTestCase extends PradoGenericSelenium2Test
 	{
 		$base='ctl0_Content_';
 		$this->url("active-controls/index.php?page=ActiveListBoxTest");
-		$this->assertTextPresent('Active List Box Functional Test');
+		$this->assertContains('Active List Box Functional Test', $this->source());
 
 		$this->assertText("{$base}label1", "Label 1");
 
-		$this->click("{$base}button1");
+		$this->byId("{$base}button1")->click();
 		$this->pause(800);
 		$this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 3', 'item 4'));
 
-		$this->click("{$base}button3");
+		$this->byId("{$base}button3")->click();
 		$this->pause(800);
 		$this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 1'));
 
-		$this->click("{$base}button4");
+		$this->byId("{$base}button4")->click();
 		$this->pause(800);
 		$this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 5'));
 
-		$this->click("{$base}button5");
+		$this->byId("{$base}button5")->click();
 		$this->pause(800);
 		$this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 5'));
 
-		$this->click("{$base}button2");
+		$this->byId("{$base}button2")->click();
 		$this->pause(800);
 		$this->assertNotSomethingSelected("{$base}list1");
 
-		$this->click("{$base}button6");
+		$this->byId("{$base}button6")->click();
 		$this->pause(800);
-		$this->click("{$base}button1");
+		$this->byId("{$base}button1")->click();
 		$this->pause(800);
 		$this->assertEquals($this->getSelectedLabels("{$base}list1"), array('item 2', 'item 3', 'item 4'));