From 5bd9734f96149e877bf4929d72433e77e4dca2b7 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Tue, 5 Jan 2010 20:10:41 -0500 Subject: [PATCH] Moving reporters to a directory and updating CakeTestSuiteDispatcher. --- cake/tests/lib/cake_test_suite_dispatcher.php | 5 +++-- cake/tests/lib/{ => reporter}/cake_html_reporter.php | 0 cake/tests/lib/{ => reporter}/cake_text_reporter.php | 0 cake/tests/lib/{ => reporter}/cli_reporter.php | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename cake/tests/lib/{ => reporter}/cake_html_reporter.php (100%) rename cake/tests/lib/{ => reporter}/cake_text_reporter.php (100%) rename cake/tests/lib/{ => reporter}/cli_reporter.php (100%) diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php index 91a3c774f3e..b9278df71ea 100644 --- a/cake/tests/lib/cake_test_suite_dispatcher.php +++ b/cake/tests/lib/cake_test_suite_dispatcher.php @@ -136,11 +136,12 @@ function getManager() { function &getReporter() { static $Reporter = NULL; if (!$Reporter) { + $type = strtolower($this->params['output']); $coreClass = 'Cake' . ucwords($this->params['output']) . 'Reporter'; - $coreFile = CAKE_TESTS_LIB . 'cake_' . strtolower($this->params['output']) . '_reporter.php'; + $coreFile = CAKE_TESTS_LIB . 'reporter' . DS . 'cake_' . $type . '_reporter.php'; $appClass = $this->params['output'] . 'Reporter'; - $appFile = APPLIBS . 'test_suite' . DS . strtolower($this->params['output']) . '_reporter.php'; + $appFile = APPLIBS . 'test_suite' . DS . 'reporter' . DS . $type . '_reporter.php'; if (include_once $coreFile) { $Reporter =& new $coreClass(); } elseif (include_once $appFile) { diff --git a/cake/tests/lib/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php similarity index 100% rename from cake/tests/lib/cake_html_reporter.php rename to cake/tests/lib/reporter/cake_html_reporter.php diff --git a/cake/tests/lib/cake_text_reporter.php b/cake/tests/lib/reporter/cake_text_reporter.php similarity index 100% rename from cake/tests/lib/cake_text_reporter.php rename to cake/tests/lib/reporter/cake_text_reporter.php diff --git a/cake/tests/lib/cli_reporter.php b/cake/tests/lib/reporter/cli_reporter.php similarity index 100% rename from cake/tests/lib/cli_reporter.php rename to cake/tests/lib/reporter/cli_reporter.php