Show more detailed error message

2 files changed, 3 insertions, 23 deletions

diff --git a/tests/lib/mail/mailer.php b/tests/lib/mail/mailer.php
index 2cb4c5cfde3..8929bfdf99d 100644
--- a/tests/lib/mail/mailer.php
+++ b/tests/lib/mail/mailer.php
@@ -53,20 +53,6 @@ class MailerTest extends TestCase {
 		$this->assertEquals(\Swift_SendmailTransport::newInstance('/var/qmail/bin/sendmail -bs'), \Test_Helper::invokePrivate($this->mailer, 'getSendMailInstance'));
 	}
 
-	public function testGetSmtpInstanceDefaults() {
-		$expected = \Swift_SmtpTransport::newInstance();
-		$expected->setHost('127.0.0.1');
-		$expected->setTimeout(10);
-		$expected->setPort(25);
-
-		$this->config
-			->expects($this->any())
-			->method('getSystemValue')
-			->will($this->returnArgument(1));
-
-		$this->assertEquals($expected, \Test_Helper::invokePrivate($this->mailer, 'getSmtpInstance'));
-	}
-
 	public function testGetInstanceDefault() {
 		$this->assertInstanceOf('\Swift_MailTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance'));
 	}
@@ -80,15 +66,6 @@ class MailerTest extends TestCase {
 		$this->assertInstanceOf('\Swift_MailTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance'));
 	}
 
-	public function testGetInstanceSmtp() {
-		$this->config
-			->expects($this->any())
-			->method('getSystemValue')
-			->will($this->returnValue('smtp'));
-
-		$this->assertInstanceOf('\Swift_SmtpTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance'));
-	}
-
 	public function testGetInstanceSendmail() {
 		$this->config
 			->expects($this->any())
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index 84432f656bf..cc25fda52f7 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -32,6 +32,9 @@ class MailSettingsControllerTest extends \Test\TestCase {
 			->disableOriginalConstructor()->getMock();
 		$this->container['MailMessage'] = $this->getMockBuilder('\OCP\Mail\IMessage')
 			->disableOriginalConstructor()->getMock();
+		$this->container['Mailer'] = $this->getMockBuilder('\OC\Mail\Mailer')
+			->setMethods(['send'])
+			->disableOriginalConstructor()->getMock();
 		$this->container['Defaults'] = $this->getMockBuilder('\OC_Defaults')
 			->disableOriginalConstructor()->getMock();
 		$this->container['DefaultMailAddress'] = 'no-reply@owncloud.com';