Author: as
Date: Mon Aug 6 09:20:02 2007
New Revision: 5817
Log:
- Fixed some failing tests.
Modified:
trunk/Mail/tests/transports/transport_smtp_test.php
Modified: trunk/Mail/tests/transports/transport_smtp_test.php
==============================================================================
--- trunk/Mail/tests/transports/transport_smtp_test.php [iso-8859-1] (original)
+++ trunk/Mail/tests/transports/transport_smtp_test.php [iso-8859-1] Mon Aug 6
09:20:02 2007
@@ -159,9 +159,7 @@
public function testWrapperMockCmdMailFail()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $smtp = $this->getMock( 'ezcMailSmtpTransportWrapper', array(
'getReplyCode', 'sendData' ), array( self::HOST_NO_AUTH, self::USER_NO_AUTH,
self::PASS_NO_AUTH, self::PORT_NO_AUTH ) );
+ $smtp = $this->getMock( 'ezcMailSmtpTransportWrapper', array(
'getReplyCode', 'sendData' ), array( self::HOST_PLAIN, self::USER_PLAIN,
self::PASS_PLAIN, self::PORT_PLAIN ) );
$smtp->expects( $this->any() )
->method( 'getReplyCode' )
@@ -189,9 +187,7 @@
public function testWrapperMockCmdRpctFail()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $smtp = $this->getMock( 'ezcMailSmtpTransportWrapper', array(
'getReplyCode', 'sendData' ), array( self::HOST_NO_AUTH, self::USER_NO_AUTH,
self::PASS_NO_AUTH, self::PORT_NO_AUTH ) );
+ $smtp = $this->getMock( 'ezcMailSmtpTransportWrapper', array(
'getReplyCode', 'sendData' ), array( self::HOST_PLAIN, self::USER_PLAIN,
self::PASS_PLAIN, self::PORT_PLAIN ) );
$smtp->expects( $this->any() )
->method( 'getReplyCode' )
@@ -219,9 +215,7 @@
public function testWrapperMockCmdDataFail()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $smtp = $this->getMock( 'ezcMailSmtpTransportWrapper', array(
'getReplyCode', 'sendData' ), array( self::HOST_NO_AUTH, self::USER_NO_AUTH,
self::PASS_NO_AUTH, self::PORT_NO_AUTH ) );
+ $smtp = $this->getMock( 'ezcMailSmtpTransportWrapper', array(
'getReplyCode', 'sendData' ), array( self::HOST_PLAIN, self::USER_PLAIN,
self::PASS_PLAIN, self::PORT_PLAIN ) );
$smtp->expects( $this->any() )
->method( 'getReplyCode' )
@@ -250,9 +244,7 @@
// Tests sending a complete mail message.
public function testFullMail()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
try
{
$this->mail->subject = __CLASS__ . ':' . __FUNCTION__;
@@ -267,9 +259,7 @@
// Tests sending a complete mail message with CCs.
public function testFullMailCc()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
$this->mail->addCc( new ezcMailAddress( '[EMAIL PROTECTED]', 'Foster
Cc' ) );
try
{
@@ -285,9 +275,7 @@
// Tests sending a complete mail message with BCCs.
public function testFullMailBcc()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
$this->mail->addBcc( new ezcMailAddress( '[EMAIL PROTECTED]', 'Foster
Bcc' ) );
try
{
@@ -303,9 +291,7 @@
// Tests sending a complete mail message with CCs and BCCs.
public function testFullMailCcBcc()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
$this->mail->addCc( new ezcMailAddress( '[EMAIL PROTECTED]', 'Foster
Cc' ) );
$this->mail->addBcc( new ezcMailAddress( '[EMAIL PROTECTED]', 'Foster
Bcc' ) );
try
@@ -322,9 +308,7 @@
// Tests sending several complete mail messages.
public function testFullMailMultiple()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
try
{
$this->mail->subject = __CLASS__ . ':' . __FUNCTION__;
@@ -340,9 +324,7 @@
// Tests sending several complete mail messages with keep connection.
public function testFullMailMultipleKeepConnection()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
try
{
$transport->keepConnection();
@@ -375,9 +357,7 @@
// Tests sending a mail to an existing host with an invalid port.
public function testInvalidPort()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '', 26
); // wrong port
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, 26 ); // wrong port
try
{
@@ -395,9 +375,7 @@
// Tests sending a mail with empty to field.
public function testInvalidMailToEmptyArray()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
$this->mail->to = array();
try
{
@@ -414,9 +392,7 @@
// Tests sending a mail with to not set.
public function testInvalidMailToNull()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
$this->mail->to = null;
try
{
@@ -433,9 +409,7 @@
// Tests sending a complete mail message with Return-Path set.
public function testFullMailReturnPath()
{
- $this->skipIfNotInNetwork( self::HOST_NO_AUTH, self::PORT_NO_AUTH );
-
- $transport = new ezcMailTransportSmtp( self::HOST_NO_AUTH, '', '',
self::PORT_NO_AUTH );
+ $transport = new ezcMailTransportSmtp( self::HOST_PLAIN,
self::USER_PLAIN, self::PASS_PLAIN, self::PORT_PLAIN );
$this->mail->returnPath = new ezcMailAddress( '[EMAIL PROTECTED]' );
try
{
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
