upstream/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2026-05-28 04:35:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

IcingaConfigHelper: empty intervals are null

Browse source
This commit is contained in:
Thomas Gelf 2016-02-28 16:25:15 +01:00
parent 7f949e1b5a
commit 11e5ef0362
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/Director/IcingaConfig/IcingaConfigHelper.php
View file

@ -171,6 +171,10 @@ class IcingaConfigHelper
public static function parseInterval($interval)
{
if ($interval === null || $interval === '') {
return null;
}
if (ctype_digit($interval)) {
return (int) $interval;
}

8
test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
View file

@ -9,6 +9,8 @@ class IcingaConfigHelperTest extends BaseTestCase
{
public function testWhetherIntervalStringIsCorrectlyParsed()
{
$this->assertEquals(c::parseInterval('0'), 0);
$this->assertEquals(c::parseInterval('0s'), 0);
$this->assertEquals(c::parseInterval('10'), 10);
$this->assertEquals(c::parseInterval('70s'), 70);
$this->assertEquals(c::parseInterval('5m 10s'), 310);
@ -24,6 +26,12 @@ class IcingaConfigHelperTest extends BaseTestCase
c::parseInterval('1h 5m 60x');
}
public function testWhetherAnEmptyValueGivesNull()
{
$this->assertNull(c::parseInterval(''));
$this->assertNull(c::parseInterval(null));
}
public function testWhetherIntervalStringIsCorrectlyRendered()
{
$this->assertEquals(c::renderInterval(10), '10s');