summaryrefslogtreecommitdiffstats
path: root/tests/lib/mail
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-06-03 12:03:02 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2015-06-03 12:33:29 +0200
commitd3e3a84cae9c8926bcff810a0e16bb9dcd024888 (patch)
tree80d5588474a46f07c6dd8da142c429c3655f058f /tests/lib/mail
parent500748725c46803ff2a0ec291db37a831322012c (diff)
downloadnextcloud-server-d3e3a84cae9c8926bcff810a0e16bb9dcd024888.tar.gz
nextcloud-server-d3e3a84cae9c8926bcff810a0e16bb9dcd024888.zip
Move the helpful method to the TestCase class
Diffstat (limited to 'tests/lib/mail')
-rw-r--r--tests/lib/mail/mailer.php12
-rw-r--r--tests/lib/mail/message.php2
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/lib/mail/mailer.php b/tests/lib/mail/mailer.php
index 7e5e689741a..21565f9ffb5 100644
--- a/tests/lib/mail/mailer.php
+++ b/tests/lib/mail/mailer.php
@@ -35,7 +35,7 @@ class MailerTest extends TestCase {
}
public function testGetMailInstance() {
- $this->assertEquals(\Swift_MailTransport::newInstance(), \Test_Helper::invokePrivate($this->mailer, 'getMailinstance'));
+ $this->assertEquals(\Swift_MailTransport::newInstance(), self::invokePrivate($this->mailer, 'getMailinstance'));
}
public function testGetSendMailInstanceSendMail() {
@@ -45,7 +45,7 @@ class MailerTest extends TestCase {
->with('mail_smtpmode', 'sendmail')
->will($this->returnValue('sendmail'));
- $this->assertEquals(\Swift_SendmailTransport::newInstance('/usr/sbin/sendmail -bs'), \Test_Helper::invokePrivate($this->mailer, 'getSendMailInstance'));
+ $this->assertEquals(\Swift_SendmailTransport::newInstance('/usr/sbin/sendmail -bs'), self::invokePrivate($this->mailer, 'getSendMailInstance'));
}
public function testGetSendMailInstanceSendMailQmail() {
@@ -55,11 +55,11 @@ class MailerTest extends TestCase {
->with('mail_smtpmode', 'sendmail')
->will($this->returnValue('qmail'));
- $this->assertEquals(\Swift_SendmailTransport::newInstance('/var/qmail/bin/sendmail -bs'), \Test_Helper::invokePrivate($this->mailer, 'getSendMailInstance'));
+ $this->assertEquals(\Swift_SendmailTransport::newInstance('/var/qmail/bin/sendmail -bs'), self::invokePrivate($this->mailer, 'getSendMailInstance'));
}
public function testGetInstanceDefault() {
- $this->assertInstanceOf('\Swift_MailTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance'));
+ $this->assertInstanceOf('\Swift_MailTransport', self::invokePrivate($this->mailer, 'getInstance'));
}
public function testGetInstancePhp() {
@@ -68,7 +68,7 @@ class MailerTest extends TestCase {
->method('getSystemValue')
->will($this->returnValue('php'));
- $this->assertInstanceOf('\Swift_MailTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance'));
+ $this->assertInstanceOf('\Swift_MailTransport', self::invokePrivate($this->mailer, 'getInstance'));
}
public function testGetInstanceSendmail() {
@@ -77,7 +77,7 @@ class MailerTest extends TestCase {
->method('getSystemValue')
->will($this->returnValue('sendmail'));
- $this->assertInstanceOf('\Swift_SendmailTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance'));
+ $this->assertInstanceOf('\Swift_SendmailTransport', self::invokePrivate($this->mailer, 'getInstance'));
}
public function testCreateMessage() {
diff --git a/tests/lib/mail/message.php b/tests/lib/mail/message.php
index c75cc18b650..8ee3c33627c 100644
--- a/tests/lib/mail/message.php
+++ b/tests/lib/mail/message.php
@@ -42,7 +42,7 @@ class MessageTest extends TestCase {
* @dataProvider mailAddressProvider
*/
public function testConvertAddresses($unconverted, $expected) {
- $this->assertSame($expected, \Test_Helper::invokePrivate($this->message, 'convertAddresses', array($unconverted)));
+ $this->assertSame($expected, self::invokePrivate($this->message, 'convertAddresses', array($unconverted)));
}
public function testSetFrom() {