fixup! fix(FileDisplayResponse): return 404 if not found

Author: susnux

tests/lib/AppFramework/Http/FileDisplayResponseTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -9,19 +11,16 @@
 
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\AppFramework\Http\IOutput;
 use OCP\Files\File;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class FileDisplayResponseTest extends \Test\TestCase {
-	/** @var File|\PHPUnit\Framework\MockObject\MockObject */
-	private $file;
-
-	/** @var FileDisplayResponse */
-	private $response;
+	private File&MockObject $file;
+	private FileDisplayResponse $response;
 
 	protected function setUp(): void {
-		$this->file = $this->getMockBuilder('OCP\Files\File')
-			->getMock();
-
+		$this->file = $this->createMock(File::class);
 		$this->file->expects($this->once())
 			->method('getETag')
 			->willReturn('myETag');
@@ -52,7 +51,7 @@ public function testLastModified(): void {
 	}
 
 	public function test304(): void {
-		$output = $this->getMockBuilder('OCP\AppFramework\Http\IOutput')
+		$output = $this->getMockBuilder(IOutput::class)
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -69,25 +68,50 @@ public function test304(): void {
 
 
 	public function testNon304(): void {
-		$output = $this->getMockBuilder('OCP\AppFramework\Http\IOutput')
+		$resource = fopen('php://memory', "w+b");
+		fwrite($resource, 'my data');
+		rewind($resource);
+
+		$this->file->expects($this->once())
+			->method('read')
+			->willReturn($resource);
+		$this->file->expects($this->any())
+			->method('getSize')
+			->willReturn(7);
+
+		$output = $this->getMockBuilder(IOutput::class)
 			->disableOriginalConstructor()
 			->getMock();
-
-		$output->expects($this->any())
+		$output->expects($this->once())
 			->method('getHttpResponseCode')
 			->willReturn(Http::STATUS_OK);
 		$output->expects($this->once())
-			->method('setOutput')
-			->with($this->equalTo('my data'));
+			->method('setReadFile')
+			->with($this->equalTo($resource));
 		$output->expects($this->once())
 			->method('setHeader')
-			->with($this->equalTo('Content-Length: 42'));
+			->with($this->equalTo('Content-Length: 7'));
+
+		$this->response->callback($output);
+	}
+
+	public function testFileNotFound(): void {
 		$this->file->expects($this->once())
-			->method('getContent')
-			->willReturn('my data');
-		$this->file->expects($this->any())
-			->method('getSize')
-			->willReturn(42);
+			->method('read')
+			->willReturn(false);
+
+		$output = $this->getMockBuilder(IOutput::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$output->expects($this->once())
+			->method('getHttpResponseCode')
+			->willReturn(Http::STATUS_OK);
+		$output->expects($this->once())
+			->method('setHttpResponseCode')
+			->with($this->equalTo(Http::STATUS_NOT_FOUND));
+		$output->expects($this->once())
+			->method('setOutput')
+			->with($this->equalTo(''));
 
 		$this->response->callback($output);
 	}