From cb7b7f1929dce12936eca957caa432e74c6dc7de Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 12 Mar 2006 04:43:03 +0000
Subject: reorganized FT tests.

---
 .gitattributes                                     | 33 ++++-----
 .gitignore                                         |  1 -
 tests/FunctionalTests/features.php                 | 39 ++++++++++
 tests/FunctionalTests/features/index.php           |  8 ++
 .../features/protected/application.xml             |  9 +++
 .../features/protected/controls/Layout.php         |  8 ++
 .../features/protected/controls/Layout.tpl         | 27 +++++++
 .../features/protected/pages/ColorPicker.page      | 40 ++++++++++
 .../features/protected/pages/DatePicker.page       | 59 +++++++++++++++
 .../features/protected/pages/FeatureList.page      |  3 +
 .../features/protected/pages/FeatureList.php       | 34 +++++++++
 .../features/protected/pages/HtmlArea.page         | 10 +++
 .../features/protected/pages/I18N/BasicI18N.page   | 31 ++++++++
 .../features/protected/pages/I18N/BasicI18N.php    | 45 ++++++++++++
 .../features/protected/pages/I18N/Home.page        |  3 +
 .../features/protected/pages/I18N/Home.zh_CN.page  |  3 +
 .../features/protected/pages/I18N/config.xml       | 12 +++
 .../features/protected/pages/RatingList.page       | 41 +++++++++++
 tests/FunctionalTests/index.php                    |  9 ++-
 tests/FunctionalTests/protected/application.xml    | 18 -----
 tests/FunctionalTests/protected/pages/Home.page    |  6 --
 .../protected/pages/Home.zh_CN.page                | 34 ---------
 .../protected/pages/I18N/BasicI18N.page            | 31 --------
 .../protected/pages/I18N/BasicI18N.php             | 45 ------------
 tests/FunctionalTests/protected/pages/Layout.php   |  8 --
 tests/FunctionalTests/protected/pages/Layout.tpl   | 37 ----------
 .../protected/pages/TicketTestPage.php             | 14 ----
 .../protected/pages/TicketTestPage.tpl             | 45 ------------
 .../protected/pages/UI/ColorPicker.page            | 40 ----------
 .../protected/pages/UI/DatePicker.page             | 59 ---------------
 .../protected/pages/UI/RatingList.page             | 41 -----------
 .../protected/pages/UI/testHtmlArea.page           | 10 ---
 .../protected/pages/ViewSource.page                | 23 ------
 .../FunctionalTests/protected/pages/ViewSource.php | 85 ----------------------
 tests/FunctionalTests/protected/pages/config.xml   | 11 ---
 tests/FunctionalTests/tickets/application.xml      |  4 -
 36 files changed, 394 insertions(+), 532 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 tests/FunctionalTests/features.php
 create mode 100644 tests/FunctionalTests/features/index.php
 create mode 100644 tests/FunctionalTests/features/protected/application.xml
 create mode 100644 tests/FunctionalTests/features/protected/controls/Layout.php
 create mode 100644 tests/FunctionalTests/features/protected/controls/Layout.tpl
 create mode 100644 tests/FunctionalTests/features/protected/pages/ColorPicker.page
 create mode 100644 tests/FunctionalTests/features/protected/pages/DatePicker.page
 create mode 100644 tests/FunctionalTests/features/protected/pages/FeatureList.page
 create mode 100644 tests/FunctionalTests/features/protected/pages/FeatureList.php
 create mode 100644 tests/FunctionalTests/features/protected/pages/HtmlArea.page
 create mode 100644 tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page
 create mode 100644 tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
 create mode 100644 tests/FunctionalTests/features/protected/pages/I18N/Home.page
 create mode 100644 tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page
 create mode 100644 tests/FunctionalTests/features/protected/pages/I18N/config.xml
 create mode 100644 tests/FunctionalTests/features/protected/pages/RatingList.page
 delete mode 100644 tests/FunctionalTests/protected/application.xml
 delete mode 100644 tests/FunctionalTests/protected/pages/Home.page
 delete mode 100644 tests/FunctionalTests/protected/pages/Home.zh_CN.page
 delete mode 100644 tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
 delete mode 100644 tests/FunctionalTests/protected/pages/I18N/BasicI18N.php
 delete mode 100644 tests/FunctionalTests/protected/pages/Layout.php
 delete mode 100644 tests/FunctionalTests/protected/pages/Layout.tpl
 delete mode 100644 tests/FunctionalTests/protected/pages/TicketTestPage.php
 delete mode 100644 tests/FunctionalTests/protected/pages/TicketTestPage.tpl
 delete mode 100644 tests/FunctionalTests/protected/pages/UI/ColorPicker.page
 delete mode 100644 tests/FunctionalTests/protected/pages/UI/DatePicker.page
 delete mode 100644 tests/FunctionalTests/protected/pages/UI/RatingList.page
 delete mode 100644 tests/FunctionalTests/protected/pages/UI/testHtmlArea.page
 delete mode 100644 tests/FunctionalTests/protected/pages/ViewSource.page
 delete mode 100644 tests/FunctionalTests/protected/pages/ViewSource.php
 delete mode 100644 tests/FunctionalTests/protected/pages/config.xml
 delete mode 100644 tests/FunctionalTests/tickets/application.xml

