From 82774aa0a41562a325f31c901584ec01c8238573 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Fri, 28 Feb 2014 10:39:25 +0100
Subject: Ported all tests from Selenium1 (RC) to Selenium2 (WebDriver) using a
 compatibility layer

---
 .../tickets/tests/Issue120TestCase.php             |  8 +--
 .../tickets/tests/Issue216TestCase.php             |  6 +-
 .../tickets/tests/Ticket121TestCase.php            | 12 ++--
 .../tickets/tests/Ticket163TestCase.php            |  4 +-
 .../tickets/tests/Ticket169TestCase.php            |  4 +-
 .../tickets/tests/Ticket191TestCase.php            |  6 +-
 .../tickets/tests/Ticket205TestCase.php            |  6 +-
 .../tickets/tests/Ticket207TestCase.php            | 10 ++--
 .../tickets/tests/Ticket21TestCase.php             | 10 ++--
 .../tickets/tests/Ticket220TestCase.php            |  6 +-
 .../tickets/tests/Ticket225TestCase.php            |  6 +-
 .../tickets/tests/Ticket227TestCase.php            |  6 +-
 .../tickets/tests/Ticket239TestCase.php            | 64 +++++++++++-----------
 .../tickets/tests/Ticket246TestCase.php            |  6 +-
 .../tickets/tests/Ticket274TestCase.php            |  6 +-
 .../tickets/tests/Ticket278TestCase.php            |  6 +-
 .../tickets/tests/Ticket27TestCase.php             |  4 +-
 .../tickets/tests/Ticket284TestCase.php            |  6 +-
 .../tickets/tests/Ticket285TestCase.php            |  4 +-
 .../tickets/tests/Ticket28TestCase.php             |  6 +-
 .../tickets/tests/Ticket290TestCase.php            | 21 ++++---
 .../tickets/tests/Ticket433TestCase.php            |  6 +-
 .../tickets/tests/Ticket439TestCase.php            |  9 ++-
 .../tickets/tests/Ticket463TestCase.php            |  4 +-
 .../tickets/tests/Ticket470TestCase.php            |  6 +-
 .../tickets/tests/Ticket477TestCase.php            |  6 +-
 .../tickets/tests/Ticket488TestCase.php            | 35 ++++++------
 .../tickets/tests/Ticket504TestCase.php            |  4 +-
 .../tickets/tests/Ticket507TestCase.php            |  4 +-
 .../tickets/tests/Ticket521TestCase.php            |  6 +-
 .../tickets/tests/Ticket526TestCase.php            |  4 +-
 .../tickets/tests/Ticket528TestCase.php            |  6 +-
 .../tickets/tests/Ticket535TestCase.php            | 14 ++---
 .../tickets/tests/Ticket538TestCase.php            |  4 +-
 .../tickets/tests/Ticket54TestCase.php             |  6 +-
 .../tickets/tests/Ticket573TestCase.php            |  4 +-
 .../tickets/tests/Ticket578TestCase.php            |  8 +--
 .../tickets/tests/Ticket585TestCase.php            |  4 +-
 .../tickets/tests/Ticket586TestCase.php            |  4 +-
 .../tickets/tests/Ticket587TestCase.php            | 10 ++--
 .../tickets/tests/Ticket592TestCase.php            | 22 ++++----
 .../tickets/tests/Ticket595TestCase.php            | 28 +++++-----
 .../tickets/tests/Ticket622TestCase.php            | 14 ++---
 .../tickets/tests/Ticket653TestCase.php            |  4 +-
 .../tickets/tests/Ticket656TestCase.php            |  6 +-
 .../tickets/tests/Ticket659TestCase.php            |  6 +-
 .../tickets/tests/Ticket660TestCase.php            |  8 +--
 .../tickets/tests/Ticket669TestCase.php            | 52 +++++++++---------
 .../tickets/tests/Ticket670TestCase.php            | 10 ++--
 .../tickets/tests/Ticket671TestCase.php            | 32 +++++------
 .../tickets/tests/Ticket671_reopenedTestCase.php   | 24 ++++----
 .../tickets/tests/Ticket679TestCase.php            | 22 ++++----
 .../tickets/tests/Ticket691TestCase.php            | 14 ++---
 .../tickets/tests/Ticket698TestCase.php            |  8 +--
 .../tickets/tests/Ticket700TestCase.php            | 24 ++++----
 .../tickets/tests/Ticket703TestCase.php            |  8 +--
 .../tickets/tests/Ticket708TestCase.php            | 14 ++---
 .../tickets/tests/Ticket719TestCase.php            | 12 ++--
 .../tickets/tests/Ticket722TestCase.php            | 13 ++---
 .../tickets/tests/Ticket72TestCase.php             |  8 +--
 .../tickets/tests/Ticket745TestCase.php            | 10 ++--
 .../tickets/tests/Ticket769TestCase.php            | 12 ++--
 .../tickets/tests/Ticket785TestCase.php            | 16 +++---
 .../tickets/tests/Ticket823TestCase.php            |  8 +--
 .../tickets/tests/Ticket828TestCase.php            |  4 +-
 .../tickets/tests/Ticket849TestCase.php            |  6 +-
 .../tickets/tests/Ticket876TestCase.php            | 14 ++---
 .../tickets/tests/Ticket886TestCase.php            |  6 +-
 .../tickets/tests/Ticket897TestCase.php            | 10 ++--
 .../tickets/tests/Ticket900TestCase.php            |  8 +--
 .../tickets/tests/Ticket922TestCase.php            |  8 +--
 .../tickets/tests/Ticket93TestCase.php             |  8 +--
 72 files changed, 394 insertions(+), 396 deletions(-)

(limited to 'tests/FunctionalTests/tickets/tests')

diff --git a/tests/FunctionalTests/tickets/tests/Issue120TestCase.php b/tests/FunctionalTests/tickets/tests/Issue120TestCase.php
index 20a4096b..8587415e 100755
--- a/tests/FunctionalTests/tickets/tests/Issue120TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Issue120TestCase.php
@@ -1,15 +1,15 @@
 <?php
 
-class Issue120TestCase extends PradoGenericSeleniumTest
+class Issue120TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Issue120');
+		$this->url('tickets/index.php?page=Issue120');
 		$this->assertTextPresent('TActiveDropDownList PromptValue Test');
-		
+
 		$this->assertSelectedIndex("ctl0_Content_ddl1", 0);
 		$this->assertSelectedValue("ctl0_Content_ddl1", 'PromptValue');
-		
+
 		$this->click("ctl0_Content_btn1");
 		$this->pause(800);
 
diff --git a/tests/FunctionalTests/tickets/tests/Issue216TestCase.php b/tests/FunctionalTests/tickets/tests/Issue216TestCase.php
index 375f90a7..bb1daa6b 100755
--- a/tests/FunctionalTests/tickets/tests/Issue216TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Issue216TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Issue216TestCase extends PradoGenericSeleniumTest
+class Issue216TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Issue216');
+		$this->url('tickets/index.php?page=Issue216');
 		$this->assertTextPresent('TTabPanel doesn\'t preserve active tab on callback request');
-		
+
 		$this->assertVisible('ctl0_Content_tab1');
 
 		$this->click("ctl0_Content_btn1");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket121TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket121TestCase.php
index 905a31a4..3fea580a 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket121TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket121TestCase.php
@@ -1,17 +1,17 @@
 <?php
 
-class Ticket121TestCase extends PradoGenericSeleniumTest
+class Ticket121TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket121');
+		$this->url('tickets/index.php?page=Ticket121');
 		$this->type("ctl0\$Content\$FooTextBox", "");
-		$this->verifyNotVisible('ctl0_Content_ctl1');
+		$this->assertNotVisible('ctl0_Content_ctl1');
 		$this->click("//input[@type='image' and @id='ctl0_Content_ctl0']", "");
-		$this->verifyVisible('ctl0_Content_ctl1');
+		$this->assertVisible('ctl0_Content_ctl1');
 		$this->type("ctl0\$Content\$FooTextBox", "content");
 		$this->clickAndWait("//input[@type='image' and @id='ctl0_Content_ctl0']", "");
-		$this->verifyNotVisible('ctl0_Content_ctl1');
-		$this->verifyTextPresent("clicked at", "");
+		$this->assertNotVisible('ctl0_Content_ctl1');
+		$this->assertTextPresent("clicked at", "");
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket163TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket163TestCase.php
index 1727ac40..ffd95d86 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket163TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket163TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket163TestCase extends PradoGenericSeleniumTest
+class Ticket163TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket163');
+		$this->url('tickets/index.php?page=Ticket163');
 		$this->assertTextPresent('kr 100,00');
 		$this->assertTextPresent('kr 0,00');
 		$this->assertTextPresent('-kr 100,00');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket169TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket169TestCase.php
index 9889ea50..a9c006f9 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket169TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket169TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket169TestCase extends PradoGenericSeleniumTest
+class Ticket169TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket169');
+		$this->url('tickets/index.php?page=Ticket169');
 		$this->assertNotVisible('ctl0_Content_validator1');
 		$this->click('ctl0_Content_ctl0');
 		$this->assertVisible('ctl0_Content_validator1');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php
