1 files changed, 64 insertions, 40 deletions

diff --git a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
index 6c380fa3191..ec5d0a9ab5b 100644
--- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
+++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
@@ -7,39 +7,51 @@
  */
 namespace OCA\DAV\Tests\unit\Upload;
 
+use OCA\DAV\Upload\AssemblyStream;
 use Sabre\DAV\File;
 
 class AssemblyStreamTest extends \Test\TestCase {
 
-	/**
-	 * @dataProvider providesNodes()
-	 */
-	public function testGetContents($expected, $nodes): void {
-		$stream = \OCA\DAV\Upload\AssemblyStream::wrap($nodes);
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesNodes')]
+	public function testGetContents(string $expected, array $nodeData): void {
+		$nodes = [];
+		foreach ($nodeData as $data) {
+			$nodes[] = $this->buildNode(...$data);
+		}
+		$stream = AssemblyStream::wrap($nodes);
 		$content = stream_get_contents($stream);
 
 		$this->assertEquals($expected, $content);
 	}
 
-	/**
-	 * @dataProvider providesNodes()
-	 */
-	public function testGetContentsFread($expected, $nodes): void {
-		$stream = \OCA\DAV\Upload\AssemblyStream::wrap($nodes);
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesNodes')]
+	public function testGetContentsFread(string $expected, array $nodeData, int $chunkLength = 3): void {
+		$nodes = [];
+		foreach ($nodeData as $data) {
+			$nodes[] = $this->buildNode(...$data);
+		}
+		$stream = AssemblyStream::wrap($nodes);
 
 		$content = '';
 		while (!feof($stream)) {
-			$content .= fread($stream, 3);
+			$chunk = fread($stream, $chunkLength);
+			$content .= $chunk;
+			if ($chunkLength !== 3) {
+				$this->assertEquals($chunkLength, strlen($chunk));
+			}
 		}
 
 		$this->assertEquals($expected, $content);
 	}
 
-	/**
-	 * @dataProvider providesNodes()
-	 */
-	public function testSeek($expected, $nodes): void {
-		$stream = \OCA\DAV\Upload\AssemblyStream::wrap($nodes);
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesNodes')]
+	public function testSeek(string $expected, array $nodeData): void {
+		$nodes = [];
+		foreach ($nodeData as $data) {
+			$nodes[] = $this->buildNode(...$data);
+		}
+
+		$stream = AssemblyStream::wrap($nodes);
 
 		$offset = floor(strlen($expected) * 0.6);
 		if (fseek($stream, $offset) === -1) {
@@ -50,63 +62,75 @@ class AssemblyStreamTest extends \Test\TestCase {
 		$this->assertEquals(substr($expected, $offset), $content);
 	}
 
-	public function providesNodes() {
-		$data8k = $this->makeData(8192);
-		$dataLess8k = $this->makeData(8191);
+	public static function providesNodes(): array {
+		$data8k = self::makeData(8192);
+		$dataLess8k = self::makeData(8191);
 
 		$tonofnodes = [];
-		$tonofdata = "";
+		$tonofdata = '';
 		for ($i = 0; $i < 101; $i++) {
-			$thisdata = rand(0, 100); // variable length and content
+			$thisdata = random_int(0, 100); // variable length and content
 			$tonofdata .= $thisdata;
-			array_push($tonofnodes, $this->buildNode($i, $thisdata));
+			$tonofnodes[] = [(string)$i, (string)$thisdata];
 		}
 
 		return[
 			'one node zero bytes' => [
 				'', [
-					$this->buildNode('0', '')
+					['0', ''],
 				]],
 			'one node only' => [
 				'1234567890', [
-					$this->buildNode('0', '1234567890')
+					['0', '1234567890'],
 				]],
 			'one node buffer boundary' => [
 				$data8k, [
-					$this->buildNode('0', $data8k)
+					['0', $data8k],
 				]],
 			'two nodes' => [
 				'1234567890', [
-					$this->buildNode('1', '67890'),
-					$this->buildNode('0', '12345')
+					['1', '67890'],
+					['0', '12345'],
 				]],
 			'two nodes end on buffer boundary' => [
 				$data8k . $data8k, [
-					$this->buildNode('1', $data8k),
-					$this->buildNode('0', $data8k)
+					['1', $data8k],
+					['0', $data8k],
 				]],
 			'two nodes with one on buffer boundary' => [
 				$data8k . $dataLess8k, [
-					$this->buildNode('1', $dataLess8k),
-					$this->buildNode('0', $data8k)
+					['1', $dataLess8k],
+					['0', $data8k],
 				]],
 			'two nodes on buffer boundary plus one byte' => [
 				$data8k . 'X' . $data8k, [
-					$this->buildNode('1', $data8k),
-					$this->buildNode('0', $data8k . 'X')
+					['1', $data8k],
+					['0', $data8k . 'X'],
 				]],
 			'two nodes on buffer boundary plus one byte at the end' => [
 				$data8k . $data8k . 'X', [
-					$this->buildNode('1', $data8k . 'X'),
-					$this->buildNode('0', $data8k)
+					['1', $data8k . 'X'],
+					['0', $data8k],
 				]],
 			'a ton of nodes' => [
 				$tonofdata, $tonofnodes
-			]
+			],
+			'one read over multiple nodes' => [
+				'1234567890', [
+					['0', '1234'],
+					['1', '5678'],
+					['2', '90'],
+				], 10],
+			'two reads over multiple nodes' => [
+				'1234567890', [
+					['0', '1234'],
+					['1', '5678'],
+					['2', '90'],
+				], 5],
 		];
 	}
 
-	private function makeData($count) {
+	private static function makeData(int $count): string {
 		$data = '';
 		$base = '1234567890';
 		$j = 0;
@@ -120,10 +144,10 @@ class AssemblyStreamTest extends \Test\TestCase {
 		return $data;
 	}
 
-	private function buildNode($name, $data) {
+	private function buildNode(string $name, string $data) {
 		$node = $this->getMockBuilder(File::class)
-			->setMethods(['getName', 'get', 'getSize'])
-			->getMockForAbstractClass();
+			->onlyMethods(['getName', 'get', 'getSize'])
+			->getMock();
 
 		$node->expects($this->any())
 			->method('getName')