diff --git a/.gitattributes b/.gitattributes
index e2289646..7d1573b9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -782,23 +782,23 @@ requirements/template-zh.html -text
 requirements/template.html -text
 tests/FunctionalTests/README.txt -text
 tests/FunctionalTests/config.php -text
+tests/FunctionalTests/features.php -text
+tests/FunctionalTests/features/index.php -text
+tests/FunctionalTests/features/protected/application.xml -text
+tests/FunctionalTests/features/protected/controls/Layout.php -text
+tests/FunctionalTests/features/protected/controls/Layout.tpl -text
+tests/FunctionalTests/features/protected/pages/ColorPicker.page -text
+tests/FunctionalTests/features/protected/pages/DatePicker.page -text
+tests/FunctionalTests/features/protected/pages/FeatureList.page -text
+tests/FunctionalTests/features/protected/pages/FeatureList.php -text
+tests/FunctionalTests/features/protected/pages/HtmlArea.page -text
+tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page -text
+tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php -text
+tests/FunctionalTests/features/protected/pages/I18N/Home.page -text
+tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page -text
+tests/FunctionalTests/features/protected/pages/I18N/config.xml -text
+tests/FunctionalTests/features/protected/pages/RatingList.page -text
 tests/FunctionalTests/index.php -text
-tests/FunctionalTests/protected/application.xml -text
-tests/FunctionalTests/protected/pages/Home.page -text
-tests/FunctionalTests/protected/pages/Home.zh_CN.page -text
-tests/FunctionalTests/protected/pages/I18N/BasicI18N.page -text
-tests/FunctionalTests/protected/pages/I18N/BasicI18N.php -text
-tests/FunctionalTests/protected/pages/Layout.php -text
-tests/FunctionalTests/protected/pages/Layout.tpl -text
-tests/FunctionalTests/protected/pages/TicketTestPage.php -text
-tests/FunctionalTests/protected/pages/TicketTestPage.tpl -text
-tests/FunctionalTests/protected/pages/UI/ColorPicker.page -text
-tests/FunctionalTests/protected/pages/UI/DatePicker.page -text
-tests/FunctionalTests/protected/pages/UI/RatingList.page -text
-tests/FunctionalTests/protected/pages/UI/testHtmlArea.page -text
-tests/FunctionalTests/protected/pages/ViewSource.page -text
-tests/FunctionalTests/protected/pages/ViewSource.php -text
-tests/FunctionalTests/protected/pages/config.xml -text
 tests/FunctionalTests/quickstart.php -text
 tests/FunctionalTests/quickstart/Advanced/I18N.php -text
 tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php -text
@@ -902,7 +902,6 @@ tests/FunctionalTests/selenium/xmlextras.js -text
 tests/FunctionalTests/selenium/xpath.js -text
 tests/FunctionalTests/tests.php -text
 tests/FunctionalTests/tickets.php -text