index 88de08cc..2b2b1a41 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php
@@ -1,14 +1,14 @@
 <?php
 
-class Ticket191TestCase extends PradoGenericSeleniumTest
+class Ticket191TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket191');
+		$this->url('tickets/index.php?page=Ticket191');
 		$this->type("ctl0\$Content\$TextBox2", "test");
 		$this->clickAndWait("name=ctl0\$Content\$ctl0");
 		$this->type("ctl0\$Content\$TextBox", "test");
 		$this->clickAndWait("name=ctl0\$Content\$ctl1");
-		$this->verifyNotVisible('ctl0_Content_ctl2');
+		$this->assertNotVisible('ctl0_Content_ctl2');
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket205TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket205TestCase.php
index 86768354..53761d14 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket205TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket205TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket205TestCase extends PradoGenericSeleniumTest
+class Ticket205TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open("tickets/index.php?page=Ticket205");
-		$this->assertTitle("Verifying Ticket 205");
+		$this->url("tickets/index.php?page=Ticket205");
+		$this->assertEquals($this->title(), "Verifying Ticket 205");
 		$this->assertNotVisible("{$base}validator1");
 
 		$this->type("{$base}textbox1", "test");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket207TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket207TestCase.php
index cd618a5d..f7cbe814 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket207TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket207TestCase.php
@@ -1,20 +1,20 @@
 <?php
 
-class Ticket207TestCase extends PradoGenericSeleniumTest
+class Ticket207TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket207');
-		$this->assertTitle("Verifying Ticket 207");
+		$this->url('tickets/index.php?page=Ticket207');
+		$this->assertEquals($this->title(), "Verifying Ticket 207");
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
-		
+
 		$this->click("{$base}button1");
 		$this->assertAlert('error on text1 fired');
 		$this->assertVisible("{$base}validator1");
 		$this->assertVisible("{$base}validator2");
-		
+
 		$this->type("{$base}text1", 'test');
 		$this->assertVisible("{$base}validator1");
 		$this->assertVisible("{$base}validator2");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php
index 5e48ff2d..7a245111 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket21TestCase.php
@@ -1,14 +1,14 @@
 <?php
 
-class Ticket21TestCase extends PradoGenericSeleniumTest
+class Ticket21TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket21');
-		$this->assertTitle("Verifying Ticket 21");
+		$this->url('tickets/index.php?page=Ticket21');
+		$this->assertEquals($this->title(), "Verifying Ticket 21");
 		$this->clickAndWait("ctl0_Content_button1");
-		$this->verifyTextPresent("Radio button clicks: 1", "");
+		$this->assertTextPresent("Radio button clicks: 1", "");
 		$this->click("ctl0_Content_button1");
-		$this->verifyTextPresent("Radio button clicks: 1", "");
+		$this->assertTextPresent("Radio button clicks: 1", "");
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
index 120e7bd0..2e6da431 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
@@ -1,16 +1,16 @@
 <?php
 
-class Ticket220TestCase extends PradoGenericSeleniumTest
+class Ticket220TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base="ctl0_Content_";
-		$this->open('tickets/index.php?page=Ticket220');
+		$this->url('tickets/index.php?page=Ticket220');
 		$this->assertTextPresent('ClientScript Test');
 		$this->assertText("{$base}label1", "Label 1");
 
 		$this->click("button1");
-		$this->assertText("{$base}label1", 'exact:Label 1: ok; ok 3?; ok 2!');
+		$this->assertText("{$base}label1", 'Label 1: ok; ok 3?; ok 2!');
 		$this->assertAlertNotPresent();
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php
index 3680eea1..d17a9555 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket225TestCase extends PradoGenericSeleniumTest
+class Ticket225TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base="ctl0_Content_";
-		$this->open('tickets/index.php?page=Ticket225');
+		$this->url('tickets/index.php?page=Ticket225');
 		$this->assertTextPresent('RadioButton Group Tests');
 		$this->assertText("{$base}label1", "Label 1");
 
@@ -16,7 +16,7 @@ class Ticket225TestCase extends PradoGenericSeleniumTest
 		$this->click("{$base}button2");
 		$this->clickAndWait("{$base}button4");
 
-		$this->assertText("{$base}label1", 'exact:ctl0$Content$button1 ctl0$Content$button2 ctl0$Content$button3');
+		$this->assertText("{$base}label1", 'ctl0$Content$button1 ctl0$Content$button2 ctl0$Content$button3');
 		$this->assertNotVisible("{$base}validator1");
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket227TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket227TestCase.php
index 1f1c0fb9..3defa014 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket227TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket227TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket227TestCase extends PradoGenericSeleniumTest
+class Ticket227TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket227');
-		$this->assertTitle('Verifying Ticket 227');
+		$this->url('tickets/index.php?page=Ticket227');
+		$this->assertEquals($this->title(), 'Verifying Ticket 227');
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket239TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket239TestCase.php
index 57251d23..6f5f0ed9 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket239TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket239TestCase.php
@@ -1,53 +1,53 @@
 <?php
 
-class Ticket239TestCase extends PradoGenericSeleniumTest
+class Ticket239TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket239');
+		$this->url('tickets/index.php?page=Ticket239');
 
 		// view1
-		$this->verifyTextPresent('view1 is activated','');
-		$this->verifyTextNotPresent('view1 is deactivated','');
-		$this->verifyTextNotPresent('view2 is activated','');
-		$this->verifyTextNotPresent('view2 is deactivated','');
-		$this->verifyTextNotPresent('view3 is activated','');
-		$this->verifyTextNotPresent('view3 is deactivated','');
+		$this->assertTextPresent('view1 is activated','');
+		$this->assertTextNotPresent('view1 is deactivated','');
+		$this->assertTextNotPresent('view2 is activated','');
+		$this->assertTextNotPresent('view2 is deactivated','');
+		$this->assertTextNotPresent('view3 is activated','');
+		$this->assertTextNotPresent('view3 is deactivated','');
 
 		// goto view2
 		$this->clickAndWait('name=ctl0$Content$ctl1');
-		$this->verifyTextNotPresent('view1 is activated','');
-		$this->verifyTextPresent('view1 is deactivated','');
-		$this->verifyTextPresent('view2 is activated','');
-		$this->verifyTextNotPresent('view2 is deactivated','');
-		$this->verifyTextNotPresent('view3 is activated','');
-		$this->verifyTextNotPresent('view3 is deactivated','');
+		$this->assertTextNotPresent('view1 is activated','');
+		$this->assertTextPresent('view1 is deactivated','');
+		$this->assertTextPresent('view2 is activated','');
+		$this->assertTextNotPresent('view2 is deactivated','');
+		$this->assertTextNotPresent('view3 is activated','');
+		$this->assertTextNotPresent('view3 is deactivated','');
 
 		// goto view3
 		$this->clickAndWait('name=ctl0$Content$ctl3');
-		$this->verifyTextNotPresent('view1 is activated','');
-		$this->verifyTextNotPresent('view1 is deactivated','');
-		$this->verifyTextNotPresent('view2 is activated','');
-		$this->verifyTextPresent('view2 is deactivated','');
-		$this->verifyTextPresent('view3 is activated','');
-		$this->verifyTextNotPresent('view3 is deactivated','');
+		$this->assertTextNotPresent('view1 is activated','');
+		$this->assertTextNotPresent('view1 is deactivated','');
+		$this->assertTextNotPresent('view2 is activated','');
+		$this->assertTextPresent('view2 is deactivated','');
+		$this->assertTextPresent('view3 is activated','');
+		$this->assertTextNotPresent('view3 is deactivated','');
 
 		// goto view2
 		$this->clickAndWait('name=ctl0$Content$ctl4');
-		$this->verifyTextNotPresent('view1 is activated','');
-		$this->verifyTextNotPresent('view1 is deactivated','');
-		$this->verifyTextPresent('view2 is activated','');
-		$this->verifyTextNotPresent('view2 is deactivated','');
-		$this->verifyTextNotPresent('view3 is activated','');
-		$this->verifyTextPresent('view3 is deactivated','');
+		$this->assertTextNotPresent('view1 is activated','');
+		$this->assertTextNotPresent('view1 is deactivated','');
+		$this->assertTextPresent('view2 is activated','');
+		$this->assertTextNotPresent('view2 is deactivated','');
+		$this->assertTextNotPresent('view3 is activated','');
+		$this->assertTextPresent('view3 is deactivated','');
 
 		// goto view1
 		$this->clickAndWait('name=ctl0$Content$ctl2');
