diff options
Diffstat (limited to 'core/tests/Album_Helper_Test.php')
| -rw-r--r-- | core/tests/Album_Helper_Test.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/tests/Album_Helper_Test.php b/core/tests/Album_Helper_Test.php index 9927b66a..e01ebcbc 100644 --- a/core/tests/Album_Helper_Test.php +++ b/core/tests/Album_Helper_Test.php @@ -23,11 +23,12 @@ class Album_Helper_Test extends Unit_Test_Case { $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"); + $this->assert_equal(VARPATH . "thumbs/$rand/_album.jpg", $album->thumb_path()); + $this->assert_true(is_dir(VARPATH . "thumbs/$rand"), "missing thumb 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(VARPATH . "resizes/$rand/_album.jpg", $album->resize_path()); + $this->assert_true(is_dir(VARPATH . "resizes/$rand"), "missing resizes dir"); $this->assert_equal(1, $album->parent_id); // MPTT tests will cover other hierarchy checks $this->assert_equal($rand, $album->name); @@ -42,15 +43,15 @@ class Album_Helper_Test extends Unit_Test_Case { $this->assert_true($album1->name != $album2->name); } - public function thumbnail_url_test() { + public function thumb_url_test() { $rand = rand(); $album = album::create(1, $rand, $rand, $rand); - $this->assert_equal("http://./var/resizes/$rand/.thumb.jpg", $album->thumbnail_url()); + $this->assert_equal("http://./var/thumbs/$rand/_album.jpg", $album->thumb_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()); + $this->assert_equal("http://./var/resizes/$rand/_album.jpg", $album->resize_url()); } } |