From 52ae5aef521fa7d800e09206342eb9ac17043cd8 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 13 Jan 2006 12:57:54 +0000
Subject:
---
tests/FunctionalTests/protected/application.xml | 1 -
tests/FunctionalTests/protected/pages/Home.page | 35 ++-------------------
.../protected/pages/I18N/BasicI18N.page | 36 ++--------------------
.../pages/Validation/RequiredFieldValidator.page | 7 +++--
.../pages/Validation/RequiredFieldValidator.php | 5 +--
5 files changed, 13 insertions(+), 71 deletions(-)
(limited to 'tests')
diff --git a/tests/FunctionalTests/protected/application.xml b/tests/FunctionalTests/protected/application.xml
index ca946653..53e73457 100644
--- a/tests/FunctionalTests/protected/application.xml
+++ b/tests/FunctionalTests/protected/application.xml
@@ -13,7 +13,6 @@
</module>
<module id="logger" class="System.Log.TLogRouter">
<route class="TFileLogRoute" />
- <route class="TBrowserLogRoute" Categories="System.Web.UI.TPage,Uncategorized" />
</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
index 606a17ac..9a49e3a2 100644
--- a/tests/FunctionalTests/protected/pages/Home.page
+++ b/tests/FunctionalTests/protected/pages/Home.page
@@ -1,34 +1,3 @@
-<!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</title>
- <style type="text/css">
- /*<![CDATA[*/
- body
- {
- font-family: Georgia, "Times New Roman", Times, serif;
- }
- .w3c
- {
- margin-top: 2em;
- display: block;
- }
- /*]]>*/
- </style>
-</head>
-
-<body>
-
+<com:TContent ID="Content">
<h1>Prado Functional Tests</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
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page b/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
index e09c2161..f4ef35d2 100644
--- a/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
+++ b/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
@@ -1,28 +1,5 @@
-<%@ Application.Globalization.Culture="zh_CN" %>
-<!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>Basic I18N Test</title>
- <style type="text/css">
- /*<![CDATA[*/
- body
- {
- font-family: Georgia, "Times New Roman", Times, serif;
- }
- .w3c
- {
- margin-top: 2em;
- display: block;
- }
- /*]]>*/
- </style>
-</head>
-
-<body>
+<%@ Title="Basic I18N Test" %>
+<com:TContent ID="Content">
<h1>Basic I18N Test</h1>
<com:TTranslate>
Hello {name}
@@ -51,11 +28,4 @@
[0] None |[1] One thing. |[2,Inf) Many things.
</com:TChoiceFormat>
</div>
-
-<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
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.page b/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.page
index 56ef07bd..e6b67c8d 100644
--- a/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.page
+++ b/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.page
@@ -1,13 +1,16 @@
+<%@ Title="Basic TRequiredFieldValidator" %>
+<com:TContent ID="Content">
<com:TForm>
<h1>Basic TRequiredFieldValidator Test1</h1>
<com:TTextBox ID="text1" />
<com:TRequiredFieldValidator
ID="validator1"
FocusOnError="true"
- FocusElementID="text2"
+ FocusElementID="<%# $this->Page->text2->ClientID %>"
ControlToValidate="text1"
ErrorMessage="*" />
<com:TButton ID="button1" Text="Click" />
<com:TTextBox ID="text2" />
<com:TJavascriptLogger />
-</com:TForm>
\ No newline at end of file
+</com:TForm>
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php b/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php
index 995b3df0..ff24b93a 100644
--- a/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php
+++ b/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php
@@ -2,9 +2,10 @@
class RequiredFieldValidator extends TPage
{
- function onLoad($param)
+ protected function onLoad($param)
{
- Prado::log("Hello", TLogger::WARNING);
+ if(!$this->IsPostBack)
+ $this->dataBind();
}
}
--
cgit v1.2.3