Minor updates.

11 files changed, 17 insertions, 24 deletions

diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page
index 9433154e..ca141c60 100644
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/Calculator2.page
@@ -36,5 +36,5 @@
 			return false;

 		};

 	</script>

-	

+

 </com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/quickstart/Advanced/I18N.php b/tests/FunctionalTests/quickstart/Advanced/I18N.php
index 6d81d3b1..5b2af8c4 100644
--- a/tests/FunctionalTests/quickstart/Advanced/I18N.php
+++ b/tests/FunctionalTests/quickstart/Advanced/I18N.php
@@ -6,43 +6,43 @@ class I18NTestCase extends SeleniumTestCase
 	function test ()

 	{

 		$this->open("../../demos/quickstart/index.php?notheme=true&page=Advanced.Samples.I18N.Home&amp;lang=en&amp;notheme=true", "");

-		$this->verifyTitle("Internationlization in PRADO", "");

+		$this->verifyTextPresent("Internationlization in PRADO", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("$12.40", "");

 		$this->verifyTextPresent("€100.00", "");

 		$this->verifyTextPresent("December 6, 2004", "");

 		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=zh&amp;notheme=true", "");

-		$this->verifyTitle("PRADO 国际化", "");

+		$this->verifyTextPresent("PRADO 国际化", "");

 		$this->verifyTextPresent("2004 十二月", "");

 		$this->verifyTextPresent("US$ 12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00 ", "");

 		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=zh_TW&amp;notheme=true", "");

-		$this->verifyTitle("PRADO 國際化", "");

+		$this->verifyTextPresent("PRADO 國際化", "");

 		$this->verifyTextPresent("2004年12月6日", "");

 		$this->verifyTextPresent("US$12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

 		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=de&amp;notheme=true", "");

-		$this->verifyTitle("Internationalisierung in PRADO", "");

+		$this->verifyTextPresent("Internationalisierung in PRADO", "");

 		$this->verifyTextPresent("6. Dezember 2004 ", "");

 		$this->verifyTextPresent("$ 12,40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

 		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=es&amp;notheme=true", "");

-		$this->verifyTitle("Internationlization en PRADO", "");

+		$this->verifyTextPresent("Internationlization en PRADO", "");

 		$this->verifyTextPresent("6 de diciembre de 2004", "");

 		$this->verifyTextPresent("US$12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

 		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=fr&amp;notheme=true", "");

-		$this->verifyTitle("Internationalisation dans PRADO", "");

+		$this->verifyTextPresent("Internationalisation avec PRADO", "");

 		$this->verifyTextPresent("6 décembre 2004", "");

 		$this->verifyTextPresent("12,40 $", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

 		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=pl&amp;notheme=true", "");

-		$this->verifyTitle("Internacjonalizacja w PRADO", "");

+		$this->verifyTextPresent("Internacjonalizacja w PRADO", "");

 		$this->verifyTextPresent("6 grudnia 2004", "");

 		$this->verifyTextPresent("US$ 12,40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

diff --git a/tests/FunctionalTests/validators/protected/pages/RegularExpressionValidator.page b/tests/FunctionalTests/validators/protected/pages/RegularExpressionValidator.page
index ac24cd0d..cfd7a333 100644
--- a/tests/FunctionalTests/validators/protected/pages/RegularExpressionValidator.page
+++ b/tests/FunctionalTests/validators/protected/pages/RegularExpressionValidator.page
@@ -14,6 +14,7 @@
 			ID="validator2"

 			ControlToValidate="text2"

 			ErrorMessage="Email Address!"

+			CheckMXRecord="false"

 			ControlCssClass="required" />

 	</div>

 	<com:TButton ID="submit1" Text="Test" />

diff --git a/tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php b/tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php
index 5107a89f..b0f7c407 100644
--- a/tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php
+++ b/tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php
@@ -21,7 +21,6 @@ class CompareValidatorTestCase extends SeleniumTestCase
 		$this->assertVisible("{$base}validator1");

 

 		$this->type("{$base}text2", "qwe");

-		$this->assertNotVisible("{$base}validator1");

 		$this->clickAndWait("//input[@type='submit' and @value='Test']", "");

 		$this->assertNotVisible("{$base}validator1");

 		$this->assertNotVisible("{$base}validator2");

diff --git a/tests/UnitTests/framework/common.php b/tests/UnitTests/framework/common.php
index 7df61c99..059dd142 100644
--- a/tests/UnitTests/framework/common.php
+++ b/tests/UnitTests/framework/common.php
@@ -10,18 +10,10 @@ require_once(SIMPLETEST_DIR.'/mock_objects.php');
 require_once(SIMPLETEST_DIR.'/reporter.php');

 require_once(SIMPLETEST_DIR.'/HtmlReporterWithCoverage.php');

 

-require_once(FRAMEWORK_DIR.'/PradoBase.php');

+require_once(FRAMEWORK_DIR.'/prado.php');

 

 set_include_path(get_include_path().";".FRAMEWORK_DIR);

 

-class Prado extends PradoBase

-{

-}

-

-function __autoload($className)

-{

-	require_once($className.Prado::CLASS_FILE_EXT);

-}

 

 error_reporting(E_ALL);

 restore_error_handler();

diff --git a/tests/unit/SQLMap/CacheTest.php b/tests/unit/SQLMap/CacheTest.php
index 11c250a8..4fd69916 100644
--- a/tests/unit/SQLMap/CacheTest.php
+++ b/tests/unit/SQLMap/CacheTest.php
@@ -96,7 +96,7 @@ class CacheTest extends BaseTest
 	protected function 	getCacheModel() 

 	{

 		$cache = new TSqlMapCacheModel();

-		$cache->setFlushInterval(5*60);

+	//	$cache->setFlushInterval(5*60);

 		$cache->setImplementation('LRU');

 		$cache->initialize($this->sqlmap);

 		return $cache;

diff --git a/tests/unit/SQLMap/TAdodbConnectionTestCase.php b/tests/unit/SQLMap/TAdodbConnectionTestCase.php
index c0d99867..1ba0ec04 100644
--- a/tests/unit/SQLMap/TAdodbConnectionTestCase.php
+++ b/tests/unit/SQLMap/TAdodbConnectionTestCase.php
@@ -1,11 +1,13 @@
 <?php

 

-require_once(SQLMAP_DIR.'/TMapper.php');

+require_once dirname(__FILE__).'/../phpunit2.php';

+

+require_once(dirname(__FILE__).'/common.php');

 

 /**

  * @package System.DataAccess

  */

-class TAdodbConnectionTestCase extends UnitTestCase

+class TAdodbConnectionTestCase extends PHPUnit2_Framework_TestCase

 {

 	protected $db_file;

 

@@ -15,7 +17,6 @@ class TAdodbConnectionTestCase extends UnitTestCase
 		$this->db_file = dirname(__FILE__).'/resources/test.db';

 		copy($file,$this->db_file);

 		$provider = new TAdodb();

-		$provider->importAdodbLibrary();

 	}

 

 	function getDsn()

diff --git a/tests/unit/SQLMap/resources/sqlmap.xml b/tests/unit/SQLMap/resources/sqlmap.xml
index b15e9862..3d20321d 100644
--- a/tests/unit/SQLMap/resources/sqlmap.xml
+++ b/tests/unit/SQLMap/resources/sqlmap.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>

 <sqlMapConfig>

 

-	<provider class="TAdodbProvider">

+	<provider class="TAdodb">

 		<datasource driver="sqlite" host="resources/test.db" />

 	</provider>

 

diff --git a/tests/unit/SQLMap/resources/test.db b/tests/unit/SQLMap/resources/test.db
index f939682e..b8c158cc 100644
--- a/tests/unit/SQLMap/resources/test.db
+++ b/tests/unit/SQLMap/resources/test.db
diff --git a/tests/unit/SQLMap/sqlite.xml b/tests/unit/SQLMap/sqlite.xml
index 62ab2aa3..27febdcb 100644
--- a/tests/unit/SQLMap/sqlite.xml
+++ b/tests/unit/SQLMap/sqlite.xml
@@ -9,7 +9,7 @@
 	</settings>

 	

 	<!-- ==== Database configuration =========	-->

-	<provider class="TAdodbProvider" >

+	<provider class="TAdodb" >

 		<datasource driver="sqlite" database="sqlite/tests.db" />

 	</provider>

 		

diff --git a/tests/unit/SQLMap/sqlite/tests.db b/tests/unit/SQLMap/sqlite/tests.db
index 380ef8fa..fa66b2cc 100644
--- a/tests/unit/SQLMap/sqlite/tests.db
+++ b/tests/unit/SQLMap/sqlite/tests.db