tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-20 12:24:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

ExtensibleSet: fix tests

Browse Source
This commit is contained in:
Thomas Gelf 2016-02-29 17:37:01 +01:00
parent c25c7ee95b
commit 245e632f54
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Director/IcingaConfig/ExtensibleSet.php
View File

@ -317,7 +317,7 @@ class ExtensibleSet
$parts[] = c::renderKeyOperatorValue( $parts[] = c::renderKeyOperatorValue(
$key, $key,
'-=', '-=',
c::renderArray($this->plusValues), c::renderArray($this->minusValues),
$prefix $prefix
); );
} }

19
test/php/library/Director/IcingaConfig/ExtensibleSetTest.php
View File

@ -3,6 +3,7 @@
namespace Tests\Icinga\Module\Director\IcingaConfig; namespace Tests\Icinga\Module\Director\IcingaConfig;
use Icinga\Module\Director\IcingaConfig\ExtensibleSet; use Icinga\Module\Director\IcingaConfig\ExtensibleSet;
use Icinga\Module\Director\Objects\IcingaUser;
use Icinga\Module\Director\Test\BaseTestCase; use Icinga\Module\Director\Test\BaseTestCase;
class ExtensibleSetTest extends BaseTestCase class ExtensibleSetTest extends BaseTestCase
@ -28,6 +29,16 @@ class ExtensibleSetTest extends BaseTestCase
); );
} }
public function testConstructorAcceptsSingleValues()
{
$set = new ExtensibleSet('Bla');
$this->assertEquals(
array('Bla'),
$set->getResolvedValues()
);
}
public function testSingleValuesCanBeBlacklisted() public function testSingleValuesCanBeBlacklisted()
{ {
$values = array('Val1', 'Val2', 'Val4'); $values = array('Val1', 'Val2', 'Val4');
@ -96,12 +107,12 @@ class ExtensibleSetTest extends BaseTestCase
public function testInheritedValuesCanBeBlacklisted() public function testInheritedValuesCanBeBlacklisted()
{ {
$pset = array('p1', 'p2', 'p3');
$child = new ExtensibleSet(); $child = new ExtensibleSet();
$child->blacklist('p2'); $child->blacklist('p2');
$pset = array('p1', 'p2', 'p3');
$parent = new ExtensibleSet($pset); $parent = new ExtensibleSet($pset);
$child->inheritFrom($parent); $child->inheritFrom($parent);
$child->blacklist(array('not', 'yet', 'p1')); $child->blacklist(array('not', 'yet', 'p1'));
@ -136,12 +147,12 @@ class ExtensibleSetTest extends BaseTestCase
public function testCombinedDefinitionRendersCorrectly() public function testCombinedDefinitionRendersCorrectly()
{ {
$set = new ExtensibleSet(array('pre', 'def', 'ined')); $set = new ExtensibleSet(array('pre', 'def', 'ined'));
$set->blacklist('and', 'not', 'those'); $set->blacklist(array('and', 'not', 'those'));
$set->extend('plus this'); $set->extend('plus this');
$out = ' key_name = [ "pre", "def", "ined" ]' . "\n" $out = ' key_name = [ "pre", "def", "ined" ]' . "\n"
. ' key_name += [ "plus this" ]' . "\n" . ' key_name += [ "plus this" ]' . "\n"
. ' key_name -= [ "plus this" ]' . "\n"; . ' key_name -= [ "and", "not", "those" ]' . "\n";
$this->assertEquals( $this->assertEquals(
$out, $out,