2 files changed, 31 insertions, 44 deletions
diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
index 5dc93660d9c..7ce87140122 100644
--- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
+++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
@@ -201,17 +201,17 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
 	}
 
 	public function testMultiBucketConfigFirstFallBackSingle() {
-		$this->config->expects($this->at(0))
-			->method('getSystemValue')
-			->with($this->equalTo('objectstore_multibucket'))
-			->willReturn('');
-
-		$this->config->expects($this->at(1))
+		$this->config->expects($this->exactly(2))
 			->method('getSystemValue')
-			->with($this->equalTo('objectstore'))
-			->willReturn([
-				'class' => 'Test\Files\Mount\FakeObjectStore',
-			]);
+			->withConsecutive(
+				[$this->equalTo('objectstore_multibucket')],
+				[$this->equalTo('objectstore')],
+			)->willReturnOnConsecutiveCalls(
+				'',
+				[
+					'class' => 'Test\Files\Mount\FakeObjectStore',
+				],
+			);
 
 		$this->user->method('getUID')
 			->willReturn('uid');
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index 7b735720ff1..37cd8414a05 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -2643,44 +2643,31 @@ class ViewTest extends \Test\TestCase {
 			])
 			->getMock();
 
-		$view
-			->expects($this->at(0))
-			->method('is_file')
-			->with('/new')
-			->willReturn(false);
-		$view
-			->expects($this->at(1))
-			->method('file_exists')
-			->with('/new')
-			->willReturn(true);
-		$view
-			->expects($this->at(2))
-			->method('is_file')
-			->with('/new/folder')
-			->willReturn(false);
-		$view
-			->expects($this->at(3))
-			->method('file_exists')
-			->with('/new/folder')
-			->willReturn(false);
-		$view
-			->expects($this->at(4))
-			->method('mkdir')
-			->with('/new/folder');
-		$view
-			->expects($this->at(5))
+		$view->expects($this->exactly(3))
 			->method('is_file')
-			->with('/new/folder/structure')
+			->withConsecutive(
+				['/new'],
+				['/new/folder'],
+				['/new/folder/structure'],
+			)
 			->willReturn(false);
-		$view
-			->expects($this->at(6))
+		$view->expects($this->exactly(3))
 			->method('file_exists')
-			->with('/new/folder/structure')
-			->willReturn(false);
-		$view
-			->expects($this->at(7))
+			->withConsecutive(
+				['/new'],
+				['/new/folder'],
+				['/new/folder/structure'],
+			)->willReturnOnConsecutiveCalls(
+				true,
+				false,
+				false,
+			);
+		$view->expects($this->exactly(2))
 			->method('mkdir')
-			->with('/new/folder/structure');
+			->withConsecutive(
+				['/new/folder'],
+				['/new/folder/structure'],
+			);
 
 		$this->assertTrue(self::invokePrivate($view, 'createParentDirectories', ['/new/folder/structure']));
 	}