3 files changed, 66 insertions, 2 deletions

diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index d06820ae..87278661 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -21,7 +21,7 @@ class core_installer {
   public function install() {
     $db = Database::instance();
     try {
-      $base_version = ORM::factory('module')->where('name', 'core')->find()->version;
+      $base_version = ORM::factory("module")->where("name", "core")->find()->version;
     } catch (Exception $e) {
       if ($e->getMessage() == "Table modules does not exist in your database.") {
 	$base_version = 0;
@@ -52,10 +52,19 @@ class core_installer {
 		   KEY `parent_id` (`parent_id`),
 		   KEY `type` (`type`))
 		 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-      $core = ORM::factory('module')->where('name', 'core')->find();
+
+      foreach (array("albums", "thumbnails") as $dir) {
+	@mkdir(VARPATH . $dir);
+      }
+
+      $core = ORM::factory("module")->where("name", "core")->find();
       $core->name = "core";
       $core->version = 1;
       $core->save();
+
+      $root = ORM::factory("item");
+      $root->title = "Gallery";
+      $root->make_root();
     }
   }
 
diff --git a/core/tests/Core_Installer_Test.php b/core/tests/Core_Installer_Test.php
new file mode 100644
index 00000000..7758f472
--- /dev/null
+++ b/core/tests/Core_Installer_Test.php
@@ -0,0 +1,50 @@
+<?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.
+ */
+
+/**
+ * This test case operates under the assumption that core_installer::install() is called by the
+ * test controller before it starts.
+ */
+class Core_Installer_Test extends Unit_Test_Case {
+  public function install_creates_albums_dir_test() {
+    $this->assert_true(file_exists(VARPATH . "albums"));
+  }
+
+  public function install_creates_thumbnails_dir_test() {
+    $this->assert_true(file_exists(VARPATH . "thumbnails"));
+  }
+
+  public function install_registers_core_module_test() {
+    $core = ORM::factory("module")->where("name", "core")->find();
+    $this->assert_equal("core", $core->name);
+
+    // This is probably too volatile to keep for long
+    $this->assert_equal(1, $core->version);
+  }
+
+  public function install_creates_root_item_test() {
+    $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(null, $root->parent_id);
+    $this->assert_equal(1, $root->scope);
+  }
+}
diff --git a/core/tests/Item_Test.php b/core/tests/Item_Test.php
index f83c60f1..d077932f 100644
--- a/core/tests/Item_Test.php
+++ b/core/tests/Item_Test.php
@@ -21,4 +21,9 @@ 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);
+  }
 }