[limb-svn] r6941 - in 3.x/trunk/limb/mail: src tests/cases

[svn at limb-project.com]

Author: pachanga
Date: 2008-04-17 15:50:51 +0400 (Thu, 17 Apr 2008)
New Revision: 6941
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6941

Modified:
   3.x/trunk/limb/mail/src/lmbMailer.class.php
   3.x/trunk/limb/mail/tests/cases/lmbMailerTest.class.php
Log:
-- adding more tests for lmbMailer

Modified: 3.x/trunk/limb/mail/src/lmbMailer.class.php
===================================================================
--- 3.x/trunk/limb/mail/src/lmbMailer.class.php	2008-04-17 08:57:37 UTC (rev 6940)
+++ 3.x/trunk/limb/mail/src/lmbMailer.class.php	2008-04-17 11:50:51 UTC (rev 6941)
@@ -174,6 +174,7 @@
   {
     if(!is_array($recipients) || isset($recipients['name']))
        $recipients = array($recipients);
+
     $result = array();
     foreach($recipients as $recipient)
     {

Modified: 3.x/trunk/limb/mail/tests/cases/lmbMailerTest.class.php
===================================================================
--- 3.x/trunk/limb/mail/tests/cases/lmbMailerTest.class.php	2008-04-17 08:57:37 UTC (rev 6940)
+++ 3.x/trunk/limb/mail/tests/cases/lmbMailerTest.class.php	2008-04-17 11:50:51 UTC (rev 6941)
@@ -7,26 +7,22 @@
  * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 
+require_once(dirname(__FILE__).'/../../src/lmbMailer.class.php');
+
 class lmbMailerTest extends UnitTestCase {
 
-  function testConfiguration()
+  function testConstructorConfiguration()
   {
-    define('LIMB_SMTP_HOST', 'foo');
-
-    define('LIMB_SMTP_PORT', 'bar');
     $config = array('smtp_port' => 'baz');
 
-    require_once(dirname(__FILE__).'/../../src/lmbMailer.class.php');
-
     $mailer = new lmbMailer($config);
-    $this->assertEqual($mailer->smtp_host, 'foo');
+    $this->assertEqual($mailer->smtp_host, LIMB_SMTP_HOST);
     $this->assertEqual($mailer->smtp_port, 'baz');
+    $this->assertNotEqual('baz', LIMB_SMTP_PORT);
   }
 
-  function testManualConfiguration()
+  function testSetConfig()
   {
-    require_once(dirname(__FILE__).'/../../src/lmbMailer.class.php');
-
     $mailer = new lmbMailer();
 
     $mailer->smtp_host = 'foo';
@@ -38,5 +34,54 @@
     $this->assertEqual($mailer->smtp_port, 'baz');
   }
 
+  function testProcessMailRecepients()
+  {
+    $mailer = new lmbMailer();
+    
+    $recs = $mailer->processMailRecipients("bob at localhost");
+    $this->assertEqual(sizeof($recs), 1);
+    $this->assertEqual($recs[0]['address'], "bob at localhost");
+    $this->assertEqual($recs[0]['name'], "");
+
+    $recs = $mailer->processMailRecipients("Bob<bob at localhost>");
+    $this->assertEqual(sizeof($recs), 1);
+    $this->assertEqual($recs[0]['address'], "bob at localhost");
+    $this->assertEqual($recs[0]['name'], "Bob");
+
+    $recs = $mailer->processMailRecipients(array("bob at localhost"));
+    $this->assertEqual(sizeof($recs), 1);
+    $this->assertEqual($recs[0]['address'], "bob at localhost");
+    $this->assertEqual($recs[0]['name'], "");
+
+    $recs = $mailer->processMailRecipients(array("name" => "Bob", "address" => "bob at localhost"));
+    $this->assertEqual(sizeof($recs), 1);
+    $this->assertEqual($recs[0]['address'], "bob at localhost");
+    $this->assertEqual($recs[0]['name'], "Bob");
+
+    $recs = $mailer->processMailRecipients(array("Bob<bob at localhost>"));
+    $this->assertEqual(sizeof($recs), 1);
+    $this->assertEqual($recs[0]['address'], "bob at localhost");
+    $this->assertEqual($recs[0]['name'], "Bob");
+
+    $recs = $mailer->processMailRecipients(array("bob at localhost", "todd at localhost"));
+    $this->assertEqual(sizeof($recs), 2);
+    $this->assertEqual($recs[0]['address'], "bob at localhost");
+    $this->assertEqual($recs[0]['name'], "");
+    $this->assertEqual($recs[1]['address'], "todd at localhost");
+    $this->assertEqual($recs[1]['name'], "");
+
+    $recs = $mailer->processMailRecipients(array("Bob<bob at localhost>", "todd at localhost"));
+    $this->assertEqual(sizeof($recs), 2);
+    $this->assertEqual($recs[0]['address'], "bob at localhost");
+    $this->assertEqual($recs[0]['name'], "Bob");
+    $this->assertEqual($recs[1]['address'], "todd at localhost");
+    $this->assertEqual($recs[1]['name'], "");
+
+    $recs = $mailer->processMailRecipients(array(array("name" => "Bob", "address" => "bob at localhost"), "todd at localhost"));
+    $this->assertEqual(sizeof($recs), 2);
+    $this->assertEqual($recs[0]['address'], "bob at localhost");
+    $this->assertEqual($recs[0]['name'], "Bob");
+    $this->assertEqual($recs[1]['address'], "todd at localhost");
+    $this->assertEqual($recs[1]['name'], "");
+  }
 }
-?>