geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-08-30 20:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move file upload and removal to helper functions

Browse Source
This commit is contained in:
Zach Borboa
2016-11-06 01:13:42 -07:00
parent 62d869ed17
commit d2313c0294
2 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/PHPCurlClass/Helper.php
+26
View File
@@ -89,3 +89,29 @@ if (function_exists('finfo_open')) {
return $mime_type;
}
}
function upload_file_to_server($upload_file_path) {
$upload_test = new Test();
$upload_test->server('upload_response', 'POST', array(
'image' => '@' . $upload_file_path,
));
$uploaded_file_path = $upload_test->curl->response->file_path;
// Ensure files are not the same path.
assert(!($upload_file_path === $uploaded_file_path));
// Ensure file uploaded successfully.
assert(md5_file($upload_file_path) === $upload_test->curl->responseHeaders['ETag']);
return $uploaded_file_path;
}
function remove_file_from_server($uploaded_file_path) {
$download_test = new Test();
// Ensure file successfully removed.
assert('true' === $download_test->server('upload_cleanup', 'POST', array(
'file_path' => $uploaded_file_path,
)));
assert(file_exists($uploaded_file_path) === false);
}
tests/PHPCurlClass/PHPCurlClassTest.php
+6 -23
View File
@@ -609,15 +609,9 @@ class CurlTest extends PHPUnit_Framework_TestCase
public function testDownload()
{
// Upload a file.
// Create and upload a file.
$upload_file_path = Helper\get_png();
$upload_test = new Test();
$upload_test->server('upload_response', 'POST', array(
'image' => '@' . $upload_file_path,
));
$uploaded_file_path = $upload_test->curl->response->file_path;
$this->assertNotEquals($upload_file_path, $uploaded_file_path);
$this->assertEquals(md5_file($upload_file_path), $upload_test->curl->responseHeaders['ETag']);
$uploaded_file_path = Helper\upload_file_to_server($upload_file_path);
// Download the file.
$downloaded_file_path = tempnam('/tmp', 'php-curl-class.');
@@ -638,27 +632,19 @@ class CurlTest extends PHPUnit_Framework_TestCase
$this->assertFalse(is_bool($download_test->curl->rawResponse));
// Remove server file.
$download_test = new Test();
$this->assertEquals('true', $download_test->server('upload_cleanup', 'POST', array(
'file_path' => $uploaded_file_path,
)));
Helper\remove_file_from_server($uploaded_file_path);
unlink($upload_file_path);
unlink($downloaded_file_path);
$this->assertFalse(file_exists($upload_file_path));
$this->assertFalse(file_exists($uploaded_file_path));
$this->assertFalse(file_exists($downloaded_file_path));
}
public function testDownloadCallback()
{
// Upload a file.
// Create and upload a file.
$upload_file_path = Helper\get_png();
$upload_test = new Test();
$upload_test->server('upload_response', 'POST', array(
'image' => '@' . $upload_file_path,
));
$uploaded_file_path = $upload_test->curl->response->file_path;
$uploaded_file_path = Helper\upload_file_to_server($upload_file_path);
// Download the file.
$callback_called = false;
@@ -679,13 +665,10 @@ class CurlTest extends PHPUnit_Framework_TestCase
$this->assertTrue($callback_called);
// Remove server file.
$this->assertEquals('true', $upload_test->server('upload_cleanup', 'POST', array(
'file_path' => $uploaded_file_path,
)));
Helper\remove_file_from_server($uploaded_file_path);
unlink($upload_file_path);
$this->assertFalse(file_exists($upload_file_path));
$this->assertFalse(file_exists($uploaded_file_path));
}
public function testMaxFilesize()