From 40a47a5e9099824d62cf08528d5eb57dca97dfd0 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Tue, 26 Jun 2007 04:28:24 +0000
Subject: [PATCH] Correcting session errors in EmailTest test case

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5348 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/controller/components/email.php     |  6 +--
 .../libs/controller/components/email.test.php | 45 ++++++++++++++-----
 cake/tests/cases/libs/file.test.php           |  2 +-
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 923db251f..41dbf9e29 100644
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -158,7 +158,7 @@ class EmailComponent extends Object{
 	var $smtpOptions = array('port'=> 25,
 							 'host' => 'localhost',
 							 'timeout' => 30);
-	
+
 /**
  * Enter description here...
  *
@@ -495,7 +495,7 @@ class EmailComponent extends Object{
 		return @mail($this->to, $this->subject, $this->__message, $this->__header, $this->additionalParams);
 	}
 /**
- * Sends out email via SMTP 
+ * Sends out email via SMTP
  *
  * @access private
  */
@@ -512,7 +512,7 @@ class EmailComponent extends Object{
 		fputs($smtpConnect, "DATE" . $this->_newLine);
 		fputs($smtpConnect, "To: {$this->to}\r\nFrom: {$this->smtpOptions['from']}\r\n{$thos->subject}\r\n{$this->__header}\r\n\r\n{$this->__message}\r\n");
 		fputs($smtpConnect, "QUIT" . $this->_newLine);
-		fclose($smtpConnect);								 
+		fclose($smtpConnect);
 	}
 /**
  * Enter description here...
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
index 8cc388baa..21f227333 100644
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/cake/tests/cases/libs/controller/components/email.test.php
@@ -1,10 +1,31 @@
 <?php
 /* SVN FILE: $Id$ */
-
 /**
- * Series of tests for email component
+ * Series of tests for email component.
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2007, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright		Copyright 2005-2007, Cake Software Foundation, Inc.
+ * @link				https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package			cake
+ * @subpackage		cake.cake.tests.cases.libs.controller.components
+ * @since			CakePHP(tm) v 1.2.0.5347
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
+ * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-
 require_once LIBS . '/controller/components/email.php';
 
 class EmailTestController extends Controller {
@@ -17,20 +38,24 @@ class EmailTest extends CakeTestCase {
 	var $name = 'Email';
 
 	function setUp() {
-		$this->Controller =& new Controller();
-		$this->Controller->_initComponents();
-		$this->View =& new View($this->Controller);
-		ClassRegistry::addObject('view', $this->View);
+		$this->Controller =& new EmailTestController();
+
+		restore_error_handler();
+		@$this->Controller->_initComponents();
+		set_error_handler('simpleTestErrorHandler');
+
+		$this->Controller->Email->startup($this->Controller);
+		ClassRegistry::addObject('view', new View($this->Controller));
 	}
 
 	function testConstruction() {
-		$this->assertTrue(is_object($this->Email));
+		$this->assertTrue(is_object($this->Controller->Email));
 	}
 
 	function testBadSmtpSent() {
 		$this->Controller->Email->smtpOptions['host'] = 'caketest.com';
 		$this->Controller->Email->delivery = 'smtp';
-		$this->assertFalse($this->Email->send('This should not work'));
+		$this->assertFalse($this->Controller->Email->send('This should not work'));
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php
index 31288a834..36fc54c93 100644
--- a/cake/tests/cases/libs/file.test.php
+++ b/cake/tests/cases/libs/file.test.php
@@ -41,7 +41,7 @@ class FileTest extends UnitTestCase {
 	function testBasic() {
 
 		$file = dirname(__FILE__) . DS . basename(__FILE__);
-		
+
 		$this->File =& new File($file);
 
 		$result = $this->File->pwd();