update tests

lib/private/connector/sabre/file.php

@@ -71,7 +71,7 @@ class File extends Node implements IFile {
 	 * different object on a subsequent GET you are strongly recommended to not
 	 * return an ETag, and just return null.
 	 *
-	 * @param resource $data
+	 * @param resource|string $data
 	 *
 	 * @throws Forbidden
 	 * @throws UnsupportedMediaType
@@ -82,6 +82,11 @@ 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);
+			$data = $stream;
+		};
 		try {
 			$exists = $this->fileView->file_exists($this->path);
 			if ($this->info && $exists && !$this->info->isUpdateable()) {
@@ -178,7 +183,9 @@ class File extends Node implements IFile {
 			// since we skipped the view we need to scan and emit the hooks ourselves
 			$storage->getScanner()->scanFile($internalPath);
 
-			$hookPath = \OC\Files\Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($this->path));
+			$view = \OC\Files\Filesystem::getView();
+			if ($view) {
+				$hookPath = $view->getRelativePath($this->fileView->getAbsolutePath($this->path));
 				if (!$exists) {
 					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_create, array(
 						\OC\Files\Filesystem::signal_param_path => $hookPath
@@ -191,6 +198,7 @@ class File extends Node implements IFile {
 				\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_write, array(
 					\OC\Files\Filesystem::signal_param_path => $hookPath
 				));
+			}
 
 			// allow sync clients to send the mtime along in a header
 			$request = \OC::$server->getRequest();
@@ -209,6 +217,7 @@ class File extends Node implements IFile {
 
 	/**
 	 * Returns the data
+	 *
 	 * @return string|resource
 	 * @throws Forbidden
 	 * @throws ServiceUnavailable
@@ -228,6 +237,7 @@ class File extends Node implements IFile {
 
 	/**
 	 * Delete the current file
+	 *
 	 * @throws Forbidden
 	 * @throws ServiceUnavailable
 	 */
@@ -358,6 +368,7 @@ class File extends Node implements IFile {
 	 * Returns whether a part file is needed for the given storage
 	 * or whether the file can be assembled/uploaded directly on the
 	 * target storage.
+	 *
 	 * @param \OCP\Files\Storage $storage
 	 * @return bool true if the storage needs part file handling
 	 */

tests/lib/connector/sabre/file.php

@@ -15,9 +15,13 @@ class File extends \Test\TestCase {
 	 */
 	public function testSimplePutFails() {
 		// setup
-		$view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array());
+		$storage = $this->getMock('\OC\Files\Storage\Local', ['fopen'], [['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]]);
+		$view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath', 'resolvePath'), array());
 		$view->expects($this->any())
-			->method('file_put_contents')
+			->method('resolvePath')
+			->will($this->returnValue(array($storage, '')));
+		$storage->expects($this->once())
+			->method('fopen')
 			->will($this->returnValue(false));
 
 		$view->expects($this->any())
@@ -36,8 +40,9 @@ class File extends \Test\TestCase {
 
 	public function testPutSingleFileShare() {
 		// setup
-		$storage = $this->getMock('\OCP\Files\Storage');
+		$stream = fopen('php://temp', 'w+');
-		$view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array());
+		$storage = $this->getMock('\OC\Files\Storage\Local', ['fopen'], [['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]]);
+		$view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath', 'resolvePath'), array());
 		$view->expects($this->any())
 			->method('resolvePath')
 			->with('')
@@ -49,6 +54,9 @@ class File extends \Test\TestCase {
 			->method('file_put_contents')
 			->with('')
 			->will($this->returnValue(true));
+		$storage->expects($this->once())
+			->method('fopen')
+			->will($this->returnValue($stream));
 
 		$info = new \OC\Files\FileInfo('/foo.txt', null, null, array(
 			'permissions' => \OCP\Constants::PERMISSION_ALL