From 92b0bfaca8053dadaf4fe9d603a562bf8fd1379c Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 1 Oct 2015 10:42:18 +0200 Subject: [PATCH] MacroTest: Fix outdated tests --- .../test/php/library/Monitoring/Object/MacroTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php index 89dae3b4d..de90e1e81 100644 --- a/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php +++ b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php @@ -48,10 +48,10 @@ class MacroTest extends BaseTestCase { $objectMock = Mockery::mock('object'); $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() @@ -59,8 +59,8 @@ class MacroTest extends BaseTestCase $hostMock = Mockery::mock('host'); $hostMock->host_name = 'test'; $hostMock->customvars = array( - 'HOST' => 'te', - 'NAME' => 'st' + 'host' => 'te', + 'name' => 'st' ); $this->assertEquals( @@ -73,12 +73,12 @@ class MacroTest extends BaseTestCase { $objectMock = Mockery::mock('object'); $objectMock->customvars = array( - 'V€RY_SP3C|@L' => 'not too special!' + 'v€ry_sp3c|@l' => 'not too special!' ); $this->assertEquals( Macro::resolveMacros('$V€RY_SP3C|@L$', $objectMock), - $objectMock->customvars['V€RY_SP3C|@L'] + $objectMock->customvars['v€ry_sp3c|@l'] ); } }