tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

MacroTest: Fix outdated tests

Browse Source
This commit is contained in:
Johannes Meyer 2015-10-01 10:42:18 +02:00
parent 85e7e7920a
commit 92b0bfaca8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
View File

@ -48,10 +48,10 @@ class MacroTest extends BaseTestCase
{ {
$objectMock = Mockery::mock('object'); $objectMock = Mockery::mock('object');
$objectMock->customvars = array( $objectMock->customvars = array(
'CUSTOMVAR' => 'test' 'customvar' => 'test'
); );
$this->assertEquals(Macro::resolveMacros('$CUSTOMVAR$', $objectMock), $objectMock->customvars['CUSTOMVAR']); $this->assertEquals(Macro::resolveMacros('$CUSTOMVAR$', $objectMock), $objectMock->customvars['customvar']);
} }
public function testFaultyMacros() public function testFaultyMacros()
@ -59,8 +59,8 @@ class MacroTest extends BaseTestCase
$hostMock = Mockery::mock('host'); $hostMock = Mockery::mock('host');
$hostMock->host_name = 'test'; $hostMock->host_name = 'test';
$hostMock->customvars = array( $hostMock->customvars = array(
'HOST' => 'te', 'host' => 'te',
'NAME' => 'st' 'name' => 'st'
); );
$this->assertEquals( $this->assertEquals(
@ -73,12 +73,12 @@ class MacroTest extends BaseTestCase
{ {
$objectMock = Mockery::mock('object'); $objectMock = Mockery::mock('object');
$objectMock->customvars = array( $objectMock->customvars = array(
'V€RY_SP3C|@L' => 'not too special!' 'v€ry_sp3c|@l' => 'not too special!'
); );
$this->assertEquals( $this->assertEquals(
Macro::resolveMacros('$V€RY_SP3C|@L$', $objectMock), Macro::resolveMacros('$V€RY_SP3C|@L$', $objectMock),
$objectMock->customvars['V€RY_SP3C|@L'] $objectMock->customvars['v€ry_sp3c|@l']
); );
} }
} }