From 9205c9d0ab8eeb140fd5283fe9fd5858a90f92a0 Mon Sep 17 00:00:00 2001 From: vincent-richard Date: Wed, 2 Sep 2020 19:57:42 +0200 Subject: Fixed unit test for DSN support. --- tests/net/smtp/SMTPCommandTest.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'tests') diff --git a/tests/net/smtp/SMTPCommandTest.cpp b/tests/net/smtp/SMTPCommandTest.cpp index a0f03bb6..ecaf292c 100644 --- a/tests/net/smtp/SMTPCommandTest.cpp +++ b/tests/net/smtp/SMTPCommandTest.cpp @@ -114,79 +114,79 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandTest) void testMAIL() { - vmime::shared_ptr cmd = SMTPCommand::MAIL(vmime::mailbox("me@vmime.org"), false); + vmime::shared_ptr cmd = SMTPCommand::MAIL(vmime::mailbox("me@vmime.org"), false, "FULL", "dsn-unique-id"); VASSERT_NOT_NULL("Not null", cmd); - VASSERT_EQ("Text", "MAIL FROM:", cmd->getText()); + VASSERT_EQ("Text", "MAIL FROM: RET=FULL ENVID=", cmd->getText()); } void testMAIL_Encoded() { vmime::shared_ptr cmd = SMTPCommand::MAIL( - vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), false + vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), false, "FULL", "dsn-unique-id" ); VASSERT_NOT_NULL("Not null", cmd); - VASSERT_EQ("Text", "MAIL FROM:", cmd->getText()); + VASSERT_EQ("Text", "MAIL FROM: RET=FULL ENVID=", cmd->getText()); } void testMAIL_UTF8() { vmime::shared_ptr cmd = SMTPCommand::MAIL( - vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), true + vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), true, "FULL", "dsn-unique-id" ); VASSERT_NOT_NULL("Not null", cmd); - VASSERT_EQ("Text", "MAIL FROM: SMTPUTF8", cmd->getText()); + VASSERT_EQ("Text", "MAIL FROM: RET=FULL ENVID= SMTPUTF8", cmd->getText()); } void testMAIL_SIZE() { vmime::shared_ptr cmd = SMTPCommand::MAIL( - vmime::mailbox("me@vmime.org"), false, 123456789 + vmime::mailbox("me@vmime.org"), false, 123456789, "FULL", "dsn-unique-id" ); VASSERT_NOT_NULL("Not null", cmd); - VASSERT_EQ("Text", "MAIL FROM: SIZE=123456789", cmd->getText()); + VASSERT_EQ("Text", "MAIL FROM: RET=FULL ENVID= SIZE=123456789", cmd->getText()); } void testMAIL_SIZE_UTF8() { vmime::shared_ptr cmd = SMTPCommand::MAIL( - vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), true, 123456789 + vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), true, 123456789, "FULL", "dsn-unique-id" ); VASSERT_NOT_NULL("Not null", cmd); - VASSERT_EQ("Text", "MAIL FROM: SMTPUTF8 SIZE=123456789", cmd->getText()); + VASSERT_EQ("Text", "MAIL FROM: RET=FULL ENVID= SMTPUTF8 SIZE=123456789", cmd->getText()); } void testRCPT() { vmime::shared_ptr cmd = - SMTPCommand::RCPT(vmime::mailbox("someone@vmime.org"), false); + SMTPCommand::RCPT(vmime::mailbox("someone@vmime.org"), false, "NEVER"); VASSERT_NOT_NULL("Not null", cmd); - VASSERT_EQ("Text", "RCPT TO:", cmd->getText()); + VASSERT_EQ("Text", "RCPT TO: NOTIFY=NEVER", cmd->getText()); } void testRCPT_Encoded() { vmime::shared_ptr cmd = SMTPCommand::RCPT( - vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), false + vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), false, "NEVER" ); VASSERT_NOT_NULL("Not null", cmd); - VASSERT_EQ("Text", "RCPT TO:", cmd->getText()); + VASSERT_EQ("Text", "RCPT TO: NOTIFY=NEVER", cmd->getText()); } void testRCPT_UTF8() { vmime::shared_ptr cmd = SMTPCommand::RCPT( - vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), true + vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), true, "NEVER" ); VASSERT_NOT_NULL("Not null", cmd); - VASSERT_EQ("Text", "RCPT TO:", cmd->getText()); + VASSERT_EQ("Text", "RCPT TO: NOTIFY=NEVER", cmd->getText()); } void testRSET() { -- cgit v1.2.3