Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final wxURI API changes. Changed Get to BuildURI to better reflect what its doing. Added wxURI::Unescape to unescape characters in a url or uri. Added wxURI::BuildUnescapedURI. Changed the wxURL convertXXXuri methods to use uri methods instead, and depreciated these methods.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-10-28 09:57:43 +00:00
parent cedea72ffa
commit 86470d432f
8 changed files with 126 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/uris/uris.cpp
View File

@@ -26,7 +26,7 @@
#include "wx/cppunit.h"
// Test wxURL & wxURI compat?
#define TEST_URL 0
#define TEST_URL 1
// ----------------------------------------------------------------------------
// test class
@@ -65,7 +65,7 @@ private:
void Assignment();
void Comparison();
#if 1
#if TEST_URL
void URLCompat();
#endif
@@ -159,14 +159,14 @@ void URITestCase::Paths()
uri->GetPath() == wxT("/path/"));
URI_TEST("path/john/../../../joe",
uri->Get() == wxT("../joe"));
uri->BuildURI() == wxT("../joe"));
}
#undef URI_TEST
#define URI_TEST_RESOLVE(string, eq, strict) \
uri = new wxURI(wxT(string));\
uri->Resolve(masteruri, strict);\
CPPUNIT_ASSERT(uri->Get() == wxT(eq));\
CPPUNIT_ASSERT(uri->BuildURI() == wxT(eq));\
delete uri;
#define URI_TEST(string, eq) \
@@ -267,7 +267,7 @@ void URITestCase::Assignment()
uri2 = uri1;
CPPUNIT_ASSERT(uri1.Get() == uri2.Get());
CPPUNIT_ASSERT(uri1.BuildURI() == uri2.BuildURI());
}
void URITestCase::Comparison()
@@ -305,6 +305,9 @@ void URITestCase::URLCompat()
CPPUNIT_ASSERT( uricopy == url );
CPPUNIT_ASSERT( uricopy == urlcopy );
CPPUNIT_ASSERT( uricopy == uri );
#if WXWIN_COMPATIBILITY_2_4
CPPUNIT_ASSERT( wxURL::ConvertFromURI(wxT("%20%41%20")) == wxT(" A ") );
#endif
}
#endif