2 files changed, 115 insertions, 0 deletions

diff --git a/tests/parser/mailboxGroupTest.cpp b/tests/parser/mailboxGroupTest.cpp
new file mode 100644
index 00000000..49d22658
--- /dev/null
+++ b/tests/parser/mailboxGroupTest.cpp
@@ -0,0 +1,97 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2013 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+
+VMIME_TEST_SUITE_BEGIN(mailboxGroupTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testParseExtraWhitespaces)
+		VMIME_TEST(testParseNoEndDelimiter)
+		VMIME_TEST(testParseExtraChars)
+		VMIME_TEST(testEmptyGroup)
+	VMIME_TEST_LIST_END
+
+
+	void testParseExtraWhitespaces()
+	{
+		vmime::mailboxGroup mgrp;
+		mgrp.parse(" \t group  : aaa <[email protected]>, bbb <[email protected]>");
+
+		VASSERT_EQ("name", "group", mgrp.getName().getWholeBuffer());
+		VASSERT_EQ("count", 2, mgrp.getMailboxCount());
+
+		VASSERT_EQ("mbox1.email", "[email protected]", mgrp.getMailboxAt(0)->getEmail());
+		VASSERT_EQ("mbox1.name", "aaa", mgrp.getMailboxAt(0)->getName());
+
+		VASSERT_EQ("mbox2.email", "[email protected]", mgrp.getMailboxAt(1)->getEmail());
+		VASSERT_EQ("mbox2.name", "bbb", mgrp.getMailboxAt(1)->getName());
+	}
+
+	void testParseNoEndDelimiter()
+	{
+		vmime::addressList addrs;
+		addrs.parse("group: aaa <[email protected]>, bbb <[email protected]>");
+
+		VASSERT_EQ("count", 1, addrs.getAddressCount());
+		VASSERT_TRUE("is group", addrs.getAddressAt(0)->isGroup());
+
+		vmime::ref <vmime::mailboxGroup> mgrp =
+			addrs.getAddressAt(0).dynamicCast <vmime::mailboxGroup>();
+
+		VASSERT_EQ("name", "group", mgrp->getName().getWholeBuffer());
+		VASSERT_EQ("count", 2, mgrp->getMailboxCount());
+
+		VASSERT_EQ("mbox1.email", "[email protected]", mgrp->getMailboxAt(0)->getEmail());
+		VASSERT_EQ("mbox1.name", "aaa", mgrp->getMailboxAt(0)->getName());
+
+		VASSERT_EQ("mbox2.email", "[email protected]", mgrp->getMailboxAt(1)->getEmail());
+		VASSERT_EQ("mbox2.name", "bbb", mgrp->getMailboxAt(1)->getName());
+	}
+
+	void testParseExtraChars()
+	{
+		vmime::mailboxGroup mgrp;
+		mgrp.parse("group: aaa <[email protected]>, bbb <[email protected]>; extra chars here...");
+
+		VASSERT_EQ("name", "group", mgrp.getName().getWholeBuffer());
+		VASSERT_EQ("count", 2, mgrp.getMailboxCount());
+
+		VASSERT_EQ("mbox1.email", "[email protected]", mgrp.getMailboxAt(0)->getEmail());
+		VASSERT_EQ("mbox1.name", "aaa", mgrp.getMailboxAt(0)->getName());
+
+		VASSERT_EQ("mbox2.email", "[email protected]", mgrp.getMailboxAt(1)->getEmail());
+		VASSERT_EQ("mbox2.name", "bbb", mgrp.getMailboxAt(1)->getName());
+	}
+
+	void testEmptyGroup()
+	{
+		vmime::mailboxGroup mgrp;
+		mgrp.parse("Undisclosed recipients:;");
+
+		VASSERT_EQ("name", "Undisclosed recipients", mgrp.getName().getWholeBuffer());
+		VASSERT_EQ("count", 0, mgrp.getMailboxCount());
+	}
+
+VMIME_TEST_SUITE_END
diff --git a/tests/parser/mailboxTest.cpp b/tests/parser/mailboxTest.cpp
index a6e46577..e6e4a608 100644
--- a/tests/parser/mailboxTest.cpp
+++ b/tests/parser/mailboxTest.cpp
@@ -29,6 +29,7 @@ VMIME_TEST_SUITE_BEGIN(mailboxTest)
 	VMIME_TEST_LIST_BEGIN
 		VMIME_TEST(testParse)
 		VMIME_TEST(testEmptyEmailAddress)
+		VMIME_TEST(testSeparatorInComment)
 	VMIME_TEST_LIST_END
 
 
@@ -124,5 +125,22 @@ VMIME_TEST_SUITE_BEGIN(mailboxTest)
 		VASSERT_EQ("email", "", mbox->getEmail());
 	}
 
+	void testSeparatorInComment()
+	{
+		vmime::addressList addrList;
+		addrList.parse("aaa(comment,comment)@vmime.org, [email protected]");
+
+		VASSERT_EQ("count", 2, addrList.getAddressCount());
+
+		vmime::ref <vmime::mailbox> mbox1 = addrList.getAddressAt(0).dynamicCast <vmime::mailbox>();
+		vmime::ref <vmime::mailbox> mbox2 = addrList.getAddressAt(1).dynamicCast <vmime::mailbox>();
+
+		VASSERT_EQ("name1", vmime::text(), mbox1->getName());
+		VASSERT_EQ("email1", "[email protected]", mbox1->getEmail());
+
+		VASSERT_EQ("name2", vmime::text(), mbox2->getName());
+		VASSERT_EQ("email2", "[email protected]", mbox2->getEmail());
+	}
+
 VMIME_TEST_SUITE_END