3 files changed, 74 insertions, 2 deletions

diff --git a/modules/gallery/tests/Controller_Auth_Test.php b/modules/gallery/tests/Controller_Auth_Test.php
index 5131fae0..76027cf6 100644
--- a/modules/gallery/tests/Controller_Auth_Test.php
+++ b/modules/gallery/tests/Controller_Auth_Test.php
@@ -20,8 +20,9 @@
 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'`);
-    $feeds = explode("\n", `git ls-files '*/*/helpers/*_rss.php'`);
+    $git_ignores = explode("\n", `git ls-files -o -i --exclude-standard`);
+    $controllers = array_diff(glob("*/*/controllers/*.php"), $git_ignores);
+    $feeds = array_diff(glob("*/*/helpers/*_rss.php"), $git_ignores);
     foreach (array_merge($controllers, $feeds) as $controller) {
       if (preg_match("{modules/(gallery_)?unit_test/}", $controller)) {
         continue;
diff --git a/modules/gallery/tests/Legal_File_Helper_Test.php b/modules/gallery/tests/Legal_File_Helper_Test.php
index d2813633..041c5d1f 100644
--- a/modules/gallery/tests/Legal_File_Helper_Test.php
+++ b/modules/gallery/tests/Legal_File_Helper_Test.php
@@ -18,6 +18,28 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Legal_File_Helper_Test extends Gallery_Unit_Test_Case {
+  public function get_photo_types_by_extension_test() {
+    $this->assert_equal("image/jpeg", legal_file::get_photo_types_by_extension("jpg")); // regular
+    $this->assert_equal("image/jpeg", legal_file::get_photo_types_by_extension("JPG")); // all caps
+    $this->assert_equal("image/png", legal_file::get_photo_types_by_extension("Png"));  // some caps
+    $this->assert_equal(null, legal_file::get_photo_types_by_extension("php"));      // invalid
+    $this->assert_equal(null, legal_file::get_photo_types_by_extension("php.jpg"));  // invalid w/ .
+
+    // No extension returns full array
+    $this->assert_equal(4, count(legal_file::get_photo_types_by_extension()));
+  }
+
+  public function get_movie_types_by_extension_test() {
+    $this->assert_equal("video/x-flv", legal_file::get_movie_types_by_extension("flv")); // regular
+    $this->assert_equal("video/x-flv", legal_file::get_movie_types_by_extension("FLV")); // all caps
+    $this->assert_equal("video/mp4", legal_file::get_movie_types_by_extension("Mp4"));  // some caps
+    $this->assert_equal(null, legal_file::get_movie_types_by_extension("php"));     // invalid
+    $this->assert_equal(null, legal_file::get_movie_types_by_extension("php.flv")); // invalid w/ .
+
+    // No extension returns full array
+    $this->assert_equal(3, count(legal_file::get_movie_types_by_extension()));
+  }
+
   public function change_extension_test() {
     $this->assert_equal("foo.jpg", legal_file::change_extension("foo.png", "jpg"));
   }
diff --git a/modules/gallery/tests/Movie_Helper_Test.php b/modules/gallery/tests/Movie_Helper_Test.php
new file mode 100644
index 00000000..78ac21a1
--- /dev/null
+++ b/modules/gallery/tests/Movie_Helper_Test.php
@@ -0,0 +1,49 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2012 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 Movie_Helper_Test extends Gallery_Unit_Test_Case {
+  public function seconds_to_hhmmssdd_test() {
+    $times = array("00:00:00.50" => 0.5,
+                   "00:00:06.00" => 6,
+                   "00:00:59.99" => 59.999,
+                   "00:01:00.00" => 60.001,
+                   "00:07:00.00" => 7 * 60,
+                   "00:45:19.00" => 45 * 60 + 19,
+                   "03:45:19.00" => 3 * 3600 + 45 * 60 + 19,
+                   "126:45:19.00" => 126 * 3600 + 45 * 60 + 19);
+    foreach ($times as $hhmmssdd => $seconds) {
+      $this->assert_equal($hhmmssdd, movie::seconds_to_hhmmssdd($seconds));
+    }
+  }
+
+  public function hhmmssdd_to_seconds_test() {
+    $times = array("0:00:00.01" => 0.01,
+                   "00:00:00.50" => 0.5,
+                   "00:00:06.00" => 6,
+                   "00:00:59.99" => 59.99,
+                   "00:01:00.00" => 60.00,
+                   "00:07:00.00" => 7 * 60,
+                   "00:45:19.00" => 45 * 60 + 19,
+                   "03:45:19.00" => 3 * 3600 + 45 * 60 + 19,
+                   "126:45:19.00" => 126 * 3600 + 45 * 60 + 19);
+    foreach ($times as $hhmmssdd => $seconds) {
+      $this->assert_equal($seconds, movie::hhmmssdd_to_seconds($hhmmssdd));
+    }
+  }
+}