forked from Wavyzz/dolibarr
Qual: Improve test messages to help locate errors + php-cs-fixer on tests (#28272)
* Qual: Apply php-cs-fixer before changes # Qual: Apply php-cs-fixer before changes Apply php-cs-fixer before changes to make real changes stand out in next commit. * Qual: Improve test messages to help locate errors. # Qual: Improve test messages to help locate errors. Included a description of the test in the failing assertions to help locate the error. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: Update spelling exception # Qual: Update spelling exception Formatting the code requires an update in the spelling exception list. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out. * Qual: php-cs-fixer on phpunit test file # Qual: php-cs-fixer on phpunit test file Apply php-cs-fixer on phpunit test files so that future manual changes stand out.
This commit is contained in:
MDW
@@ -36,7 +36,7 @@ if (empty($user->id)) {
|
||||
$user->fetch(1);
|
||||
$user->getrights();
|
||||
}
|
||||
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
|
||||
$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
|
||||
|
||||
print "\n".$langs->trans("CurrentTimeZone").' : '.getServerTimeZoneString();
|
||||
print "\n".$langs->trans("CurrentHour").' : '.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver');
|
||||
@@ -60,44 +60,44 @@ class DateLibTest extends CommonClassTest
|
||||
public function testNumBetweenDay()
|
||||
{
|
||||
global $conf,$user,$langs,$db;
|
||||
$conf=$this->savconf;
|
||||
$user=$this->savuser;
|
||||
$langs=$this->savlangs;
|
||||
$db=$this->savdb;
|
||||
$conf = $this->savconf;
|
||||
$user = $this->savuser;
|
||||
$langs = $this->savlangs;
|
||||
$db = $this->savdb;
|
||||
|
||||
// With same hours
|
||||
$date1=dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
|
||||
$date2=dol_mktime(0, 0, 0, 1, 2, 2012, 'gmt');
|
||||
$date1 = dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
|
||||
$date2 = dol_mktime(0, 0, 0, 1, 2, 2012, 'gmt');
|
||||
|
||||
$result=num_between_day($date1, $date2, 1);
|
||||
$result = num_between_day($date1, $date2, 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(2, $result);
|
||||
|
||||
$result=num_between_day($date1, $date2, 0);
|
||||
$result = num_between_day($date1, $date2, 0);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(1, $result);
|
||||
|
||||
// With different hours
|
||||
$date1=dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
|
||||
$date2=dol_mktime(12, 0, 0, 1, 2, 2012, 'gmt');
|
||||
$date1 = dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
|
||||
$date2 = dol_mktime(12, 0, 0, 1, 2, 2012, 'gmt');
|
||||
|
||||
$result=num_between_day($date1, $date2, 1);
|
||||
$result = num_between_day($date1, $date2, 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(2, $result);
|
||||
|
||||
$result=num_between_day($date1, $date2, 0);
|
||||
$result = num_between_day($date1, $date2, 0);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(1, $result);
|
||||
|
||||
// With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
|
||||
$date1=dol_mktime(0, 0, 0, 3, 28, 2014, true);
|
||||
$date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);
|
||||
$date1 = dol_mktime(0, 0, 0, 3, 28, 2014, true);
|
||||
$date2 = dol_mktime(0, 0, 0, 3, 31, 2014, true);
|
||||
|
||||
$result=num_between_day($date1, $date2, 1);
|
||||
$result = num_between_day($date1, $date2, 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(4, $result);
|
||||
|
||||
$result=num_between_day($date1, $date2, 0);
|
||||
$result = num_between_day($date1, $date2, 0);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(3, $result);
|
||||
|
||||
@@ -112,62 +112,62 @@ class DateLibTest extends CommonClassTest
|
||||
public function testNumPublicHoliday()
|
||||
{
|
||||
global $conf,$user,$langs,$db;
|
||||
$conf=$this->savconf;
|
||||
$user=$this->savuser;
|
||||
$langs=$this->savlangs;
|
||||
$db=$this->savdb;
|
||||
$conf = $this->savconf;
|
||||
$user = $this->savuser;
|
||||
$langs = $this->savlangs;
|
||||
$db = $this->savdb;
|
||||
|
||||
// With same hours - Tuesday/Wednesday jan 2013
|
||||
$date1=dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');
|
||||
$date2=dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');
|
||||
$date3=dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');
|
||||
$date1 = dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');
|
||||
$date2 = dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');
|
||||
$date3 = dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'FR', 1);
|
||||
$result = num_public_holiday($date1, $date2, 'FR', 1);
|
||||
print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for FR result=".$result."\n";
|
||||
$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 closed days (country france)
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'XX', 1);
|
||||
$result = num_public_holiday($date1, $date2, 'XX', 1);
|
||||
print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for XX result=".$result."\n";
|
||||
$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 closed days (country unknown)
|
||||
|
||||
print '----'."\n";
|
||||
$result=num_public_holiday($date2, $date3, 'FR', 1);
|
||||
$result = num_public_holiday($date2, $date3, 'FR', 1);
|
||||
print __METHOD__." for Wednesday 2 - Thursday 3 jan 2013 for FR result=".$result."\n";
|
||||
$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR'); // no closed days
|
||||
|
||||
// Check with easter monday
|
||||
$date1=dol_mktime(0, 0, 0, 4, 21, 2019, 'gmt');
|
||||
$date2=dol_mktime(0, 0, 0, 4, 23, 2019, 'gmt');
|
||||
$date1 = dol_mktime(0, 0, 0, 4, 21, 2019, 'gmt');
|
||||
$date2 = dol_mktime(0, 0, 0, 4, 23, 2019, 'gmt');
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'XX', 1);
|
||||
$result = num_public_holiday($date1, $date2, 'XX', 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX'); // 2 opened day, 1 closed days (sunday)
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'FR', 1);
|
||||
$result = num_public_holiday($date1, $date2, 'FR', 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR'); // 1 opened day, 2 closed days (sunday + easter monday)
|
||||
|
||||
// Check for sunday/saturday - Friday 4 - Sunday 6 jan 2013
|
||||
$date1=dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
|
||||
$date2=dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');
|
||||
$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
|
||||
$date2 = dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'FR', 1);
|
||||
$result = num_public_holiday($date1, $date2, 'FR', 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'FR', 1, 1, 1);
|
||||
$result = num_public_holiday($date1, $date2, 'FR', 1, 1, 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'FR', 1, 1, 0);
|
||||
$result = num_public_holiday($date1, $date2, 'FR', 1, 1, 0);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(1, $result, 'NumPublicHoliday for FR'); // 2 opened day, 1 closed days
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'FR', 1, 0, 0);
|
||||
$result = num_public_holiday($date1, $date2, 'FR', 1, 0, 0);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(0, $result, 'NumPublicHoliday for FR'); // 3 opened day, 0 closed days
|
||||
|
||||
$result=num_public_holiday($date1, $date2, 'XX', 1);
|
||||
$result = num_public_holiday($date1, $date2, 'XX', 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(2, $result, 'NumPublicHoliday for XX'); // 1 opened day, 2 closed days (even if country unknown)
|
||||
}
|
||||
@@ -180,48 +180,48 @@ class DateLibTest extends CommonClassTest
|
||||
public function testNumOpenDay()
|
||||
{
|
||||
global $conf,$user,$langs,$db;
|
||||
$conf=$this->savconf;
|
||||
$user=$this->savuser;
|
||||
$langs=$this->savlangs;
|
||||
$db=$this->savdb;
|
||||
$conf = $this->savconf;
|
||||
$user = $this->savuser;
|
||||
$langs = $this->savlangs;
|
||||
$db = $this->savdb;
|
||||
|
||||
// With same hours - Tuesday/Wednesday jan 2013
|
||||
$date1=dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt'); // tuesday
|
||||
$date2=dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt'); // wednesday
|
||||
$date3=dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt'); // thursday
|
||||
$date1 = dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt'); // tuesday
|
||||
$date2 = dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt'); // wednesday
|
||||
$date3 = dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt'); // thursday
|
||||
|
||||
$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
|
||||
$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 opened days (country france)
|
||||
|
||||
$result=num_open_day($date1, $date2, 0, 1, 0, 'XX');
|
||||
$result = num_open_day($date1, $date2, 0, 1, 0, 'XX');
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 opened days (country unknown)
|
||||
|
||||
$result=num_open_day($date2, $date3, 0, 1, 0, 'FR');
|
||||
$result = num_open_day($date2, $date3, 0, 1, 0, 'FR');
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR'); // 2 opened days
|
||||
|
||||
// With same hours - Friday/Sunday jan 2013
|
||||
$date1=dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt'); // friday
|
||||
$date2=dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt'); // sunday
|
||||
$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt'); // friday
|
||||
$date2 = dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt'); // sunday
|
||||
|
||||
$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
|
||||
$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(1, $result, 'NumOpenDay for FR'); // 1 opened day, 2 closed
|
||||
|
||||
$result=num_open_day($date1, $date2, 'XX', 1);
|
||||
$result = num_open_day($date1, $date2, 'XX', 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(1, $result, 'NumOpenDay for XX'); // 1 opened day, 2 closes (even if country unknown)
|
||||
|
||||
// Test option MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY and MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY
|
||||
$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 0;
|
||||
$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
|
||||
$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(2, $result, 'NumOpenDay for FR when saturday is a working day'); //2 opened day, 1 closed
|
||||
|
||||
$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 0;
|
||||
$result=num_open_day($date1, $date2, 'XX', 1);
|
||||
$result = num_open_day($date1, $date2, 'XX', 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(3, $result, 'NumOpenDay for XX when saturday + sunday are working days'); // 3 opened day, 0 closes (even if country unknown)
|
||||
}
|
||||
@@ -234,12 +234,12 @@ class DateLibTest extends CommonClassTest
|
||||
public function testConvertTime2Seconds()
|
||||
{
|
||||
global $conf,$user,$langs,$db;
|
||||
$conf=$this->savconf;
|
||||
$user=$this->savuser;
|
||||
$langs=$this->savlangs;
|
||||
$db=$this->savdb;
|
||||
$conf = $this->savconf;
|
||||
$user = $this->savuser;
|
||||
$langs = $this->savlangs;
|
||||
$db = $this->savdb;
|
||||
|
||||
$result=convertTime2Seconds(1, 1, 2);
|
||||
$result = convertTime2Seconds(1, 1, 2);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(3662, $result);
|
||||
|
||||
@@ -254,16 +254,16 @@ class DateLibTest extends CommonClassTest
|
||||
public function testConvertSecondToTime()
|
||||
{
|
||||
global $conf,$user,$langs,$db;
|
||||
$conf=$this->savconf;
|
||||
$user=$this->savuser;
|
||||
$langs=$this->savlangs;
|
||||
$db=$this->savdb;
|
||||
$conf = $this->savconf;
|
||||
$user = $this->savuser;
|
||||
$langs = $this->savlangs;
|
||||
$db = $this->savdb;
|
||||
|
||||
$result=convertSecondToTime(0, 'all', 86400);
|
||||
$result = convertSecondToTime(0, 'all', 86400);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('0', $result);
|
||||
|
||||
$result=convertSecondToTime(86400, 'all', 86400);
|
||||
$result = convertSecondToTime(86400, 'all', 86400);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertSame('1 '.$langs->trans("d"), $result);
|
||||
|
||||
@@ -278,63 +278,63 @@ class DateLibTest extends CommonClassTest
|
||||
public function testDolPrintDate()
|
||||
{
|
||||
global $conf,$user,$langs,$db;
|
||||
$conf=$this->savconf;
|
||||
$user=$this->savuser;
|
||||
$langs=$this->savlangs;
|
||||
$db=$this->savdb;
|
||||
$conf = $this->savconf;
|
||||
$user = $this->savuser;
|
||||
$langs = $this->savlangs;
|
||||
$db = $this->savdb;
|
||||
|
||||
// Check %Y-%m-%d %H:%M:%S format
|
||||
$result=dol_print_date('1970-01-01', '%Y-%m-%d %H:%M:%S', true); // A case for compatibility check
|
||||
$result = dol_print_date('1970-01-01', '%Y-%m-%d %H:%M:%S', true); // A case for compatibility check
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('1970-01-01 00:00:00', $result);
|
||||
|
||||
|
||||
// Check %Y-%m-%d %H:%M:%S format
|
||||
$result=dol_print_date(0, '%Y-%m-%d %H:%M:%S', true);
|
||||
$result = dol_print_date(0, '%Y-%m-%d %H:%M:%S', true);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('1970-01-01 00:00:00', $result);
|
||||
|
||||
// Same with T and Z
|
||||
$result=dol_print_date(0, '%Y-%m-%dT%H:%M:%SZ', true);
|
||||
$result = dol_print_date(0, '%Y-%m-%dT%H:%M:%SZ', true);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('1970-01-01T00:00:00Z', $result);
|
||||
|
||||
// Check %Y-%m-%d %H:%M:%S format
|
||||
$result=dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
|
||||
$result = dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('2500-01-01 00:00:00', $result);
|
||||
|
||||
// Check %Y-%m-%d %H:%M:%S format
|
||||
$result=dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
|
||||
$result = dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('1912-01-01 00:00:00', $result); // dol_print_date use TZ (good) but epoch converter does not use it.
|
||||
|
||||
// Check %Y-%m-%d %H:%M:%S format
|
||||
$result=dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
|
||||
$result = dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('1600-01-01 00:00:00', $result);
|
||||
|
||||
// test with negative timezone
|
||||
$result=dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
|
||||
$result = dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('1969-12-31 23:59:59', $result);
|
||||
|
||||
// Check dayhour format for fr_FR
|
||||
$outputlangs=new Translate('', $conf);
|
||||
$outputlangs = new Translate('', $conf);
|
||||
$outputlangs->setDefaultLang('fr_FR');
|
||||
$outputlangs->load("main");
|
||||
|
||||
$result=dol_print_date(0+24*3600, 'dayhour', true, $outputlangs);
|
||||
$result = dol_print_date(0 + 24 * 3600, 'dayhour', true, $outputlangs);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('02/01/1970 00:00', $result);
|
||||
|
||||
// Check %a and %b format for fr_FR
|
||||
$result=dol_print_date(0, '%a %b %B', true, $outputlangs);
|
||||
$result = dol_print_date(0, '%a %b %B', true, $outputlangs);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('Jeu Jan. Janvier', $result);
|
||||
|
||||
|
||||
$result=dol_print_date(1619388000, '%Y-%m-%d %a', 'gmt', $outputlangs);
|
||||
$result = dol_print_date(1619388000, '%Y-%m-%d %a', 'gmt', $outputlangs);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('2021-04-25 Dim', $result);
|
||||
|
||||
@@ -345,16 +345,16 @@ class DateLibTest extends CommonClassTest
|
||||
*/
|
||||
|
||||
// Check day format for en_US
|
||||
$outputlangs=new Translate('', $conf);
|
||||
$outputlangs = new Translate('', $conf);
|
||||
$outputlangs->setDefaultLang('en_US');
|
||||
$outputlangs->load("main");
|
||||
|
||||
$result=dol_print_date(0+24*3600, 'day', true, $outputlangs);
|
||||
$result = dol_print_date(0 + 24 * 3600, 'day', true, $outputlangs);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('01/02/1970', $result);
|
||||
|
||||
// Check %a and %b format for en_US
|
||||
$result=dol_print_date(0, '%a %b %B', true, $outputlangs);
|
||||
$result = dol_print_date(0, '%a %b %B', true, $outputlangs);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('Thu Jan January', $result);
|
||||
|
||||
@@ -369,17 +369,17 @@ class DateLibTest extends CommonClassTest
|
||||
public function testDolTimePlusDuree()
|
||||
{
|
||||
global $conf,$user,$langs,$db;
|
||||
$conf=$this->savconf;
|
||||
$user=$this->savuser;
|
||||
$langs=$this->savlangs;
|
||||
$db=$this->savdb;
|
||||
$conf = $this->savconf;
|
||||
$user = $this->savuser;
|
||||
$langs = $this->savlangs;
|
||||
$db = $this->savdb;
|
||||
|
||||
// Check dayhour format for fr_FR
|
||||
$outputlangs=new Translate('', $conf);
|
||||
$outputlangs = new Translate('', $conf);
|
||||
$outputlangs->setDefaultLang('fr_FR');
|
||||
$outputlangs->load("main");
|
||||
|
||||
$result=dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0, 1, 'm'), 1, 'y'), 1, 'd'), 'dayhour', true, $outputlangs);
|
||||
$result = dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0, 1, 'm'), 1, 'y'), 1, 'd'), 'dayhour', true, $outputlangs);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals('02/02/1971 00:00', $result);
|
||||
|
||||
@@ -394,33 +394,33 @@ class DateLibTest extends CommonClassTest
|
||||
public function testDolStringToTime()
|
||||
{
|
||||
global $conf,$user,$langs,$db;
|
||||
$conf=$this->savconf;
|
||||
$user=$this->savuser;
|
||||
$langs=$this->savlangs;
|
||||
$db=$this->savdb;
|
||||
$conf = $this->savconf;
|
||||
$user = $this->savuser;
|
||||
$langs = $this->savlangs;
|
||||
$db = $this->savdb;
|
||||
|
||||
$stime='19700102';
|
||||
$result=dol_stringtotime($stime);
|
||||
$stime = '19700102';
|
||||
$result = dol_stringtotime($stime);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(86400, $result);
|
||||
|
||||
$stime='1970-01-01T02:00:00Z';
|
||||
$result=dol_stringtotime($stime);
|
||||
$stime = '1970-01-01T02:00:00Z';
|
||||
$result = dol_stringtotime($stime);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(7200, $result);
|
||||
|
||||
$stime='1970-01-01 02:00:00';
|
||||
$result=dol_stringtotime($stime);
|
||||
$stime = '1970-01-01 02:00:00';
|
||||
$result = dol_stringtotime($stime);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(7200, $result);
|
||||
|
||||
$stime='19700101T020000Z';
|
||||
$result=dol_stringtotime($stime);
|
||||
$stime = '19700101T020000Z';
|
||||
$result = dol_stringtotime($stime);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(7200, $result);
|
||||
|
||||
$stime='19700101020000';
|
||||
$result=dol_stringtotime($stime);
|
||||
$stime = '19700101020000';
|
||||
$result = dol_stringtotime($stime);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertEquals(7200, $result);
|
||||
|
||||
@@ -436,16 +436,16 @@ class DateLibTest extends CommonClassTest
|
||||
{
|
||||
global $conf;
|
||||
|
||||
$day=3;
|
||||
$month=2;
|
||||
$year=2015;
|
||||
$day = 3;
|
||||
$month = 2;
|
||||
$year = 2015;
|
||||
$conf->global->MAIN_START_WEEK = 1; // start on monday
|
||||
$prev = dol_get_first_day_week($day, $month, $year);
|
||||
$this->assertEquals(2, (int) $prev['first_day']); // monday for month 2, year 2014 is the 2
|
||||
|
||||
$day=3;
|
||||
$month=2;
|
||||
$year=2015;
|
||||
$day = 3;
|
||||
$month = 2;
|
||||
$year = 2015;
|
||||
$conf->global->MAIN_START_WEEK = 0; // start on sunday
|
||||
$prev = dol_get_first_day_week($day, $month, $year);
|
||||
$this->assertEquals(1, (int) $prev['first_day']); // sunday for month 2, year 2015 is the 1st
|
||||
|
||||
Reference in New Issue
Block a user