Phing: added target for phpunit+selenium

Functional tests were using an old selenium RC version. Ported them to
use phpunit + selenium; next: opensauce

37 files changed, 3 insertions, 37 deletions

diff --git a/tests/FunctionalTests/features/assets/.gitignore b/tests/FunctionalTests/features/assets/.gitignore
index d6b7ef32..d6b7ef32 100644..100755
--- a/tests/FunctionalTests/features/assets/.gitignore
+++ b/tests/FunctionalTests/features/assets/.gitignore
diff --git a/tests/FunctionalTests/features/index.php b/tests/FunctionalTests/features/index.php
index fe127639..77ddf367 100644..100755
--- a/tests/FunctionalTests/features/index.php
+++ b/tests/FunctionalTests/features/index.php
@@ -4,5 +4,3 @@ require_once(dirname(__FILE__).'/../../../framework/prado.php');
 
 $app=new TApplication;
 $app->run();
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/application.xml b/tests/FunctionalTests/features/protected/application.xml
index 9153f3f7..9153f3f7 100644..100755
--- a/tests/FunctionalTests/features/protected/application.xml
+++ b/tests/FunctionalTests/features/protected/application.xml
diff --git a/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl b/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl
index 276d03b2..276d03b2 100644..100755
--- a/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl
+++ b/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl
diff --git a/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php
index ef36863b..6a95407d 100644..100755
--- a/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php
+++ b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php
@@ -22,4 +22,3 @@ class LabeledTextBox extends TTemplateControl
 	}
 } 
 
-?>
diff --git a/tests/FunctionalTests/features/protected/controls/Layout.php b/tests/FunctionalTests/features/protected/controls/Layout.php
index f60a9a18..0ac4d6b3 100644..100755
--- a/tests/FunctionalTests/features/protected/controls/Layout.php
+++ b/tests/FunctionalTests/features/protected/controls/Layout.php
@@ -4,5 +4,3 @@ class Layout extends TTemplateControl
 {
 
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/controls/Layout.tpl b/tests/FunctionalTests/features/protected/controls/Layout.tpl
index dbd433b8..dbd433b8 100644..100755
--- a/tests/FunctionalTests/features/protected/controls/Layout.tpl
+++ b/tests/FunctionalTests/features/protected/controls/Layout.tpl
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page
index 9f17d4ed..9f17d4ed 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php
index 322f4db7..d33ee43b 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php
@@ -40,4 +40,3 @@ class ActiveControl extends TPage
 		return self::$_colors[rand(0,count(self::$_colors)-1)];
 	}
 }
-?>
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.page b/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.page
index b98874cb..b98874cb 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.page
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.page
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.php
index ac08e4ed..c13cda9b 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.php
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.php
@@ -30,5 +30,3 @@ class AutoComplete extends TPage
 		return $list;				 
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.page b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.page
index f0021299..f0021299 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.page
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.page
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.php
index 7afd1d59..86cb3e9b 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.php
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.php
@@ -11,5 +11,3 @@ class Calculator extends TPage
 		$this->c->Text = floatval($this->a->Text) + floatval($this->b->Text);	
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page
index ca141c60..ca141c60 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.php
index 3789a3f9..8d184cb9 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.php
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.php
@@ -16,5 +16,3 @@ class Calculator2 extends TPage
 		$this->panel1->renderControl($param->Output); 
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.page b/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.page
index a8cb3c27..a8cb3c27 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.page
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.page
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.php
index 1b1d0cbc..e01e1c0a 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.php
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.php
@@ -32,5 +32,3 @@ class VisibleUpdate extends TPage
 			" and Button 2 was ".($this->button2->Enabled ? 'enabled' : 'disabled');
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/config.xml b/tests/FunctionalTests/features/protected/pages/ActiveControls/config.xml
index 37988c44..37988c44 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/config.xml
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/config.xml
diff --git a/tests/FunctionalTests/features/protected/pages/ClientScripts.page b/tests/FunctionalTests/features/protected/pages/ClientScripts.page
index 18aca48b..18aca48b 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ClientScripts.page
+++ b/tests/FunctionalTests/features/protected/pages/ClientScripts.page
diff --git a/tests/FunctionalTests/features/protected/pages/ColorPicker.page b/tests/FunctionalTests/features/protected/pages/ColorPicker.page
index 3d8c46db..3d8c46db 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ColorPicker.page
+++ b/tests/FunctionalTests/features/protected/pages/ColorPicker.page
diff --git a/tests/FunctionalTests/features/protected/pages/FeatureList.page b/tests/FunctionalTests/features/protected/pages/FeatureList.page
index ef25ccb9..ef25ccb9 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/FeatureList.page
+++ b/tests/FunctionalTests/features/protected/pages/FeatureList.page
diff --git a/tests/FunctionalTests/features/protected/pages/FeatureList.php b/tests/FunctionalTests/features/protected/pages/FeatureList.php
index 8f28f6de..e5fad8d0 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/FeatureList.php
+++ b/tests/FunctionalTests/features/protected/pages/FeatureList.php
@@ -30,5 +30,3 @@ class FeatureList extends TPage
 		return $list;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/FocusControl.page b/tests/FunctionalTests/features/protected/pages/FocusControl.page