-tests/FunctionalTests/tickets/application.xml -text
 tests/FunctionalTests/tickets/index.php -text
 tests/FunctionalTests/tickets/protected/pages/Layout.php -text
 tests/FunctionalTests/tickets/protected/pages/Layout.tpl -text
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 201b8a2b..00000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tests/FunctionalTests/protected/messages/zh_CN
diff --git a/tests/FunctionalTests/features.php b/tests/FunctionalTests/features.php
new file mode 100644
index 00000000..71c8ce3a
--- /dev/null
+++ b/tests/FunctionalTests/features.php
@@ -0,0 +1,39 @@
+<?php
+
+require('config.php');
+header("Content-Type: text/html; charset=UTF-8");
+class BrowserTestConfig extends PradoTestConfig
+{
+	//functional test groups
+	public function unit_test_groups()
+	{
+		$groups = array();
+
+		//tests for quickstart samples
+		$this->get_directories(dirname(__FILE__).'/features/tests', $groups);
+
+		return $groups;
+	}
+
+	protected function get_directories($base,&$groups)
+	{
+		$groups[] = realpath($base);
+		$dirs = new DirectoryIterator($base);
+		foreach($dirs as $dir)
+			if(!$dir->isDot() && $dir->isDir()
+				&& !preg_match("/\.svn/", $dir->getPathName()))
+				$this->get_directories($dir->getPathName(), $groups);
+	}
+}
+
+
+$root = dirname(__FILE__);
+$server = SimpleSeleniumProxyServer::getInstance($root);
+
+$tester = new PradoSimpleTester(new BrowserTestConfig());
+$browser_tests = $tester->getTests();
+$browser_tests->run(new SimpleReporter());
+
+$server->handleRequest();
+
+?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/index.php b/tests/FunctionalTests/features/index.php
new file mode 100644
index 00000000..fe127639
--- /dev/null
+++ b/tests/FunctionalTests/features/index.php
@@ -0,0 +1,8 @@
+<?php
+
+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
new file mode 100644
index 00000000..642152cc
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/application.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<application id="FeatureTests" Mode="Debug">
+	<services>
+	  <service id="page" class="TPageService" DefaultPage="FeatureList">
+	    <pages MasterClass="Application.controls.Layout" />
+	  </service>
+	</services>
+</application>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/controls/Layout.php b/tests/FunctionalTests/features/protected/controls/Layout.php
new file mode 100644
index 00000000..2c6e02d6
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/controls/Layout.php
@@ -0,0 +1,8 @@
+<?php
+
+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
new file mode 100644
index 00000000..18482377
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/controls/Layout.tpl
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC
+	"-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<com:THead Title="PRADO Feature Tests">
+	<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
+	<style type="text/css">
+	/*<![CDATA[*/
+	body
+	{
+		font-family: Georgia, "Times New Roman", Times, serif;
+	}
+	.w3c
+	{
+		margin-top: 2em;
+		display: block;
+	}
+	/*]]>*/
+	</style>
+</com:THead>
+<body>
+<com:TForm>
+<com:TContentPlaceHolder ID="Content" />
+</com:TForm>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/ColorPicker.page b/tests/FunctionalTests/features/protected/pages/ColorPicker.page
new file mode 100644
index 00000000..3d8c46db
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/ColorPicker.page
@@ -0,0 +1,40 @@
+<com:TContent ID="Content">
+
+<com:TColorPicker Text="#FFCC00" /><br />
+
+
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+
+<p>asda<br /></p>
+<p>asda<br /></p>
+
+<com:TColorPicker Mode="Simple" /><br />
+
+
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+
+<com:TColorPicker ShowColorPicker="false" /><br />
+
+<p>asda<br /></p>
+
+<com:TColorPicker Mode="Full" /><br />
+
+<p>asda<br /></p>
+<p>asda<br /></p>
+
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+<p>asda<br /></p>
+
+
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/DatePicker.page b/tests/FunctionalTests/features/protected/pages/DatePicker.page
new file mode 100644
index 00000000..4347f748
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/DatePicker.page
@@ -0,0 +1,59 @@
+<com:TContent ID="Content">
+
+<h1>TDatePicker Samples</h1>
+
+<table class="sampletable">
+
+<tr>
+	<td class="samplenote">Default TDatePicker</td>
+	<td class="sampleaction">
+		<com:TDatePicker />
+	</td>
+</tr>
+
+<tr>
+	<td class="samplenote">Button Mode</td>
+	<td class="sampleaction">
+		<com:TDatePicker Mode="Button" />
+	</td>
+</tr>
+
+<tr>
+	<td class="samplenote">InputMode="DropDownList", custom DateFormat</td>
+	<td class="sampleaction">
+		<com:TDatePicker DateFormat="yyyy/MMMM" InputMode="DropDownList"/>
+	</td>
+</tr>
+
+<tr>
+	<td class="samplenote">InputMode="DropDownList", custom DateFormat, Culture</td>
+	<td class="sampleaction">
+		<com:TDatePicker DateFormat="MM/yyyy" Culture="fr" InputMode="DropDownList"/>
+	</td>
+</tr>
+
+
+<tr>
+	<td class="samplenote">Custom DateFormat, culture, ImageButton mode</td>
+	<td class="sampleaction">
+		<com:TDatePicker Mode="ImageButton" Culture="zh_CN" DateFormat="日期：yyyy年M月d日"/>
+	</td>
+</tr>
+
+<tr>
+	<td class="samplenote">Custom DateFormat, DropDownList, pre-selected date set in as Text</td>
+	<td class="sampleaction">
+		<com:TDatePicker DateFormat="yyyy/MMMM/dd" Text="2005/05/15" InputMode="DropDownList"/>
+	</td>
+</tr>
+
+<tr>
+	<td class="samplenote">DropDownList, pre-selected date as integer</td>
+	<td class="sampleaction">
+		<com:TDatePicker InputMode="DropDownList" Date=<%= @strtotime("-1 month") %>/>
+	</td>
+</tr>
+	
+</table>
+
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/FeatureList.page b/tests/FunctionalTests/features/protected/pages/FeatureList.page
new file mode 100644
index 00000000..ef25ccb9
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/FeatureList.page
@@ -0,0 +1,3 @@
+<com:TContent ID="Content">
+<com:TBulletedList ID="List" DisplayMode="HyperLink"/>
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/FeatureList.php b/tests/FunctionalTests/features/protected/pages/FeatureList.php
new file mode 100644
index 00000000..7f82d34e
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/FeatureList.php
@@ -0,0 +1,34 @@
+<?php
+
+class FeatureList extends TPage
+{
+	public function onLoad($param)
+	{
+		parent::onLoad($param);
+		$list=$this->getPageList(dirname(__FILE__),'');
+		$this->List->DataSource=$list;
+		$this->List->dataBind();
+	}
+
+	protected function getPageList($directory,$basePath)
+	{
+		$list=array();
+		$folder=@opendir($directory);
+		while($entry=@readdir($folder))
+		{
+			if($entry[0]==='.')
+				continue;
+			else if(is_file($directory.'/'.$entry))
+			{
+				if(($page=basename($entry,'.page'))!==$entry && strpos($page,'.')===false)
+					$list['?page='.$basePath.$page]=$basePath.$page;
+			}
+			else
+				$list=array_merge($list,$this->getPageList($directory.'/'.$entry,$basePath.$entry.'.'));
+		}
+		closedir($folder);
+		return $list;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/HtmlArea.page b/tests/FunctionalTests/features/protected/pages/HtmlArea.page
new file mode 100644
index 00000000..8b56f48d
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/HtmlArea.page
@@ -0,0 +1,10 @@
+<%@ Application.Globalization.Charset="GB2312" %>
+<com:TContent ID="Content">
+
+	<com:THtmlArea>
+		<prop:Options>
+			plugins : "contextmenu,paste",
+			language: "zh_CN"
+		</prop:Options>
+	</com:THtmlArea>
+</com:TContent>
\ 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
new file mode 100644
index 00000000..e13eecf2
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page
@@ -0,0 +1,31 @@
+<%@ Title="Basic I18N Test" Application.Globalization.Culture="zh_CN" %>
+<com:TContent ID="Content">
+<h1>Basic I18N Test</h1>
+<com:TTranslate>
+	Hello {name}
+		<com:TTranslateParameter Key="name">
+			<com:TLabel>
+				<com:TTranslate>Name</com:TTranslate>
+			</com:TLabel>
+		</com:TTranslateParameter>
+</com:TTranslate>
+
+<div>
+<com:TNumberFormat Value="10000" Type="currency"/>
+</div>
+<div><com:TDateFormat Value="2006-01-15" Culture="zh_CN"/></div>
+
+<div>
+<com:TChoiceFormat Value="0">
+	[0] None |[1] One thing. |[2,Inf) Many things.
+</com:TChoiceFormat><br />
+
+<com:TChoiceFormat Value="1">
+	[0] None |[1] One thing. |[2,Inf) Many things.
+</com:TChoiceFormat><br />
+
+<com:TChoiceFormat Value="5">
+	[0] None |[1] One thing. |[2,Inf) Many things.
+</com:TChoiceFormat>
+</div>
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
new file mode 100644
index 00000000..cac0a04e
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * ${classname}
+ *
+ * ${description}
+ *
+ * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
+ * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
+ * @package ${package}
+ */
+class BasicI18N extends TPage
+{
+}
+
+/**
+ * ${classname}
+ *
+ * ${description}
+ *
+ * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
+ * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
+ * @package ${package}
+ *//*
+class BasicI18NTestCase extends SeleniumTestCase
+{
+	function setup()
+	{
+		$page = Prado::getApplication()->getTestPage(__FILE__);
+		$this->open($page);
+	}
+
+	function testI18N()
+	{
+		$this->verifyTitle("Basic I18N Test", "");
+		$this->verifyTextPresent("Hello", "");
+		$this->verifyTextPresent("US$10,000.00", "");
+		$this->verifyTextPresent("2006年1月15日 上午12时00分00秒", "");
+		$this->verifyTextPresent("None", "");
+		$this->verifyTextPresent("One thing.", "");
+		$this->verifyTextPresent("Many things.", "");
+	}
+}
+*/
+?>
\ 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
new file mode 100644
index 00000000..9a49e3a2
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/I18N/Home.page
@@ -0,0 +1,3 @@
+<com:TContent ID="Content">
+<h1>Prado Functional Tests</h1>
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page b/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page
new file mode 100644
index 00000000..1b931cc2
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page
@@ -0,0 +1,3 @@
+<com:TContent ID="Content">
+<h1>Prado Functional Tests (Chinese)</h1>
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/I18N/config.xml b/tests/FunctionalTests/features/protected/pages/I18N/config.xml
new file mode 100644
index 00000000..25e26ac5
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/I18N/config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <paths>
+	<using namespace="System.I18N.*" />
+  </paths>
+  <modules>
+    <module id="globalization" class="TGlobalization">
+      <translation type="XLIFF" source="Application.pages.I18N.messages" autosave="true" cache="true" />
+	</module>
+  </modules>
+</configuration>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/RatingList.page b/tests/FunctionalTests/features/protected/pages/RatingList.page
new file mode 100644
index 00000000..909180c7
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/RatingList.page
@@ -0,0 +1,41 @@
+<com:TContent ID="Content">
+<h1>TRatingList Examples</h1>
+
+<h2>Default TRatingList</h2>
+	<com:TRatingList RepeatDirection="Vertical" Style="caption-side: right;">
+		<com:TListItem Text="Fair" />
+		<com:TListItem Text="Average" />
+		<com:TListItem Text="Good" />
+		<com:TListItem Text="Execellent" />
+	</com:TRatingList>
+
+<h2>TRatingList </h2>
+	<com:TRatingList SelectedIndex="2">
+		<com:TListItem Text="Poor" />
+		<com:TListItem Text="Fair" />
+		<com:TListItem Text="Average" />
+		<com:TListItem Text="Good" />
+		<com:TListItem Text="Execellent" />
+		<com:TListItem Text="Super" />
+	</com:TRatingList>
+
+<h2>TRatingList </h2>
+	<com:TRatingList RatingStyle="blocks" SelectedValue="Good">
+		<com:TListItem Text="Poor" />
+		<com:TListItem Text="Fair" />
+		<com:TListItem Text="Average" />
+		<com:TListItem Text="Good" />
+		<com:TListItem Text="Execellent" />
+		<com:TListItem Text="Super" />
+	</com:TRatingList>
+
+<h2>TRatingList </h2>
+	<com:TRatingList ID="Rating1" AllowInput="false" Caption="Rating:" Rating="4.6">
+		<com:TListItem Text="Poor" />
+		<com:TListItem Text="Fair" />
+		<com:TListItem Text="Average" />
+		<com:TListItem Text="Good" />
+		<com:TListItem Text="Execellent" />
+		<com:TListItem Text="Super" />
+	</com:TRatingList>		
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/index.php b/tests/FunctionalTests/index.php
index 7cf01abd..2cfcfd1f 100644
--- a/tests/FunctionalTests/index.php
+++ b/tests/FunctionalTests/index.php
@@ -5,8 +5,11 @@ Prado Functional Test Suites
 </title>
 </head>
 <body>
-<a href="quickstart.php">Tests of QuickStart Tutorial Demo</a>
-<br/>
-<a href="tickets.php">Tests of Trac Tickets</a>
+<h1>Prado Functional Test Suites</h1>
+<ul>
+  <li><a href="quickstart.php">Tests of QuickStart Tutorial Demo</a></li>
+  <li><a href="tickets.php">Tests of Trac Tickets</a></li>
+  <li><a href="features.php">Tests of New Features</a> (<a href="features/index.php">list of new features</a>)</li>
+</ul>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/application.xml b/tests/FunctionalTests/protected/application.xml
deleted file mode 100644
index 53e73457..00000000
--- a/tests/FunctionalTests/protected/application.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<application id="FunctionTests" Mode="Debug">
-	<paths>
-		<alias id="Tests" path="." />
-		<using namespace="System.I18N.*" />
-	</paths>
-	
-	<modules>
-		<module id="globalization" class="TGlobalization">
-			<translation  type="XLIFF" source="Tests.messages" 
-					autosave="true" cache="true" />
-		</module>
-		<module id="logger" class="System.Log.TLogRouter">
-			<route class="TFileLogRoute" />
-		</module>
-	</modules>
-</application>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/Home.page b/tests/FunctionalTests/protected/pages/Home.page
deleted file mode 100644
index bf2830d6..00000000
--- a/tests/FunctionalTests/protected/pages/Home.page
+++ /dev/null
@@ -1,6 +0,0 @@
-<com:TContent ID="Content">
-<com:TForm>
-<h1>Prado Functional Tests</h1>
-<com:TJavascriptLogger />
-</com:TForm>
-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/Home.zh_CN.page b/tests/FunctionalTests/protected/pages/Home.zh_CN.page
deleted file mode 100644
index df7a9cc0..00000000
--- a/tests/FunctionalTests/protected/pages/Home.zh_CN.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Strict//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-	
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-	<title>Prado Functional Tests (zh_CN)</title>
-	<style type="text/css">
-	/*<![CDATA[*/
-	body
-	{
-		font-family: Georgia, "Times New Roman", Times, serif;
-	}
-	.w3c
-	{
-		margin-top: 2em;
-		display: block;
-	}
-	/*]]>*/
-	</style>
-</head>
-
-<body>
-
-<h1>Prado Functional Tests (zh_CN)</h1>
-
-<div class="w3c">
-<a href="http://validator.w3.org/check?uri=referer">
-		Validate XHTML 1.0
-</a>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page b/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
deleted file mode 100644
index e13eecf2..00000000
--- a/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Title="Basic I18N Test" Application.Globalization.Culture="zh_CN" %>
-<com:TContent ID="Content">
-<h1>Basic I18N Test</h1>
-<com:TTranslate>
-	Hello {name}
-		<com:TTranslateParameter Key="name">
-			<com:TLabel>
-				<com:TTranslate>Name</com:TTranslate>
-			</com:TLabel>
-		</com:TTranslateParameter>
-</com:TTranslate>
-
-<div>
-<com:TNumberFormat Value="10000" Type="currency"/>
-</div>
-<div><com:TDateFormat Value="2006-01-15" Culture="zh_CN"/></div>
-
-<div>
-<com:TChoiceFormat Value="0">
-	[0] None |[1] One thing. |[2,Inf) Many things.
-</com:TChoiceFormat><br />
-
-<com:TChoiceFormat Value="1">
-	[0] None |[1] One thing. |[2,Inf) Many things.
-</com:TChoiceFormat><br />
-
-<com:TChoiceFormat Value="5">
-	[0] None |[1] One thing. |[2,Inf) Many things.
-</com:TChoiceFormat>
-</div>
-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/I18N/BasicI18N.php b/tests/FunctionalTests/protected/pages/I18N/BasicI18N.php
deleted file mode 100644
index 6920f439..00000000
--- a/tests/FunctionalTests/protected/pages/I18N/BasicI18N.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * ${classname}
- *
- * ${description}
- *
- * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
- * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
- * @package ${package}
- */
-class BasicI18N extends TPage
-{
-}
-
-/**
- * ${classname}
- *
- * ${description}
- *
- * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
- * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
- * @package ${package}
- */
-class BasicI18NTestCase extends SeleniumTestCase
-{
-	function setup()
-	{
-		$page = Prado::getApplication()->getTestPage(__FILE__);
-		$this->open($page);
-	}
-
-	function testI18N()
-	{
-		$this->verifyTitle("Basic I18N Test", "");
-		$this->verifyTextPresent("Hello", "");
-		$this->verifyTextPresent("US$10,000.00", "");
-		$this->verifyTextPresent("2006年1月15日 上午12时00分00秒", "");
-		$this->verifyTextPresent("None", "");
-		$this->verifyTextPresent("One thing.", "");
-		$this->verifyTextPresent("Many things.", "");
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/Layout.php b/tests/FunctionalTests/protected/pages/Layout.php
deleted file mode 100644
index 2c6e02d6..00000000
--- a/tests/FunctionalTests/protected/pages/Layout.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class Layout extends TTemplateControl
-{
-
-}
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/Layout.tpl b/tests/FunctionalTests/protected/pages/Layout.tpl
deleted file mode 100644
index d58acd5d..00000000
--- a/tests/FunctionalTests/protected/pages/Layout.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Strict//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-	
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<com:THead Title="PRADO Functional Tests">
-	<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-	<style type="text/css">
-	/*<![CDATA[*/
-	body
-	{
-		font-family: Georgia, "Times New Roman", Times, serif;
-	}
-	.w3c
-	{
-		margin-top: 2em;
-		display: block;
-	}
-	/*]]>*/
-	</style>
-</com:THead>
-<body>
-<com:TForm>
-<com:TContentPlaceHolder ID="Content" />
-<com:TJavascriptLogger />
-</com:TForm>
-<div class="w3c">
-<a href="http://validator.w3.org/check?uri=referer">
-		Validate XHTML 1.0
-</a>
-<a href="?page=ViewSource&amp;path=<%= str_replace('.','/', $this->Request->ServiceParameter) %>.page"
-	style="margin: 0 1em;"
-	onclick="window.open(this.href); return false;" 
-	onkeypress="window.open(this.href); return false;">View Source</a>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/TicketTestPage.php b/tests/FunctionalTests/protected/pages/TicketTestPage.php
deleted file mode 100644
index f647f56b..00000000
--- a/tests/FunctionalTests/protected/pages/TicketTestPage.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class TicketTestPage extends TTemplateControl
-{
-	public function onLoad($param)
-	{
-		$num = str_replace('Ticket_','',get_class($this->getPage()));
-		$this->getPage()->setTitle("Verifying Ticket $num");
-		$this->ticketlink->setText("Verifying Ticket $num");
-		$this->ticketlink->setNavigateUrl("http://trac.pradosoft.com/ticket/{$num}");
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/TicketTestPage.tpl b/tests/FunctionalTests/protected/pages/TicketTestPage.tpl
deleted file mode 100644
index bf2f8fab..00000000
--- a/tests/FunctionalTests/protected/pages/TicketTestPage.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Strict//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-	
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<com:THead Title="PRADO Functional Tests">
-	<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-	<style type="text/css">
-	/*<![CDATA[*/
-	.defect
-	{
-		color: #c00;
-		font-size: 1.15em;
-	}
-	body
-	{
-		font-family: Georgia, "Times New Roman", Times, serif;
-	}
-	.w3c
-	{
-		margin-top: 2em;
-		display: block;
-	}
-	/*]]>*/
-	</style>
-</com:THead>
-<body>
-<com:TForm>
-<h1><com:THyperLink ID="ticketlink" /></h1>
-
-<com:TContentPlaceHolder ID="Content" />
-<hr style="margin-top: 2em" />
-<com:TJavascriptLogger />
-</com:TForm>
-<div class="w3c">
-<a href="http://validator.w3.org/check?uri=referer">
-		Validate XHTML 1.0
-</a>
-<a href="?page=ViewSource&amp;path=<%= str_replace('.','/', $this->Request->ServiceParameter) %>.page"
-	style="margin: 0 1em;"
-	onclick="window.open(this.href); return false;" 
-	onkeypress="window.open(this.href); return false;">View Source</a>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/UI/ColorPicker.page b/tests/FunctionalTests/protected/pages/UI/ColorPicker.page
deleted file mode 100644
index 3d8c46db..00000000
--- a/tests/FunctionalTests/protected/pages/UI/ColorPicker.page
+++ /dev/null
@@ -1,40 +0,0 @@
-<com:TContent ID="Content">
-
-<com:TColorPicker Text="#FFCC00" /><br />
-
-
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-
-<p>asda<br /></p>
-<p>asda<br /></p>
-
-<com:TColorPicker Mode="Simple" /><br />
-
-
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-
-<com:TColorPicker ShowColorPicker="false" /><br />
-
-<p>asda<br /></p>
-
-<com:TColorPicker Mode="Full" /><br />
-
-<p>asda<br /></p>
-<p>asda<br /></p>
-
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-<p>asda<br /></p>
-
-
-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/UI/DatePicker.page b/tests/FunctionalTests/protected/pages/UI/DatePicker.page
deleted file mode 100644
index 4347f748..00000000
--- a/tests/FunctionalTests/protected/pages/UI/DatePicker.page
+++ /dev/null
@@ -1,59 +0,0 @@
-<com:TContent ID="Content">
-
-<h1>TDatePicker Samples</h1>
-
-<table class="sampletable">
-
-<tr>
-	<td class="samplenote">Default TDatePicker</td>
-	<td class="sampleaction">
-		<com:TDatePicker />
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">Button Mode</td>
-	<td class="sampleaction">
-		<com:TDatePicker Mode="Button" />
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">InputMode="DropDownList", custom DateFormat</td>
-	<td class="sampleaction">
-		<com:TDatePicker DateFormat="yyyy/MMMM" InputMode="DropDownList"/>
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">InputMode="DropDownList", custom DateFormat, Culture</td>
-	<td class="sampleaction">
-		<com:TDatePicker DateFormat="MM/yyyy" Culture="fr" InputMode="DropDownList"/>
-	</td>
-</tr>
-
-
-<tr>
-	<td class="samplenote">Custom DateFormat, culture, ImageButton mode</td>
-	<td class="sampleaction">
-		<com:TDatePicker Mode="ImageButton" Culture="zh_CN" DateFormat="日期：yyyy年M月d日"/>
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">Custom DateFormat, DropDownList, pre-selected date set in as Text</td>
-	<td class="sampleaction">
-		<com:TDatePicker DateFormat="yyyy/MMMM/dd" Text="2005/05/15" InputMode="DropDownList"/>
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">DropDownList, pre-selected date as integer</td>
-	<td class="sampleaction">
-		<com:TDatePicker InputMode="DropDownList" Date=<%= @strtotime("-1 month") %>/>
-	</td>
-</tr>
-	
-</table>
-
-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/UI/RatingList.page b/tests/FunctionalTests/protected/pages/UI/RatingList.page
deleted file mode 100644
index 909180c7..00000000
--- a/tests/FunctionalTests/protected/pages/UI/RatingList.page
+++ /dev/null
@@ -1,41 +0,0 @@
-<com:TContent ID="Content">
-<h1>TRatingList Examples</h1>
-
-<h2>Default TRatingList</h2>
-	<com:TRatingList RepeatDirection="Vertical" Style="caption-side: right;">
-		<com:TListItem Text="Fair" />
-		<com:TListItem Text="Average" />
-		<com:TListItem Text="Good" />
-		<com:TListItem Text="Execellent" />
-	</com:TRatingList>
-
-<h2>TRatingList </h2>
-	<com:TRatingList SelectedIndex="2">
-		<com:TListItem Text="Poor" />
-		<com:TListItem Text="Fair" />
-		<com:TListItem Text="Average" />
-		<com:TListItem Text="Good" />
-		<com:TListItem Text="Execellent" />
-		<com:TListItem Text="Super" />
-	</com:TRatingList>
-
-<h2>TRatingList </h2>
-	<com:TRatingList RatingStyle="blocks" SelectedValue="Good">
-		<com:TListItem Text="Poor" />
-		<com:TListItem Text="Fair" />
-		<com:TListItem Text="Average" />
-		<com:TListItem Text="Good" />
-		<com:TListItem Text="Execellent" />
-		<com:TListItem Text="Super" />
-	</com:TRatingList>
-
-<h2>TRatingList </h2>
-	<com:TRatingList ID="Rating1" AllowInput="false" Caption="Rating:" Rating="4.6">
-		<com:TListItem Text="Poor" />
-		<com:TListItem Text="Fair" />
-		<com:TListItem Text="Average" />
-		<com:TListItem Text="Good" />
-		<com:TListItem Text="Execellent" />
-		<com:TListItem Text="Super" />
-	</com:TRatingList>		
-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/UI/testHtmlArea.page b/tests/FunctionalTests/protected/pages/UI/testHtmlArea.page
deleted file mode 100644
index 5e9665dd..00000000
--- a/tests/FunctionalTests/protected/pages/UI/testHtmlArea.page
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@ Application.Globalization.Charset="GB2312" %>
-<com:TContent ID="Content">
-
-	<com:THtmlArea>
-		<prop:Options>
-			plugins : "contextmenu,paste", 
-			language: "zh_CN"
-		</prop:Options>
-	</com:THtmlArea>
-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/ViewSource.page b/tests/FunctionalTests/protected/pages/ViewSource.page
deleted file mode 100644
index 218cc901..00000000
--- a/tests/FunctionalTests/protected/pages/ViewSource.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
-
-<com:THead Title="PRADO QuickStart Source View">
-<meta http-equiv="content-language" content="en"/>
-</com:THead>
-
-<body>
-<com:TForm>
-<div id="sourceList">
-<com:TLiteral ID="SourceList" />
-<com:TCheckBox ID="showLineNumbers" AutoPostBack="true" />
-<com:TLabel For="showLineNumbers">Show Line Numbers</com:TLabel>
-</div>
-<div id="sourceView">
-<com:TTextHighlighter ID="Highlighter" CssClass="source"
-	ShowLineNumbers="<%# $this->Page->showLineNumbers->Checked %>" >
-<com:TLiteral ID="SourceView" />
-</com:TTextHighlighter>
-</com:TForm>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/ViewSource.php b/tests/FunctionalTests/protected/pages/ViewSource.php
deleted file mode 100644
index 84f39161..00000000
--- a/tests/FunctionalTests/protected/pages/ViewSource.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-class ViewSource extends TPage
-{
-	private $_path=null;
-	private $_fullPath=null;
-	private $_fileType=null;
-
-	protected function isFileTypeAllowed($extension)
-	{
-		return in_array($extension,array('tpl','page','php'));
-	}
-
-	protected function getFileExtension($fileName)
-	{
-		if(($pos=strrpos($fileName,'.'))===false)
-			return '';
-		else
-			return substr($fileName,$pos+1);
-	}
-
-	public function onLoad($param)
-	{
-		parent::onLoad($param);
-		$path=$this->Request->Items['path'];
-		$fullPath=realpath($this->Service->BasePath.'/'.$path);
-		$fileExt=$this->getFileExtension($fullPath);
-		if($fullPath!==false && is_file($fullPath) && strpos($fullPath,$this->Service->BasePath)!==false)
-		{
- 			if($this->isFileTypeAllowed($fileExt))
- 			{
-				$this->_fullPath=strtr($fullPath,'\\','/');
-				$this->_path=strtr(substr($fullPath,strlen($this->Service->BasePath)),'\\','/');
- 			}
-		}
-		if($this->_fullPath===null)
-			throw new THttpException(500,'File Not Found: %s',$path);
-		$basePath=dirname($this->_fullPath);
-		if($dh=opendir($basePath))
-		{
-			$str="<h2>{$this->_path}</h2>\n";
-			while(($file=readdir($dh))!==false)
-			{
-				if(is_file($basePath.'/'.$file))
-				{
-					$fileType=$this->getFileExtension($basePath.'/'.$file);
-					if($this->isFileTypeAllowed($fileType))
-					{
-						if($fileType==='tpl' || $fileType==='page')
-							$type='Template file';
-						else
-							$type='Class file';
-						$path='/'.ltrim(strtr(dirname($this->_path),'\\','/').'/'.$file,'/');
-						$str.="$type: <a href=\"?page=ViewSource&amp;path=$path\">$file</a><br/>";
-					}
-				}
-
-			}
-			closedir($dh);
-			$this->SourceList->Text=$str;
-		}
-
-		switch($fileExt)
-		{
-			case 'page' :
-			case 'tpl' :
-				$this->Highlighter->Language='prado';
-				break;
-			case 'php' :
-				$this->Highlighter->Language='php';
-				break;
-			case 'xml' :
-				$this->Highlighter->Language='xml';
-				break;
-			default :
-				$this->Highlighter->Language='html';
-				break;
-		}
-
-		$this->SourceView->Text=file_get_contents($this->_fullPath);
-		$this->dataBind();
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/config.xml b/tests/FunctionalTests/protected/pages/config.xml
deleted file mode 100644
index b7007323..00000000
--- a/tests/FunctionalTests/protected/pages/config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <paths>
-    <alias id="Pages" path="." />
-	<using namespace="Pages.UI.*" />
-  </paths>
-  <pages MasterClass="Pages.Layout">
-    <page id="ViewSource" MasterClass="" />
-  </pages>
-</configuration>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/application.xml b/tests/FunctionalTests/tickets/application.xml
deleted file mode 100644
index e973d37d..00000000
--- a/tests/FunctionalTests/tickets/application.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<application id="FunctionTests" Mode="Debug">
-</application>
\ No newline at end of file
-- 
cgit v1.2.3