From 6f959deed90750d3f87f26e64fc44beb3f7ba903 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 3 Dec 2008 03:23:30 +0000
Subject: Rename generic test.php to gallery_unit_test.php to make navigation
 to this file a little easier

---
 index.php                                          |   2 +-
 .../controllers/gallery_unit_test.php              | 105 +++++++++++++++++++++
 modules/gallery_unit_test/controllers/test.php     | 105 ---------------------
 3 files changed, 106 insertions(+), 106 deletions(-)
 create mode 100644 modules/gallery_unit_test/controllers/gallery_unit_test.php
 delete mode 100644 modules/gallery_unit_test/controllers/test.php

diff --git a/index.php b/index.php
index 96360bfe..44b00e67 100644
--- a/index.php
+++ b/index.php
@@ -47,7 +47,7 @@ define('SYSPATH', strtr(realpath('kohana') . '/', DIRECTORY_SEPARATOR, '/'));
 
 // Force a test run if we're in command line mode.
 if (PHP_SAPI == 'cli') {
-  $_SERVER['argv'] = array($_SERVER['argv'][0], 'test');
+  $_SERVER['argv'] = array($_SERVER['argv'][0], 'gallery_unit_test');
   define('TEST_MODE', 1);
   @system('mkdir -p test/var/logs');
   define('VARPATH', strtr(realpath('test/var') . '/', DIRECTORY_SEPARATOR, '/'));
diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
new file mode 100644
index 00000000..2046e323
--- /dev/null
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -0,0 +1,105 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Gallery_Unit_Test_Controller extends Controller {
+  function Index() {
+    if (!defined('TEST_MODE')) {
+      print Kohana::show_404();
+    }
+
+    $original_config = DOCROOT . "var/database.php";
+    $test_config = VARPATH . "database.php";
+    if (!file_exists($original_config)) {
+      print "Please copy kohana/config/database.php to $original_config.\n";
+      print "Then, add a \$config['unit_test'] database configuration in $original_config.\n";
+      return;
+    } else {
+      copy($original_config, $test_config);
+      $db_config = Kohana::config('database');
+      if (empty($db_config['unit_test'])) {
+        print "Please create a \$config['unit_test'] database configuration in $test_config.\n";
+        return;
+      }
+
+      try {
+        $db = Database::instance('unit_test');
+        $db->connect();
+
+        // Make this the default database for the rest of this run
+        Database::$instances = array('default' => $db);
+      } catch (Exception $e) {
+        print "{$e->getMessage()}\n";
+        return;
+      }
+    }
+
+    // Find all tests, excluding sample tests that come with the unit_test module.
+    $paths = array(APPPATH . "tests");
+    foreach (glob(MODPATH . "*/tests") as $path) {
+      if ($path != MODPATH . "unit_test/tests") {
+        $paths[] = $path;
+      }
+    }
+    Kohana::config_set('unit_test.paths', $paths);
+
+    // We probably don't want to uninstall and reinstall the core every time, but let's start off
+    // this way.  Uninstall modules first and core last.  Ignore errors during uninstall.
+    try {
+      $this->_uninstall_modules();
+    } catch (Exception $e) {
+    }
+
+    $this->_install_modules();
+
+    print new Unit_Test();
+  }
+
+  private function _uninstall_modules() {
+    foreach (module::installed() as $module) {
+      if ($module->name == "core") {
+        continue;
+      }
+
+      $installer_class = "{$module->name}_installer";
+      Kohana::log("debug", "$installer_class");
+      if (method_exists($installer_class, "uninstall")) {
+        call_user_func_array(array($installer_class, "uninstall"), array());
+      }
+    }
+
+    // Always uninstall core last.
+   core_installer::uninstall();
+  }
+
+  private function _install_modules() {
+    core_installer::install();
+
+    foreach (glob(MODPATH . "*/helpers/*_installer.php") as $file) {
+      $module_name = basename(dirname(dirname($file)));
+      if ($module_name == "core") {
+        continue;
+      }
+
+      $installer_class = "{$module_name}_installer";
+      if (method_exists($installer_class, "install")) {
+        call_user_func_array(array($installer_class, "install"), array());
+      }
+    }
+  }
+}
diff --git a/modules/gallery_unit_test/controllers/test.php b/modules/gallery_unit_test/controllers/test.php
deleted file mode 100644
index b5835556..00000000
--- a/modules/gallery_unit_test/controllers/test.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Test_Controller extends Controller {
-  function Index() {
-    if (!defined('TEST_MODE')) {
-      print Kohana::show_404();
-    }
-
-    $original_config = DOCROOT . "var/database.php";
-    $test_config = VARPATH . "database.php";
-    if (!file_exists($original_config)) {
-      print "Please copy kohana/config/database.php to $original_config.\n";
-      print "Then, add a \$config['unit_test'] database configuration in $original_config.\n";
-      return;
-    } else {
-      copy($original_config, $test_config);
-      $db_config = Kohana::config('database');
-      if (empty($db_config['unit_test'])) {
-        print "Please create a \$config['unit_test'] database configuration in $test_config.\n";
-        return;
-      }
-
-      try {
-        $db = Database::instance('unit_test');
-        $db->connect();
-
-        // Make this the default database for the rest of this run
-        Database::$instances = array('default' => $db);
-      } catch (Exception $e) {
-        print "{$e->getMessage()}\n";
-        return;
-      }
-    }
-
-    // Find all tests, excluding sample tests that come with the unit_test module.
-    $paths = array(APPPATH . "tests");
-    foreach (glob(MODPATH . "*/tests") as $path) {
-      if ($path != MODPATH . "unit_test/tests") {
-        $paths[] = $path;
-      }
-    }
-    Kohana::config_set('unit_test.paths', $paths);
-
-    // We probably don't want to uninstall and reinstall the core every time, but let's start off
-    // this way.  Uninstall modules first and core last.  Ignore errors during uninstall.
-    try {
-      $this->_uninstall_modules();
-    } catch (Exception $e) {
-    }
-
-    $this->_install_modules();
-
-    print new Unit_Test();
-  }
-
-  private function _uninstall_modules() {
-    foreach (module::installed() as $module) {
-      if ($module->name == "core") {
-        continue;
-      }
-
-      $installer_class = "{$module->name}_installer";
-      Kohana::log("debug", "$installer_class");
-      if (method_exists($installer_class, "uninstall")) {
-        call_user_func_array(array($installer_class, "uninstall"), array());
-      }
-    }
-
-    // Always uninstall core last.
-   core_installer::uninstall();
-  }
-
-  private function _install_modules() {
-    core_installer::install();
-
-    foreach (glob(MODPATH . "*/helpers/*_installer.php") as $file) {
-      $module_name = basename(dirname(dirname($file)));
-      if ($module_name == "core") {
-        continue;
-      }
-
-      $installer_class = "{$module_name}_installer";
-      if (method_exists($installer_class, "install")) {
-        call_user_func_array(array($installer_class, "install"), array());
-      }
-    }
-  }
-}
-- 
cgit v1.2.3