Skip to content

Commit

Permalink
chore: improve code style
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-virkus committed Jan 22, 2024
1 parent cec51a5 commit 4acff84
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 158 deletions.
4 changes: 0 additions & 4 deletions lib/src/message_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1360,8 +1360,6 @@ class MessageBuilder extends PartBuilder {
MimeMessage? replyToMessage,
bool replyToSimplifyReferences = false,
String? messageId,
bool isChat = false,
String? chatGroupId,
CharacterSet characterSet = CharacterSet.utf8,
TransferEncoding transferEncoding = TransferEncoding.quotedPrintable,
}) {
Expand All @@ -1377,8 +1375,6 @@ class MessageBuilder extends PartBuilder {
..originalMessage = replyToMessage
..replyToSimplifyReferences = replyToSimplifyReferences
..messageId = messageId
..isChat = isChat
..chatGroupId = chatGroupId
..characterSet = characterSet
..transferEncoding = transferEncoding;

Expand Down
2 changes: 1 addition & 1 deletion lib/src/private/imap/search_parser.dart
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class SearchParser extends ResponseParser<SearchImapResult> {
if (entry == '(TAG') {
i++;
tag = listEntries[i].substring(1, listEntries[i].length - 2);
} else if (entry == 'UID') {
// } else if (entry == 'UID') {
// Included for completeness.
} else if (entry == 'MIN') {
i++;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/private/imap/sort_parser.dart
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class SortParser extends ResponseParser<SortImapResult> {
if (entry == '(TAG') {
i++;
tag = listEntries[i].substring(1, listEntries[i].length - 2);
} else if (entry == 'UID') {
// } else if (entry == 'UID') {
// Included for completeness.
} else if (entry == 'MIN') {
i++;
Expand Down
152 changes: 0 additions & 152 deletions test/message_builder_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -114,158 +114,6 @@ void main() {
);
//print(message.renderMessage());
});

test('Simple chat message', () {
const from = MailAddress('Personal Name', 'sender@domain.com');
final to = [
const MailAddress('Recipient Personal Name', 'recipient@domain.com'),
];
const subject = 'Hello from test';
const text =
'Hello World - here\'s some text that should spans two lines in the '
'end when this sentence is finished.';
final message = MessageBuilder.buildSimpleTextMessage(
from,
to,
text,
subject: subject,
isChat: true,
);
expect(message.getHeaderValue('subject'), 'Hello from test');
var id = message.getHeaderValue('message-id') ?? '';
expect(id, isNotNull);
expect(id.startsWith('<chat\$'), isTrue);
expect(message.getHeaderValue('date'), isNotNull);
expect(
message.getHeaderValue('from'),
'"Personal Name" <sender@domain.com>',
);
expect(
message.getHeaderValue('to'),
'"Recipient Personal Name" <recipient@domain.com>',
);
expect(
message.getHeaderValue('Content-Type'),
'text/plain; charset="utf-8"',
);
expect(
message.getHeaderValue('Content-Transfer-Encoding'),
'quoted-printable',
);

final messageText = message.renderMessage();
//print(messageText);
final parsed = MimeMessage.parseFromText(messageText);

expect(parsed.getHeaderValue('subject'), 'Hello from test');
id = parsed.getHeaderValue('message-id') ?? '';
expect(id, isNotNull);
expect(id.startsWith('<chat\$'), isTrue);
expect(parsed.getHeaderValue('date'), isNotNull);
expect(
parsed.getHeaderValue('from'),
'"Personal Name" <sender@domain.com>',
);
expect(
parsed.getHeaderValue('to'),
'"Recipient Personal Name" <recipient@domain.com>',
);
expect(
parsed.getHeaderValue('Content-Type'),
'text/plain; charset="utf-8"',
);
expect(
parsed.getHeaderValue('Content-Transfer-Encoding'),
'quoted-printable',
);
expect(
parsed.decodeContentText(),
'Hello World - here\'s some text that should spans two lines in the '
'end when this sentence is finished.',
);
});

test('Simple chat group message', () {
const from = MailAddress('Personal Name', 'sender@domain.com');
final to = [
const MailAddress('Recipient Personal Name', 'recipient@domain.com'),
const MailAddress('Other Recipient', 'other@domain.com'),
];
const subject = 'Hello from test';
const text =
'Hello World - here\s some text that should spans two lines in the '
'end when this sentence is finished.';
final message = MessageBuilder.buildSimpleTextMessage(
from,
to,
text,
subject: subject,
isChat: true,
chatGroupId: '1234abc123',
);
expect(message.getHeaderValue('subject'), 'Hello from test');
var id = message.getHeaderValue('message-id') ?? '';
expect(id, isNotNull);
expect(id.startsWith('<chat\$group.1234abc123.'), isTrue);
expect(message.getHeaderValue('date'), isNotNull);
expect(
message.getHeaderValue('from'),
'"Personal Name" <sender@domain.com>',
);
expect(
message.getHeaderValue('to'),
'"Recipient Personal Name" <recipient@domain.com>, '
'"Other Recipient" <other@domain.com>',
);
expect(
message.getHeaderValue('Content-Type'),
'text/plain; charset="utf-8"',
);
expect(
message.getHeaderValue('Content-Transfer-Encoding'),
'quoted-printable',
);

final buffer = StringBuffer();
message.render(buffer);
final messageText = buffer.toString();
//print(messageText);
final parsed = MimeMessage.parseFromText(messageText);

expect(parsed.getHeaderValue('subject'), 'Hello from test');
id = parsed.getHeaderValue('message-id') ?? '';
expect(id, isNotNull);
expect(id.startsWith('<chat\$group.1234abc123.'), isTrue);
expect(parsed.getHeaderValue('date'), isNotNull);
expect(
parsed.getHeaderValue('from'),
'"Personal Name" <sender@domain.com>',
);
final toRecipients = parsed.decodeHeaderMailAddressValue('to') ?? [];
expect(toRecipients, isNotNull);
expect(toRecipients.length, 2);
expect(toRecipients[0].email, 'recipient@domain.com');
expect(toRecipients[0].hostName, 'domain.com');
expect(toRecipients[0].mailboxName, 'recipient');
expect(toRecipients[0].personalName, 'Recipient Personal Name');
expect(toRecipients[1].email, 'other@domain.com');
expect(toRecipients[1].hostName, 'domain.com');
expect(toRecipients[1].mailboxName, 'other');
expect(toRecipients[1].personalName, 'Other Recipient');
expect(
parsed.getHeaderValue('Content-Type'),
'text/plain; charset="utf-8"',
);
expect(
parsed.getHeaderValue('Content-Transfer-Encoding'),
'quoted-printable',
);
expect(
parsed.decodeContentText(),
'Hello World - here\s some text that should spans two lines in the '
'end when this sentence is finished.',
);
});
});

group('multipart tests', () {
Expand Down

0 comments on commit 4acff84

Please sign in to comment.