From 5725a23a56f97d4fb0bbebae9a70f2165e1db7d3 Mon Sep 17 00:00:00 2001 From: AD7six Date: Sat, 19 Mar 2011 18:35:14 +0100 Subject: [PATCH] use the domain cake_developer and cake_error as appropriate --- lib/Cake/TestSuite/CakeTestCase.php | 2 +- lib/Cake/TestSuite/CakeTestRunner.php | 2 +- lib/Cake/TestSuite/Fixture/CakeFixtureManager.php | 2 +- lib/Cake/TestSuite/Reporter/CakeBaseReporter.php | 4 ++-- lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Cake/TestSuite/CakeTestCase.php b/lib/Cake/TestSuite/CakeTestCase.php index 3e80dc0a8f8..0eba8e943a6 100644 --- a/lib/Cake/TestSuite/CakeTestCase.php +++ b/lib/Cake/TestSuite/CakeTestCase.php @@ -184,7 +184,7 @@ protected function assertPostConditions() { */ function loadFixtures() { if (empty($this->fixtureManager)) { - throw new Exception(__d('cake', 'No fixture manager to load the test fixture')); + throw new Exception(__d('cake_error', 'No fixture manager to load the test fixture')); } $args = func_get_args(); foreach ($args as $class) { diff --git a/lib/Cake/TestSuite/CakeTestRunner.php b/lib/Cake/TestSuite/CakeTestRunner.php index 21515886e52..c349e1bc6b2 100644 --- a/lib/Cake/TestSuite/CakeTestRunner.php +++ b/lib/Cake/TestSuite/CakeTestRunner.php @@ -84,7 +84,7 @@ protected function _getFixtureManager($arguments) { if (class_exists($arguments['fixtureManager'])) { return new $arguments['fixtureManager']; } - throw new RuntimeException(__d('cake', 'Could not find fixture manager %s.', $arguments['fixtureManager'])); + throw new RuntimeException(__d('cake_error', 'Could not find fixture manager %s.', $arguments['fixtureManager'])); } App::uses('AppFixtureManager', 'TestSuite'); if (class_exists('AppFixtureManager')) { diff --git a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php index ababd8629df..49161a14a04 100644 --- a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php +++ b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php @@ -239,7 +239,7 @@ public function loadSingle($name, $db = null) { $fixture->truncate($db); $fixture->insert($db); } else { - throw new UnexpectedValueException(__d('cake', 'Referenced fixture class %s not found', $name)); + throw new UnexpectedValueException(__d('cake_error', 'Referenced fixture class %s not found', $name)); } } diff --git a/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php index b79bd0d525f..a0887530ace 100644 --- a/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php +++ b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php @@ -187,7 +187,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) { if (!$this->_headerSent) { echo $this->paintHeader(); } - echo __d('cake', 'Running %s', $suite->getName()) . "\n"; + echo __d('cake_developer', 'Running %s', $suite->getName()) . "\n"; } /** @@ -217,4 +217,4 @@ public function endTest(PHPUnit_Framework_Test $test, $time) { $this->paintPass($test, $time); } -} +} \ No newline at end of file diff --git a/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php index d709a7c7782..2e575fa5a41 100644 --- a/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php +++ b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php @@ -234,8 +234,8 @@ public function paintFail($message, $test) { echo "
  • \n"; echo "Failed"; echo "
    " . $this->_htmlEntities($message->toString()) . "
    \n"; - echo "
    " . __d('cake', 'Test case: %s', $testName) . "
    \n"; - echo "
    " . __d('cake', 'Stack trace:') . '
    ' . $trace . "
    \n"; + echo "
    " . __d('cake_developer', 'Test case: %s', $testName) . "
    \n"; + echo "
    " . __d('cake_developer', 'Stack trace:') . '
    ' . $trace . "
    \n"; echo "
  • \n"; } @@ -272,8 +272,8 @@ public function paintException($message, $test) { echo "" . get_class($message) . ""; echo "
    " . $this->_htmlEntities($message->getMessage()) . "
    \n"; - echo "
    " . __d('cake', 'Test case: %s', $testName) . "
    \n"; - echo "
    " . __d('cake', 'Stack trace:') . '
    ' . $trace . "
    \n"; + echo "
    " . __d('cake_developer', 'Test case: %s', $testName) . "
    \n"; + echo "
    " . __d('cake_developer', 'Stack trace:') . '
    ' . $trace . "
    \n"; echo "\n"; } @@ -341,6 +341,6 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) { if (!$this->_headerSent) { echo $this->paintHeader(); } - echo '

    ' . __d('cake', 'Running %s', $suite->getName()) . '

    '; + echo '

    ' . __d('cake_developer', 'Running %s', $suite->getName()) . '

    '; } -} +} \ No newline at end of file