1 files changed, 5 insertions, 31 deletions

diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 9018f4c6..36342fda 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -17,6 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
+require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
+
 class File_Structure_Test extends Unit_Test_Case {
   public function no_trailing_closing_php_tag_test() {
     $dir = new GalleryCodeFilterIterator(
@@ -233,7 +235,9 @@ class File_Structure_Test extends Unit_Test_Case {
     foreach ($info_files as $file) {
       foreach (file($file) as $line) {
         $parts = explode("=", $line, 2);
-        $values[trim($parts[0])] = trim($parts[1]);
+        if (isset($parts[1])) {
+          $values[trim($parts[0])] = trim($parts[1]);
+        }
       }
 
       $module = dirname($file);
@@ -261,33 +265,3 @@ class File_Structure_Test extends Unit_Test_Case {
     }
   }
 }
-
-class PhpCodeFilterIterator extends FilterIterator {
-  public function accept() {
-    $path_name = $this->getInnerIterator()->getPathName();
-    return substr($path_name, -4) == ".php";
-  }
-}
-
-class GalleryCodeFilterIterator extends FilterIterator {
-  public function accept() {
-    // Skip anything that we didn"t write
-    $path_name = $this->getInnerIterator()->getPathName();
-    return !(
-      strpos($path_name, ".svn") ||
-      strpos($path_name, DOCROOT . "test") !== false ||
-      strpos($path_name, DOCROOT . "var") !== false ||
-      strpos($path_name, MODPATH . "forge") !== false ||
-      strpos($path_name, MODPATH . "gallery/views/kohana_error_page.php") !== false ||
-      strpos($path_name, MODPATH . "gallery/views/kohana_profiler.php") !== false ||
-      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_error_page.php") !== false ||
-      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_unit_test_cli.php") !== false ||
-      strpos($path_name, MODPATH . "unit_test") !== false ||
-      strpos($path_name, MODPATH . "exif/lib") !== false ||
-      strpos($path_name, MODPATH . "user/lib/PasswordHash") !== false ||
-      strpos($path_name, DOCROOT . "lib/swfupload") !== false ||
-      strpos($path_name, SYSPATH) !== false ||
-      strpos($path_name, MODPATH . "gallery/libraries/HTMLPurifier") !== false ||
-      substr($path_name, -1, 1) == "~");
-  }
-}