6 files changed, 110 insertions, 31 deletions
diff --git a/core/tests/Album_Test.php b/core/tests/Album_Test.php
new file mode 100644
index 00000000..52ee4833
--- /dev/null
+++ b/core/tests/Album_Test.php
@@ -0,0 +1,47 @@
+<?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 Album_Test extends Unit_Test_Case {
+  public function create_album_test() {
+    $rand = rand();
+    $album = album::create(1, $rand, $rand, $rand);
+
+    $this->assert_equal(VARPATH . "albums/$rand", $album->path());
+    $this->assert_equal(VARPATH . "thumbnails/$rand", $album->thumbnail_path());
+    $this->assert_equal(VARPATH . "thumbnails/$rand", $album->resize_path());
+
+    $this->assert_true(is_dir($album->path()), "missing path: {$album->path()}");
+    $this->assert_true(is_dir($album->resize_path()), "missing path: {$album->resize_path()}");
+
+    $this->assert_equal(1, $album->parent_id);  // MPTT tests will cover other hierarchy checks
+    $this->assert_equal($rand, $album->name);
+    $this->assert_equal($rand, $album->title);
+    $this->assert_equal($rand, $album->description);
+
+    $this->assert_equal($album->parent()->right - 2, $album->left);
+    $this->assert_equal($album->parent()->right - 1, $album->right);
+  }
+
+  public function create_conflicting_album_test() {
+    $rand = rand();
+    $album1 = album::create(1, $rand, $rand, $rand);
+    $album2 = album::create(1, $rand, $rand, $rand);
+    $this->assert_true($album1->name != $album2->name);
+  }
+}
diff --git a/core/tests/Core_Installer_Test.php b/core/tests/Core_Installer_Test.php
index 7758f472..4903805b 100644
--- a/core/tests/Core_Installer_Test.php
+++ b/core/tests/Core_Installer_Test.php
@@ -40,11 +40,14 @@ class Core_Installer_Test extends Unit_Test_Case {
   }
 
   public function install_creates_root_item_test() {
+    $max_right =
+      Database::instance()->query("SELECT MAX(`right`) AS `right` FROM items")->current()->right;
+
     $root = ORM::factory('item')->find(1);
     $this->assert_equal("Gallery", $root->title);
     $this->assert_equal(1, $root->left);
-    $this->assert_equal(2, $root->right);
+    $this->assert_equal($max_right, $root->right);
     $this->assert_equal(null, $root->parent_id);
-    $this->assert_equal(1, $root->scope);
+    $this->assert_equal(1, $root->level);
   }
 }
diff --git a/core/tests/File_Structure_Test.php b/core/tests/File_Structure_Test.php
index 00663bc6..d3f4ae23 100644
--- a/core/tests/File_Structure_Test.php
+++ b/core/tests/File_Structure_Test.php
@@ -110,6 +110,7 @@ class GalleryCodeFilterIterator extends FilterIterator {
              strstr($path_name, MODPATH . 'forge') !== false ||
              strstr($path_name, MODPATH . 'unit_test') !== false ||
              strstr($path_name, MODPATH . 'mptt') !== false ||
+             strstr($path_name, MODPATH . 'kodoc') !== false ||
              strstr($path_name, DOCROOT . 'var') !== false ||
              strstr($path_name, DOCROOT . 'test') !== false);
   }
diff --git a/core/tests/Item_Test.php b/core/tests/Item_Test.php
deleted file mode 100644
index d077932f..00000000
--- a/core/tests/Item_Test.php
+++ /dev/null
@@ -1,29 +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 Item_Test extends Unit_Test_Case {
-  public function create_item_test() {
-    ORM::factory('item');
-  }
-
-  public function create_root_item_test() {
-    $root = ORM::factory('item')->find(1);
-    $this->assert_equal("Gallery", $root->title);
-  }
-}
diff --git a/core/tests/Photo_Test.php b/core/tests/Photo_Test.php
new file mode 100644
index 00000000..8b0a48cc
--- /dev/null
+++ b/core/tests/Photo_Test.php
@@ -0,0 +1,57 @@
+<?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 Photo_Test extends Unit_Test_Case {
+  public function create_photo_test() {
+    $rand = rand();
+    $photo = photo::create(1, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
+
+    $this->assert_equal(VARPATH . "albums/$rand.jpg", $photo->path());
+    $this->assert_equal(VARPATH . "thumbnails/{$rand}_thumb.jpg", $photo->thumbnail_path());
+    $this->assert_equal(VARPATH . "thumbnails/{$rand}_resize.jpg", $photo->resize_path());
+
+    $this->assert_true(is_file($photo->path()), "missing: {$photo->path()}");
+    $this->assert_true(is_file($photo->resize_path()), "missing: {$photo->resize_path()}");
+    $this->assert_true(is_file($photo->thumbnail_path()), "missing: {$photo->thumbnail_path()}");
+
+    $this->assert_equal(1, $photo->parent_id);  // MPTT tests will cover other hierarchy checks
+    $this->assert_equal("$rand.jpg", $photo->name);
+    $this->assert_equal($rand, $photo->title);
+    $this->assert_equal($rand, $photo->description);
+
+    $this->assert_equal($photo->parent()->right - 2, $photo->left);
+    $this->assert_equal($photo->parent()->right - 1, $photo->right);
+  }
+
+  public function create_conflicting_photo_test() {
+    $rand = rand();
+    $photo1 = photo::create(1, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
+    $photo2 = photo::create(1, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
+    $this->assert_true($photo1->name != $photo2->name);
+  }
+
+  public function create_photo_with_no_extension_test() {
+    try {
+      photo::create(1, "unknown_file", "name", "title", "description");
+      $this->assert_false("should fail with an exception");
+    } catch (Exception $e) {
+      // pass
+    }
+  }
+}
diff --git a/core/tests/test.jpg b/core/tests/test.jpg
new file mode 100644
index 00000000..1f3525e5
--- /dev/null
+++ b/core/tests/test.jpg