2 files changed, 25 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"));
   }