Discussion:
[22891] standard/incubator/tests/Zend/Mail/FileTest.php: Zend_Mail file transport tests fixes
lcf
2010-08-23 21:04:18 UTC
Permalink
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22891] standard/incubator/tests/Zend/Mail/FileTest.php: Zend_Mail file transport tests fixes</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22891</dd>
<dt>Author</dt> <dd>lcf</dd>
<dt>Date</dt> <dd>2010-08-23 14:04:18 -0700 (Mon, 23 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Zend_Mail file transport tests fixes</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardincubatortestsZendMailFileTestphp">standard/incubator/tests/Zend/Mail/FileTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardincubatortestsZendMailFileTestphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/tests/Zend/Mail/FileTest.php (22890 => 22891)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/tests/Zend/Mail/FileTest.php 2010-08-23 20:39:46 UTC (rev 22890)
+++ standard/incubator/tests/Zend/Mail/FileTest.php 2010-08-23 21:04:18 UTC (rev 22891) </span><span class="lines">@@ -48,6 +48,10 @@ </span><span class="cx"> $this-&gt;_tmpdir = dirname(__FILE__) . '/_files/test.file/'; </span><span class="cx"> } </span><span class="cx"> </span><ins>+ if (!file_exists($this-&gt;_tmpdir)) {
+ mkdir($this-&gt;_tmpdir);
+ }
+ </ins><span class="cx"> $this-&gt;_cleanDir($this-&gt;_tmpdir);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>

