composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

Browse Source
This commit is contained in:
Molkobain
2020-08-26 16:09:23 +02:00
parent 0a5e4effc0 8319d655b9
commit 7f3c10b69d
465 changed files with 1335 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/core/LogFileNameBuilderTest.php
View File

@@ -6,8 +6,6 @@ namespace Combodo\iTop\Test\UnitTest\Core;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use DailyRotatingLogFileNameBuilder;
use WeeklyRotatingLogFileNameBuilder;
use MonthlyRotatingLogFileNameBuilder;
use DateTime;
/**
@@ -90,7 +88,7 @@ class LogFileNameBuilderTest extends ItopTestCase
$oFileBuilder->ResetLastModifiedDateForFile();
$oFileBuilder->CheckAndRotateLogFile();
$this->assertFileNotExists($sLogFile, 'Test log file modification date is yesterday, file rotated !');
$this->assertFileExists($sRotatedLogFile, 'Rotation was done');
$this->assertFileExists($sRotatedLogFile, 'Rotation was not done');
// file cleanup will be done in tearDown !
}
@@ -165,4 +163,4 @@ class LogFileNameBuilderTest extends ItopTestCase
$this->assertEquals($sExpectedOccurrence, $sActualOccurrence);
}
}
}

3
test/core/WeeklyScheduledProcessMockConfig.php
View File

@@ -17,6 +17,7 @@ class WeeklyScheduledProcessMockConfig extends AbstractWeeklyScheduledProcess
$this->oConfig->SetModuleSetting(self::MODULE_NAME, self::MODULE_SETTING_ENABLED, $bEnabledValue);
$this->oConfig->SetModuleSetting(self::MODULE_NAME, self::MODULE_SETTING_TIME, $sTimeValue);
$this->oConfig->SetModuleSetting(self::MODULE_NAME, self::MODULE_SETTING_WEEKDAYS, 'monday, tuesday, wednesday, thursday, friday');
utils::InitTimeZone($this->oConfig);
}
protected function GetModuleName()
@@ -33,4 +34,4 @@ class WeeklyScheduledProcessMockConfig extends AbstractWeeklyScheduledProcess
{
// nothing to do here (not tested)
}
}
}

5
test/core/WeeklyScheduledProcessTest.php
View File

@@ -2,7 +2,6 @@
namespace Combodo\iTop\Test\UnitTest\Core;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use Config;
use DateTime;
@@ -38,9 +37,7 @@ class WeeklyScheduledProcessTest extends ItopTestCase
{
$oWeeklyImpl = new \WeeklyScheduledProcessMockConfig($bEnabledValue, $sTimeValue);
$sItopTimeZone = $oWeeklyImpl->getOConfig()->Get('timezone');
$timezone = new \DateTimeZone($sItopTimeZone);
$oExpectedDateTime = new DateTime($sExpectedTime, $timezone);
$oExpectedDateTime = new DateTime($sExpectedTime);
$this->assertEquals($oExpectedDateTime, $oWeeklyImpl->GetNextOccurrence($sCurrentTime));
}