Merge pull request #32861 from nextcloud/fix/remove-at-matcher-in-user_ldap-tests

Remove deprecated at() matcher from user_ldap tests

3 files changed, 26 insertions, 36 deletions

diff --git a/apps/user_ldap/tests/LDAPProviderTest.php b/apps/user_ldap/tests/LDAPProviderTest.php
index 59f51f204bf..8a071119d16 100644
--- a/apps/user_ldap/tests/LDAPProviderTest.php
+++ b/apps/user_ldap/tests/LDAPProviderTest.php
@@ -58,9 +58,6 @@ class LDAPProviderTest extends \Test\TestCase {
 			 ->setMethods(['getUserManager', 'getBackends', 'getGroupManager'])
 			 ->setConstructorArgs(['', new \OC\Config(\OC::$configDir)])
 			 ->getMock();
-		$server->expects($this->at(1))
-			->method('getBackends')
-			->willReturn([$userBackend]);
 		$server->expects($this->any())
 			->method('getUserManager')
 			->willReturn($this->getUserManagerMock($userBackend));
@@ -136,10 +133,10 @@ class LDAPProviderTest extends \Test\TestCase {
 			 ->setMethods(['userExists', 'getLDAPAccess', 'username2dn'])
 			 ->disableOriginalConstructor()
 			 ->getMock();
-		$userBackend->expects($this->at(0))
+		$userBackend->expects($this->once())
 			->method('userExists')
 			->willReturn(true);
-		$userBackend->expects($this->at(2))
+		$userBackend->expects($this->once())
 			->method('username2dn')
 			->willReturn('cn=existing_user,ou=Are Sufficient To,ou=Test,dc=example,dc=org');
 		$userBackend->expects($this->any())
@@ -186,10 +183,10 @@ class LDAPProviderTest extends \Test\TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$groupBackend->expects($this->at(0))
+		$groupBackend->expects($this->once())
 			->method('groupExists')
 			->willReturn(true);
-		$groupBackend->expects($this->at(2))
+		$groupBackend->expects($this->once())
 			->method('groupname2dn')
 			->willReturn('cn=existing_group,ou=Are Sufficient To,ou=Test,dc=example,dc=org');
 		$groupBackend->expects($this->any())
@@ -473,10 +470,10 @@ class LDAPProviderTest extends \Test\TestCase {
 			 ->setMethods(['userExists', 'getLDAPAccess', 'getConnection', 'clearCache'])
 			 ->disableOriginalConstructor()
 			 ->getMock();
-		$userBackend->expects($this->at(0))
+		$userBackend->expects($this->once())
 			->method('userExists')
 			->willReturn(true);
-		$userBackend->expects($this->at(3))
+		$userBackend->expects($this->once())
 			->method('clearCache')
 			->willReturn(true);
 		$userBackend->expects($this->any())
@@ -518,10 +515,10 @@ class LDAPProviderTest extends \Test\TestCase {
 			->setMethods(['groupExists', 'getLDAPAccess', 'getConnection', 'clearCache'])
 			->disableOriginalConstructor()
 			->getMock();
-		$groupBackend->expects($this->at(0))
+		$groupBackend->expects($this->once())
 			->method('groupExists')
 			->willReturn(true);
-		$groupBackend->expects($this->at(3))
+		$groupBackend->expects($this->once())
 			->method('clearCache')
 			->willReturn(true);
 		$groupBackend->expects($this->any())
@@ -598,10 +595,10 @@ class LDAPProviderTest extends \Test\TestCase {
 			->setMethods(['userExists', 'getLDAPAccess', 'getConnection', 'getConfiguration'])
 			->disableOriginalConstructor()
 			->getMock();
-		$userBackend->expects($this->at(0))
+		$userBackend->expects($this->once())
 			->method('userExists')
 			->willReturn(true);
-		$userBackend->expects($this->at(3))
+		$userBackend->expects($this->once())
 			->method('getConfiguration')
 			->willReturn(['ldap_display_name' => 'displayName']);
 		$userBackend->expects($this->any())
@@ -636,10 +633,10 @@ class LDAPProviderTest extends \Test\TestCase {
 			->setMethods(['userExists', 'getLDAPAccess', 'getConnection', 'getConfiguration'])
 			->disableOriginalConstructor()
 			->getMock();
-		$userBackend->expects($this->at(0))
+		$userBackend->expects($this->once())
 			->method('userExists')
 			->willReturn(true);
-		$userBackend->expects($this->at(3))
+		$userBackend->expects($this->once())
 			->method('getConfiguration')
 			->willReturn(['ldap_email_attr' => 'mail']);
 		$userBackend->expects($this->any())
@@ -684,7 +681,7 @@ class LDAPProviderTest extends \Test\TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$groupBackend->expects($this->at(0))
+		$groupBackend->expects($this->once())
 			->method('groupExists')
 			->willReturn(true);
 		$groupBackend->expects($this->any())
diff --git a/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php b/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php
index b13efa14e5c..49431ec0d9a 100644
--- a/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php
+++ b/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php
@@ -159,18 +159,15 @@ class UUIDFixInsertTest extends TestCase {
 			->with(0, 50)
 			->willReturn($groupBatches[0]);
 
-		$this->jobList->expects($this->at(0))
+		$this->jobList->expects($this->exactly(5))
 			->method('add')
-			->willThrowException(new \InvalidArgumentException('Background job arguments can\'t exceed 4000 etc'));
-		$this->jobList->expects($this->at(1))
-			->method('add')
-			->willThrowException(new \InvalidArgumentException('Background job arguments can\'t exceed 4000 etc'));
-		$this->jobList->expects($this->at(2))
-			->method('add');
-		$this->jobList->expects($this->at(3))
-			->method('add');
-		$this->jobList->expects($this->at(4))
-			->method('add');
+			->willReturnOnConsecutiveCalls(
+				$this->throwException(new \InvalidArgumentException('Background job arguments can\'t exceed 4000 etc')),
+				$this->throwException(new \InvalidArgumentException('Background job arguments can\'t exceed 4000 etc')),
+				null,
+				null,
+				null,
+			);
 
 		/** @var IOutput $out */
 		$out = $this->createMock(IOutput::class);
diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php
index e86eb5e9e2e..d2113de842e 100644
--- a/apps/user_ldap/tests/User/UserTest.php
+++ b/apps/user_ldap/tests/User/UserTest.php
@@ -254,16 +254,12 @@ class UserTest extends \Test\TestCase {
 	}
 
 	public function testUpdateQuotaDefaultProvided() {
-		$this->connection->expects($this->at(0))
-			->method('__get')
-			->with($this->equalTo('ldapQuotaAttribute'))
-			->willReturn('myquota');
-		$this->connection->expects($this->at(1))
-			->method('__get')
-			->with($this->equalTo('ldapQuotaDefault'))
-			->willReturn('25 GB');
 		$this->connection->expects($this->exactly(2))
-			->method('__get');
+			->method('__get')
+			->willReturnMap([
+				['ldapQuotaAttribute', 'myquota'],
+				['ldapQuotaDefault', '25 GB'],
+			]);
 
 		$this->access->expects($this->once())
 			->method('readAttribute')