Fixed tests

chameleon82 · Mar 6, 2015 · 0e567bd · 0e567bd
1 parent 52df346
commit 0e567bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/tests/unit/framework/console/controllers/BaseMessageControllerTest.php b/tests/unit/framework/console/controllers/BaseMessageControllerTest.php
@@ -99,10 +99,9 @@ abstract protected function saveMessages($messages, $category);
      * Loads messages
      *
      * @param string $category
-     * @param boolean $shouldExist if file should exist
      * @return array
      */
-    abstract protected function loadMessages($category, $shouldExist = true);
+    abstract protected function loadMessages($category);
 
     /**
      * @return array default config

diff --git a/tests/unit/framework/console/controllers/PHPMessageControllerTest.php b/tests/unit/framework/console/controllers/PHPMessageControllerTest.php
@@ -70,7 +70,7 @@ protected function saveMessages($messages, $category)
     /**
      * @inheritdoc
      */
-    protected function loadMessages($category, $shouldExist = true)
+    protected function loadMessages($category)
     {
         if (defined('HHVM_VERSION')) {
             // https://github.com/facebook/hhvm/issues/1447
@@ -79,10 +79,7 @@ protected function loadMessages($category, $shouldExist = true)
 
         $messageFilePath = $this->getMessageFilePath($category);
 
-        if ($shouldExist) {
-            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!");
+        if (!file_exists($messageFilePath)) {
             return [];
         }
         return require $messageFilePath;

diff --git a/tests/unit/framework/console/controllers/POMessageControllerTest.php b/tests/unit/framework/console/controllers/POMessageControllerTest.php
@@ -74,13 +74,10 @@ protected function saveMessages($messages, $category)
     /**
      * @inheritdoc
      */
-    protected function loadMessages($category, $shouldExist = true)
+    protected function loadMessages($category)
     {
         $messageFilePath = $this->getMessageFilePath();
-        if ($shouldExist) {
-            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!");
+        if (!file_exists($messageFilePath)) {
             return [];
         }