-		$this->verifyTextPresent('view1 is activated','');
-		$this->verifyTextNotPresent('view1 is deactivated','');
-		$this->verifyTextNotPresent('view2 is activated','');
-		$this->verifyTextPresent('view2 is deactivated','');
-		$this->verifyTextNotPresent('view3 is activated','');
-		$this->verifyTextNotPresent('view3 is deactivated','');
+		$this->assertTextPresent('view1 is activated','');
+		$this->assertTextNotPresent('view1 is deactivated','');
+		$this->assertTextNotPresent('view2 is activated','');
+		$this->assertTextPresent('view2 is deactivated','');
+		$this->assertTextNotPresent('view3 is activated','');
+		$this->assertTextNotPresent('view3 is deactivated','');
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket246TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket246TestCase.php
index bedd6e2c..7c4fe364 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket246TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket246TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket246TestCase extends PradoGenericSeleniumTest
+class Ticket246TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket246');
-		$this->assertTitle('Verifying Ticket 246');
+		$this->url('tickets/index.php?page=Ticket246');
+		$this->assertEquals($this->title(), 'Verifying Ticket 246');
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
index b2b17de7..6da15a47 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket274TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket274TestCase extends PradoGenericSeleniumTest
+class Ticket274TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket274');
-		$this->assertTitle('Verifying Ticket 274');
+		$this->url('tickets/index.php?page=Ticket274');
+		$this->assertEquals($this->title(), 'Verifying Ticket 274');
 		$this->assertNotVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
 
diff --git a/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
index 4bfffede..2b1d4c09 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket278TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket278TestCase extends PradoGenericSeleniumTest
+class Ticket278TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket278');
-		$this->assertTitle('Verifying Ticket 278');
+		$this->url('tickets/index.php?page=Ticket278');
+		$this->assertEquals($this->title(), 'Verifying Ticket 278');
 		$this->assertNotVisible($base.'validator1');
 		$this->assertNotVisible($base.'validator2');
 		$this->assertNotVisible($base.'panel1');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket27TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket27TestCase.php
index 7defd7ae..a57d83a6 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket27TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket27TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket27TestCase extends PradoGenericSeleniumTest
+class Ticket27TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket27');
+		$this->url('tickets/index.php?page=Ticket27');
 		$this->verifyTitle("Verifying Ticket 27", "");
 		$this->click("//input[@value='Agree']", "");
 		$this->assertVisible("ctl0_Content_validator1", "");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket284TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket284TestCase.php
index d28ea771..08c0338c 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket284TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket284TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket284TestCase extends PradoGenericSeleniumTest
+class Ticket284TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket284');
+		$this->url('tickets/index.php?page=Ticket284');
 		$this->assertTextPresent('Verifying Ticket 284');
 		$this->click('ctl0_Content_ctl1');
-		
+
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket285TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket285TestCase.php
index 8b996964..76f1c271 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket285TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket285TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket285TestCase extends PradoGenericSeleniumTest
+class Ticket285TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket285');
+		$this->url('tickets/index.php?page=Ticket285');
 		$this->assertTextPresent('350.00');
 		$this->assertTextPresent('349.99');
 	}
diff --git a/tests/FunctionalTests/tickets/tests/Ticket28TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket28TestCase.php
index 1f64b3f9..c0364ce6 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket28TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket28TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket28TestCase extends PradoGenericSeleniumTest
+class Ticket28TestCase extends PradoGenericSelenium2Test
 {
-	
+
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket28');
+		$this->url('tickets/index.php?page=Ticket28');
 		$this->assertTextPresent('Label 1');
 		$this->clickAndWait('link=Click Me');
 		$this->assertTextPresent('Link Button 1 Clicked!');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php
index f541d63d..0dc95e87 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket290TestCase.php
@@ -1,28 +1,27 @@
 <?php
 
 /**
-* 
+*
 */
-class Ticket290TestCase extends PradoGenericSeleniumTest
+class Ticket290TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket290');
-		$this->assertTitle("Verifying Ticket 290");
-		
+		$this->url('tickets/index.php?page=Ticket290');
+		$this->assertEquals($this->title(), "Verifying Ticket 290");
+
 		$this->assertText("{$base}label1", "Label 1");
 		$this->assertText("{$base}label2", "Label 2");
 
 		$this->type("{$base}textbox1", "test");
-		// bad hack to simulate enter key.. 
-		$this->submit('ctl0_ctl1');
+
+		$this->click("{$base}textbox1");
+		$this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::ENTER);
 		$this->pause(800);
-		
-		$this->assertText("{$base}label1", "Doing Validation");
 
-		// this can't work properly without manual testing
-		//$this->assertText("{$base}label2", "Button 2 (default) Clicked!");
+		$this->assertText("{$base}label1", "Doing Validation");
+		$this->assertText("{$base}label2", "Button 2 (default) Clicked!");
 	}
 }
 
diff --git a/tests/FunctionalTests/tickets/tests/Ticket433TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket433TestCase.php
index b8462988..b1f7ed00 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket433TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket433TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket433TestCase extends PradoGenericSeleniumTest
+class Ticket433TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket433');
-		$this->assertTitle("Verifying Ticket 433");
+		$this->url('tickets/index.php?page=Ticket433');
+		$this->assertEquals($this->title(), "Verifying Ticket 433");
 		$this->assertText("{$base}VoteClick", "BEFORE click");
 
 		$this->click("{$base}VoteClick");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php
index c393de91..e7991cd6 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket439TestCase.php
@@ -1,15 +1,14 @@
 <?php
 
-class Ticket439TestCase extends PradoGenericSeleniumTest
+class Ticket439TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket439');
-		$this->assertTitle("Verifying Ticket 439");
+		$this->url('tickets/index.php?page=Ticket439');
+		$this->assertEquals($this->title(), "Verifying Ticket 439");
 		$this->click("{$base}button1");
-		$this->waitForPageToLoad(3000);
 		$this->pause(800);
-		$this->assertTitle("Verifying Home");
+		$this->assertEquals($this->title(), "Verifying Home");
 	}
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket463TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket463TestCase.php
index 34ffb8fd..1901ae50 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket463TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket463TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket463TestCase extends PradoGenericSeleniumTest
+class Ticket463TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket463');
+		$this->url('tickets/index.php?page=Ticket463');
 		$this->verifyTitle("Verifying Ticket 463", "");
 		$this->assertTextPresent('May 1, 2005 12:00:00 AM');
 	}
diff --git a/tests/FunctionalTests/tickets/tests/Ticket470TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket470TestCase.php
index 4a2804ea..6c40927a 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket470TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket470TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket470TestCase extends PradoGenericSeleniumTest
+class Ticket470TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket470');
+		$this->url('tickets/index.php?page=Ticket470');
 		$this->verifyTitle("Verifying Ticket 470");
 		$this->assertText("{$base}counter", "0");
 		$this->assertText("{$base}Results", "");
@@ -38,7 +38,7 @@ class Ticket470TestCase extends PradoGenericSeleniumTest
 		$this->assertText("{$base}counter", "1");
 		$this->assertText("{$base}Results", "");
 		$this->assertVisible("{$base}validator1");
-	
+
 		$this->type("{$base}TextBox", "test");
 		$this->click("{$base}button1");
 		$this->pause(800);
diff --git a/tests/FunctionalTests/tickets/tests/Ticket477TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket477TestCase.php
index 16ebc56e..13f2740a 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket477TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket477TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket477TestCase extends PradoGenericSeleniumTest
+class Ticket477TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket477');
-		$this->assertTitle("Verifying Ticket 477");
+		$this->url('tickets/index.php?page=Ticket477');
+		$this->assertEquals($this->title(), "Verifying Ticket 477");
 		$this->assertNotVisible("{$base}validator1");
 		$this->assertNotVisible("{$base}validator2");
 
diff --git a/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php
index c3b2f43f..7940338f 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket488TestCase.php
@@ -1,40 +1,41 @@
 <?php
 
-class Ticket488TestCase extends PradoGenericSeleniumTest
+class Ticket488TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('active-controls/index.php?page=CustomValidatorByPass');
+		$base='ctl0_Content_';
+		$this->url('active-controls/index.php?page=CustomValidatorByPass');
 		$this->assertTextPresent('Custom Login');
 		$this->assertNotVisible('loginBox');
 		$this->click("showLogin");
 		$this->assertVisible("loginBox");
-		$this->assertNotVisible("validator1");
-		$this->assertNotVisible("validator2");
+		$this->assertNotVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 
-		$this->click("checkLogin");
+		$this->click("{$base}checkLogin");
 		$this->pause(800);
-		$this->assertVisible("validator1");
-		$this->assertNotVisible("validator2");
+		$this->assertVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 
-		$this->type('Username', 'tea');
-		$this->type('Password', 'mmama');
+		$this->type("{$base}Username", 'tea');
+		$this->type("{$base}Password", 'mmama');
 
-		$this->click("checkLogin");
+		$this->click("{$base}checkLogin");
 		$this->pause(800);
-		$this->assertNotVisible("validator1");
-		$this->assertVisible("validator2");
+		$this->assertNotVisible("{$base}validator1");
+		$this->assertVisible("{$base}validator2");
 
-		$this->type('Password', 'test');
-		$this->click("checkLogin");
+		$this->type("{$base}Password", 'test');
+		$this->click("{$base}checkLogin");
 		$this->pause(800);