index af414c3a..af414c3a 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/FocusControl.page
+++ b/tests/FunctionalTests/features/protected/pages/FocusControl.page
diff --git a/tests/FunctionalTests/features/protected/pages/FocusControl.php b/tests/FunctionalTests/features/protected/pages/FocusControl.php
index e534a92a..ef57a25b 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/FocusControl.php
+++ b/tests/FunctionalTests/features/protected/pages/FocusControl.php
@@ -13,5 +13,3 @@ class FocusControl extends TPage
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page
index e13eecf2..e13eecf2 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page
+++ b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
index 929e2f17..d4a98e26 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
+++ b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
@@ -22,7 +22,7 @@ class BasicI18N extends TPage
  * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
  * @package ${package}
  *//*
-class BasicI18NTestCase extends SeleniumTestCase
+class BasicI18NTestCase extends PradoGenericSeleniumTest
 {
 	function setup()
 	{
@@ -41,5 +41,4 @@ class BasicI18NTestCase extends SeleniumTestCase
 		$this->verifyTextPresent("Many things.", "");
 	}
 }
-*/
-?>
\ No newline at end of file
+*/
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/Home.page b/tests/FunctionalTests/features/protected/pages/I18N/Home.page
index 9a49e3a2..9a49e3a2 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/I18N/Home.page
+++ b/tests/FunctionalTests/features/protected/pages/I18N/Home.page
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page b/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page
index 1b931cc2..1b931cc2 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page
+++ b/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/config.xml b/tests/FunctionalTests/features/protected/pages/I18N/config.xml
index 25e26ac5..25e26ac5 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/I18N/config.xml
+++ b/tests/FunctionalTests/features/protected/pages/I18N/config.xml
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/messages/.gitignore b/tests/FunctionalTests/features/protected/pages/I18N/messages/.gitignore
index e69de29b..e69de29b 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/I18N/messages/.gitignore
+++ b/tests/FunctionalTests/features/protected/pages/I18N/messages/.gitignore
diff --git a/tests/FunctionalTests/features/protected/pages/MyJavascriptLib.php b/tests/FunctionalTests/features/protected/pages/MyJavascriptLib.php
index 72e6061e..a3c4d5e4 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/MyJavascriptLib.php
+++ b/tests/FunctionalTests/features/protected/pages/MyJavascriptLib.php
@@ -28,5 +28,3 @@ class MyJavascriptLib extends TComponent
 		$this->_manager->registerScriptFile($url,$url);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/RatingList.page b/tests/FunctionalTests/features/protected/pages/RatingList.page
index 909180c7..909180c7 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/RatingList.page
+++ b/tests/FunctionalTests/features/protected/pages/RatingList.page
diff --git a/tests/FunctionalTests/features/protected/pages/TestComp.php b/tests/FunctionalTests/features/protected/pages/TestComp.php
index 0358357a..b70a4911 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/TestComp.php
+++ b/tests/FunctionalTests/features/protected/pages/TestComp.php
@@ -16,5 +16,3 @@ class TestComp extends TControl
 		MyJavascriptLib::registerPackage($this,$this->_class);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
index 78c66365..78c66365 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
+++ b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
diff --git a/tests/FunctionalTests/features/protected/pages/myscripts/packages.php b/tests/FunctionalTests/features/protected/pages/myscripts/packages.php
index e39199f9..a5666551 100644..100755
--- a/tests/FunctionalTests/features/protected/pages/myscripts/packages.php
+++ b/tests/FunctionalTests/features/protected/pages/myscripts/packages.php
@@ -6,5 +6,3 @@ $deps['test'] = array('test');
 $deps['test2'] = array('test');
 
 return array($packages,$deps);
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/runtime/.gitignore b/tests/FunctionalTests/features/protected/runtime/.gitignore
index d6b7ef32..d6b7ef32 100644..100755
--- a/tests/FunctionalTests/features/protected/runtime/.gitignore
+++ b/tests/FunctionalTests/features/protected/runtime/.gitignore
diff --git a/tests/FunctionalTests/features/tests/MyTestCase.php b/tests/FunctionalTests/features/tests/MyTestCase.php
index 43a4762d..92b0886a 100644..100755
--- a/tests/FunctionalTests/features/tests/MyTestCase.php
+++ b/tests/FunctionalTests/features/tests/MyTestCase.php
@@ -1,19 +1,10 @@
 <?php
 
-class MyTestCase extends SeleniumTestCase
+class MyTestCase extends PradoGenericSeleniumTest
 {
 	function test1()
 	{
 		$this->open('http://127.0.0.1');
 		$this->assertTextNotPresent('asd');
 	}
-
-	function test2()
-	{
-		$this->skipBrowsers(self::FIREFOX);
-		$this->open('http://127.0.0.1');
-		$this->assertTextNotPresent('asd');
-	}
 }
-
-?>
\ No newline at end of file