diff options
author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2018-08-01 12:42:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-01 12:42:34 +0300 |
commit | 3c9050907a322d1c9b9f68507237c89004cd2501 (patch) | |
tree | 4026524341932f6341159b61a1226fbb8067edd0 /tests | |
parent | f3683f83bfa1cc23163aab0a08a35e1d6dca220d (diff) | |
parent | f08265bc5ae144c9126b576ce4abc9e787a14411 (diff) |
Merge pull request #1000 from nextcloud/refactor/strict-model
Make OCA\Mail\Model strict
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Integration/Service/MailTransmissionIntegrationTest.php | 3 | ||||
-rw-r--r-- | tests/Model/NewMessageDataTest.php | 4 | ||||
-rw-r--r-- | tests/Service/MailTransmissionTest.php | 14 |
3 files changed, 9 insertions, 12 deletions
diff --git a/tests/Integration/Service/MailTransmissionIntegrationTest.php b/tests/Integration/Service/MailTransmissionIntegrationTest.php index 49ec6de86..655f38506 100644 --- a/tests/Integration/Service/MailTransmissionIntegrationTest.php +++ b/tests/Integration/Service/MailTransmissionIntegrationTest.php @@ -118,7 +118,6 @@ class MailTransmissionIntegrationTest extends TestCase { $mb = $this->getMessageBuilder(); $originalMessage = $mb->from('from@domain.tld') ->to('to@domain.tld') - ->subject('subject') ->subject('reply test') ->finish(); $originalUID = $this->saveMessage('inbox', $originalMessage); @@ -137,7 +136,6 @@ class MailTransmissionIntegrationTest extends TestCase { $mb = $this->getMessageBuilder(); $originalMessage = $mb->from('from@domain.tld') ->to('to@domain.tld') - ->subject('subject') ->subject('reply test') ->finish(); $originalUID = $this->saveMessage('inbox', $originalMessage); @@ -156,7 +154,6 @@ class MailTransmissionIntegrationTest extends TestCase { $mb = $this->getMessageBuilder(); $originalMessage = $mb->from('from@domain.tld') ->to('to@domain.tld') - ->subject('subject') ->subject('reply test') ->finish(); $originalUID = $this->saveMessage('inbox', $originalMessage); diff --git a/tests/Model/NewMessageDataTest.php b/tests/Model/NewMessageDataTest.php index d40cab207..bf1844611 100644 --- a/tests/Model/NewMessageDataTest.php +++ b/tests/Model/NewMessageDataTest.php @@ -35,7 +35,7 @@ class NewMessageDataTest extends TestCase { $bcc = ''; $subject = 'Hello'; $body = 'Hi!'; - $attachments = null; + $attachments = []; $messageData = NewMessageData::fromRequest($account, $to, $cc, $bcc, $subject, $body, $attachments); $this->assertEquals($account, $messageData->getAccount()); @@ -54,7 +54,7 @@ class NewMessageDataTest extends TestCase { $bcc = '"Test3" <test3@domain.net>'; $subject = 'Hello'; $body = 'Hi!'; - $attachments = null; + $attachments = []; $messageData = NewMessageData::fromRequest($account, $to, $cc, $bcc, $subject, $body, $attachments); $this->assertEquals($account, $messageData->getAccount()); diff --git a/tests/Service/MailTransmissionTest.php b/tests/Service/MailTransmissionTest.php index 75f37a57c..057bf2c33 100644 --- a/tests/Service/MailTransmissionTest.php +++ b/tests/Service/MailTransmissionTest.php @@ -76,7 +76,7 @@ class MailTransmissionTest extends TestCase { public function testSendNewMessage() { $account = $this->createMock(Account::class); - $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod', null); + $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod'); $replyData = new RepliedMessageData($account, null, null); $message = $this->createMock(IMessage::class); $account->expects($this->once()) @@ -105,7 +105,7 @@ class MailTransmissionTest extends TestCase { public function testSendNewMessageAndCollectAddresses() { $account = $this->createMock(Account::class); - $messageData = NewMessageData::fromRequest($account, 'to@domain.tld', 'cc@domain.tld', 'bcc@domain.tld', 'sub', 'bod', null); + $messageData = NewMessageData::fromRequest($account, 'to@domain.tld', 'cc@domain.tld', 'bcc@domain.tld', 'sub', 'bod'); $replyData = new RepliedMessageData($account, null, null); $message = $this->createMock(IMessage::class); $transport = $this->createMock(Horde_Mail_Transport::class); @@ -147,7 +147,7 @@ class MailTransmissionTest extends TestCase { public function testSendMessageAndDeleteDraft() { $account = $this->createMock(Account::class); - $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod', null); + $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod'); $replyData = new RepliedMessageData($account, null, null); $message = $this->createMock(IMessage::class); $account->expects($this->once()) @@ -178,7 +178,7 @@ class MailTransmissionTest extends TestCase { $account = $this->createMock(Account::class); $alias = $this->createMock(Alias::class); $alias->alias = 'a@d.com'; - $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod', null); + $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod'); $replyData = new RepliedMessageData($account, null, null); $message = $this->createMock(IMessage::class); $account->expects($this->once()) @@ -268,7 +268,7 @@ class MailTransmissionTest extends TestCase { public function testReplyToAnExistingMessage() { $account = $this->createMock(Account::class); - $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod', null); + $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod'); $folderId = base64_encode('INBOX'); $repliedMessageId = 321; $replyData = new RepliedMessageData($account, $folderId, $repliedMessageId); @@ -315,7 +315,7 @@ class MailTransmissionTest extends TestCase { public function testSaveDraft() { $account = $this->createMock(Account::class); - $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod', null); + $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod'); $message = $this->createMock(IMessage::class); $account->expects($this->once()) ->method('newMessage') @@ -332,7 +332,7 @@ class MailTransmissionTest extends TestCase { public function testSaveDraftAndReplaceOldOne() { $account = $this->createMock(Account::class); - $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod', null); + $messageData = NewMessageData::fromRequest($account, 'to@d.com', '', '', 'sub', 'bod'); $message = $this->createMock(IMessage::class); $account->expects($this->once()) ->method('newMessage') |