-		$this->assertNotVisible("validator1");
-		$this->assertNotVisible("validator2");
+		$this->assertNotVisible("{$base}validator1");
+		$this->assertNotVisible("{$base}validator2");
 	}
 
 	function test_more()
 	{
-		$this->open('tickets/index.php?page=Ticket488');
+		$this->url('tickets/index.php?page=Ticket488');
 		//add test assertions here.
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket504TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket504TestCase.php
index 63ecfe2f..7ffa7428 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket504TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket504TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket504TestCase extends PradoGenericSeleniumTest
+class Ticket504TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket504');
+		$this->url('tickets/index.php?page=Ticket504');
 		$this->verifyTitle("Verifying Ticket 504", "");
 
 		$this->assertText("status", "");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket507TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket507TestCase.php
index 19d54e9b..0b90749b 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket507TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket507TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket507TestCase extends PradoGenericSeleniumTest
+class Ticket507TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base='ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket507');
+		$this->url('tickets/index.php?page=Ticket507');
 		$this->verifyTitle("Verifying Ticket 507", "");
 
 		$this->assertText("{$base}label1", "Label 1");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket521TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket521TestCase.php
index 2df88612..dfc81a3d 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket521TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket521TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket521TestCase extends PradoGenericSeleniumTest
+class Ticket521TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open("tickets/index.php?page=Ticket521");
-		$this->assertTitle("Verifying Ticket 521");
+		$this->url("tickets/index.php?page=Ticket521");
+		$this->assertEquals($this->title(), "Verifying Ticket 521");
 		$this->assertText("{$base}label1", "Label 1");
 
 		$this->click("{$base}button1");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket526TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket526TestCase.php
index 7476db69..6a7ee693 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket526TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket526TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket526TestCase extends PradoGenericSeleniumTest
+class Ticket526TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base="ctl0_Content_";
-		$this->open('tickets/index.php?page=Ticket526');
+		$this->url('tickets/index.php?page=Ticket526');
 		$this->verifyTitle("Verifying Ticket 526", "");
 
 		$this->assertElementNotPresent("{$base}dpbutton");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket528TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket528TestCase.php
index 3903000a..7fb24d04 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket528TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket528TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket528TestCase extends PradoGenericSeleniumTest
+class Ticket528TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket528');
-		$this->assertTitle("Verifying Ticket 528");
+		$this->url('tickets/index.php?page=Ticket528');
+		$this->assertEquals($this->title(), "Verifying Ticket 528");
 
 		$this->select("{$base}DDropTurno", "Tarde");
 		$this->pause(800);
diff --git a/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php
index 26f5a7d7..6634ed93 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket535TestCase.php
@@ -1,34 +1,34 @@
 <?php
 
-class Ticket535TestCase extends PradoGenericSeleniumTest
+class Ticket535TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket535');
-		$this->assertTitle("Verifying Ticket 535");
+		$this->url('tickets/index.php?page=Ticket535');
+		$this->assertEquals($this->title(), "Verifying Ticket 535");
 
 		$this->assertText("{$base}label1", "Label 1");
 
 		$this->click("{$base}radio1");
 		$this->click("{$base}button1");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:radio1 checked:{1} radio2 checked:{}');
+		$this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{}');
 
 		$this->click("{$base}radio2");
 		$this->click("{$base}button1");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:radio1 checked:{1} radio2 checked:{1}');
+		$this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{1}');
 
 		$this->click("{$base}bad_radio1");
 		$this->click("{$base}button2");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:bad_radio1 checked:{1} bad_radio2 checked:{}');
+		$this->assertText("{$base}label1", 'bad_radio1 checked:{1} bad_radio2 checked:{}');
 
 		$this->click("{$base}bad_radio2");
 		$this->click("{$base}button2");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:bad_radio1 checked:{} bad_radio2 checked:{1}');
+		$this->assertText("{$base}label1", 'bad_radio1 checked:{} bad_radio2 checked:{1}');
 	}
 
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket538TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket538TestCase.php
index 16b0f863..edec5750 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket538TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket538TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket538TestCase extends PradoGenericSeleniumTest
+class Ticket538TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base="ctl0_Content_";
-		$this->open('tickets/index.php?page=Ticket538');
+		$this->url('tickets/index.php?page=Ticket538');
 		$this->verifyTitle("Verifying Ticket 538", "");
 
 		$this->assertText("{$base}ALLog", 'waiting for response...');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php
index f8e5a469..86923010 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket54TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket54TestCase extends PradoGenericSeleniumTest
+class Ticket54TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket54');
-		$this->verifyTextPresent("|A|a|B|b|C|", "");
+		$this->url('tickets/index.php?page=Ticket54');
+		$this->assertTextPresent("|A|a|B|b|C|", "");
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket573TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket573TestCase.php
index 996d72e9..1f9461be 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket573TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket573TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class Ticket573TestCase extends PradoGenericSeleniumTest
+class Ticket573TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket573');
+		$this->url('tickets/index.php?page=Ticket573');
 		$this->verifyTitle("Verifying Ticket 573", "");
 
 		$this->assertText('test1', '10.00');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php
index 47330326..ae0c991b 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket578TestCase.php
@@ -1,22 +1,22 @@
 <?php
 
-class Ticket578TestCase extends PradoGenericSeleniumTest
+class Ticket578TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket578');
+		$this->url('tickets/index.php?page=Ticket578');
 		$this->verifyTitle("Verifying Ticket 578", "");
 
 		$this->assertText("{$base}label1", "Label 1");
 		$this->click("{$base}button1", "");
 		$this->pause(800);
-		$this->assertText("{$base}label1", "Button 1 was clicked : ");
+		$this->assertText("{$base}label1", "Button 1 was clicked :");
 
 		$text="helloworld";
 		$this->runScript("tinyMCE.get('{$base}text1').setContent('{$text}')");
 		$this->click("{$base}button1", "");
 		$this->pause(800);
-		$this->assertText("{$base}label1", "exact:Button 1 was clicked : <p>{$text}</p>");
+		$this->assertText("{$base}label1", "Button 1 was clicked : <p>{$text}</p>");
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php
index 8b2d36b3..5a9dd8d4 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket585TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket585TestCase extends PradoGenericSeleniumTest
+class Ticket585TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket585');
+		$this->url('tickets/index.php?page=Ticket585');
 		$this->verifyTitle("Verifying Ticket 585", "");
 
 		$this->assertText("error", "");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php
index 612c086a..50efd50a 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket586TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket586TestCase extends PradoGenericSeleniumTest
+class Ticket586TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket586');
+		$this->url('tickets/index.php?page=Ticket586');
 		$this->verifyTitle("Verifying Ticket 586", "");
 
 		$this->assertText("{$base}label1", "Status");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket587TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket587TestCase.php
index 7fa37bad..b4ddc287 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket587TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket587TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket587TestCase extends PradoGenericSeleniumTest
+class Ticket587TestCase extends PradoGenericSelenium2Test
 {
 	function testKeyPress()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket587_reopened');
-		$this->assertTitle("Verifying Ticket 587_reopened");
+		$this->url('tickets/index.php?page=Ticket587_reopened');
+		$this->assertEquals($this->title(), "Verifying Ticket 587_reopened");
 
 		$this->assertText($base."label1", "Label 1");
 		$this->select($base."list1", "item 3");
@@ -26,8 +26,8 @@ class Ticket587TestCase extends PradoGenericSeleniumTest
 	function testButtonClick()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket587_reopened');
-		$this->assertTitle("Verifying Ticket 587_reopened");
+		$this->url('tickets/index.php?page=Ticket587_reopened');
+		$this->assertEquals($this->title(), "Verifying Ticket 587_reopened");
 
 		$this->assertText($base."label1", "Label 1");
 		$this->select($base."list1", "item 3");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket592TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket592TestCase.php
index ec8d2284..14467952 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket592TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket592TestCase.php
@@ -1,45 +1,45 @@
 <?php
 
-class Ticket592TestCase extends PradoGenericSeleniumTest
+class Ticket592TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket592');
-		$this->assertTitle("Verifying Ticket 592");
+		$this->url('tickets/index.php?page=Ticket592');
+		$this->assertEquals($this->title(), "Verifying Ticket 592");
 
 		$this->assertText("{$base}label1", "Label 1");
 
 		$this->click("{$base}radio1");
 		$this->click("{$base}button1");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:radio1 checked:{1} radio2 checked:{}');
+		$this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{}');
 
 		$this->click("{$base}radio2");
 		$this->click("{$base}button1");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:radio1 checked:{1} radio2 checked:{1}');
+		$this->assertText("{$base}label1", 'radio1 checked:{1} radio2 checked:{1}');
 
 		$this->click("{$base}bad_radio1");
 		$this->click("{$base}button2");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:bad_radio1 checked:{1} bad_radio2 checked:{}');
+		$this->assertText("{$base}label1", 'bad_radio1 checked:{1} bad_radio2 checked:{}');
 
 		$this->click("{$base}bad_radio2");
 		$this->click("{$base}button2");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:bad_radio1 checked:{} bad_radio2 checked:{1}');
-		
+		$this->assertText("{$base}label1", 'bad_radio1 checked:{} bad_radio2 checked:{1}');
+
 		$this->click("{$base}bad_radio3");
 		$this->click("{$base}button3");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:bad_radio3 checked:{1} bad_radio4 checked:{}');
+		$this->assertText("{$base}label1", 'bad_radio3 checked:{1} bad_radio4 checked:{}');
 
 		$this->click("{$base}bad_radio4");
 		$this->click("{$base}button3");
 		$this->pause(800);
-		$this->assertText("{$base}label1", 'exact:bad_radio3 checked:{} bad_radio4 checked:{1}');
-		
+		$this->assertText("{$base}label1", 'bad_radio3 checked:{} bad_radio4 checked:{1}');
+
 	}
 
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php
index 14b2f985..0781b506 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket595TestCase.php
@@ -1,37 +1,37 @@
 <?php
 
