Skip to content

Commit 1e6ee08

Browse files
committed
Fixed unit tests accordingly
1 parent ec46abe commit 1e6ee08

17 files changed

+35
-24
lines changed

src/core/renderer/MCAddressDisplay.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,18 @@ String * AddressDisplay::veryShortDisplayStringForAddress(Address * address)
8383

8484
String * AddressDisplay::displayStringForAddresses(Array * addresses)
8585
{
86-
return Address::nonEncodedRFC822StringForAddresses(addresses);
86+
String * result = String::string();
87+
if (addresses == NULL) {
88+
return result;
89+
}
90+
for(unsigned int i = 0 ; i < addresses->count() ; i ++) {
91+
Address * address = (Address *) addresses->objectAtIndex(i);
92+
if (i != 0) {
93+
result->appendString(MCSTR(", "));
94+
}
95+
result->appendString(AddressDisplay::displayStringForAddress(address));
96+
}
97+
return result;
8798
}
8899

89100
String * AddressDisplay::shortDisplayStringForAddresses(Array * addresses)

unittest/data/summary/output/1021-chinese.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
From:"向左"<[email protected]>
2-
To:"189佑"<[email protected]>
1+
From:向左<[email protected]>
2+
33
Subject:哈哈
44
Date:December 23, 2014 at 12:09:33 PM PST
55

unittest/data/summary/output/1433-utf-8.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From:"プレスネットワーク"<[email protected]>
1+
From:プレスネットワーク<[email protected]>
22
33
Subject:[PressNetwork Digest] 2010年12月21日(火) [2件]
44
Date:December 21, 2010 at 1:11:28 PM PST

unittest/data/summary/output/1460-no-charset.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From:"プレスネットワーク"<[email protected]>
1+
From:プレスネットワーク<[email protected]>
22
33
Subject:[PressNetwork Digest] 2010年12月08日(水) [3件]
44
Date:December 8, 2010 at 1:12:04 PM PST

unittest/data/summary/output/1640-no-charset.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
From:"멜론"<[email protected]>
2-
To:"멜론고객님"<[email protected]>
1+
From:멜론<[email protected]>
2+
To:멜론고객님<[email protected]>
33
Subject:[멜론] 이용약관 및 서비스 상품약관 변경 안내
44
Date:December 8, 2009 at 6:01:00 AM PST
55

unittest/data/summary/output/2977-chinese.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
From:Chris Yip<[email protected]>
2-
To:"雅琪 王"<[email protected]>
2+
To:雅琪 王<[email protected]>
33
Subject:Headset
44
Date:May 3, 2011 at 11:35:09 PM PDT
55

unittest/data/summary/output/4489-to-field-chinese.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
From:Naiqi Xiao<[email protected]>
2-
To:"王 琦君"<[email protected]>
2+
To:王 琦君<[email protected]>
33
Subject:测试费表格
44
Date:October 8, 2011 at 6:37:46 PM PDT
55

unittest/data/summary/output/4925-japanese.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From:"ETCマイレージサービス事務局"<[email protected]>
1+
From:ETCマイレージサービス事務局<[email protected]>
22
To:Undisclosed recipient
33
Subject:ETCマイレージからのお知らせ
44
Date:November 15, 2011 at 3:08:51 PM PST

unittest/data/summary/output/5229-cyrillic-asian.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From:"Иван Винников"<[email protected]>
2-
To:"'Эльдар Мустафин'"<[email protected]>, "'Руслан Лобачев'"<[email protected]>
3-
Cc:"Дмитрий Денискин"<[email protected]>
1+
From:Иван Винников<[email protected]>
2+
To:'Эльдар Мустафин'<[email protected]>, 'Руслан Лобачев'<[email protected]>
3+
Cc:Дмитрий Денискин<[email protected]>
44
Subject:REGGI
55
Date:December 22, 2011 at 4:13:00 AM PST
66

unittest/data/summary/output/6094-japanese-1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
From:"うるの拓也"<[email protected]>
2-
To:"吉田学( I.B.S)"<[email protected]>
1+
From:うるの拓也<[email protected]>
2+
To:吉田学( I.B.S)<[email protected]>
33
Subject:緊急ミーティング
44
Date:June 10, 2012 at 7:05:22 PM PDT
55

0 commit comments

Comments
 (0)