php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-12 03:30:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Alexander Makarov
2015-03-07 00:31:22 +03:00
parent 52df3466f4
commit 0e567bdd9c
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/framework/console/controllers/BaseMessageControllerTest.php
View File

@@ -99,10 +99,9 @@ abstract class BaseMessageControllerTest extends TestCase
* Loads messages * Loads messages
* *
* @param string $category * @param string $category
* @param boolean $shouldExist if file should exist
* @return array * @return array
*/ */
abstract protected function loadMessages($category, $shouldExist = true); abstract protected function loadMessages($category);
/** /**
* @return array default config * @return array default config

7
tests/unit/framework/console/controllers/PHPMessageControllerTest.php
View File

@@ -70,7 +70,7 @@ class PHPMessageControllerTest extends BaseMessageControllerTest
/** /**
* @inheritdoc * @inheritdoc
*/ */
protected function loadMessages($category, $shouldExist = true) protected function loadMessages($category)
{ {
if (defined('HHVM_VERSION')) { if (defined('HHVM_VERSION')) {
// https://github.com/facebook/hhvm/issues/1447 // https://github.com/facebook/hhvm/issues/1447
@@ -79,10 +79,7 @@ class PHPMessageControllerTest extends BaseMessageControllerTest
$messageFilePath = $this->getMessageFilePath($category); $messageFilePath = $this->getMessageFilePath($category);
if ($shouldExist) { if (!file_exists($messageFilePath)) {
static::assertTrue(file_exists($messageFilePath), "There's no message file $messageFilePath that should exist!");
} else {
static::assertFalse(file_exists($messageFilePath), "There's message file $messageFilePath that should not exist!");
return []; return [];
} }
return require $messageFilePath; return require $messageFilePath;

7
tests/unit/framework/console/controllers/POMessageControllerTest.php
View File

@@ -74,13 +74,10 @@ class POMessageControllerTest extends BaseMessageControllerTest
/** /**
* @inheritdoc * @inheritdoc
*/ */
protected function loadMessages($category, $shouldExist = true) protected function loadMessages($category)
{ {
$messageFilePath = $this->getMessageFilePath(); $messageFilePath = $this->getMessageFilePath();
if ($shouldExist) { if (!file_exists($messageFilePath)) {
static::assertTrue(file_exists($messageFilePath), "There's no message file $messageFilePath that should exist!");
} else {
static::assertFalse(file_exists($messageFilePath), "There's message file $messageFilePath that should not exist!");
return []; return [];
} }