-class Ticket595TestCase extends PradoGenericSeleniumTest
+class Ticket595TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base="ctl0_Content_";
-		$this->open('tickets/index.php?page=Ticket595');
-		$this->assertTitle("Verifying Ticket 595");
-		
+		$this->url('tickets/index.php?page=Ticket595');
+		$this->assertEquals($this->title(), "Verifying Ticket 595");
+
 		$this->click($base.'ctl2');
-        $this->assertAttribute($base.'A@class','errorclassA');
-		
+        $this->verifyAttribute($base.'A@class','errorclassA');
+
 		$this->type($base.'A', 'Prado');
 		$this->click($base.'ctl2');
-        $this->assertAttribute($base.'A@class','errorclassA');
-		
+        $this->verifyAttribute($base.'A@class','errorclassA');
+
 		$this->type($base.'A', 'test@pradosoft.com');
 		$this->click($base.'ctl2');
 		$this->pause(800);
-        $this->assertAttribute($base.'A@class','');
+        $this->verifyAttribute($base.'A@class','');
 
 		$this->click($base.'ctl5');
 		$this->pause(800);
-        $this->assertAttribute($base.'B@class','exact: errorclassB');
-		
+        $this->verifyAttribute($base.'B@class',' errorclassB');
+
 		$this->type($base.'B', 'Prado');
 		$this->click($base.'ctl5');
 		$this->pause(800);
-        $this->assertAttribute($base.'B@class','exact: errorclassB');
-		
+        $this->verifyAttribute($base.'B@class',' errorclassB');
+
 		$this->type($base.'B', 'test@pradosoft.com');
 		$this->click($base.'ctl5');
 		$this->pause(800);
-        $this->assertAttribute($base.'B@class','');
+        $this->verifyAttribute($base.'B@class','');
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket622TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket622TestCase.php
index 0d0fe3d2..e26da1f1 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket622TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket622TestCase.php
@@ -1,17 +1,17 @@
 <?php
 
-class Ticket622TestCase extends PradoGenericSeleniumTest
+class Ticket622TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base="ctl0_Content_";
-		$this->open('tickets/index.php?page=Ticket622');
-		$this->assertTitle("Verifying Ticket 622");
-		
+		$this->url('tickets/index.php?page=Ticket622');
+		$this->assertEquals($this->title(), "Verifying Ticket 622");
+
 		$this->click($base.'ctl0');
 		$this->pause(800);
-        $this->assertAttribute($base.'ALB@style',';');
-        $this->assertAttribute('css=span#acb span@style', ';');
-        $this->assertAttribute('css=span#arb span@style', ';');
+        $this->verifyAttribute($base.'ALB@style','');
+        $this->verifyAttribute('css=span#acb span@style', '');
+        $this->verifyAttribute('css=span#arb span@style', '');
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket653TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket653TestCase.php
index ec5eceb4..fbf569bb 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket653TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket653TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket653TestCase extends PradoGenericSeleniumTest
+class Ticket653TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		// Open with 'Friendly URL'
-		$this->open('tickets/index.php/ticket653');
+		$this->url('tickets/index.php/ticket653');
 		$this->verifyTitle("Verifying Ticket 653", "");
 
 		$this->assertText('textspan', 'This is the page for Ticket653');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php
index 9fe238b9..af0c8f02 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php
@@ -1,11 +1,11 @@
 <?php
-class Ticket656TestCase extends PradoGenericSeleniumTest
+class Ticket656TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket656');
-		$this->assertTitle("Verifying Ticket 656");
+		$this->url('tickets/index.php?page=Ticket656');
+		$this->assertEquals($this->title(), "Verifying Ticket 656");
 
 		// First test, current date
 		$this->click($base."btnUpdate");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket659TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket659TestCase.php
index 91326e9d..bb1a021d 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket659TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket659TestCase.php
@@ -1,18 +1,18 @@
 <?php
 
-class Ticket659TestCase extends PradoGenericSeleniumTest
+class Ticket659TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
 		// Normal component (working)
-		$this->open('tickets/index.php?page=ToggleTest');
+		$this->url('tickets/index.php?page=ToggleTest');
 		$this->assertText("${base}lbl", "Down");
 		$this->click("${base}btn", "");
 		$this->pause(800);
 		$this->assertText("${base}lbl", "Up");
 		// Extended component (not working)
-		$this->open('tickets/index.php?page=Ticket659');
+		$this->url('tickets/index.php?page=Ticket659');
 		$this->assertText("${base}lbl", "Down");
 		$this->click("${base}btn", "");
 		$this->pause(800);
diff --git a/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php
index e0c97e53..f77e5fac 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket660TestCase.php
@@ -1,12 +1,12 @@
 <?php
-class Ticket660TestCase extends PradoGenericSeleniumTest
+class Ticket660TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket660');
-		$this->assertTitle("Verifying Ticket 660");
-		
+		$this->url('tickets/index.php?page=Ticket660');
+		$this->assertEquals($this->title(), "Verifying Ticket 660");
+
 		$this->click($base.'PB');
 		$this->pause(800);
 		$this->assertText($base.'A','ÄÖÜ äöü');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket669TestCase.php
index b6931808..6afb1072 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->url('tickets/index.php?page=Ticket669');
+		$this->assertEquals($this->title(), "Verifying Ticket 669");
+
 		$this->assertTextPresent('1 - Test without callback');
-		$this->assertValue($base.'tb1', 'exact:ActiveTextBox');
-		$this->assertValue($base.'tb2', 'exact:TextBox in ActivePanel');
-		
+		$this->assertValue($base.'tb1', 'ActiveTextBox');
+		$this->assertValue($base.'tb2', 'TextBox in ActivePanel');
+
 		$this->click($base.'ctl4');
 		$this->pause(800);
-		$this->assertValue($base.'tb1', 'exact:ActiveTextBox +1');
-		$this->assertValue($base.'tb2', 'exact:TextBox in ActivePanel +1');
-		
+		$this->assertValue($base.'tb1', 'ActiveTextBox +1');
+		$this->assertValue($base.'tb2', 'TextBox in ActivePanel +1');
+
 		$this->click($base.'ctl1');
 		$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->assertValue($base.'tb3', 'ActiveTextBox');
+		$this->assertValue($base.'tb4', 'TextBox in ActivePanel');
+		$this->assertValue($base.'tb5', 'TextBox in ActivePanel');
+
 		$this->click($base.'ctl6');
 		$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->assertValue($base.'tb3', 'ActiveTextBox +1');
+		$this->assertValue($base.'tb4', 'TextBox in ActivePanel +1');
+		$this->assertValue($base.'tb5', 'TextBox in ActivePanel +1');
+
 		$this->click($base.'ctl2');
 		$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->assertValue($base.'tb6', 'ActiveTextBox');
+		$this->assertValue($base.'tb7', 'TextBox in Panel');
+
 		$this->click($base.'ctl8');
 		$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
diff --git a/tests/FunctionalTests/tickets/tests/Ticket670TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket670TestCase.php
index 33e45b49..f0387746 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket670TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket670TestCase.php
@@ -1,12 +1,12 @@
 <?php
-class Ticket670TestCase extends PradoGenericSeleniumTest
+class Ticket670TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket670');
-		$this->assertTitle("Verifying Ticket 670");
-		
+		$this->url('tickets/index.php?page=Ticket670');
+		$this->assertEquals($this->title(), "Verifying Ticket 670");
+
 		$this->type($base."datePicker", '07-07-2003');
 		$this->pause(800);
 		//$this->assertText($base."datePicker",'07-07-2003');
@@ -15,7 +15,7 @@ class Ticket670TestCase extends PradoGenericSeleniumTest
 		$this->click($base."ok");
 		$this->pause(800);
 		$this->assertText($base."lbl",'07-07-2007');
-		
+
 	}
 
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket671TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket671TestCase.php
index 031dc991..53330ca4 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket671TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket671TestCase.php
@@ -1,41 +1,41 @@
 <?php
-class Ticket671TestCase extends PradoGenericSeleniumTest
+class Ticket671TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket671');
-		$this->assertTitle("Verifying Ticket 671");
-		
-		$this->verifyNotVisible($base.'ctl0');
+		$this->url('tickets/index.php?page=Ticket671');
+		$this->assertEquals($this->title(), "Verifying Ticket 671");
+
+		$this->assertNotVisible($base.'ctl0');
 		// Click submit
 		$this->click($base.'ctl1');
 		$this->pause(800);
-		$this->verifyText($base.'ctl0', 'Please Select Test 3');
-		$this->verifyVisible($base.'ctl0');
+		$this->assertText($base.'ctl0', 'Please Select Test 3');
+		$this->assertVisible($base.'ctl0');
 		$this->select($base.'addl', 'Test 2');
 		$this->pause(800);
