From 4a417708f00b1ebd5865c8075bb36b7fc0f14756 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 25 Nov 2009 13:49:40 -0800 Subject: Kohana::show_404() -> throw new Kohana_404_Exception() --- modules/gallery_unit_test/controllers/gallery_unit_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery_unit_test') diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php index 58e0d9c5..391ad029 100644 --- a/modules/gallery_unit_test/controllers/gallery_unit_test.php +++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php @@ -20,7 +20,7 @@ class Gallery_Unit_Test_Controller extends Controller { function Index() { if (!TEST_MODE) { - print Kohana::show_404(); + print throw new Kohana_404_Exception(); } // Jump through some hoops to satisfy the way that we check for the site_domain in -- cgit v1.2.3 From 287f79dd721193aaaafdee3908cd8f251654de02 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 21 Dec 2009 11:30:06 -0800 Subject: Updated for K24 --- .../controllers/gallery_unit_test.php | 39 +++++++++++----------- modules/gallery_unit_test/helpers/MY_request.php | 25 ++++++++++++++ 2 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 modules/gallery_unit_test/helpers/MY_request.php (limited to 'modules/gallery_unit_test') diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php index 391ad029..498dd756 100644 --- a/modules/gallery_unit_test/controllers/gallery_unit_test.php +++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php @@ -20,7 +20,7 @@ class Gallery_Unit_Test_Controller extends Controller { function Index() { if (!TEST_MODE) { - print throw new Kohana_404_Exception(); + throw new Kohana_404_Exception(); } // Jump through some hoops to satisfy the way that we check for the site_domain in @@ -30,6 +30,7 @@ class Gallery_Unit_Test_Controller extends Controller { $_SERVER["SCRIPT_FILENAME"] = "index.php"; $_SERVER["SCRIPT_NAME"] = "./index.php"; + $config = Kohana_Config::instance(); $original_config = DOCROOT . "var/database.php"; $test_config = VARPATH . "database.php"; if (!file_exists($original_config)) { @@ -41,20 +42,20 @@ class Gallery_Unit_Test_Controller extends Controller { if (empty($db_config['unit_test'])) { $default = $db_config['default']; $conn = $default['connection']; - Kohana::config_set('database.unit_test.benchmark', $default['benchmark']); - Kohana::config_set('database.unit_test.persistent', $default['persistent']); - Kohana::config_set('database.unit_test.connection.type', $conn['type']); - Kohana::config_set('database.unit_test.connection.user', $conn['user']); - Kohana::config_set('database.unit_test.connection.pass', $conn['pass']); - Kohana::config_set('database.unit_test.connection.host', $conn['host']); - Kohana::config_set('database.unit_test.connection.port', $conn['port']); - Kohana::config_set('database.unit_test.connection.socket', $conn['socket']); - Kohana::config_set('database.unit_test.connection.database', "{$conn['database']}_test"); - Kohana::config_set('database.unit_test.character_set', $default['character_set']); - Kohana::config_set('database.unit_test.table_prefix', $default['table_prefix']); - Kohana::config_set('database.unit_test.object', $default['object']); - Kohana::config_set('database.unit_test.cache', $default['cache']); - Kohana::config_set('database.unit_test.escape', $default['escape']); + $config->set('database.unit_test.benchmark', $default['benchmark']); + $config->set('database.unit_test.persistent', $default['persistent']); + $config->set('database.unit_test.connection.type', $conn['type']); + $config->set('database.unit_test.connection.user', $conn['user']); + $config->set('database.unit_test.connection.pass', $conn['pass']); + $config->set('database.unit_test.connection.host', $conn['host']); + $config->set('database.unit_test.connection.port', $conn['port']); + $config->set('database.unit_test.connection.socket', $conn['socket']); + $config->set('database.unit_test.connection.database', "{$conn['database']}_test"); + $config->set('database.unit_test.character_set', $default['character_set']); + $config->set('database.unit_test.table_prefix', $default['table_prefix']); + $config->set('database.unit_test.object', $default['object']); + $config->set('database.unit_test.cache', $default['cache']); + $config->set('database.unit_test.escape', $default['escape']); $db_config = Kohana::config('database'); } @@ -69,7 +70,7 @@ class Gallery_Unit_Test_Controller extends Controller { $db->connect(); // Make this the default database for the rest of this run - Database::$instances = array('default' => $db); + Database::set_default_instance($db); } catch (Exception $e) { print "{$e->getMessage()}\n"; return; @@ -80,7 +81,7 @@ class Gallery_Unit_Test_Controller extends Controller { // Clean out the database if ($tables = $db->list_tables()) { foreach ($db->list_tables() as $table) { - $db->query("DROP TABLE $table"); + $db->query("DROP TABLE {{$table}}"); } } @@ -97,7 +98,7 @@ class Gallery_Unit_Test_Controller extends Controller { $db->clear_cache(); // Rest the cascading class path - Kohana::config_set("core", Kohana::config_load("core")); + $config->set("core", $config->load("core")); // Install the active modules // Force gallery and user to be installed first to resolve dependencies. @@ -119,7 +120,7 @@ class Gallery_Unit_Test_Controller extends Controller { } } - Kohana::config_set('unit_test.paths', $paths); + $config->set('unit_test.paths', $paths); // Trigger late-binding install actions (defined in gallery_event::user_login) graphics::choose_default_toolkit(); diff --git a/modules/gallery_unit_test/helpers/MY_request.php b/modules/gallery_unit_test/helpers/MY_request.php new file mode 100644 index 00000000..9cc9746a --- /dev/null +++ b/modules/gallery_unit_test/helpers/MY_request.php @@ -0,0 +1,25 @@ + Date: Mon, 21 Dec 2009 12:09:16 -0800 Subject: Stop using Kohana::lang. --- modules/gallery_unit_test/views/kohana_unit_test_cli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery_unit_test') diff --git a/modules/gallery_unit_test/views/kohana_unit_test_cli.php b/modules/gallery_unit_test/views/kohana_unit_test_cli.php index 352671eb..3203ee44 100644 --- a/modules/gallery_unit_test/views/kohana_unit_test_cli.php +++ b/modules/gallery_unit_test/views/kohana_unit_test_cli.php @@ -44,7 +44,7 @@ foreach ($results as $class => $methods) { red_start(), color_end()); echo " ", $result->getMessage(), "\n"; echo " ", $result->getFile(); - echo " ", "(" . Kohana::lang("unit_test.line") . " " . $result->getLine(), ")\n"; + echo " ", "(line " . $result->getLine(), ")\n"; if ($result->getDebug() !== null) { echo " ", "(", gettype($result->getDebug()), ") ", var_export($result->getDebug(), true), "\n"; -- cgit v1.2.3 From e94009e90df5124ab83aad6a7f6a45806c3ff71b Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 21 Dec 2009 17:26:04 -0800 Subject: Add a helper for doing complex string comparisons --- modules/gallery_unit_test/helpers/diff.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/gallery_unit_test/helpers/diff.php (limited to 'modules/gallery_unit_test') diff --git a/modules/gallery_unit_test/helpers/diff.php b/modules/gallery_unit_test/helpers/diff.php new file mode 100644 index 00000000..1ea16fa6 --- /dev/null +++ b/modules/gallery_unit_test/helpers/diff.php @@ -0,0 +1,26 @@ + Date: Tue, 22 Dec 2009 15:41:47 -0800 Subject: Fix some function definitions (they should be static) --- modules/gallery_unit_test/helpers/MY_request.php | 2 +- modules/gallery_unit_test/helpers/diff.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/gallery_unit_test') diff --git a/modules/gallery_unit_test/helpers/MY_request.php b/modules/gallery_unit_test/helpers/MY_request.php index 9cc9746a..452fb0cc 100644 --- a/modules/gallery_unit_test/helpers/MY_request.php +++ b/modules/gallery_unit_test/helpers/MY_request.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class request extends request_Core { - public function set_user_agent($value) { + static function set_user_agent($value) { self::$user_agent = null; $_SERVER["HTTP_USER_AGENT"] = $value; } diff --git a/modules/gallery_unit_test/helpers/diff.php b/modules/gallery_unit_test/helpers/diff.php index 1ea16fa6..7b573732 100644 --- a/modules/gallery_unit_test/helpers/diff.php +++ b/modules/gallery_unit_test/helpers/diff.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class diff_Core { - public function compare($a, $b) { + static function compare($a, $b) { fwrite(fopen($a_name = tempnam("/tmp", "test"), "w"), $a); fwrite(fopen($b_name = tempnam("/tmp", "test"), "w"), $b); return `diff $a_name $b_name`; -- cgit v1.2.3