Started cleaning tests' selenium2 compatibility layer

1 files changed, 18 insertions, 18 deletions

diff --git a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php
index 04837ef4..7606e46b 100755
--- a/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveRadioButtonTestCase.php
@@ -6,47 +6,47 @@ class ActiveRadioButtonTestCase extends PradoGenericSelenium2Test
 	{
 		$base='ctl0_Content_';
 		$this->url("active-controls/index.php?page=ActiveRadioButtonTest");
-		$this->assertTextPresent("Active Radio Button Test");
+		$this->assertContains("Active Radio Button Test", $this->source());
 		$this->assertText("{$base}label1", 'Label 1');
 
-		$this->assertNotChecked("{$base}radio1");
-		$this->assertNotChecked("{$base}radio2");
-		$this->assertNotChecked("{$base}radio3");
+		$this->assertFalse($this->byId("{$base}radio1")->selected());
+		$this->assertFalse($this->byId("{$base}radio2")->selected());
+		$this->assertFalse($this->byId("{$base}radio3")->selected());
 
 		$this->assertText("{$base}radio1_label", 'Radio Button 1');
 		$this->assertText("{$base}radio2_label", 'Radio Button 2');
 		$this->assertText("{$base}radio3_label", 'Radio Button 3');
 
-		$this->click("{$base}change_text1");
+		$this->byId("{$base}change_text1")->click();
 		$this->pause(800);
 		$this->assertText("{$base}radio1_label", 'Hello Radio Button 1');
 		$this->assertText("{$base}radio2_label", 'Radio Button 2');
 		$this->assertText("{$base}radio3_label", 'Radio Button 3');
 
-		$this->click("{$base}change_text2");
+		$this->byId("{$base}change_text2")->click();
 		$this->pause(800);
 		$this->assertText("{$base}radio1_label", 'Hello Radio Button 1');
 		$this->assertText("{$base}radio2_label", 'Radio Button 2 World');
 		$this->assertText("{$base}radio3_label", 'Radio Button 3');
 
-		$this->click("{$base}change_radio1");
+		$this->byId("{$base}change_radio1")->click();
 		$this->pause(800);
-		$this->assertChecked("{$base}radio1");
-		$this->assertNotChecked("{$base}radio2");
-		$this->assertNotChecked("{$base}radio3");
+		$this->assertTrue($this->byId("{$base}radio1")->selected());
+		$this->assertFalse($this->byId("{$base}radio2")->selected());
+		$this->assertFalse($this->byId("{$base}radio3")->selected());
 
-		$this->click("{$base}change_radio2");
+		$this->byId("{$base}change_radio2")->click();
 		$this->pause(800);
-		$this->assertNotChecked("{$base}radio1");
-		$this->assertChecked("{$base}radio2");
-		$this->assertNotChecked("{$base}radio3");
+		$this->assertFalse($this->byId("{$base}radio1")->selected());
+		$this->assertTrue($this->byId("{$base}radio2")->selected());
+		$this->assertFalse($this->byId("{$base}radio3")->selected());
 
 
-		$this->click("{$base}radio3");
+		$this->byId("{$base}radio3")->click();
 		$this->pause(800);
-		$this->assertNotChecked("{$base}radio1");
-		$this->assertChecked("{$base}radio2");
-		$this->assertChecked("{$base}radio3");
+		$this->assertFalse($this->byId("{$base}radio1")->selected());
+		$this->assertTrue($this->byId("{$base}radio2")->selected());
+		$this->assertTrue($this->byId("{$base}radio3")->selected());
 		$this->assertText("{$base}label1", 'Label 1:Radio Button 3 Checked');