diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang index e33b22f9ef9..2e36eda606b 100644 --- a/htdocs/langs/pt_BR/main.lang +++ b/htdocs/langs/pt_BR/main.lang @@ -10,8 +10,8 @@ SeparatorDecimal=, SeparatorThousand=None FormatDateShort=%d/%m/%Y FormatDateShortInput=%d/%m/%Y -FormatDateShortJava=dd/mm/yyyy -FormatDateShortJavaInput=dd/mm/yyyy +FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index 89f17b4476b..65a373be905 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -74,13 +74,16 @@ class AllTests $suite->addTestSuite('JsonLibTest'); require_once dirname(__FILE__).'/ImagesLibTest.php'; $suite->addTestSuite('ImagesLibTest'); - require_once dirname(__FILE__).'/FunctionsTest.php'; - $suite->addTestSuite('FunctionsTest'); - require_once dirname(__FILE__).'/Functions2Test.php'; - $suite->addTestSuite('Functions2Test'); + require_once dirname(__FILE__).'/FunctionsLibTest.php'; + $suite->addTestSuite('FunctionsLibTest'); + require_once dirname(__FILE__).'/Functions2LibTest.php'; + $suite->addTestSuite('Functions2LibTest'); require_once dirname(__FILE__).'/XCalLibTest.php'; $suite->addTestSuite('XCalLibTest'); + require_once dirname(__FILE__).'/LangTest.php'; + $suite->addTestSuite('LangTest'); + require_once dirname(__FILE__).'/SecurityTest.php'; $suite->addTestSuite('SecurityTest'); @@ -166,6 +169,9 @@ class AllTests require_once dirname(__FILE__).'/ScriptsTest.php'; $suite->addTestSuite('ScriptsTest'); + require_once dirname(__FILE__).'/FormAdminTest.php'; + $suite->addTestSuite('FormAdminTest'); + require_once dirname(__FILE__).'/ModulesTest.php'; // At end because it's the longer $suite->addTestSuite('ModulesTest'); diff --git a/test/phpunit/Functions2Test.php b/test/phpunit/Functions2LibTest.php similarity index 96% rename from test/phpunit/Functions2Test.php rename to test/phpunit/Functions2LibTest.php index 3c44e004fc9..6ac87d0c165 100755 --- a/test/phpunit/Functions2Test.php +++ b/test/phpunit/Functions2LibTest.php @@ -17,7 +17,7 @@ */ /** - * \file test/phpunit/FunctionsTest.php + * \file test/phpunit/Functions2LibTest.php * \ingroup test * \brief PHPUnit test * \remarks To run this script as CLI: phpunit filename.php @@ -48,7 +48,7 @@ if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is * @backupStaticAttributes enabled * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. */ -class Functions2Test extends PHPUnit_Framework_TestCase +class Functions2LibTest extends PHPUnit_Framework_TestCase { protected $savconf; protected $savuser; @@ -128,20 +128,20 @@ class Functions2Test extends PHPUnit_Framework_TestCase print __METHOD__." result=".$result."\n"; $this->assertEquals('νεο',$result); } - + /** * isValidMailDomain - * + * * @return void */ public function testIsValidMailDomain() { - + } /** * isValidURL - * + * * @return void */ public function testIsValidUrl() diff --git a/test/phpunit/FunctionsTest.php b/test/phpunit/FunctionsLibTest.php similarity index 99% rename from test/phpunit/FunctionsTest.php rename to test/phpunit/FunctionsLibTest.php index 1fa41f0c460..c175a18a543 100755 --- a/test/phpunit/FunctionsTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -17,7 +17,7 @@ */ /** - * \file test/phpunit/FunctionsTest.php + * \file test/phpunit/FunctionsLibTest.php * \ingroup test * \brief PHPUnit test * \remarks To run this script as CLI: phpunit filename.php @@ -48,7 +48,7 @@ if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is * @backupStaticAttributes enabled * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. */ -class FunctionsTest extends PHPUnit_Framework_TestCase +class FunctionsLibTest extends PHPUnit_Framework_TestCase { protected $savconf; protected $savuser; diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php new file mode 100755 index 00000000000..35f3f979487 --- /dev/null +++ b/test/phpunit/LangTest.php @@ -0,0 +1,177 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file test/phpunit/LangTest.php + * \ingroup test + * \brief PHPUnit test + * \remarks To run this script as CLI: phpunit filename.php + */ + +global $conf,$user,$langs,$db; +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +require_once 'PHPUnit/Autoload.php'; +require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php'; + +if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); +if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); +if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no menu to show +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session) + +if (empty($user->id)) +{ + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); +} +$conf->global->MAIN_DISABLE_ALL_MAILS=1; + + +/** + * Class for PHPUnit tests + * + * @backupGlobals disabled + * @backupStaticAttributes enabled + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + */ +class LangTest extends PHPUnit_Framework_TestCase +{ + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; + + /** + * Constructor + * We save global variables into local variables + * + * @return SecurityTest + */ + function __construct() + { + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; + + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; + } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + public static function tearDownAfterClass() + { + global $conf,$user,$langs,$db; + $db->rollback(); + + print __METHOD__."\n"; + } + + /** + * Init phpunit tests + * + * @return void + */ + protected function setUp() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + print __METHOD__."\n"; + } + + /** + * End phpunit tests + * + * @return void + */ + protected function tearDown() + { + print __METHOD__."\n"; + } + + /** + * testBank + * + * @return string + */ + public function testLang() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; + + $filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs'); + foreach($filesarray as $key => $code) + { + if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue; + + print 'Check language file for code='.$code."\n"; + $tmplangs=new Translate('',$conf); + $langcode=$code; + $tmplangs->setDefaultLang($langcode); + $tmplangs->load("main"); + + $result=$tmplangs->trans("SeparatorDecimal"); + print __METHOD__." SeparatorDecimal=".$result."\n"; + $this->assertContains($result,array('.',',','/',' ','','None')); + + $result=$tmplangs->trans("SeparatorThousand"); + print __METHOD__." SeparatorThousand=".$result."\n"; + $this->assertContains($result,array('.',',','/',' ','','None','SeparatorThousand')); // SeparatorThousand is returned when SeparatorThousand=Space + + // Test java string contains only d,M,y,/,-,. and not m,... + $result=$tmplangs->trans("FormatDateShortJava"); + print __METHOD__." FormatDateShortJava=".$result."\n"; + $this->assertRegExp('/^[dMy\/\-\.]+$/',$result); + $result=$tmplangs->trans("FormatDateShortJavaInput"); + print __METHOD__." FormatDateShortJavaInput=".$result."\n"; + $this->assertRegExp('/^[dMy\/\-\.]+$/',$result); + + unset($tmplangs); + } + + return $result; + } +} +?> \ No newline at end of file