Simplified the temp_filename implementation and removed the mocks.

2 files changed, 1 insertions, 63 deletions

diff --git a/modules/gallery/tests/Mock_Built_In.php b/modules/gallery/tests/Mock_Built_In.php
deleted file mode 100644
index b02e5ecf..00000000
--- a/modules/gallery/tests/Mock_Built_In.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2011 Chad Parry
- *
- * 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.
- */
-/**
- * Deterministic replacement for the built-in tempnam function.
- * This is useful in unit tests where a dependency on tempnam needs to be mocked.
- */
-class Mock_Built_In {
-  private $nonces;
-
-  function __construct() {
-    $this->nonces = func_get_args();
-  }
-
-  function _tempnam($dir, $prefix) {
-    if (empty($this->nonces))
-      return false;
-    $filename = "$dir/$prefix" . array_shift($this->nonces);
-    if (!touch($filename))
-      return false;
-    return $filename;
-  }
-}
diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php
index dfe5d9ab..3d56c516 100644
--- a/modules/gallery/tests/System_Helper_Test.php
+++ b/modules/gallery/tests/System_Helper_Test.php
@@ -18,33 +18,10 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class System_Helper_Test extends Gallery_Unit_Test_Case {
-  public function temp_filename_random_test() {
+  public function temp_filename_test() {
     $filename = system::temp_filename("file", "ext");
     $this->assert_true(file_exists($filename), "File not created");
     unlink($filename);
     $this->assert_pattern($filename, "|/file.*\\.ext$|");
   }
-
-  public function tempnam_collision_test() {
-    require_once('Mock_Built_In.php');
-    $existing = TMPPATH . "/file1.ext";
-    $available = TMPPATH . "/file2.ext";
-    touch($existing);
-    $filename = system::_tempnam(TMPPATH, "file", ".ext",
-                                 array(new Mock_Built_In("1", "2"), "_tempnam"));
-    unlink($existing);
-    $this->assert_true(file_exists($filename), "File not created");
-    unlink($filename);
-    $this->assert_equal($available, $filename, "Incorrect filename created");
-  }
-
-  public function tempnam_abort_test() {
-    require_once('Mock_Built_In.php');
-    $filename = system::_tempnam(TMPPATH, "file", ".ext",
-                                 array(new Mock_Built_In(), "_tempnam"));
-    if ($filename) {
-      @unlink($filename);
-    }
-    $this->assert_false($filename, "Operation not aborted");
-  }
 }