Fix php unit tests

Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud · Jan 17, 2024 · 0e06e46 · 0e06e46
1 parent a183add
commit 0e06e46
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 24 deletions.
diff --git a/tests/Unit/LockManagerTest.php b/tests/Unit/LockManagerTest.php
@@ -137,9 +137,9 @@ public function testLock(bool $isLocked, bool $lockDoesNotExist, int $counter, s
 
 		if ($expectNewToken) {
 			$this->metaDataStorage->expects($this->once())
-				->method('getMetaData')
-				->with('userId', 42)
-				->willReturn('{"counter": 0}');
+				->method('getCounter')
+				->with()
+				->willReturn(0);
 
 			if ($counter > 0) {
 				$this->secureRandom->expects($this->once())

diff --git a/tests/Unit/MetaDataStorageTest.php b/tests/Unit/MetaDataStorageTest.php
@@ -449,15 +449,28 @@ public function testSaveIntermediateFile(bool $folderExists, bool $intermediateF
 
 		if ($folderExists) {
 			$metaDataFolder = $this->createMock(ISimpleFolder::class);
-			$this->appData->expects($this->once())
-				->method('getFolder')
-				->with('/meta-data/42')
-				->willReturn($metaDataFolder);
 
-			$metaDataFolder->expects($this->once())
-				->method('fileExists')
-				->with('intermediate.meta.data')
-				->willReturn($intermediateFileExists);
+			if ($intermediateFileIsEmpty || !$intermediateFileExists) {
+				$this->appData->expects($this->once())
+					->method('getFolder')
+					->with('/meta-data/42')
+					->willReturn($metaDataFolder);
+
+				$metaDataFolder->expects($this->once())
+					->method('fileExists')
+					->with('intermediate.meta.data')
+					->willReturn($intermediateFileExists);
+			} else {
+				$this->appData->expects($this->exactly(2))
+					->method('getFolder')
+					->with('/meta-data/42')
+					->willReturn($metaDataFolder);
+
+				$metaDataFolder->expects($this->exactly(3))
+					->method('fileExists')
+					->withConsecutive(['intermediate.meta.data'], ['intermediate.meta.data.signature'], ['intermediate.meta.data.counter'])
+					->willReturn($intermediateFileExists);
+			}
 
 			if ($intermediateFileExists) {
 				$intermediateFile = $this->createMock(ISimpleFile::class);
@@ -493,33 +506,48 @@ public function testSaveIntermediateFile(bool $folderExists, bool $intermediateF
 						->method('putContent')
 						->with('signature');
 
+					$intermediateCounterFile = $this->createMock(ISimpleFile::class);
+					$intermediateCounterFile->expects($this->once())
+						->method('getContent')
+						->willReturn('1');
+
+					$counterFile = $this->createMock(ISimpleFile::class);
+					$counterFile->expects($this->once())
+						->method('putContent')
+						->with('1');
+
 					if ($finalFileExists) {
-						$metaDataFolder->expects($this->exactly(4))
+						$metaDataFolder->expects($this->exactly(6))
 							->method('getFile')
-							->withConsecutive(['intermediate.meta.data'], ['meta.data'], ['intermediate.meta.data.signature'], ['meta.data.signature'])
-							->willReturnOnConsecutiveCalls($intermediateFile, $finalFile, $intermediateSignatureFile, $signatureFile);
+							->withConsecutive(['intermediate.meta.data'], ['meta.data'], ['intermediate.meta.data.signature'], ['meta.data.signature'], ['intermediate.meta.data.counter'], ['meta.data.counter'])
+							->willReturnOnConsecutiveCalls($intermediateFile, $finalFile, $intermediateSignatureFile, $signatureFile, $intermediateCounterFile, $counterFile);
 					} else {
-						$metaDataFolder->expects($this->exactly(4))
+						$metaDataFolder->expects($this->exactly(6))
 							->method('getFile')
-							->withConsecutive(['intermediate.meta.data'], ['meta.data'], ['intermediate.meta.data.signature'], ['meta.data.signature'])
+							->withConsecutive(['intermediate.meta.data'], ['meta.data'], ['intermediate.meta.data.signature'], ['meta.data.signature'], ['intermediate.meta.data.counter'], ['meta.data.counter'])
 							->willReturnOnConsecutiveCalls(
 								$intermediateFile,
 								$this->throwException(new NotFoundException()),
 								$intermediateSignatureFile,
 								$this->throwException(new NotFoundException()),
+								$intermediateCounterFile,
+								$this->throwException(new NotFoundException()),
 							);
 
-						$metaDataFolder->expects($this->exactly(2))
+						$metaDataFolder->expects($this->exactly(3))
 							->method('newFile')
-							->withConsecutive(['meta.data'], ['meta.data.signature'])
-							->willReturn($finalFile, $signatureFile);
+							->withConsecutive(['meta.data'], ['meta.data.signature'], ['meta.data.counter'])
+							->willReturn($finalFile, $signatureFile, $counterFile);
 					}
 
 					$intermediateFile->expects($this->once())
 						->method('delete');
 
 					$intermediateSignatureFile->expects($this->once())
 						->method('delete');
+
+					$intermediateCounterFile->expects($this->once())
+						->method('delete');
 				}
 
 				$metaDataStorage->expects($this->once())
@@ -583,20 +611,24 @@ public function testDeleteIntermediateFile(bool $folderExists, bool $fileExists)
 				->with('/meta-data/42')
 				->willReturn($metaDataFolder);
 
-			$metaDataFolder->expects($this->once())
+			$metaDataFolder->expects($this->exactly(2))
 				->method('fileExists')
-				->with('intermediate.meta.data')
+				->withConsecutive(['intermediate.meta.data'], ['intermediate.meta.data.counter'])
 				->willReturn($fileExists);
 
 			if ($fileExists) {
 				$intermediateFile = $this->createMock(ISimpleFile::class);
 				$intermediateFile->expects($this->once())
 					->method('delete');
 
-				$metaDataFolder->expects($this->once())
+				$intermediateCounterFile = $this->createMock(ISimpleFile::class);
+				$intermediateCounterFile->expects($this->once())
+					->method('delete');
+
+				$metaDataFolder->expects($this->exactly(2))
 					->method('getFile')
-					->with('intermediate.meta.data')
-					->willReturn($intermediateFile);
+					->withConsecutive(['intermediate.meta.data'], ['intermediate.meta.data.counter'])
+					->willReturnOnConsecutiveCalls($intermediateFile, $intermediateCounterFile);
 			}
 		}