From ec07b23af8263fed53eaf8ea29360e270186afb5 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Wed, 27 May 2015 17:19:04 +0300 Subject: [PATCH] Test corrections --- tests/Espo/Core/CronManagerTest.php | 12 ++++++++---- tests/Espo/Core/Utils/LanguageTest.php | 11 ++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/Espo/Core/CronManagerTest.php b/tests/Espo/Core/CronManagerTest.php index 82afbba9a0..b90137f756 100644 --- a/tests/Espo/Core/CronManagerTest.php +++ b/tests/Espo/Core/CronManagerTest.php @@ -85,10 +85,12 @@ class CronManagerTest extends \PHPUnit_Framework_TestCase $this->objects['fileManager'] ->expects($this->once()) ->method('getPhpContents') - ->will($this->returnValue(time()-60)); + ->will($this->returnValue(array( + 'time' => time() - 60, + ))); $this->objects['config'] - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('get') ->will($this->returnValue(50)); @@ -100,10 +102,12 @@ class CronManagerTest extends \PHPUnit_Framework_TestCase $this->objects['fileManager'] ->expects($this->once()) ->method('getPhpContents') - ->will($this->returnValue(time()-49)); + ->will($this->returnValue(array( + 'time' => time() - 49, + ))); $this->objects['config'] - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('get') ->will($this->returnValue(50)); diff --git a/tests/Espo/Core/Utils/LanguageTest.php b/tests/Espo/Core/Utils/LanguageTest.php index 788cde284f..32fba7a81c 100644 --- a/tests/Espo/Core/Utils/LanguageTest.php +++ b/tests/Espo/Core/Utils/LanguageTest.php @@ -53,9 +53,18 @@ class LanguageTest extends \PHPUnit_Framework_TestCase ->method('get') ->will($this->returnValueMap($map)); + $this->objects['metadata'] = $this->getMockBuilder('\Espo\Core\Utils\Metadata')->disableOriginalConstructor()->getMock(); + $this->objects['metadata']->expects($this->any()) + ->method('getModuleList') + ->will($this->returnValue( + array ( + 'Crm', + ) + )); + $this->objects['preferences'] = $this->getMockBuilder('\Espo\Entities\Preferences')->disableOriginalConstructor()->getMock(); - $this->object = new \Espo\Core\Utils\Language($this->objects['fileManager'], $this->objects['config'], $this->objects['preferences']); + $this->object = new \Espo\Core\Utils\Language($this->objects['fileManager'], $this->objects['config'], $this->objects['metadata'], $this->objects['preferences']); $this->reflection = new ReflectionHelper($this->object); $this->reflection->setProperty('cacheFile', $this->cacheFile);