From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 14 Apr 2015 13:25:52 +0000 (+0200)
Subject: pass a stream to the tests
X-Git-Tag: v8.1.0alpha1~8^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=308af8b909822b1d1e3b601061d56d9e34585dff;p=nextcloud-server.git

pass a stream to the tests
---

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index bc4535657dc..8d739167f8f 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -82,12 +82,6 @@ class File extends Node implements IFile {
 	 * @return string|null
 	 */
 	public function put($data) {
-		if (is_string($data)) {
-			$stream = fopen('php://temp', 'r+');
-			fwrite($stream, $data);
-			fseek($stream, 0);
-			$data = $stream;
-		};
 		try {
 			$exists = $this->fileView->file_exists($this->path);
 			if ($this->info && $exists && !$this->info->isUpdateable()) {
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index 13884656310..3fe5c2751f1 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -10,6 +10,13 @@ namespace Test\Connector\Sabre;
 
 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
 	 */
@@ -29,7 +36,7 @@ class File extends \Test\TestCase {
 			->will($this->returnValue('/test.txt'));
 
 		$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
-			'permissions'=>\OCP\Constants::PERMISSION_ALL
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		), null);
 
 		$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);
 
-		$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);
 
 		// 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);
 
 		// action
-		$file->put('test data');
+		$file->put($this->getStream('test data'));
 	}
 
 	/**
 	 * Test setting name with setName() with invalid chars
+	 *
 	 * @expectedException \OC\Connector\Sabre\Exception\InvalidPath
 	 */
 	public function testSetNameInvalidChars() {
@@ -176,7 +184,7 @@ class File extends \Test\TestCase {
 		$file = new \OC\Connector\Sabre\File($view, $info);
 
 		// action
-		$file->put('test data');
+		$file->put($this->getStream('test data'));
 	}
 
 	/**