mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pass a stream to the tests

This commit is contained in:
Robin Appelman 2015-04-14 15:25:52 +02:00
parent 2fd44dbde4
commit 308af8b909
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/connector/sabre/file.php
View File

@ -82,12 +82,6 @@ class File extends Node implements IFile {
* @return string|null * @return string|null
*/ */
public function put($data) { public function put($data) {
if (is_string($data)) {
$stream = fopen('php://temp', 'r+');
fwrite($stream, $data);
fseek($stream, 0);
$data = $stream;
};
try { try {
$exists = $this->fileView->file_exists($this->path); $exists = $this->fileView->file_exists($this->path);
if ($this->info && $exists && !$this->info->isUpdateable()) { if ($this->info && $exists && !$this->info->isUpdateable()) {

18
tests/lib/connector/sabre/file.php
View File

@ -10,6 +10,13 @@ namespace Test\Connector\Sabre;
class File extends \Test\TestCase { class File extends \Test\TestCase {
private function getStream($string) {
$stream = fopen('php://temp', 'r+');
fwrite($stream, $string);
fseek($stream, 0);
return $stream;
}
/** /**
* @expectedException \Sabre\DAV\Exception * @expectedException \Sabre\DAV\Exception
*/ */
@ -29,7 +36,7 @@ class File extends \Test\TestCase {
->will($this->returnValue('/test.txt')); ->will($this->returnValue('/test.txt'));
$info = new \OC\Files\FileInfo('/test.txt', null, null, array( $info = new \OC\Files\FileInfo('/test.txt', null, null, array(
'permissions'=>\OCP\Constants::PERMISSION_ALL 'permissions' => \OCP\Constants::PERMISSION_ALL
), null); ), null);
$file = new \OC\Connector\Sabre\File($view, $info); $file = new \OC\Connector\Sabre\File($view, $info);
@ -64,7 +71,7 @@ class File extends \Test\TestCase {
$file = new \OC\Connector\Sabre\File($view, $info); $file = new \OC\Connector\Sabre\File($view, $info);
$this->assertNotEmpty($file->put('test data')); $this->assertNotEmpty($file->put($this->getStream('test data')));
} }
/** /**
@ -99,7 +106,7 @@ class File extends \Test\TestCase {
$file = new \OC\Connector\Sabre\File($view, $info); $file = new \OC\Connector\Sabre\File($view, $info);
// action // action
$file->put('test data'); $file->put($this->getStream('test data'));
} }
/** /**
@ -122,11 +129,12 @@ class File extends \Test\TestCase {
$file = new \OC\Connector\Sabre\File($view, $info); $file = new \OC\Connector\Sabre\File($view, $info);
// action // action
$file->put('test data'); $file->put($this->getStream('test data'));
} }
/** /**
* Test setting name with setName() with invalid chars * Test setting name with setName() with invalid chars
*
* @expectedException \OC\Connector\Sabre\Exception\InvalidPath * @expectedException \OC\Connector\Sabre\Exception\InvalidPath
*/ */
public function testSetNameInvalidChars() { public function testSetNameInvalidChars() {
@ -176,7 +184,7 @@ class File extends \Test\TestCase {
$file = new \OC\Connector\Sabre\File($view, $info); $file = new \OC\Connector\Sabre\File($view, $info);
// action // action
$file->put('test data'); $file->put($this->getStream('test data'));
} }
/** /**