From 681ca375fd5af01501a91a78214ab7a26ad67ac7 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 9 Jul 2018 17:20:37 +0300 Subject: Make basic_url(string) ctor to consider empty string as invalid argument --- tests/url/driver.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tests/url/driver.cxx') diff --git a/tests/url/driver.cxx b/tests/url/driver.cxx index 5fbeaa2..64bc2b5 100644 --- a/tests/url/driver.cxx +++ b/tests/url/driver.cxx @@ -169,9 +169,8 @@ try // Test ctors and operators. // { - wurl u0 ((wstring ())); + wurl u0; assert (u0.empty ()); - assert (u0 == wurl ()); wurl u1 (scheme::http, wurl_authority {wstring (), wurl_host (L"[123]"), 0}, @@ -288,7 +287,7 @@ try { case print_mode::str: { - cout << url (ua) << endl; + cout << (*ua != '\0' ? url (ua) : url ()) << endl; break; } case print_mode::wstr: @@ -297,7 +296,7 @@ try // wstring s (ua, ua + strlen (ua)); - wcout << wurl (s) << endl; + wcout << (!s.empty () ? wurl (s) : wurl ()) << endl; break; } case print_mode::comp: @@ -305,7 +304,10 @@ try // Convert ASCII string to wstring. // wstring s (ua, ua + strlen (ua)); - wurl u (s); + + wurl u; + if (!s.empty ()) + u = wurl (s); if (!u.empty ()) { -- cgit v1.1