</body>
</html>
lcf
2010-08-24 18:48:57 UTC
Permalink
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22897] standard/incubator/tests/Zend/Mail/FileTest.php: Zend_Mail file transport tests fixes</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22897</dd>
<dt>Author</dt> <dd>lcf</dd>
<dt>Date</dt> <dd>2010-08-24 11:48:55 -0700 (Tue, 24 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Zend_Mail file transport tests fixes</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardincubatortestsZendMailFileTestphp">standard/incubator/tests/Zend/Mail/FileTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardincubatortestsZendMailFileTestphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/tests/Zend/Mail/FileTest.php (22896 => 22897)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/tests/Zend/Mail/FileTest.php 2010-08-24 15:25:51 UTC (rev 22896)
+++ standard/incubator/tests/Zend/Mail/FileTest.php 2010-08-24 18:48:55 UTC (rev 22897)
</span><span class="lines">@@ -21,12 +21,26 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @namespace
</del><ins>+ * Test helper
</ins><span class="cx"> */
</span><del>-namespace ZendTest\Mail;
-use Zend\Mail;
</del><ins>+require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'TestHelper.php';
</ins><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Zend_Mail
+ */
+require_once 'Zend/Mail.php';
+
+/**
+ * Zend_Mail_Transport_File
+ */
+require_once 'Zend/Mail/Transport/File.php';
+
+/**
+ * PHPUnit test case
+ */
+require_once 'PHPUnit/Framework/TestCase.php';
+
+/** </ins><span class="cx"> * @category Zend </span><span class="cx"> * @package Zend_Mail </span><span class="cx"> * @subpackage UnitTests </span><span class="lines">@@ -34,7 +48,7 @@ </span><span class="cx"> * @license http://framework.zend.com/license/new-bsd New BSD License </span><span class="cx"> * @group Zend_Mail </span><span class="cx"> */ </span><del>-class FileTest extends \PHPUnit_Framework_TestCase </del><ins>+class Zend_Mail_FileTest extends PHPUnit_Framework_TestCase </ins><span class="cx"> { </span><span class="cx"> protected $_params; </span><span class="cx"> protected $_transport; </span><span class="lines">@@ -48,10 +62,6 @@ </span><span class="cx"> $this-&gt;_tmpdir = dirname(__FILE__) . '/_files/test.file/'; </span><span class="cx"> } </span><span class="cx"> </span><del>- if (!file_exists($this-&gt;_tmpdir)) {
- mkdir($this-&gt;_tmpdir);
- }
- </del><span class="cx"> $this-&gt;_cleanDir($this-&gt;_tmpdir);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -82,24 +92,24 @@
</span><span class="cx"> public function testTransportSetup()
</span><span class="cx"> {
</span><span class="cx"> try {
</span><del>- $transport = new Mail\Transport\File();
- } catch (\Exception $e) {
</del><ins>+ $transport = new Zend_Mail_Transport_File();
+ } catch (Exception $e) { </ins><span class="cx"> $this-&gt;fail('Exception raised while creating file transport with no params'); </span><span class="cx"> } </span><span class="cx"> </span><span class="cx"> try { </span><del>- $transport = new Mail\Transport\File(array( </del><ins>+ $transport = new Zend_Mail_Transport_File(array( </ins><span class="cx"> 'path' =&gt; $this-&gt;_tmpdir, </span><del>- 'callback' =&gt; function(){return 'test';} </del><ins>+ 'callback' =&gt; 'test_function' </ins><span class="cx"> )); </span><del>- } catch (\Exception $e) { </del><ins>+ } catch (Exception $e) { </ins><span class="cx"> $this-&gt;fail('Exception raised while creating file transport with params'); </span><span class="cx"> } </span><span class="cx"> } </span><span class="cx"> </span><span class="cx"> protected function _prepareMail() </span><span class="cx"> { </span><del>- $mail = new Mail\Mail(); </del><ins>+ $mail = new Zend_Mail(); </ins><span class="cx"> $mail-&gt;setBodyText('This is the text of the mail.'); </span><span class="cx"> $mail-&gt;setFrom('alexander-***@public.gmane.org', 'Alexander Steshenko'); </span><span class="cx"> $mail-&gt;addTo('oleg-***@public.gmane.org', 'Oleg Lobach'); </span><span class="lines">@@ -111,14 +121,14 @@ </span><span class="cx"> public function testNotWritablePathFailure() </span><span class="cx"> { </span><span class="cx"> try { </span><del>- $transport = new Mail\Transport\File(array( </del><ins>+ $transport = new Zend_Mail_Transport_File(array( </ins><span class="cx"> 'path' =&gt; $this-&gt;_tmpdir . '/not_existing/directory' </span><span class="cx"> )); </span><span class="cx"> </span><span class="cx"> $mail = $this-&gt;_prepareMail(); </span><span class="cx"> $mail-&gt;send($transport); </span><span class="cx"> </span><del>- } catch (Mail\Transport\Exception $e) { </del><ins>+ } catch (Zend_Mail_Transport_Exception $e) { </ins><span class="cx"> return; // test is ok </span><span class="cx"> } </span><span class="cx"> $this-&gt;fail('No exception raised with not writable path set'); </span><span class="lines">@@ -126,7 +136,7 @@ </span><span class="cx"> </span><span class="cx"> public function testTransportSendMail() </span><span class="cx"> { </span><del>- $transport = new Mail\Transport\File(array('path' =&gt; $this-&gt;_tmpdir)); </del><ins>+ $transport = new Zend_Mail_Transport_File(array('path' =&gt; $this-&gt;_tmpdir)); </ins><span class="cx"> </span><span class="cx"> $mail = $this-&gt;_prepareMail(); </span><span class="cx"> $mail-&gt;send($transport); </span><span class="lines">@@ -147,17 +157,17 @@ </span><span class="cx"> $this-&gt;assertContains(&quot;This is the text of the mail.&quot;, $email);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public function testPrependToClosure()
</del><ins>+ public function prependCallback($transport)
</ins><span class="cx"> {
</span><span class="cx"> // callback utilizes default callback and prepends recipient email
</span><del>- $callback = function($transport) {
- $defaultCallback = $transport-&gt;getDefaultCallback();
- return $transport-&gt;recipients . '_' . $defaultCallback($transport);
- }; </del><ins>+ return $transport-&gt;recipients . '_' . $transport-&gt;defaultCallback($transport);
+ }
</ins><span class="cx">
</span><del>- $transport = new Mail\Transport\File(array(
</del><ins>+ public function testPrependToCallback()
+ {
+ $transport = new Zend_Mail_Transport_File(array( </ins><span class="cx"> 'path' =&gt; $this-&gt;_tmpdir, </span><del>- 'callback' =&gt; $callback </del><ins>+ 'callback' =&gt; array($this, 'prependCallback') </ins><span class="cx"> )); </span><span class="cx"> </span><span class="cx"> $mail = $this-&gt;_prepareMail();
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...