From d7a1b5817e8389e9a4ea3d33c4dd250df9c6860c Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Thu, 14 Dec 2017 22:11:58 +0100
Subject: Issue #186: SMTPUTF8 is not an argument to RCPT + UTF8 in recipient
 address must switch the whole message to SMTPUTF8.

---
 tests/net/smtp/SMTPTransportTestUtils.hpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'tests/net/smtp/SMTPTransportTestUtils.hpp')

diff --git a/tests/net/smtp/SMTPTransportTestUtils.hpp b/tests/net/smtp/SMTPTransportTestUtils.hpp
index cfd830cf..b5af2f10 100644
--- a/tests/net/smtp/SMTPTransportTestUtils.hpp
+++ b/tests/net/smtp/SMTPTransportTestUtils.hpp
@@ -607,7 +607,7 @@ public:
 		{
 			m_rcptLines.insert("RCPT TO:<recipient1@test.vmime.org>");
 			m_rcptLines.insert("RCPT TO:<recipient2@test.vmime.org>");
-			m_rcptLines.insert("RCPT TO:<récepteur@test.vmime.org> SMTPUTF8");
+			m_rcptLines.insert("RCPT TO:<récepteur@test.vmime.org>");
 		}
 		else
 		{
@@ -681,11 +681,19 @@ public:
 
 				if (SUPPORTS_UTF8)
 				{
-					VASSERT_EQ("MAIL", std::string("MAIL FROM:<expéditeur@test.vmime.org> SMTPUTF8"), line);
+					VASSERT(
+						"MAIL",
+						   std::string("MAIL FROM:<expediteur@test.vmime.org> SMTPUTF8") == line
+						|| std::string("MAIL FROM:<expéditeur@test.vmime.org> SMTPUTF8") == line
+					);
 				}
 				else
 				{
-					VASSERT_EQ("MAIL", std::string("MAIL FROM:<=?utf-8?Q?exp=C3=A9diteur?=@test.vmime.org>"), line);
+					VASSERT(
+						"MAIL",
+						   std::string("MAIL FROM:<expediteur@test.vmime.org>") == line
+						|| std::string("MAIL FROM:<=?utf-8?Q?exp=C3=A9diteur?=@test.vmime.org>") == line
+					);
 				}
 
 				localSend("250 OK\r\n");
-- 
cgit v1.2.3