Add more phpunit tests

This commit is contained in:
Laurent Destailleur 2011-05-01 09:38:38 +00:00
parent 0b8aca3f0d
commit 0b82d5f4a3
3 changed files with 15 additions and 11 deletions

View File

@ -49,14 +49,20 @@ class AllTests
{
$suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework');
require_once dirname(__FILE__).'/DateLibTest.php';
//require_once dirname(__FILE__).'/CoreTest.php';
//$suite->addTestSuite('CoreTest');
require_once dirname(__FILE__).'/DateLibTest.php';
$suite->addTestSuite('DateLibTest');
require_once dirname(__FILE__).'/FunctionsTest.php';
$suite->addTestSuite('FunctionsTest');
require_once dirname(__FILE__).'/SecurityTest.php';
$suite->addTestSuite('SecurityTest');
require_once dirname(__FILE__).'/BuildDocTest.php';
$suite->addTestSuite('BuildDocTest');
require_once dirname(__FILE__).'/CMailFileTest.php';
$suite->addTestSuite('CMailFileTest');
require_once dirname(__FILE__).'/CommonObjectTest.php';
$suite->addTestSuite('CommonObjectTest');
@ -90,13 +96,11 @@ class AllTests
require_once dirname(__FILE__).'/CategorieTest.php';
$suite->addTestSuite('CategorieTest');
require_once dirname(__FILE__).'/ModulesTest.php';
require_once dirname(__FILE__).'/ModulesTest.php'; // At end because it's the longer
$suite->addTestSuite('ModulesTest');
require_once dirname(__FILE__).'/CMailFileTest.php';
$suite->addTestSuite('CMailFileTest');
return $suite;
}
}
?>
?>

View File

@ -121,7 +121,7 @@ class CoreTest extends PHPUnit_Framework_TestCase
$_SERVER["DOCUMENT_ROOT"]='/var/www';
$_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php';
$expectedresult='/dolibarrnew';
// Put this into conf.php if you want to text alt
// Put this into conf.php if you want to test alt
//$dolibarr_main_url_root='http://localhost/dolibarralias';
//$dolibarr_main_url_root_alt='http://localhost/dolibarralias/custom2';
@ -133,7 +133,7 @@ class CoreTest extends PHPUnit_Framework_TestCase
$_SERVER["DOCUMENT_ROOT"]='/var/www';
$_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php';
$expectedresult='/aaa/htdocs';
// Put this into conf.php if you want to text alt
// Put this into conf.php if you want to test alt
//$dolibarr_main_url_root='http://localhost/dolibarralias';
//$dolibarr_main_url_root_alt='http://localhost/dolibarralias/custom2';
@ -146,7 +146,7 @@ class CoreTest extends PHPUnit_Framework_TestCase
$_SERVER["DOCUMENT_ROOT"]='/home/ldestail/workspace/dolibarr/htdocs';
$_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
$expectedresult='';
// Put this into conf.php if you want to text alt
// Put this into conf.php if you want to test alt
//$dolibarr_main_url_root='http://localhost/dolibarralias';
//$dolibarr_main_url_root_alt='http://localhost/dolibarralias/custom2';
@ -159,7 +159,7 @@ class CoreTest extends PHPUnit_Framework_TestCase
$_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr'; // This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
$_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
$expectedresult='';
// Put this into conf.php if you want to text alt
// Put this into conf.php if you want to test alt
//$dolibarr_main_url_root='http://localhost/dolibarralias';
//$dolibarr_main_url_root_alt='http://localhost/dolibarralias/custom2';
@ -180,7 +180,7 @@ class CoreTest extends PHPUnit_Framework_TestCase
print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n";
print __METHOD__." DOL_MAIN_URL_ROOT_ALT=".DOL_MAIN_URL_ROOT_ALT."\n";
print __METHOD__." DOL_URL_ROOT_ALT=".DOL_URL_ROOT_ALT."\n";
$this->assertEquals(DOL_URL_ROOT."x",$expectedresult."x");
$this->assertEquals(DOL_URL_ROOT,$expectedresult);
return true;
}

View File

@ -119,7 +119,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
$input="A string first<br>\nA string second<br>";
$after=dol_htmlcleanlastbr($input);
$this->assertEquals($after,"A string first<br>\nA string second");
$input="A string\n<br>\n";
$input="A string\n<br type=\"_moz\" />\n";
$after=dol_htmlcleanlastbr($input);
$this->assertEquals($after,"A string");
$input="A string\n<br><br />\n\n";