-		$this->verifyVisible($base.'ctl0');
-		$this->verifyText($base."lblResult", "You have selected 'Test 2'. But this is not valid !");
+		$this->assertVisible($base.'ctl0');
+		$this->assertText($base."lblResult", "You have selected 'Test 2'. But this is not valid !");
 		$this->select($base.'addl', 'Test 3');
 		$this->pause(800);
-		$this->verifyNotVisible($base.'ctl0');
-		$this->verifyText($base."lblResult", "You have selected 'Test 3'.");
+		$this->assertNotVisible($base.'ctl0');
+		$this->assertText($base."lblResult", "You have selected 'Test 3'.");
 		$this->click($base.'ctl1');
 		$this->pause(800);
-		$this->verifyText($base."lblResult", "You have successfully validated the form");
-		
+		$this->assertText($base."lblResult", "You have successfully validated the form");
+
 		$this->type($base.'testTextBox', 'test');
 		$this->pause(800);
 		$this->click($base.'ctl3');
 		$this->pause(800);
-		$this->verifyVisible($base.'ctl2');
+		$this->assertVisible($base.'ctl2');
 		$this->type($base.'testTextBox',"Prado");
 		$this->pause(800);
 		$this->click($base.'ctl3');
 		$this->pause(800);
-		$this->verifyNotVisible($base.'ctl2');
-		$this->verifyText($base.'lblResult2', 'Thanks !');
+		$this->assertNotVisible($base.'ctl2');
+		$this->assertText($base.'lblResult2', 'Thanks !');
 	}
 
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket671_reopenedTestCase.php b/tests/FunctionalTests/tickets/tests/Ticket671_reopenedTestCase.php
index 7ba24dcc..02201075 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket671_reopenedTestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket671_reopenedTestCase.php
@@ -1,46 +1,46 @@
 <?php
 
-class Ticket671_reopenedTestCase extends PradoGenericSeleniumTest
+class Ticket671_reopenedTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base="ctl0_Content_";
-		$this->open('tickets/index.php?page=Ticket671_reopened');
-		$this->assertTitle("Verifying Ticket 671_reopened");
+		$this->url('tickets/index.php?page=Ticket671_reopened');
+		$this->assertEquals($this->title(), "Verifying Ticket 671_reopened");
 		// Type wrong value
 		$this->type($base.'testField', 'abcd');
 		$this->click($base.'ctl4');
 		$this->pause(800);
 		$this->assertVisible($base.'ctl2');
-		$this->assertText($base.'Result', 'exact:Check callback called (1) --- Save callback called DATA NOK');
-		
+		$this->assertText($base.'Result', 'Check callback called (1) --- Save callback called DATA NOK');
+
 		// Reclick, should not have any callback
 		$this->click($base.'ctl4');
 		$this->pause(800);
 		$this->assertVisible($base.'ctl2');
-		$this->assertText($base.'Result', 'exact:Check callback called (2) --- Save callback called DATA NOK');
-		
+		$this->assertText($base.'Result', 'Check callback called (2) --- Save callback called DATA NOK');
+
 		// Type right value
 		$this->type($base.'testField', 'Test');
 		$this->click($base.'ctl4');
 		$this->pause(800);
 		$this->assertNotVisible($base.'ctl2');
-		$this->assertText($base.'Result', 'exact:Check callback called (3) --- Save callback called DATA OK');
-		
+		$this->assertText($base.'Result', 'Check callback called (3) --- Save callback called DATA OK');
+
 		// Type empty value
 		$this->type($base.'testField', '');
 		$this->click($base.'ctl4');
 		$this->pause(800);
 		$this->assertVisible($base.'ctl1');
 		$this->assertNotVisible($base.'ctl2');
-		$this->assertText($base.'Result', 'exact:Check callback called (3) --- Save callback called DATA OK');
-		
+		$this->assertText($base.'Result', 'Check callback called (3) --- Save callback called DATA OK');
+
 		// Type right value
 		$this->type($base.'testField', 'Test');
 		$this->click($base.'ctl4');
 		$this->pause(800);
 		$this->assertNotVisible($base.'ctl1');
 		$this->assertNotVisible($base.'ctl2');
-		$this->assertText($base.'Result', 'exact:Check callback called (4) --- Save callback called DATA OK');		
+		$this->assertText($base.'Result', 'Check callback called (4) --- Save callback called DATA OK');
 	}
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket679TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket679TestCase.php
index 4ee22c20..af957fa3 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket679TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket679TestCase.php
@@ -1,18 +1,18 @@
 <?php
-class Ticket679TestCase extends PradoGenericSeleniumTest
+class Ticket679TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket679');
-		$this->assertTitle("Verifying Ticket 679");
-		
+		$this->url('tickets/index.php?page=Ticket679');
+		$this->assertEquals($this->title(), "Verifying Ticket 679");
+
 		// First part of ticket : Repeater bug
 		$this->click($base."ctl0");
 		$this->pause(800);
 		$this->assertText($base."myLabel",'outside');
-		$this->verifyVisible($base."myLabel");
-		
+		$this->assertVisible($base."myLabel");
+
 		// Reload completly the page
 		$this->refresh();
 		$this->pause(800);
@@ -20,16 +20,16 @@ class Ticket679TestCase extends PradoGenericSeleniumTest
 		$this->click($base."Repeater_ctl0_ctl0");
 		$this->pause(800);
 		$this->assertText($base."myLabel",'inside');
-		$this->verifyVisible($base."myLabel");
-		
+		$this->assertVisible($base."myLabel");
+
 		// Second part of ticket : ARB bug
-		$this->verifyNotChecked($base."myRadioButton");
+		$this->assertNotChecked($base."myRadioButton");
 		$this->click($base."ctl1");
 		$this->pause(800);
-		$this->verifyChecked($base."myRadioButton");
+		$this->assertChecked($base."myRadioButton");
 		$this->click($base."ctl2");
 		$this->pause(800);
-		$this->verifyNotChecked($base."myRadioButton");
+		$this->assertNotChecked($base."myRadioButton");
 		$this->pause(800);
 	}
 
diff --git a/tests/FunctionalTests/tickets/tests/Ticket691TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket691TestCase.php
index a441f82c..ae6cd7d3 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket691TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket691TestCase.php
@@ -1,16 +1,16 @@
 <?php
-class Ticket691TestCase extends PradoGenericSeleniumTest
+class Ticket691TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket691');
-		$this->assertTitle("Verifying Ticket 691");
-		
-		$this->click($base."List_c2");
+		$this->url('tickets/index.php?page=Ticket691');
+		$this->assertEquals($this->title(), "Verifying Ticket 691");
+
+		$this->click("//input[@id='{$base}List_c2']/../..");
 		$this->pause(800);
-		$this->assertText($base."Title", "Thanks");
-		$this->assertText($base."Result", "You vote 3");
+		$this->assertText("{$base}Title", "Thanks");
+		$this->assertText("{$base}Result", "You vote 3");
 	}
 
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket698TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket698TestCase.php
index 8f58a320..5c8c46aa 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket698TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket698TestCase.php
@@ -1,12 +1,12 @@
 <?php
-class Ticket698TestCase extends PradoGenericSeleniumTest
+class Ticket698TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket698');
-		$this->assertTitle("Verifying Ticket 698");
-		
+		$this->url('tickets/index.php?page=Ticket698');
+		$this->assertEquals($this->title(), "Verifying Ticket 698");
+
 		$this->click($base."switchContentTypeButton");
 		$this->pause(800);
 		$this->assertVisible($base."EditHtmlTextBox");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php
index 0366c2fc..d14823bf 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php
@@ -1,13 +1,13 @@
 <?php
-class Ticket700TestCase extends PradoGenericSeleniumTest
+class Ticket700TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		// page: Home
-		$this->open('tickets/index700.php');
+		$this->url('tickets/index700.php');
 		$this->clickAndWait('ctl0_Logout');
 		$this->clickAndWait('pageHome');
-		$this->assertTitle("Home");
+		$this->assertEquals($this->title(), "Home");
 		$this->assertTextPresent('|Param1: Set at app config|');
 		$this->assertTextPresent('|Param2: Set at root|');
 		$this->assertTextPresent('|Param3: default 3|');
@@ -16,12 +16,12 @@ class Ticket700TestCase extends PradoGenericSeleniumTest
 
 		// page: admin.Home
 		$this->clickAndWait('pageAdminHome');
-		$this->assertTitle('UserLogin');
+		$this->assertEquals($this->title(), 'UserLogin');
 		$this->type('ctl0_Main_Username','AdminUser');
 		$this->type('ctl0_Main_Password','demo');
 		$this->clickAndWait('ctl0_Main_LoginButton');
 		$this->clickAndWait('pageAdminHome');
-		$this->assertTitle('admin.Home');
+		$this->assertEquals($this->title(), 'admin.Home');
 		$this->assertTextPresent('|Param1: Set at app config|');
 		$this->assertTextPresent('|Param2: Set at admin|');
 		$this->assertTextPresent('|Param3: Set at admin|');
@@ -30,24 +30,24 @@ class Ticket700TestCase extends PradoGenericSeleniumTest
 
 		// page: admin.Home2
 		$this->clickAndWait('pageAdminHome2');
