stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-10 16:05:21 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplified the temp_filename implementation and removed the mocks.

Browse Source
This commit is contained in:
Chad Parry
2011-05-04 17:48:25 -06:00
parent 0e844766ba
commit d2331bf434
3 changed files with 5 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/gallery/helpers/system.php
View File

@@ -47,20 +47,13 @@ class system_Core {
* It allows the caller to specify a prefix and an extension.
* It always places the file in TMPPATH.
*/
static function temp_filename($prefix = "", $extension = "") {
return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam");
}
/**
* This helper provides a dependency-injected implementation of tempnam.
*/
static function _tempnam($dir, $prefix, $postfix, $builtin) {
static function temp_filename($prefix="", $extension="") {
do {
$basename = call_user_func($builtin, $dir, $prefix);
$basename = tempnam(TMPPATH, $prefix);
if (!$basename) {
return false;
}
$filename = $basename . $postfix;
$filename = "$basename.$extension";
$success = !file_exists($filename) && @rename($basename, $filename);
if (!$success) {
@unlink($basename);
@@ -68,4 +61,4 @@ class system_Core {
} while (!$success);
return $filename;
}
}
}

39
modules/gallery/tests/Mock_Built_In.php
View File

@@ -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;
}
}

25
modules/gallery/tests/System_Helper_Test.php
View File

@@ -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");
}
}