Add tests for mutt_addrlist_parse + slight refactor and fix return value

diff --git a/address/address.c b/address/address.c
index a07812d25f75e5d11971fe8bdf788e24d901a2d1..bd38ac21b5236764ad4a52fe05b3de509d6c606a 100644 (file)
--- a/address/address.c
+++ b/address/address.c
@@ -434,7 +434,7 @@ void mutt_addr_free(struct Address **a)
  * mutt_addrlist_parse - Parse a list of email addresses
  * @param al AddressList to append addresses
  * @param s  String to parse
- * @retval num Number of parsed addressess
+ * @retval num Number of parsed addresses
  */
 int mutt_addrlist_parse(struct AddressList *al, const char *s)
 {
@@ -453,6 +453,7 @@ int mutt_addrlist_parse(struct AddressList *al, const char *s)
   {
     switch (*s)
     {
+      case ';':
       case ',':
         if (phraselen != 0)
         {
@@ -472,8 +473,14 @@ int mutt_addrlist_parse(struct AddressList *al, const char *s)
           }
         }
 
-        commentlen = 0;
+        if (*s == ';')
+        {
+          /* add group terminator */
+          mutt_addrlist_append(al, mutt_addr_new());
+        }
+
         phraselen = 0;
+        commentlen = 0;
         s++;
         break;
 
@@ -509,37 +516,9 @@ int mutt_addrlist_parse(struct AddressList *al, const char *s)
         phraselen = 0;
         commentlen = 0;
         s++;
-        parsed++;
         break;
       }
 
-      case ';':
-        if (phraselen != 0)
-        {
-          terminate_buffer(phrase, phraselen);
-          if (add_addrspec(al, phrase, comment, &commentlen, sizeof(comment) - 1))
-          {
-            parsed++;
-          }
-        }
-        else if (commentlen != 0)
-        {
-          struct Address *last = TAILQ_LAST(al, AddressList);
-          if (last && !last->personal)
-          {
-            terminate_buffer(comment, commentlen);
-            last->personal = mutt_str_strdup(comment);
-          }
-        }
-
-        /* add group terminator */
-        mutt_addrlist_append(al, mutt_addr_new());
-
-        phraselen = 0;
-        commentlen = 0;
-        s++;
-        break;
-
       case '<':
       {
         struct Address *a = mutt_addr_new();

diff --git a/test/address/mutt_addrlist_parse.c b/test/address/mutt_addrlist_parse.c
index 703448d7a0a2d21154876c9d9ef13ccbf669a194..ea76c12a74296cf75685fc4c2aeb9b1fa31d45af 100644 (file)
--- a/test/address/mutt_addrlist_parse.c
+++ b/test/address/mutt_addrlist_parse.c
@@ -26,21 +26,67 @@
 #include "config.h"
 #include "mutt/mutt.h"
 #include "address/lib.h"
+#include "common.h"
 
 void test_mutt_addrlist_parse(void)
 {
   // int mutt_addrlist_parse(struct AddressList *al, const char *s);
+  {
+    struct AddressList alist = TAILQ_HEAD_INITIALIZER(alist);
+    int parsed = mutt_addrlist_parse(&alist, NULL);
+    TEST_CHECK(parsed == 0);
+    TEST_CHECK(TAILQ_EMPTY(&alist));
+  }
 
   {
     struct AddressList alist = TAILQ_HEAD_INITIALIZER(alist);
-    mutt_addrlist_parse(&alist, "apple");
-    TEST_CHECK(TAILQ_FIRST(&alist) != NULL);
+    int parsed = mutt_addrlist_parse(&alist, "apple");
+    TEST_CHECK(parsed == 1);
+    TEST_CHECK(!TAILQ_EMPTY(&alist));
+    TEST_CHECK_STR_EQ(TAILQ_FIRST(&alist)->mailbox, "apple");
     mutt_addrlist_clear(&alist);
   }
 
   {
     struct AddressList alist = TAILQ_HEAD_INITIALIZER(alist);
-    mutt_addrlist_parse(&alist, NULL);
-    TEST_CHECK(TAILQ_FIRST(&alist) == NULL);
+    int parsed = mutt_addrlist_parse(&alist, "Incomplete <address");
+    TEST_CHECK(parsed == 0);
+    TEST_CHECK(TAILQ_EMPTY(&alist));
+  }
+
+  {
+    struct AddressList alist = TAILQ_HEAD_INITIALIZER(alist);
+    int parsed = mutt_addrlist_parse(&alist,
+        "Complete <address@example.com>, Incomplete <address");
+    TEST_CHECK(parsed == 0);
+    TEST_CHECK(TAILQ_EMPTY(&alist));
+  }
+
+  {
+    struct AddressList alist = TAILQ_HEAD_INITIALIZER(alist);
+    int parsed = mutt_addrlist_parse(&alist,
+        "Simple Address <test@example.com>,"
+        "My Group: member1@group.org, member2@group.org, "
+        "\"John M. Doe\" <john@doe.org>; Another One <foo@bar.baz>");
+    TEST_CHECK(parsed == 5);
+    TEST_CHECK(!TAILQ_EMPTY(&alist));
+    struct Address *a = TAILQ_FIRST(&alist);
+    TEST_CHECK_STR_EQ("test@example.com", a->mailbox);
+    a = TAILQ_NEXT(a, entries);
+    TEST_CHECK_STR_EQ("My Group", a->mailbox);
+    TEST_CHECK(a->group == 1);
+    a = TAILQ_NEXT(a, entries);
+    TEST_CHECK_STR_EQ("member1@group.org", a->mailbox);
+    a = TAILQ_NEXT(a, entries);
+    TEST_CHECK_STR_EQ("member2@group.org", a->mailbox);
+    a = TAILQ_NEXT(a, entries);
+    TEST_CHECK_STR_EQ("john@doe.org", a->mailbox);
+    a = TAILQ_NEXT(a, entries);
+    TEST_CHECK(a->mailbox == NULL);
+    TEST_CHECK(a->group == 0);
+    a = TAILQ_NEXT(a, entries);
+    TEST_CHECK_STR_EQ("foo@bar.baz", a->mailbox);
+    a = TAILQ_NEXT(a, entries);
+    TEST_CHECK(a == NULL);
   }
 }