-		$this->assertTitle('admin.Home2');
+		$this->assertEquals($this->title(), 'admin.Home2');
 		$this->clickAndWait('ctl0_Logout');
 		$this->clickAndWait('pageAdminHome2');
-		$this->assertTitle('admin.Home2');
+		$this->assertEquals($this->title(), 'admin.Home2');
 
 		// page: admin.users.Home
 		$this->clickAndWait('pageAdminUsersHome');
-		$this->assertTitle('UserLogin');
+		$this->assertEquals($this->title(), 'UserLogin');
 		$this->type('ctl0_Main_Username','NormalUser');
 		$this->type('ctl0_Main_Password','demo');
 		$this->clickAndWait('ctl0_Main_LoginButton');
 		$this->clickAndWait('pageAdminUsersHome');
-		$this->assertTitle('UserLogin');
+		$this->assertEquals($this->title(), 'UserLogin');
 		$this->type('ctl0_Main_Username','AdminUser');
 		$this->type('ctl0_Main_Password','demo');
 		$this->clickAndWait('ctl0_Main_LoginButton');
 		$this->clickAndWait('pageAdminUsersHome');
-		$this->assertTitle('admin.users.Home');
+		$this->assertEquals($this->title(), 'admin.users.Home');
 		$this->assertTextPresent('|Param1: Set at admin|');
 		$this->assertTextPresent('|Param2: Set at admin.users|');
 		$this->assertTextPresent('|Param3: default 3|');
@@ -56,11 +56,11 @@ class Ticket700TestCase extends PradoGenericSeleniumTest
 
 		// page: admin.users.Home2
 		$this->clickAndWait('pageAdminUsersHome2');
-		$this->assertTitle('admin.users.Home2');
+		$this->assertEquals($this->title(), 'admin.users.Home2');
 
 		// page: content.Home
 		$this->clickAndWait('pageContentHome');
-		$this->assertTitle('content.Home');
+		$this->assertEquals($this->title(), 'content.Home');
 		$this->assertTextPresent('|Param1: Set at app config|');
 		$this->assertTextPresent('|Param2: Set at root|');
 		$this->assertTextPresent('|Param3: default 3|');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php
index dedb491f..3b278557 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket703TestCase.php
@@ -1,11 +1,11 @@
 <?php
-class Ticket703TestCase extends PradoGenericSeleniumTest
+class Ticket703TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket703.Ticket703');
-		$this->assertTitle("Verifying Ticket703.Ticket703 703.703");
+		$this->url('tickets/index.php?page=Ticket703.Ticket703');
+		$this->assertEquals($this->title(), "Verifying Ticket703.Ticket703 703.703");
 		// Start with an empty log
 		$this->click($base.'ctl2');
 		// Wait for callback to be lanched
@@ -16,7 +16,7 @@ class Ticket703TestCase extends PradoGenericSeleniumTest
 		$this->click($base.'ctl0');
 		$this->pause(800);
 		$this->click($base.'ctl1');
-		$this->assertTextPresent($base.'logBox', "Test of prado logging system");			
+		$this->assertTextPresent($base.'logBox', "Test of prado logging system");
 
 		// Clean log for next run
 		$this->click($base.'ctl2');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket708TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket708TestCase.php
index 87509b29..b10b070a 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket708TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket708TestCase.php
@@ -1,24 +1,24 @@
 <?php
-class Ticket708TestCase extends PradoGenericSeleniumTest
+class Ticket708TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket708');
-		$this->assertTitle("Verifying Ticket 708");
-		
+		$this->url('tickets/index.php?page=Ticket708');
+		$this->assertEquals($this->title(), "Verifying Ticket 708");
+
 		$this->click($base."grid_ctl1_RadioButton");
 		$this->pause(800);
 		$this->assertText($base."Result", "You have selected Radio Button #1");
-		
+
 		$this->click($base."grid_ctl2_RadioButton");
 		$this->pause(800);
 		$this->assertText($base."Result", "You have selected Radio Button #2");
-		
+
 		$this->click($base."grid_ctl3_RadioButton");
 		$this->pause(800);
 		$this->assertText($base."Result", "You have selected Radio Button #3");
-		
+
 		$this->click($base."grid_ctl4_RadioButton");
 		$this->pause(800);
 		$this->assertText($base."Result", "You have selected Radio Button #4");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
index 4205427b..a984ee43 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket719TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket719TestCase extends PradoGenericSeleniumTest
+class Ticket719TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("tickets/index.php?page=Ticket719");
-		$this->verifyTextPresent("Verifying Ticket 719");
+		$this->url("tickets/index.php?page=Ticket719");
+		$this->assertTextPresent("Verifying Ticket 719");
 
 		$base="ctl0_Content_";
 
@@ -17,17 +17,17 @@ class Ticket719TestCase extends PradoGenericSeleniumTest
 		$this->type("${base}autocomplete", 'f');
 		$this->runScript("Prado.Registry['${base}autocomplete'].onKeyPress({})");
 		$this->pause(500);
-		$this->verifyTextPresent('Finland');
+		$this->assertTextPresent('Finland');
 
 		$this->type("${base}autocomplete", 'fr');
 		$this->runScript("Prado.Registry['${base}autocomplete'].onKeyPress({})");
 		$this->pause(500);
-		$this->verifyTextPresent('French');
+		$this->assertTextPresent('French');
 
 		$this->type("${base}autocomplete", 'fra');
 		$this->runScript("Prado.Registry['${base}autocomplete'].onKeyPress({})");
 		$this->pause(500);
-		$this->verifyTextPresent('France');
+		$this->assertTextPresent('France');
 
 		$this->click("css=#${base}autocomplete_result ul li");
 		$this->pause(800);
diff --git a/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php
index 90711162..f98214cc 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket722TestCase.php
@@ -1,28 +1,27 @@
 <?php
-class Ticket722TestCase extends PradoGenericSeleniumTest
+class Ticket722TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket722');
-		$this->assertTitle("Verifying Ticket 722");
-		
+		$this->url('tickets/index.php?page=Ticket722');
+		$this->assertEquals($this->title(), "Verifying Ticket 722");
+
 		$this->assertText($base.'InPlaceTextBox__label', 'Editable Text');
 		$this->click($base.'InPlaceTextBox__label');
 		$this->pause(800);
 		$this->assertVisible($base.'InPlaceTextBox');
 		$this->type($base.'InPlaceTextBox',"Prado");
-		$this->fireEvent($base.'InPlaceTextBox', 'blur'); // Release textbox
 		$this->pause(800);
 		$this->assertNotVisible($base.'InPlaceTextBox');
 		$this->assertText($base.'InPlaceTextBox__label', 'Prado');
 		$this->click($base.'ctl0');
 		$this->pause(800);
-		$this->assertText($base.'InPlaceTextBox__label', 'exact:Prado [Read Only]');
+		$this->assertText($base.'InPlaceTextBox__label', 'Prado [Read Only]');
 		$this->click($base.'InPlaceTextBox__label');
 		$this->pause(800);
 		$this->assertNotVisible($base.'InPlaceTextBox');
-		
+
 	}
 
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket72TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket72TestCase.php
index 111b7583..1a236ffa 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket72TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket72TestCase.php
@@ -1,14 +1,14 @@
 <?php
 
-class Ticket72TestCase extends PradoGenericSeleniumTest
+class Ticket72TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket72');
+		$this->url('tickets/index.php?page=Ticket72');
 		$this->type("ctl0\$Content\$K1", "abc");
 		$this->type("ctl0\$Content\$K2", "efg");
 		$this->clickAndWait("//input[@type='submit' and @value='Send']", "");
-		$this->verifyTextPresent("efg", "");
-		$this->verifyTextNotPresent("abcefg", "");
+		$this->assertTextPresent("efg", "");
+		$this->assertTextNotPresent("abcefg", "");
 	}
 }
diff --git a/tests/FunctionalTests/tickets/tests/Ticket745TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket745TestCase.php
index f822e37f..c23aa900 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket745TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket745TestCase.php
@@ -1,17 +1,17 @@
 <?php
-class Ticket745TestCase extends PradoGenericSeleniumTest
+class Ticket745TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket745');
-		$this->assertTitle("Verifying Ticket 745");
-		
+		$this->url('tickets/index.php?page=Ticket745');
+		$this->assertEquals($this->title(), "Verifying Ticket 745");
+
 		$this->select($base.'Wizard1_DropDownList1', 'Green');
 		$this->click($base.'Wizard1_ctl4_ctl1');
 		$this->pause(800);
 		$this->assertTextPresent ('Step 3 of 3');
-		
+
 	}
 
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket769TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
index 258a09a7..b335d148 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket769TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket769TestCase extends PradoGenericSeleniumTest
+class Ticket769TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$base="ctl0_Content_";
-		$this->open('tickets/index.php?page=Ticket769');
-		$this->assertTitle("Verifying Ticket 769");
+		$this->url('tickets/index.php?page=Ticket769');
+		$this->assertEquals($this->title(), "Verifying Ticket 769");
 
 		$this->click($base.'ctl0');
 		$this->assertVisible($base.'ctl1');
