From c13d5c35134fbdb637d32eaf721d90e0c3889739 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 17 Jan 2010 19:24:48 -0800
Subject: Helper class for common test methods (like creating albums, photos,
 etc).

---
 modules/gallery_unit_test/helpers/test.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 modules/gallery_unit_test/helpers/test.php

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
new file mode 100644
index 00000000..30a87807
--- /dev/null
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -0,0 +1,30 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 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_Core {
+  static function random_album($parent=null) {
+    $rand = rand();
+
+    $album = ORM::factory("item");
+    $album->type = "album";
+    $album->parent_id = $parent ? $parent->id : 1;
+    $album->name = "test_$rand";
+    return $album->save();
+  }
+}
-- 
cgit v1.2.3


From 53a17e3444e677dbb1878db68ffa1677511690c3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 17 Jan 2010 19:26:22 -0800
Subject: Add album title in random_album().

---
 modules/gallery_unit_test/helpers/test.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 30a87807..2fa12a23 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -24,7 +24,8 @@ class test_Core {
     $album = ORM::factory("item");
     $album->type = "album";
     $album->parent_id = $parent ? $parent->id : 1;
-    $album->name = "test_$rand";
+    $album->name = "name_$rand";
+    $album->title = "title_$rand";
     return $album->save();
   }
 }
-- 
cgit v1.2.3


From c9fd8d751d3bb46b8b0d6d5bea0cf8272f06c11b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 17 Jan 2010 19:57:24 -0800
Subject: Add random_photo()

---
 modules/gallery_unit_test/helpers/test.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 2fa12a23..6dfa3cf0 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -28,4 +28,15 @@ class test_Core {
     $album->title = "title_$rand";
     return $album->save();
   }
+
+  static function random_photo($parent=null) {
+    $rand = rand();
+    $photo = ORM::factory("item");
+    $photo->type = "photo";
+    $photo->parent_id = $parent ? $parent->id : 1;
+    $photo->set_data_file(MODPATH . "gallery/tests/test.jpg");
+    $photo->name = "name_$rand.jpg";
+    $photo->title = "title_$rand";
+    return $photo->save();
+  }
 }
-- 
cgit v1.2.3


From dd5f08b703754b88f10234db94c44f153e4f37ca Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 17 Jan 2010 20:06:28 -0800
Subject: Create xxx_unsaved() versions for the case where you want to tinker
 with the item before it gets saved.

