From 223cba531e10c90253ea447e373c4e99a72c0299 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 9 Nov 2008 23:49:09 +0000
Subject: Rename tests to make room for controller tests   Album_Test ->
 Album_Helper_Test   Photo_Test -> Photo_Helper_Test

---
 core/tests/Album_Helper_Test.php | 56 +++++++++++++++++++++++++++++++
 core/tests/Album_Test.php        | 56 -------------------------------
 core/tests/Photo_Helper_Test.php | 71 ++++++++++++++++++++++++++++++++++++++++
 core/tests/Photo_Test.php        | 71 ----------------------------------------
 4 files changed, 127 insertions(+), 127 deletions(-)
 create mode 100644 core/tests/Album_Helper_Test.php
 delete mode 100644 core/tests/Album_Test.php
 create mode 100644 core/tests/Photo_Helper_Test.php
 delete mode 100644 core/tests/Photo_Test.php

(limited to 'core/tests')

diff --git a/core/tests/Album_Helper_Test.php b/core/tests/Album_Helper_Test.php
new file mode 100644
index 00000000..9927b66a
--- /dev/null
+++ b/core/tests/Album_Helper_Test.php
@@ -0,0 +1,56 @@
+<?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_Helper_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->file_path());
+    $this->assert_equal(VARPATH . "resizes/$rand/.thumb.jpg", $album->thumbnail_path());
+    $this->assert_true(is_dir(VARPATH . "resizes/$rand"), "missing thumbnail dir");
+
+    // It's unclear that a resize makes sense for an album.  But we have one.
+    $this->assert_equal(VARPATH . "resizes/$rand/.resize.jpg", $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);
+  }
+
+  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);
+  }
+
+  public function thumbnail_url_test() {
+    $rand = rand();
+    $album = album::create(1, $rand, $rand, $rand);
+    $this->assert_equal("http://./var/resizes/$rand/.thumb.jpg", $album->thumbnail_url());
+  }
+
+  public function resize_url_test() {
+    $rand = rand();
+    $album = album::create(1, $rand, $rand, $rand);
+    $this->assert_equal("http://./var/resizes/$rand/.resize.jpg", $album->resize_url());
+  }
+}
diff --git a/core/tests/Album_Test.php b/core/tests/Album_Test.php
deleted file mode 100644
index a2ab1c48..00000000
--- a/core/tests/Album_Test.php
+++ /dev/null
@@ -1,56 +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 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->file_path());
-    $this->assert_equal(VARPATH . "resizes/$rand/.thumb.jpg", $album->thumbnail_path());
-    $this->assert_true(is_dir(VARPATH . "resizes/$rand"), "missing thumbnail dir");
-
-    // It's unclear that a resize makes sense for an album.  But we have one.
-    $this->assert_equal(VARPATH . "resizes/$rand/.resize.jpg", $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);
-  }
-
-  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);
-  }
-
-  public function thumbnail_url_test() {
-    $rand = rand();
-    $album = album::create(1, $rand, $rand, $rand);
-    $this->assert_equal("http://./var/resizes/$rand/.thumb.jpg", $album->thumbnail_url());
-  }
-
-  public function resize_url_test() {
-    $rand = rand();
-    $album = album::create(1, $rand, $rand, $rand);
-    $this->assert_equal("http://./var/resizes/$rand/.resize.jpg", $album->resize_url());
-  }
-}
diff --git a/core/tests/Photo_Helper_Test.php b/core/tests/Photo_Helper_Test.php
new file mode 100644
index 00000000..99c8ed34
--- /dev/null
+++ b/core/tests/Photo_Helper_Test.php
@@ -0,0 +1,71 @@
+<?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_Helper_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->file_path());
+    $this->assert_equal(VARPATH . "resizes/{$rand}.thumb.jpg", $photo->thumbnail_path());
+    $this->assert_equal(VARPATH . "resizes/{$rand}.resize.jpg", $photo->resize_path());
+
+    $this->assert_true(is_file($photo->file_path()), "missing: {$photo->file_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, "/tmp", "name", "title", "description");
+      $this->assert_false("should fail with an exception");
+    } catch (Exception $e) {
+      // pass
+    }
+  }
+
+  public function thumbnail_url_test() {
+    $rand = rand();
+    $photo = photo::create(1, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
+    $this->assert_equal("http://./var/resizes/{$rand}.thumb.jpg", $photo->thumbnail_url());
+  }
+
+  public function resize_url_test() {
+    $rand = rand();
+    $album = album::create(1, $rand, $rand, $rand);
+    $photo = photo::create($album->id, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
+
+    $this->assert_equal("http://./var/resizes/{$rand}/{$rand}.resize.jpg", $photo->resize_url());
+  }
+}
diff --git a/core/tests/Photo_Test.php b/core/tests/Photo_Test.php
deleted file mode 100644
index 248ebee6..00000000
--- a/core/tests/Photo_Test.php
+++ /dev/null
@@ -1,71 +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 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->file_path());
-    $this->assert_equal(VARPATH . "resizes/{$rand}.thumb.jpg", $photo->thumbnail_path());
-    $this->assert_equal(VARPATH . "resizes/{$rand}.resize.jpg", $photo->resize_path());
-
-    $this->assert_true(is_file($photo->file_path()), "missing: {$photo->file_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, "/tmp", "name", "title", "description");
-      $this->assert_false("should fail with an exception");
-    } catch (Exception $e) {
-      // pass
-    }
-  }
-
-  public function thumbnail_url_test() {
-    $rand = rand();
-    $photo = photo::create(1, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
-    $this->assert_equal("http://./var/resizes/{$rand}.thumb.jpg", $photo->thumbnail_url());
-  }
-
-  public function resize_url_test() {
-    $rand = rand();
-    $album = album::create(1, $rand, $rand, $rand);
-    $photo = photo::create($album->id, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
-
-    $this->assert_equal("http://./var/resizes/{$rand}/{$rand}.resize.jpg", $photo->resize_url());
-  }
-}
-- 
cgit v1.2.3