Update BasicI18N.page

6 files changed, 9 insertions, 30 deletions

diff --git a/.gitattributes b/.gitattributes
index 11565ffe..e463bbfe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -642,7 +642,6 @@ tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php -tex
 tests/FunctionalTests/protected/pages/ViewSource.page -text
 tests/FunctionalTests/protected/pages/ViewSource.php -text
 tests/FunctionalTests/protected/pages/config.xml -text
-tests/FunctionalTests/protected/tests/HomePageTest.php -text
 tests/FunctionalTests/quickstart_tests/Controls/ButtonTestCase.php -text
 tests/FunctionalTests/quickstart_tests/Controls/CheckBoxTestCase.php -text
 tests/FunctionalTests/quickstart_tests/Controls/HyperLinkTestCase.php -text
diff --git a/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page b/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
index f4ef35d2..d4725015 100644
--- a/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
+++ b/tests/FunctionalTests/protected/pages/I18N/BasicI18N.page
@@ -13,7 +13,7 @@
 <div>

 <com:TNumberFormat Value="10000" Type="currency"/>

 </div>

-<div><com:TDateFormat Value="2006-01-15"/></div>

+<div><com:TDateFormat Value="2006-01-15" Culture="zh_CN"/></div>

 

 <div>

 <com:TChoiceFormat Value="0">

diff --git a/tests/FunctionalTests/protected/pages/Validation/CheckBox.php b/tests/FunctionalTests/protected/pages/Validation/CheckBox.php
index 7eba9317..6e2d8ee5 100644
--- a/tests/FunctionalTests/protected/pages/Validation/CheckBox.php
+++ b/tests/FunctionalTests/protected/pages/Validation/CheckBox.php
@@ -9,7 +9,7 @@ class CheckBox extends TPage
 	}

 }

 

-class CheckBoxTestCase extends SeleniumTestCase

+class CheckBoxTestCase2 extends SeleniumTestCase

 {

 	function setup()

 	{

diff --git a/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php b/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php
index ff24b93a..0399d4a3 100644
--- a/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php
+++ b/tests/FunctionalTests/protected/pages/Validation/RequiredFieldValidator.php
@@ -19,12 +19,12 @@ class RequiredFieldTestCase extends SeleniumTestCase
 	function testValidator()

 	{

 		$this->assertTextPresent("Basic TRequiredFieldValidator Test1");

-		$this->assertNotVisible("validator1");

-		$this->click("button1");

-		$this->assertVisible("validator1");

-		$this->type("text1", "test");

-		$this->clickAndWait("button1");

-		$this->assertNotVisible("validator1");

+		$this->assertNotVisible("ctl0_Content_validator1");

+		$this->click("ctl0_Content_button1");

+		$this->assertVisible("ctl0_Content_validator1");

+		$this->type("ctl0_Content_text1", "test");

+		$this->clickAndWait("ctl0_Content_button1");

+		$this->assertNotVisible("ctl0_Content_validator1");

 	}

 }

 

diff --git a/tests/FunctionalTests/protected/pages/config.xml b/tests/FunctionalTests/protected/pages/config.xml
index 1a551a90..b7007323 100644
--- a/tests/FunctionalTests/protected/pages/config.xml
+++ b/tests/FunctionalTests/protected/pages/config.xml
@@ -3,6 +3,7 @@
 <configuration>

   <paths>

     <alias id="Pages" path="." />

+	<using namespace="Pages.UI.*" />

   </paths>

   <pages MasterClass="Pages.Layout">

     <page id="ViewSource" MasterClass="" />

diff --git a/tests/FunctionalTests/protected/tests/HomePageTest.php b/tests/FunctionalTests/protected/tests/HomePageTest.php
deleted file mode 100644
index 777f27fd..00000000
--- a/tests/FunctionalTests/protected/tests/HomePageTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php

-

-/**

- * ${classname}

- *

- * ${description}

- *

- * @author Wei Zhuo<weizhuo[at]gmail[dot]com>

- * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $

- * @package ${package}

- */

-class HomePageTest extends SeleniumTestCase

-{

-	function testHomePage()

-	{

-		$this->open("tests.php");

-		$this->verifyTitle("Prado Functional Tests");

-	}

-}

-

-?>
\ No newline at end of file