From 7c65b2f40ea9242260eac5a746863f5925423861 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Sun, 22 Sep 2013 22:39:41 +0200
Subject: Phing: added target for phpunit+selenium

Functional tests were using an old selenium RC version. Ported them to
use phpunit + selenium; next: opensauce
---
 tests/FunctionalTests/features/assets/.gitignore              |  0
 tests/FunctionalTests/features/index.php                      |  2 --
 tests/FunctionalTests/features/protected/application.xml      |  0
 .../features/protected/controls/LabeledTextBox.tpl            |  0
 .../features/protected/controls/LabeledTextbox.php            |  1 -
 tests/FunctionalTests/features/protected/controls/Layout.php  |  2 --
 tests/FunctionalTests/features/protected/controls/Layout.tpl  |  0
 .../protected/pages/ActiveControls/ActiveControl.page         |  0
 .../features/protected/pages/ActiveControls/ActiveControl.php |  1 -
 .../features/protected/pages/ActiveControls/AutoComplete.page |  0
 .../features/protected/pages/ActiveControls/AutoComplete.php  |  2 --
 .../features/protected/pages/ActiveControls/Calculator.page   |  0
 .../features/protected/pages/ActiveControls/Calculator.php    |  2 --
 .../features/protected/pages/ActiveControls/Calculator2.page  |  0
 .../features/protected/pages/ActiveControls/Calculator2.php   |  2 --
 .../protected/pages/ActiveControls/VisibleUpdate.page         |  0
 .../features/protected/pages/ActiveControls/VisibleUpdate.php |  2 --
 .../features/protected/pages/ActiveControls/config.xml        |  0
 .../features/protected/pages/ClientScripts.page               |  0
 .../FunctionalTests/features/protected/pages/ColorPicker.page |  0
 .../FunctionalTests/features/protected/pages/FeatureList.page |  0
 .../FunctionalTests/features/protected/pages/FeatureList.php  |  2 --
 .../features/protected/pages/FocusControl.page                |  0
 .../FunctionalTests/features/protected/pages/FocusControl.php |  2 --
 .../features/protected/pages/I18N/BasicI18N.page              |  0
 .../features/protected/pages/I18N/BasicI18N.php               |  5 ++---
 tests/FunctionalTests/features/protected/pages/I18N/Home.page |  0
 .../features/protected/pages/I18N/Home.zh_CN.page             |  0
 .../FunctionalTests/features/protected/pages/I18N/config.xml  |  0
 .../features/protected/pages/I18N/messages/.gitignore         |  0
 .../features/protected/pages/MyJavascriptLib.php              |  2 --
 .../FunctionalTests/features/protected/pages/RatingList.page  |  0
 tests/FunctionalTests/features/protected/pages/TestComp.php   |  2 --
 .../features/protected/pages/ValidatorEffects.page            |  0
 .../features/protected/pages/myscripts/packages.php           |  2 --
 tests/FunctionalTests/features/protected/runtime/.gitignore   |  0
 tests/FunctionalTests/features/tests/MyTestCase.php           | 11 +----------
 37 files changed, 3 insertions(+), 37 deletions(-)
 mode change 100644 => 100755 tests/FunctionalTests/features/assets/.gitignore
 mode change 100644 => 100755 tests/FunctionalTests/features/index.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/application.xml
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/controls/LabeledTextbox.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/controls/Layout.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/controls/Layout.tpl
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ActiveControls/config.xml
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ClientScripts.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ColorPicker.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/FeatureList.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/FeatureList.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/FocusControl.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/FocusControl.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/I18N/Home.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/I18N/config.xml
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/I18N/messages/.gitignore
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/MyJavascriptLib.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/RatingList.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/TestComp.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/pages/myscripts/packages.php
 mode change 100644 => 100755 tests/FunctionalTests/features/protected/runtime/.gitignore
 mode change 100644 => 100755 tests/FunctionalTests/features/tests/MyTestCase.php

(limited to 'tests/FunctionalTests/features')

diff --git a/tests/FunctionalTests/features/assets/.gitignore b/tests/FunctionalTests/features/assets/.gitignore
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/index.php b/tests/FunctionalTests/features/index.php
old mode 100644
new mode 100755
index fe127639..77ddf367
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl b/tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php
old mode 100644
new mode 100755
index ef36863b..6a95407d
--- 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
old mode 100644
new mode 100755
index f60a9a18..0ac4d6b3
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php
old mode 100644
new mode 100755
index 322f4db7..d33ee43b
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/AutoComplete.php
old mode 100644
new mode 100755
index ac08e4ed..c13cda9b
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator.php
old mode 100644
new mode 100755
index 7afd1d59..86cb3e9b
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.php
old mode 100644
new mode 100755
index 3789a3f9..8d184cb9
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.php
old mode 100644
new mode 100755
index 1b1d0cbc..e01e1c0a
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/ClientScripts.page b/tests/FunctionalTests/features/protected/pages/ClientScripts.page
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/ColorPicker.page b/tests/FunctionalTests/features/protected/pages/ColorPicker.page
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/FeatureList.page b/tests/FunctionalTests/features/protected/pages/FeatureList.page
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/FeatureList.php b/tests/FunctionalTests/features/protected/pages/FeatureList.php
old mode 100644
new mode 100755
index 8f28f6de..e5fad8d0
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/FocusControl.php b/tests/FunctionalTests/features/protected/pages/FocusControl.php
old mode 100644
new mode 100755
index e534a92a..ef57a25b
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
old mode 100644
new mode 100755
index 929e2f17..d4a98e26
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page b/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/config.xml b/tests/FunctionalTests/features/protected/pages/I18N/config.xml
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/messages/.gitignore b/tests/FunctionalTests/features/protected/pages/I18N/messages/.gitignore
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/MyJavascriptLib.php b/tests/FunctionalTests/features/protected/pages/MyJavascriptLib.php
old mode 100644
new mode 100755
index 72e6061e..a3c4d5e4
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/TestComp.php b/tests/FunctionalTests/features/protected/pages/TestComp.php
old mode 100644
new mode 100755
index 0358357a..b70a4911
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/protected/pages/myscripts/packages.php b/tests/FunctionalTests/features/protected/pages/myscripts/packages.php
old mode 100644
new mode 100755
index e39199f9..a5666551
--- 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
old mode 100644
new mode 100755
diff --git a/tests/FunctionalTests/features/tests/MyTestCase.php b/tests/FunctionalTests/features/tests/MyTestCase.php
old mode 100644
new mode 100755
index 43a4762d..92b0886a
--- 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
-- 
cgit v1.2.3