1 files changed, 34 insertions, 34 deletions

diff --git a/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php
index b6931808..8b5a0166 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php
@@ -1,47 +1,47 @@
 <?php
-class Ticket669TestCase extends PradoGenericSeleniumTest
+class Ticket669TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket669');
-		$this->assertTitle("Verifying Ticket 669");
-		
-		$this->assertTextPresent('1 - Test without callback');
-		$this->assertValue($base.'tb1', 'exact:ActiveTextBox');
-		$this->assertValue($base.'tb2', 'exact:TextBox in ActivePanel');
-		
-		$this->click($base.'ctl4');
+		$this->url('tickets/index.php?page=Ticket669');
+		$this->assertEquals($this->title(), "Verifying Ticket 669");
+
+		$this->assertContains('1 - Test without callback', $this->source());
+		$this->assertValue($base.'tb1', 'ActiveTextBox');
+		$this->assertValue($base.'tb2', 'TextBox in ActivePanel');
+
+		$this->byId($base.'ctl4')->click();
 		$this->pause(800);
-		$this->assertValue($base.'tb1', 'exact:ActiveTextBox +1');
-		$this->assertValue($base.'tb2', 'exact:TextBox in ActivePanel +1');
-		
-		$this->click($base.'ctl1');
+		$this->assertValue($base.'tb1', 'ActiveTextBox +1');
+		$this->assertValue($base.'tb2', 'TextBox in ActivePanel +1');
+
+		$this->byId($base.'ctl1')->click();
 		$this->pause(800);
-		$this->assertTextPresent('2 - Test callback with 2nd ActivePanel');
-		$this->assertValue($base.'tb3', 'exact:ActiveTextBox');
-		$this->assertValue($base.'tb4', 'exact:TextBox in ActivePanel');
-		$this->assertValue($base.'tb5', 'exact:TextBox in ActivePanel');
-		
-		$this->click($base.'ctl6');
+		$this->assertContains('2 - Test callback with 2nd ActivePanel', $this->source());
+		$this->assertValue($base.'tb3', 'ActiveTextBox');
+		$this->assertValue($base.'tb4', 'TextBox in ActivePanel');
+		$this->assertValue($base.'tb5', 'TextBox in ActivePanel');
+
+		$this->byId($base.'ctl6')->click();
 		$this->pause(800);
-		
-		$this->assertValue($base.'tb3', 'exact:ActiveTextBox +1');
-		$this->assertValue($base.'tb4', 'exact:TextBox in ActivePanel +1');
-		$this->assertValue($base.'tb5', 'exact:TextBox in ActivePanel +1');
-		
-		$this->click($base.'ctl2');
+
+		$this->assertValue($base.'tb3', 'ActiveTextBox +1');
+		$this->assertValue($base.'tb4', 'TextBox in ActivePanel +1');
+		$this->assertValue($base.'tb5', 'TextBox in ActivePanel +1');
+
+		$this->byId($base.'ctl2')->click();
 		$this->pause(800);
-		$this->assertTextPresent('3 - Test callback without 2nd ActivePanel');
-		$this->assertValue($base.'tb6', 'exact:ActiveTextBox');
-		$this->assertValue($base.'tb7', 'exact:TextBox in Panel');
-		
-		$this->click($base.'ctl8');
+		$this->assertContains('3 - Test callback without 2nd ActivePanel', $this->source());
+		$this->assertValue($base.'tb6', 'ActiveTextBox');
+		$this->assertValue($base.'tb7', 'TextBox in Panel');
+
+		$this->byId($base.'ctl8')->click();
 		$this->pause(800);
-		
-		$this->assertValue($base.'tb6', 'exact:ActiveTextBox +1');
-		$this->assertValue($base.'tb7', 'exact:TextBox in Panel +1');
-		
+
+		$this->assertValue($base.'tb6', 'ActiveTextBox +1');
+		$this->assertValue($base.'tb7', 'TextBox in Panel +1');
+
 	}
 
 }
\ No newline at end of file