---
 modules/gallery_unit_test/helpers/test.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 6dfa3cf0..5368539f 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class test_Core {
-  static function random_album($parent=null) {
+  static function random_album_unsaved($parent=null) {
     $rand = rand();
 
     $album = ORM::factory("item");
@@ -26,10 +26,14 @@ class test_Core {
     $album->parent_id = $parent ? $parent->id : 1;
     $album->name = "name_$rand";
     $album->title = "title_$rand";
-    return $album->save();
+    return $album;
   }
 
-  static function random_photo($parent=null) {
+  static function random_album($parent=null) {
+    return test::random_album_unsaved($parent)->save();
+  }
+
+  static function random_photo_unsaved($parent=null) {
     $rand = rand();
     $photo = ORM::factory("item");
     $photo->type = "photo";
@@ -37,6 +41,10 @@ class test_Core {
     $photo->set_data_file(MODPATH . "gallery/tests/test.jpg");
     $photo->name = "name_$rand.jpg";
     $photo->title = "title_$rand";
-    return $photo->save();
+    return $photo;
+  }
+
+  static function random_photo($parent=null) {
+    return test::random_photo_unsaved($parent)->save();
   }
 }
-- 
cgit v1.2.3


From f492436317a61aa8387d1fb2232f8e5255ed5d3c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 13:03:59 -0800
Subject: Add random_name().

---
 modules/gallery_unit_test/helpers/test.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 5368539f..29a7a79a 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -47,4 +47,12 @@ class test_Core {
   static function random_photo($parent=null) {
     return test::random_photo_unsaved($parent)->save();
   }
+
+  static function random_name($item=null) {
+    $rand = "name_" . rand();
+    if ($item && $item->is_photo()) {
+      $rand .= ".jpg";
+    }
+    return $rand;
+  }
 }
-- 
cgit v1.2.3


From f94fa25e0868e9988ebf7168701dd059b1135fdb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 22:51:52 -0800
Subject: Add starts_with().

---
 modules/gallery_unit_test/helpers/test.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 29a7a79a..77948465 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -55,4 +55,8 @@ class test_Core {
     }
     return $rand;
   }
+
+  static function starts_with($outer, $inner) {
+    return strpos($outer, $inner) === 0;
+  }
 }
-- 
cgit v1.2.3


From 76da85a1a08cdf065bf186c81ea444d03d6f8935 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 19 Jan 2010 22:38:19 -0800
Subject: Extend Gallery_Unit_Test_Case instead of Unit_Test_Case.

---
 modules/akismet/tests/Akismet_Helper_Test.php     |   2 +-
 modules/comment/tests/Comment_Event_Test.php      |   2 +-
 modules/comment/tests/Comment_Helper_Test.php     |   2 +-
 modules/comment/tests/Comment_Model_Test.php      |   2 +-
 modules/digibug/tests/Digibug_Controller_Test.php |   2 +-
 modules/exif/tests/Exif_Test.php                  |   2 +-
 modules/gallery/tests/Access_Helper_Test.php      |   2 +-
 modules/gallery/tests/Albums_Controller_Test.php  |   2 +-
 modules/gallery/tests/Cache_Test.php              |   2 +-
 modules/gallery/tests/Controller_Auth_Test.php    |   2 +-
 modules/gallery/tests/Database_Test.php           |   2 +-
 modules/gallery/tests/Dir_Helper_Test.php         |   2 +-
 modules/gallery/tests/DrawForm_Test.php           |   2 +-
 modules/gallery/tests/File_Structure_Test.php     |   2 +-
 modules/gallery/tests/Gallery_I18n_Test.php       |   2 +-
 modules/gallery/tests/Gallery_Installer_Test.php  |   2 +-
 modules/gallery/tests/Html_Helper_Test.php        |   2 +-
 modules/gallery/tests/Item_Helper_Test.php        |   2 +-
 modules/gallery/tests/Item_Model_Test.php         |   2 +-
 modules/gallery/tests/Locales_Helper_Test.php     |   2 +-
 modules/gallery/tests/Menu_Test.php               |   2 +-
 modules/gallery/tests/ORM_MPTT_Test.php           |   2 +-
 modules/gallery/tests/Photos_Controller_Test.php  |   2 +-
 modules/gallery/tests/SafeString_Test.php         |   2 +-
 modules/gallery/tests/Sendmail_Test.php           |   2 +-
 modules/gallery/tests/Url_Security_Test.php       |   2 +-
 modules/gallery/tests/Var_Test.php                |   2 +-
 modules/gallery/tests/Xss_Security_Test.php       |   2 +-
 modules/gallery_unit_test/helpers/test.php        |  11 ++
 modules/rest/tests/Rest_Controller_Test.php       | 142 ++++------------------
 modules/tag/tests/Tag_Rest_Helper_Test.php        |   2 +-
 modules/tag/tests/Tag_Test.php                    |   2 +-
 modules/user/tests/No_Direct_ORM_Access_Test.php  |   2 +-
 modules/user/tests/User_Groups_Test.php           |   2 +-
 modules/user/tests/User_Installer_Test.php        |   2 +-
 35 files changed, 68 insertions(+), 151 deletions(-)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/akismet/tests/Akismet_Helper_Test.php b/modules/akismet/tests/Akismet_Helper_Test.php
index b32e9a02..e185f280 100644
--- a/modules/akismet/tests/Akismet_Helper_Test.php
+++ b/modules/akismet/tests/Akismet_Helper_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Akismet_Helper_Test extends Unit_Test_Case {
+class Akismet_Helper_Test extends Gallery_Unit_Test_Case {
   private $_comment;
 
   public function setup() {
diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index 5b7daef4..27272055 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Comment_Event_Test extends Unit_Test_Case {
+class Comment_Event_Test extends Gallery_Unit_Test_Case {
   public function deleting_an_item_deletes_its_comments_too_test() {
     $album = test::random_album();
 
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index d780aba6..7ba024c7 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Comment_Helper_Test extends Unit_Test_Case {
+class Comment_Helper_Test extends Gallery_Unit_Test_Case {
   private $_ip_address;
   private $_user_agent;
 
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index c98eb63c..f0449c05 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Comment_Model_Test extends Unit_Test_Case {
+class Comment_Model_Test extends Gallery_Unit_Test_Case {
 
   public function cant_view_comments_for_unviewable_items_test() {
     $album = test::random_album();
diff --git a/modules/digibug/tests/Digibug_Controller_Test.php b/modules/digibug/tests/Digibug_Controller_Test.php
index 38dcd8e9..561dd3c9 100644
--- a/modules/digibug/tests/Digibug_Controller_Test.php
+++ b/modules/digibug/tests/Digibug_Controller_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Digibug_Controller_Test extends Unit_Test_Case {
+class Digibug_Controller_Test extends Gallery_Unit_Test_Case {
   private $_server;
 
   public function setup() {
diff --git a/modules/exif/tests/Exif_Test.php b/modules/exif/tests/Exif_Test.php
index 191bdb99..e4835b7f 100644
--- a/modules/exif/tests/Exif_Test.php
+++ b/modules/exif/tests/Exif_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Exif_Test extends Unit_Test_Case {
+class Exif_Test extends Gallery_Unit_Test_Case {
   public function exif_extract_test() {
     $photo = test::random_photo_unsaved()
       ->set_data_file(MODPATH . "exif/tests/data/image.jpg")
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index da72f12f..7ddd2875 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Access_Helper_Test extends Unit_Test_Case {
+class Access_Helper_Test extends Gallery_Unit_Test_Case {
   private $_group;
 
   public function teardown() {
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index 26dc2571..76c9a628 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Albums_Controller_Test extends Unit_Test_Case {
+class Albums_Controller_Test extends Gallery_Unit_Test_Case {
   public function setup() {
     $this->_save = array($_POST, $_SERVER);
   }
diff --git a/modules/gallery/tests/Cache_Test.php b/modules/gallery/tests/Cache_Test.php
index d5bf37cc..1023568b 100644
--- a/modules/gallery/tests/Cache_Test.php
+++ b/modules/gallery/tests/Cache_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Cache_Test extends Unit_Test_Case {
+class Cache_Test extends Gallery_Unit_Test_Case {
   private $_driver;
   public function setup() {
     db::build()->delete("caches")->execute();
diff --git a/modules/gallery/tests/Controller_Auth_Test.php b/modules/gallery/tests/Controller_Auth_Test.php
index 124d8b4c..c27196da 100644
--- a/modules/gallery/tests/Controller_Auth_Test.php
+++ b/modules/gallery/tests/Controller_Auth_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Controller_Auth_Test extends Unit_Test_Case {
+class Controller_Auth_Test extends Gallery_Unit_Test_Case {
   public function find_missing_auth_test() {
     $found = array();
     $controllers = explode("\n", `git ls-files '*/*/controllers/*.php'`);
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 6aa186e5..e58f73eb 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Database_Test extends Unit_Test_Case {
+class Database_Test extends Gallery_Unit_Test_Case {
   function setup() {
     $config = Kohana_Config::instance();
     $config->set("database.mock.connection.type", "mock");
diff --git a/modules/gallery/tests/Dir_Helper_Test.php b/modules/gallery/tests/Dir_Helper_Test.php
index 46bb871c..69241447 100644
--- a/modules/gallery/tests/Dir_Helper_Test.php
+++ b/modules/gallery/tests/Dir_Helper_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Dir_Helper_Test extends Unit_Test_Case {
+class Dir_Helper_Test extends Gallery_Unit_Test_Case {
   public function remove_album_test() {
     $dirname = (VARPATH . "albums/testdir");
     mkdir($dirname, 0777, true);
diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index da8a6b04..f7b727c0 100644
--- a/modules/gallery/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class DrawForm_Test extends Unit_Test_Case {
+class DrawForm_Test extends Gallery_Unit_Test_Case {
   function no_group_test() {
     $form = new Forge("test/controller", "", "post", array("id" => "g-test-group-form"));
     $form->input("title")->label(t("Title"));
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index b5026188..bffdf361 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -19,7 +19,7 @@
  */
 require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
 
-class File_Structure_Test extends Unit_Test_Case {
+class File_Structure_Test extends Gallery_Unit_Test_Case {
   public function no_trailing_closing_php_tag_test() {
     $dir = new GalleryCodeFilterIterator(
       new RecursiveIteratorIterator(new RecursiveDirectoryIterator(DOCROOT)));
diff --git a/modules/gallery/tests/Gallery_I18n_Test.php b/modules/gallery/tests/Gallery_I18n_Test.php
index 5d2fd994..f6e50d71 100644
--- a/modules/gallery/tests/Gallery_I18n_Test.php
+++ b/modules/gallery/tests/Gallery_I18n_Test.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class Gallery_I18n_Test extends Unit_Test_Case {
+class Gallery_I18n_Test extends Gallery_Unit_Test_Case {
   private $i18n;
 
   public function setup() {
diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 74a07b1a..3db434bc 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -22,7 +22,7 @@
  * This test case operates under the assumption that gallery_installer::install() is called by the
  * test controller before it starts.
  */
-class Gallery_Installer_Test extends Unit_Test_Case {
+class Gallery_Installer_Test extends Gallery_Unit_Test_Case {
   public function install_creates_dirs_test() {
     $this->assert_true(file_exists(VARPATH . "albums"));
     $this->assert_true(file_exists(VARPATH . "resizes"));
diff --git a/modules/gallery/tests/Html_Helper_Test.php b/modules/gallery/tests/Html_Helper_Test.php
index 1662b866..be318632 100644
--- a/modules/gallery/tests/Html_Helper_Test.php
+++ b/modules/gallery/tests/Html_Helper_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Html_Helper_Test extends Unit_Test_Case {
+class Html_Helper_Test extends Gallery_Unit_Test_Case {
   public function clean_test() {
     $safe_string = html::clean("hello <p  >world</p>");
     $this->assert_equal("hello &lt;p  &gt;world&lt;/p&gt;",
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index b3896c7a..5fa8d6b1 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Item_Helper_Test extends Unit_Test_Case {
+class Item_Helper_Test extends Gallery_Unit_Test_Case {
 
   public function viewable_test() {
     $album = test::random_album();
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 284491a0..9ea74b16 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Item_Model_Test extends Unit_Test_Case {
+class Item_Model_Test extends Gallery_Unit_Test_Case {
   public function saving_sets_created_and_updated_dates_test() {
     $item = test::random_photo();
     $this->assert_true(!empty($item->created));
diff --git a/modules/gallery/tests/Locales_Helper_Test.php b/modules/gallery/tests/Locales_Helper_Test.php
index 4c03d8d4..a2680928 100644
--- a/modules/gallery/tests/Locales_Helper_Test.php
+++ b/modules/gallery/tests/Locales_Helper_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Locales_Helper_Test extends Unit_Test_Case {
+class Locales_Helper_Test extends Gallery_Unit_Test_Case {
   static $installed_locales;
   static $default_locale;
 
diff --git a/modules/gallery/tests/Menu_Test.php b/modules/gallery/tests/Menu_Test.php
index c91aee0b..643aa727 100644
--- a/modules/gallery/tests/Menu_Test.php
+++ b/modules/gallery/tests/Menu_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Menu_Test extends Unit_Test_Case {
+class Menu_Test extends Gallery_Unit_Test_Case {
   public function find_menu_item_test() {
     $menu = new Menu(true);
     $menu
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index 30adf2a0..1ffe1c57 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class ORM_MPTT_Test extends Unit_Test_Case {
+class ORM_MPTT_Test extends Gallery_Unit_Test_Case {
 
   public function add_to_parent_test() {
     $album = test::random_album();
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index f548b40d..6012ed1c 100644
--- a/modules/gallery/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Photos_Controller_Test extends Unit_Test_Case {
+class Photos_Controller_Test extends Gallery_Unit_Test_Case {
   public function setup() {
     $this->_save = array($_POST, $_SERVER);
     $_SERVER["HTTP_REFERER"] = "HTTP_REFERER";
diff --git a/modules/gallery/tests/SafeString_Test.php b/modules/gallery/tests/SafeString_Test.php
index 2c07d934..7002a874 100644
--- a/modules/gallery/tests/SafeString_Test.php
+++ b/modules/gallery/tests/SafeString_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class SafeString_Test extends Unit_Test_Case {
+class SafeString_Test extends Gallery_Unit_Test_Case {
   public function toString_escapes_for_html_test() {
     $safe_string = new SafeString("hello <p>world</p>");
     $this->assert_equal("hello &lt;p&gt;world&lt;/p&gt;",
diff --git a/modules/gallery/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php
index f3a8d897..bc57e434 100644
--- a/modules/gallery/tests/Sendmail_Test.php
+++ b/modules/gallery/tests/Sendmail_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Sendmail_Test extends Unit_Test_Case {
+class Sendmail_Test extends Gallery_Unit_Test_Case {
   public function setup() {
     Kohana_Config::instance()->set("sendmail.from", "from@gallery3.com");
   }
diff --git a/modules/gallery/tests/Url_Security_Test.php b/modules/gallery/tests/Url_Security_Test.php
index de25880f..255b3909 100644
--- a/modules/gallery/tests/Url_Security_Test.php
+++ b/modules/gallery/tests/Url_Security_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Url_Security_Test extends Unit_Test_Case {
+class Url_Security_Test extends Gallery_Unit_Test_Case {
   public function setup() {
     $this->save = array(Router::$current_uri, Router::$complete_uri, $_GET);
   }
diff --git a/modules/gallery/tests/Var_Test.php b/modules/gallery/tests/Var_Test.php
index 355d94a7..fb19da7a 100644
--- a/modules/gallery/tests/Var_Test.php
+++ b/modules/gallery/tests/Var_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Var_Test extends Unit_Test_Case {
+class Var_Test extends Gallery_Unit_Test_Case {
   public function add_parameter_test() {
     module::set_var("gallery", "Parameter", "original value");
     $this->assert_equal("original value", module::get_var("gallery", "Parameter"));
diff --git a/modules/gallery/tests/Xss_Security_Test.php b/modules/gallery/tests/Xss_Security_Test.php
index b296d97c..a39a069d 100644
--- a/modules/gallery/tests/Xss_Security_Test.php
+++ b/modules/gallery/tests/Xss_Security_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Xss_Security_Test extends Unit_Test_Case {
+class Xss_Security_Test extends Gallery_Unit_Test_Case {
   public function find_unescaped_variables_in_views_test() {
     $found = array();
     foreach (glob("*/*/views/*.php") as $view) {
diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 77948465..8e483c60 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -48,6 +48,11 @@ class test_Core {
     return test::random_photo_unsaved($parent)->save();
   }
 
+  static function random_user($password="password") {
+    $rand = "name_" . rand();
+    return identity::create_user($rand, $rand, $password, "$rand@rand.com");
+  }
+
   static function random_name($item=null) {
     $rand = "name_" . rand();
     if ($item && $item->is_photo()) {
@@ -59,4 +64,10 @@ class test_Core {
   static function starts_with($outer, $inner) {
     return strpos($outer, $inner) === 0;
   }
+
+  static function call_and_capture($callback) {
+    ob_start();
+    call_user_func($callback);
+    return ob_get_clean();
+  }
 }
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index c881583c..ae5e6d48 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -17,108 +17,43 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Rest_Controller_Test extends Unit_Test_Case {
+class Rest_Controller_Test extends Gallery_Unit_Test_Case {
   public function setup() {
     $this->_save = array($_GET, $_POST, $_SERVER);
   }
 
-  private function _create_user() {
-    if (empty($this->_user)) {
-      $this->_user = identity::create_user("access_test" . rand(), "Access Test", "password");
-      $this->_key = ORM::factory("user_access_token");
-      $this->_key->access_key = md5($this->_user->name . rand());
-      $this->_key->user_id = $this->_user->id;
-      $this->_key->save();
-      identity::set_active_user($this->_user);
-    }
-    return array($this->_key->access_key, $this->_user);
-  }
-
   public function teardown() {
     list($_GET, $_POST, $_SERVER) = $this->_save;
-    if (!empty($this->_user)) {
-      try {
-        $this->_user->delete();
-      } catch (Exception $e) { }
-    }
-  }
-
-  private function _create_image($parent=null) {
-    $filename = MODPATH . "gallery/tests/test.jpg";
-    $image_name = "image_" . rand();
-    if (empty($parent)) {
-      $parent = ORM::factory("item", 1);
-    }
-    return photo::create($parent, $filename, "$image_name.jpg", $image_name);
-  }
-
-  public function rest_access_key_exists_test() {
-    list ($access_key, $user) = $this->_create_user();
-    $_SERVER["REQUEST_METHOD"] = "GET";
-    $_GET["user"] = $user->name;;
-    $_GET["password"] = "password";
-
-    $this->assert_equal(
-      json_encode(array("status" => "OK", "token" => $access_key)),
-      $this->_call_controller());
   }
 
-  public function rest_access_key_generated_test() {
-    list ($access_key, $user) = $this->_create_user();
-    ORM::factory("user_access_token")
-      ->where("access_key", $access_key)
-      ->delete();
-    $_SERVER["REQUEST_METHOD"] = "GET";
-    $_GET["user"] = $user->name;
-    $_GET["password"] = "password";
+  public function login_test() {
+    $user = test::random_user("password");
 
-    $results = json_decode($this->_call_controller());
-
-    $this->assert_equal("OK", $results->status);
-    $this->assert_false(empty($results->token));
-  }
+    // There's no access key at first
+    $this->assert_false(
+      ORM::factory("user_access_token")->where("user_id", "=", $user->id)->find()->loaded());
 
-  public function rest_access_key_no_parameters_test() {
-    $_SERVER["REQUEST_METHOD"] = "GET";
-
-    try {
-      $this->_call_controller();
-    } catch (Rest_Exception $e) {
-      $this->assert_equal(403, $e->getCode());
-      $this->assert_equal("Forbidden", $e->getMessage());
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
-  }
+    $_POST["user"] = $user->name;
+    $_POST["password"] = "password";
 
-  public function rest_access_key_user_not_found_test() {
-    $_SERVER["REQUEST_METHOD"] = "POST";
-    $_POST["request"] = json_encode(array("user" => "access_test2", "password" => "password"));
+    $response = test::call_and_capture(array(new Rest_Controller(), "index"));
+    $expected =
+      ORM::factory("user_access_token")->where("user_id", "=", $user->id)->find()->access_key;
 
-    try {
-      $this->_call_controller();
-    } catch (Rest_Exception $e) {
-      $this->assert_equal(403, $e->getCode());
-      $this->assert_equal("Forbidden", $e->getMessage());
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
+    // Now there is an access key, and it was returned
+    $this->assert_equal(json_encode($expected), $response);
   }
 
-  public function rest_access_key_invalid_password_test() {
-    $_SERVER["REQUEST_METHOD"] = "POST";
+  public function login_failed_test() {
+    $user = test::random_user("password");
+    $_POST["user"] = $user->name;
+    $_POST["password"] = "WRONG PASSWORD";
 
-    try {
-      $this->_call_controller();
-    } catch (Rest_Exception $e) {
-      $this->assert_equal(403, $e->getCode());
-      $this->assert_equal("Forbidden", $e->getMessage());
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
+    // @todo check the http response code
+    $this->assert_equal(null, test::call_and_capture(array(new Rest_Controller(), "index")));
   }
 
-  public function rest_get_resource_no_request_key_test() {
+  public function rest_get_resource_no_request_key_test_() {
     $_SERVER["REQUEST_METHOD"] = "GET";
     $photo = $this->_create_image();
 
@@ -132,7 +67,7 @@ class Rest_Controller_Test extends Unit_Test_Case {
       $this->_call_controller("rest", explode("/", $photo->relative_url())));
   }
 
-  public function rest_get_resource_invalid_key_test() {
+  public function rest_get_resource_invalid_key_test_() {
     list ($access_key, $user) = $this->_create_user();
     $_SERVER["HTTP_X_GALLERY_REQUEST_KEY"] = md5($access_key); // screw up the access key;
     $_SERVER["REQUEST_METHOD"] = "GET";
@@ -147,7 +82,7 @@ class Rest_Controller_Test extends Unit_Test_Case {
     }
   }
 
-  public function rest_get_resource_no_user_for_key_test() {
+  public function rest_get_resource_no_user_for_key_test_() {
     list ($access_key, $user) = $this->_create_user();
     $_SERVER["REQUEST_METHOD"] = "GET";
     $_SERVER["HTTP_X_GALLERY_REQUEST_KEY"] = $access_key;
@@ -166,7 +101,7 @@ class Rest_Controller_Test extends Unit_Test_Case {
     }
   }
 
-  public function rest_get_resource_no_handler_test() {
+  public function rest_get_resource_no_handler_test_() {
     list ($access_key, $user) = $this->_create_user();
     $_SERVER["REQUEST_METHOD"] = "GET";
     $_SERVER["HTTP_X_GALLERY_REQUEST_KEY"] = $access_key;
@@ -183,7 +118,7 @@ class Rest_Controller_Test extends Unit_Test_Case {
     }
   }
 
-  public function rest_get_resource_test() {
+  public function rest_get_resource_test_() {
     list ($access_key, $user) = $this->_create_user();
     $_SERVER["REQUEST_METHOD"] = "GET";
     $_SERVER["HTTP_X_GALLERY_REQUEST_KEY"] = $access_key;
@@ -198,33 +133,4 @@ class Rest_Controller_Test extends Unit_Test_Case {
                                         "internet_address" => $photo->slug))),
       $this->_call_controller("rest", explode("/", $photo->relative_url())));
   }
-
-  private function _call_controller($method="access_key", $arg=null) {
-    $controller = new Rest_Controller();
-
-    ob_start();
-    call_user_func_array(array($controller, $method), $arg);
-    $results = ob_get_contents();
-    ob_end_clean();
-
-    return $results;
-  }
-}
-
-class rest_rest {
-  static $request = null;
-
-  static function get($request) {
-    self::$request = $request;
-    $item = ORM::factory("item")
-      ->where("relative_url_cache", "=", implode("/", $request->arguments))
-      ->find();
-    $response["path"] = $item->relative_url();
-    $response["title"] = $item->title;
-    $response["thumb_url"] = $item->thumb_url();
-    $response["description"] = $item->description;
-    $response["internet_address"] = $item->slug;
-    return rest::reply(array($item->type => $response));
-  }
-
 }
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index 555539fd..c2d55ba4 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Tag_Rest_Helper_Test extends Unit_Test_Case {
+class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
   public function setup() {
     try {
       Database::instance()->query("TRUNCATE {tags}");
diff --git a/modules/tag/tests/Tag_Test.php b/modules/tag/tests/Tag_Test.php
index c96e7f2b..c3243145 100644
--- a/modules/tag/tests/Tag_Test.php
+++ b/modules/tag/tests/Tag_Test.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Tag_Test extends Unit_Test_Case {
+class Tag_Test extends Gallery_Unit_Test_Case {
   public function create_tag_test() {
     $rand = rand();
     $root = ORM::factory("item", 1);
diff --git a/modules/user/tests/No_Direct_ORM_Access_Test.php b/modules/user/tests/No_Direct_ORM_Access_Test.php
index 440321fa..c372258e 100644
--- a/modules/user/tests/No_Direct_ORM_Access_Test.php
+++ b/modules/user/tests/No_Direct_ORM_Access_Test.php
@@ -19,7 +19,7 @@
  */
 require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
 
-class No_Direct_ORM_Access_Test extends Unit_Test_Case {
+class No_Direct_ORM_Access_Test extends Gallery_Unit_Test_Case {
   public function no_access_to_users_table_test() {
     $dir = new UserModuleFilterIterator(
       new PhpCodeFilterIterator(
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 163b7d79..089ab9a6 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class User_Groups_Test extends Unit_Test_Case {
+class User_Groups_Test extends Gallery_Unit_Test_Case {
   public function teardown() {
     try {
       $group = ORM::factory("group")->where("name", "=", "user_groups_test")->find();
diff --git a/modules/user/tests/User_Installer_Test.php b/modules/user/tests/User_Installer_Test.php
index 12a10eda..b3c5960a 100644
--- a/modules/user/tests/User_Installer_Test.php
+++ b/modules/user/tests/User_Installer_Test.php
@@ -22,7 +22,7 @@
  * This test case operates under the assumption that user_installer::install() is called by the
  * test controller before it starts.
  */
-class User_Installer_Test extends Unit_Test_Case {
+class User_Installer_Test extends Gallery_Unit_Test_Case {
   public function install_creates_admin_user_test() {
     $user = ORM::factory("user", 1);
     $this->assert_equal("guest", $user->name);
-- 
cgit v1.2.3


From 2a41e27d49bd9f5f341ee201ec3878767a9271ec Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 20 Jan 2010 21:15:57 -0800
Subject: Add random_tag().

---
 modules/gallery_unit_test/helpers/test.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 8e483c60..2bb38b81 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -70,4 +70,12 @@ class test_Core {
     call_user_func($callback);
     return ob_get_clean();
   }
+
+  static function random_tag() {
+    $tag = ORM::factory("tag");
+    $tag->name = (string)rand();
+
+    // have to reload because ORM::load has string versions of values that we set as integers.
+    return $tag->save()->reload();
+  }
 }
-- 
cgit v1.2.3


From d3e3bbd713e9391893bc2561f15b6f2348412faa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 20 Jan 2010 23:27:52 -0800
Subject: improve comment.

---
 modules/gallery_unit_test/helpers/test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 2bb38b81..aa8dda88 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -75,7 +75,7 @@ class test_Core {
     $tag = ORM::factory("tag");
     $tag->name = (string)rand();
 
-    // have to reload because ORM::load has string versions of values that we set as integers.
+    // Reload so that ORM coerces all fields into strings.
     return $tag->save()->reload();
   }
 }
-- 
cgit v1.2.3


From 40b17474bbadbaa48f37f8de776e8cbe35efc8e3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 21 Jan 2010 19:08:29 -0800
Subject: Add random_group().

---
 modules/gallery_unit_test/helpers/test.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index aa8dda88..94dac22e 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -53,6 +53,10 @@ class test_Core {
     return identity::create_user($rand, $rand, $password, "$rand@rand.com");
   }
 
+  static function random_group() {
+    return identity::create_group((string)rand());
+  }
+
   static function random_name($item=null) {
     $rand = "name_" . rand();
     if ($item && $item->is_photo()) {
-- 
cgit v1.2.3


From 61198c22aaae8bdeff8dfbe3bfaedc1320dfdab1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 22 Jan 2010 01:10:52 -0800
Subject: Reload items after saving so that we convert their members to
 strings.

---
 modules/gallery_unit_test/helpers/test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery_unit_test/helpers')

diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 94dac22e..3e116808 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -30,7 +30,7 @@ class test_Core {
   }
 
   static function random_album($parent=null) {
-    return test::random_album_unsaved($parent)->save();
+    return test::random_album_unsaved($parent)->save()->reload();
   }
 
   static function random_photo_unsaved($parent=null) {
@@ -45,7 +45,7 @@ class test_Core {
   }
 
   static function random_photo($parent=null) {
-    return test::random_photo_unsaved($parent)->save();
+    return test::random_photo_unsaved($parent)->save()->reload();
   }
 
   static function random_user($password="password") {
-- 
cgit v1.2.3