diff options
| author | Vincent Richard <[email protected]> | 2013-11-15 20:46:03 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2013-11-15 20:46:03 +0000 |
| commit | e760842265e2dd3d352b59164cb8fda64420a5a9 (patch) | |
| tree | 82514c1721be049b9d84613c1ec7a12457cebaab /tests/utility/urlTest.cpp | |
| parent | Custom fetch attributes. (diff) | |
| download | vmime-e760842265e2dd3d352b59164cb8fda64420a5a9.tar.gz vmime-e760842265e2dd3d352b59164cb8fda64420a5a9.zip | |
Use "std::map" instead of "propertySet" in url class.
Diffstat (limited to 'tests/utility/urlTest.cpp')
| -rw-r--r-- | tests/utility/urlTest.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/tests/utility/urlTest.cpp b/tests/utility/urlTest.cpp index 6703ecd3..85991511 100644 --- a/tests/utility/urlTest.cpp +++ b/tests/utility/urlTest.cpp @@ -164,29 +164,29 @@ VMIME_TEST_SUITE_BEGIN(urlTest) vmime::utility::url u1("", ""); VASSERT_EQ("1.1", true, parseHelper(u1, "proto://host/path?p1=v1&p2=v2")); - VASSERT_EQ("1.2", "v1", u1.getParams().getProperty <vmime::string>("p1")); - VASSERT_EQ("1.3", "v2", u1.getParams().getProperty <vmime::string>("p2")); + VASSERT_EQ("1.2", "v1", u1.getParams()["p1"]); + VASSERT_EQ("1.3", "v2", u1.getParams()["p2"]); VASSERT_EQ("1.4", "/path", u1.getPath()); vmime::utility::url u2("", ""); VASSERT_EQ("2.1", true, parseHelper(u2, "proto://host/path?p1=v1&p2")); - VASSERT_EQ("2.2", "v1", u2.getParams().getProperty <vmime::string>("p1")); - VASSERT_EQ("2.3", "p2", u2.getParams().getProperty <vmime::string>("p2")); + VASSERT_EQ("2.2", "v1", u2.getParams()["p1"]); + VASSERT_EQ("2.3", "p2", u2.getParams()["p2"]); VASSERT_EQ("2.4", "/path", u2.getPath()); vmime::utility::url u3("", ""); VASSERT_EQ("3.1", true, parseHelper(u3, "proto://host/?p1=v1&p2=v2")); - VASSERT_EQ("3.2", "v1", u3.getParams().getProperty <vmime::string>("p1")); - VASSERT_EQ("3.3", "v2", u3.getParams().getProperty <vmime::string>("p2")); + VASSERT_EQ("3.2", "v1", u3.getParams()["p1"]); + VASSERT_EQ("3.3", "v2", u3.getParams()["p2"]); VASSERT_EQ("3.4", "", u3.getPath()); vmime::utility::url u4("", ""); VASSERT_EQ("4.1", true, parseHelper(u4, "proto://host/path?p1=%3D&%3D=v2")); - VASSERT_EQ("4.2", "=", u4.getParams().getProperty <vmime::string>("p1")); - VASSERT_EQ("4.3", "v2", u4.getParams().getProperty <vmime::string>("=")); + VASSERT_EQ("4.2", "=", u4.getParams()["p1"]); + VASSERT_EQ("4.3", "v2", u4.getParams()["="]); VASSERT_EQ("4.4", "/path", u4.getPath()); } @@ -211,14 +211,17 @@ VMIME_TEST_SUITE_BEGIN(urlTest) VASSERT_EQ("2", "proto://host", static_cast <vmime::string>(u2)); vmime::utility::url u3("proto", "host"); - u3.getParams().setProperty("p1", "v1"); + u3.getParams()["p1"] = "v1"; VASSERT_EQ("3.1", "proto://host/?p1=v1", static_cast <vmime::string>(u3)); - u3.getParams().setProperty("p2", "v2"); + u3.getParams()["p2"] = "v2"; VASSERT_EQ("3.2", "proto://host/?p1=v1&p2=v2", static_cast <vmime::string>(u3)); - u3.getParams().setProperty("&", "="); - VASSERT_EQ("3.3", "proto://host/?p1=v1&p2=v2&%26=%3D", + + // Test special characters + u3.getParams().clear(); + u3.getParams()["&"] = "="; + VASSERT_EQ("3.3", "proto://host/?%26=%3D", static_cast <vmime::string>(u3)); } |