Use the new method everywhere

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

1 files changed, 45 insertions, 68 deletions

diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
index 9a22f63c1be..d8df7613729 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
@@ -40,27 +40,28 @@ use OCP\L10N\IFactory as L10NFactory;
 use OCP\Mail\IEMailTemplate;
 use OCP\Mail\IMailer;
 use OCP\Mail\IMessage;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\VObject\Component\VCalendar;
 
 class EmailProviderTest extends AbstractNotificationProviderTest {
 	public const USER_EMAIL = 'frodo@hobb.it';
 
-	/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var ILogger|MockObject */
 	protected $logger;
 
-	/** @var L10NFactory|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var L10NFactory|MockObject */
 	protected $l10nFactory;
 
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IL10N|MockObject */
 	protected $l10n;
 
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IURLGenerator|MockObject */
 	protected $urlGenerator;
 
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IConfig|MockObject */
 	protected $config;
 
-	/** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IMailer|MockObject */
 	private $mailer;
 
 	protected function setUp(): void {
@@ -101,19 +102,6 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 
 		$users = [$user1, $user2, $user3, $user4];
 
-		$this->config->expects($this->at(0))
-			->method('getUserValue')
-			->with('uid1', 'core', 'lang', null)
-			->willReturn(null);
-		$this->config->expects($this->at(1))
-			->method('getUserValue')
-			->with('uid2', 'core', 'lang', null)
-			->willReturn('de');
-		$this->config->expects($this->at(2))
-			->method('getUserValue')
-			->with('uid3', 'core', 'lang', null)
-			->willReturn('de');
-
 		$enL10N = $this->createMock(IL10N::class);
 		$enL10N->method('t')
 			->willReturnArgument(0);
@@ -126,30 +114,31 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 		$deL10N->method('l')
 			->willReturnArgument(0);
 
-		$this->l10nFactory->expects($this->at(0))
+		$this->l10nFactory
+			->method('getUserLanguage')
+			->willReturnMap([
+				[$user1, 'en'],
+				[$user2, 'de'],
+				[$user3, 'de'],
+			]);
+
+		$this->l10nFactory
 			->method('findLanguage')
-			->with()
 			->willReturn('en');
 
-		$this->l10nFactory->expects($this->at(1))
-			->method('languageExists')
-			->with('dav', 'en')
-			->willReturn(true);
-
-		$this->l10nFactory->expects($this->at(2))
-			->method('get')
-			->with('dav', 'en')
-			->willReturn($enL10N);
-
-		$this->l10nFactory->expects($this->at(3))
+		$this->l10nFactory
 			->method('languageExists')
-			->with('dav', 'de')
-			->willReturn(true);
+			->willReturnMap([
+				['dav', 'en', true],
+				['dav', 'de', true],
+			]);
 
-		$this->l10nFactory->expects($this->at(4))
+		$this->l10nFactory
 			->method('get')
-			->with('dav', 'de')
-			->willReturn($deL10N);
+			->willReturnMap([
+				['dav', 'en', null, $enL10N],
+				['dav', 'de', null, $deL10N],
+			]);
 
 		$template1 = $this->getTemplateMock();
 		$message11 = $this->getMessageMock('uid1@example.com', $template1);
@@ -223,19 +212,6 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 
 		$users = [$user1, $user2, $user3, $user4];
 
-		$this->config->expects($this->at(0))
-			->method('getUserValue')
-			->with('uid1', 'core', 'lang', null)
-			->willReturn(null);
-		$this->config->expects($this->at(1))
-			->method('getUserValue')
-			->with('uid2', 'core', 'lang', null)
-			->willReturn('de');
-		$this->config->expects($this->at(2))
-			->method('getUserValue')
-			->with('uid3', 'core', 'lang', null)
-			->willReturn('de');
-
 		$enL10N = $this->createMock(IL10N::class);
 		$enL10N->method('t')
 			->willReturnArgument(0);
@@ -248,30 +224,31 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 		$deL10N->method('l')
 			->willReturnArgument(0);
 
-		$this->l10nFactory->expects($this->at(0))
+		$this->l10nFactory
+			->method('getUserLanguage')
+			->willReturnMap([
+				[$user1, 'en'],
+				[$user2, 'de'],
+				[$user3, 'de'],
+			]);
+
+		$this->l10nFactory
 			->method('findLanguage')
-			->with()
 			->willReturn('en');
 
-		$this->l10nFactory->expects($this->at(1))
-			->method('languageExists')
-			->with('dav', 'de')
-			->willReturn(true);
-
-		$this->l10nFactory->expects($this->at(2))
-			->method('get')
-			->with('dav', 'de')
-			->willReturn($enL10N);
-
-		$this->l10nFactory->expects($this->at(3))
+		$this->l10nFactory
 			->method('languageExists')
-			->with('dav', 'en')
-			->willReturn(true);
+			->willReturnMap([
+				['dav', 'en', true],
+				['dav', 'de', true],
+			]);
 
-		$this->l10nFactory->expects($this->at(4))
+		$this->l10nFactory
 			->method('get')
-			->with('dav', 'en')
-			->willReturn($deL10N);
+			->willReturnMap([
+				['dav', 'en', null, $enL10N],
+				['dav', 'de', null, $deL10N],
+			]);
 
 		$template1 = $this->getTemplateMock();
 		$message11 = $this->getMessageMock('foo1@example.org', $template1);