@@ -15,11 +15,11 @@ class Ticket769TestCase extends PradoGenericSeleniumTest
 		$this->click($base.'ctl0');
 		$this->pause(800);
 		$this->assertNotVisible($base.'ctl1');
-		$this->assertEquals($this->getValue($base.'ctl0'), 'T1 clicked' );
+		$this->assertValue($base.'ctl0', 'T1 clicked' );
 
 		$this->click($base.'ctl2');
 		$this->pause(800);
-		$this->assertEquals($this->getText($base.'B'), 'This is B');
+		$this->assertText($base.'B', 'This is B');
 		$this->click($base.'ctl3');
 		$this->pause(800);
 
@@ -30,6 +30,6 @@ class Ticket769TestCase extends PradoGenericSeleniumTest
 		$this->click($base.'ctl0');
 		$this->pause(800);
 		$this->assertNotVisible($base.'ctl1');
-		$this->assertEquals($this->getValue($base.'ctl0'), 'T1 clicked clicked' );
+		$this->assertValue($base.'ctl0', 'T1 clicked clicked' );
 	}
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket785TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket785TestCase.php
index 229a68eb..7b8e7dd0 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket785TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket785TestCase.php
@@ -1,19 +1,19 @@
 <?php
-class Ticket785TestCase extends PradoGenericSeleniumTest
+class Ticket785TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
 		$year=date('Y')-1;
 		$base = 'ctl0_Content_';
-		$this->open('tickets/index.php?page=Ticket785');
-		$this->assertTitle("Verifying Ticket 785");
-		
+		$this->url('tickets/index.php?page=Ticket785');
+		$this->assertEquals($this->title(), "Verifying Ticket 785");
+
 		$this->assertText('selDate', '');
 		$this->select($base."datePicker_year", $year);
 		$this->pause(800);
 		$expectedDate=date("d-m").'-'.$year;
 		$this->assertText('selDate', $expectedDate);
-		
+
 		$this->click($base."datePickerbutton");
 		$this->pause(800);
 		$this->click("css=input.todayButton");
@@ -21,13 +21,13 @@ class Ticket785TestCase extends PradoGenericSeleniumTest
 		$this->clickAt("css=body","0,0"); 		// Hide calendar
 		$expectedDate=date("d-m-Y");
 		$this->assertText('selDate', $expectedDate);
-		
+
 		$this->assertText('selDate2', '');
 		$this->type($base.'datePicker2', '12/05/2006');
 		$this->pause(800);
 		$this->clickAt("css=body","0,0");
-		$this->assertText('selDate2', '12/05/2006');		
-		
+		$this->assertText('selDate2', '12/05/2006');
+
 	}
 
 }
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket823TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket823TestCase.php
index 11e363ba..7b7a7759 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket823TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket823TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-class Ticket823TestCase extends PradoGenericSeleniumTest {
+class Ticket823TestCase extends PradoGenericSelenium2Test {
 
 	public function test() {
-		$this->open('tickets/index.php?page=Ticket823');
-		$this->assertTitle("Verifying Ticket 823");
+		$this->url('tickets/index.php?page=Ticket823');
+		$this->assertEquals($this->title(), "Verifying Ticket 823");
 		$base = 'ctl0_Content_';
-		$this->assertElementPresent('xpath=//option[@value="Choose..."]');		
+		$this->assertElementPresent('xpath=//option[@value="Choose..."]');
 	}
 }
 
diff --git a/tests/FunctionalTests/tickets/tests/Ticket828TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket828TestCase.php
index bbe185ad..f4d3676e 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket828TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket828TestCase.php
@@ -1,11 +1,11 @@
 <?php
-class Ticket828TestCase extends PradoGenericSeleniumTest
+class Ticket828TestCase extends PradoGenericSelenium2Test
 {
 
 	function test()
 	{
 		$base = "ctl0_Content_";
-		$this->open("tickets/index.php?page=Ticket828");
+		$this->url("tickets/index.php?page=Ticket828");
 		$this->click("{$base}submit1");
 		$this->assertVisible("{$base}validator1");
 		$this->assertVisible("{$base}validator2");
diff --git a/tests/FunctionalTests/tickets/tests/Ticket849TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket849TestCase.php
index fef9ac31..afd826f5 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket849TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket849TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket849TestCase extends PradoGenericSeleniumTest
+class Ticket849TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket849');
-		$this->assertTitle("Verifying Ticket 849");
+		$this->url('tickets/index.php?page=Ticket849');
+		$this->assertEquals($this->title(), "Verifying Ticket 849");
 		$base='ctl0_Content_';
 		$this->click($base.'ctl0');
 		$this->pause(800);
diff --git a/tests/FunctionalTests/tickets/tests/Ticket876TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket876TestCase.php
index 8006dd09..8d64d60d 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket876TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket876TestCase.php
@@ -1,22 +1,22 @@
 <?php
 
-class Ticket876TestCase extends PradoGenericSeleniumTest {
+class Ticket876TestCase extends PradoGenericSelenium2Test {
 
 	public function test() {
-		$this->open('tickets/index.php?page=Ticket876');
-		$this->assertTitle("Verifying Ticket 876");
+		$this->url('tickets/index.php?page=Ticket876');
+		$this->assertEquals($this->title(), "Verifying Ticket 876");
 		$base = 'ctl0_Content_';
-		
+
 		$this->assertElementPresent('xpath=//link[@rel="stylesheet"]');
 		$this->clickAndWait($base.'Button');
 		$this->assertElementNotPresent('xpath=//link[@rel="stylesheet"]');
-		
+
 		/*$this->select($base.'Date_month', 10);
 		$this->select($base.'Date_day', 22);
-		
+
 		$this->clickAndWait($base.'SendButton');
 		$this->assertTextPresent('2008-10-22');*/
 	}
-	
+
 }
 
diff --git a/tests/FunctionalTests/tickets/tests/Ticket886TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket886TestCase.php
index 99990ebf..820e0170 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket886TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket886TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-class Ticket886TestCase extends PradoGenericSeleniumTest
+class Ticket886TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket886');
-		$this->assertTitle("Verifying Ticket 886");
+		$this->url('tickets/index.php?page=Ticket886');
+		$this->assertEquals($this->title(), "Verifying Ticket 886");
 		$base = 'ctl0_Content_';
 		$this->clickAndWait($base.'SendButton');
 		$this->assertTextPresent(date('Y').'-01-01');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket897TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket897TestCase.php
index 67d1f1f2..6c49276f 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket897TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket897TestCase.php
@@ -1,16 +1,16 @@
 <?php
 
-class Ticket897TestCase extends PradoGenericSeleniumTest
+class Ticket897TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket897');
-		$this->assertTitle("Verifying Ticket 897");
+		$this->url('tickets/index.php?page=Ticket897');
+		$this->assertEquals($this->title(), "Verifying Ticket 897");
 		$base = 'ctl0_Content_';
-		
+
 		$this->select($base.'Date_month', 10);
 		$this->select($base.'Date_day', 22);
-		
+
 		$this->clickAndWait($base.'SendButton');
 		$this->assertTextPresent(date('Y').'-10-22');
 	}
diff --git a/tests/FunctionalTests/tickets/tests/Ticket900TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket900TestCase.php
index 3ec69873..a6f823bc 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket900TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket900TestCase.php
@@ -1,13 +1,13 @@
 <?php
 
-class Ticket900TestCase extends PradoGenericSeleniumTest
+class Ticket900TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket900');
-		$this->assertTitle("Verifying Ticket 900");
+		$this->url('tickets/index.php?page=Ticket900');
+		$this->assertEquals($this->title(), "Verifying Ticket 900");
 		$base = 'ctl0_Content_';
-		
+
 		$this->clickAndWait('ctl0$Content$DataGrid$ctl1$ctl3');
 		$this->type($base.'DataGrid_ctl1_TextBox', '');
 		$this->click($base.'DataGrid_ctl1_ctl3');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket922TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket922TestCase.php
index 208bd1d0..64490f1f 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket922TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket922TestCase.php
@@ -1,13 +1,13 @@
 <?php
 
-class Ticket922TestCase extends PradoGenericSeleniumTest
+class Ticket922TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket922');
-		$this->assertTitle("Verifying Ticket 922");
+		$this->url('tickets/index.php?page=Ticket922');
+		$this->assertEquals($this->title(), "Verifying Ticket 922");
 		$base = 'ctl0_Content_';
-		
+
 		$this->type($base.'Text', 'two words');
 		$this->clickAndWait('ctl0$Content$ctl0');
 		$this->assertText($base.'Result','two words');
diff --git a/tests/FunctionalTests/tickets/tests/Ticket93TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket93TestCase.php
index a56925a8..51d5b582 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket93TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket93TestCase.php
@@ -4,12 +4,12 @@
  *
  */
 
-class Ticket93TestCase extends PradoGenericSeleniumTest
+class Ticket93TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open('tickets/index.php?page=Ticket93');
-		$this->verifyTextPresent("ValidationGroups without any inputs with grouping");
+		$this->url('tickets/index.php?page=Ticket93');
+		$this->assertTextPresent("ValidationGroups without any inputs with grouping");
 	}
-	
+
 }
-- 
cgit v1.2.3