test: Finish migrating tests/Core/ to PHPUnit 10 compatible codetest/noid/more-phpunit-10

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 20 insertions, 18 deletions

diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php
index 2ce30105293..bc79c5771ca 100644
--- a/tests/lib/Encryption/Keys/StorageTest.php
+++ b/tests/lib/Encryption/Keys/StorageTest.php
@@ -9,6 +9,7 @@
 namespace Test\Encryption\Keys;
 
 use OC\Encryption\Keys\Storage;
+use OC\Encryption\Util;
 use OC\Files\View;
 use OCP\IConfig;
 use OCP\Security\ICrypto;
@@ -36,9 +37,9 @@ class StorageTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->util = $this->getMockBuilder('OC\Encryption\Util')
+		$this->util = $this->getMockBuilder(Util::class)
 			->disableOriginalConstructor()
-			->setMethodsExcept(['getFileKeyDir'])
+			->onlyMethods(array_diff(get_class_methods(Util::class), ['getFileKeyDir']))
 			->getMock();
 
 		$this->view = $this->getMockBuilder(View::class)
@@ -114,7 +115,7 @@ class StorageTest extends TestCase {
 		);
 	}
 
-	public function dataTestGetFileKey() {
+	public static function dataTestGetFileKey() {
 		return [
 			['/files/foo.txt', '/files/foo.txt', true, 'key'],
 			['/files/foo.txt.ocTransferId2111130212.part', '/files/foo.txt', true, 'key'],
@@ -157,13 +158,10 @@ class StorageTest extends TestCase {
 		if (!$originalKeyExists) {
 			$this->view->expects($this->exactly(2))
 				->method('file_exists')
-				->withConsecutive(
-					[$this->equalTo('/user1/files_encryption/keys' . $strippedPartialName . '/encModule/fileKey')],
-					[$this->equalTo('/user1/files_encryption/keys' . $path . '/encModule/fileKey')],
-				)->willReturnOnConsecutiveCalls(
-					$originalKeyExists,
-					true,
-				);
+				->willReturnMap([
+					['/user1/files_encryption/keys' . $strippedPartialName . '/encModule/fileKey', $originalKeyExists],
+					['/user1/files_encryption/keys' . $path . '/encModule/fileKey', true],
+				]);
 
 			$this->view->expects($this->once())
 				->method('file_get_contents')
@@ -481,7 +479,7 @@ class StorageTest extends TestCase {
 		return [$parts[1], '/' . implode('/', array_slice($parts, 2))];
 	}
 
-	public function dataProviderCopyRename() {
+	public static function dataProviderCopyRename() {
 		return [
 			['/user1/files/source.txt', '/user1/files/target.txt', false, false,
 				'/user1/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'],
@@ -534,7 +532,7 @@ class StorageTest extends TestCase {
 		);
 	}
 
-	public function dataTestGetPathToKeys() {
+	public static function dataTestGetPathToKeys() {
 		return [
 			['/user1/files/source.txt', false, '', '/user1/files_encryption/keys/files/source.txt/'],
 			['/user1/files/source.txt', true, '', '/files_encryption/keys/files/source.txt/'],
@@ -577,7 +575,7 @@ class StorageTest extends TestCase {
 	public function testBackupUserKeys($createBackupDir): void {
 		$storage = $this->getMockBuilder('OC\Encryption\Keys\Storage')
 			->setConstructorArgs([$this->view, $this->util, $this->crypto, $this->config])
-			->setMethods(['getTimestamp'])
+			->onlyMethods(['getTimestamp'])
 			->getMock();
 
 		$storage->expects($this->any())->method('getTimestamp')->willReturn('1234567');
@@ -586,11 +584,15 @@ class StorageTest extends TestCase {
 			->with('user1/files_encryption/backup')->willReturn(!$createBackupDir);
 
 		if ($createBackupDir) {
+			$calls = [
+				'user1/files_encryption/backup',
+				'user1/files_encryption/backup/test.encryptionModule.1234567',
+			];
 			$this->view->expects($this->exactly(2))->method('mkdir')
-				->withConsecutive(
-					['user1/files_encryption/backup'],
-					['user1/files_encryption/backup/test.encryptionModule.1234567'],
-				);
+				->willReturnCallback(function ($path) use (&$calls) {
+					$expected = array_shift($calls);
+					$this->assertEquals($expected, $path);
+				});
 		} else {
 			$this->view->expects($this->once())->method('mkdir')
 				->with('user1/files_encryption/backup/test.encryptionModule.1234567');
@@ -605,7 +607,7 @@ class StorageTest extends TestCase {
 		$this->assertTrue($storage->backupUserKeys('encryptionModule', 'test', 'user1'));
 	}
 
-	public function dataTestBackupUserKeys() {
+	public static function dataTestBackupUserKeys() {
 		return [
 			[true], [false]
 		];