Do not use Tooltips if they are disabled

[wxWidgets.git] / tests / uris / uris.cpp

diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index 3152be43aa744f1a6c2d9bb50d7a2aadae538331..f2cc591394b5fff3f31e92aab102661bf72d27ee 100644 (file)
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -25,7 +25,12 @@
 #include "wx/url.h"
 
 // Test wxURL & wxURI compat?
 #include "wx/url.h"
 
 // Test wxURL & wxURI compat?

-#define TEST_URL ( 1 && wxUSE_URL )
+#define TEST_URL wxUSE_URL
+
+// Define this as 1 to test network connections, this is disabled by default as
+// some machines running automatic builds don't allow outgoing connections and
+// so the tests fail
+#define TEST_NETWORK 0

 
 // ----------------------------------------------------------------------------
 // test class
 
 // ----------------------------------------------------------------------------
 // test class


@@ -40,7 +45,9 @@ private:
     CPPUNIT_TEST_SUITE( URITestCase );
         CPPUNIT_TEST( IPv4 );
         CPPUNIT_TEST( IPv6 );
     CPPUNIT_TEST_SUITE( URITestCase );
         CPPUNIT_TEST( IPv4 );
         CPPUNIT_TEST( IPv6 );

+        CPPUNIT_TEST( Server );

         CPPUNIT_TEST( Paths );
         CPPUNIT_TEST( Paths );

+        CPPUNIT_TEST( UserAndPass );

         CPPUNIT_TEST( NormalResolving );
         CPPUNIT_TEST( ComplexResolving );
         CPPUNIT_TEST( ReallyComplexResolving );
         CPPUNIT_TEST( NormalResolving );
         CPPUNIT_TEST( ComplexResolving );
         CPPUNIT_TEST( ReallyComplexResolving );


@@ -48,15 +55,21 @@ private:
         CPPUNIT_TEST( BackwardsResolving );
         CPPUNIT_TEST( Assignment );
         CPPUNIT_TEST( Comparison );
         CPPUNIT_TEST( BackwardsResolving );
         CPPUNIT_TEST( Assignment );
         CPPUNIT_TEST( Comparison );

+        CPPUNIT_TEST( Unescaping );
+        CPPUNIT_TEST( FileScheme );

 #if TEST_URL
         CPPUNIT_TEST( URLCompat );
 #if TEST_URL
         CPPUNIT_TEST( URLCompat );

+#if 0 && wxUSE_PROTOCOL_HTTP

         CPPUNIT_TEST( URLProxy  );
         CPPUNIT_TEST( URLProxy  );

+#endif

 #endif
     CPPUNIT_TEST_SUITE_END();
 
     void IPv4();
     void IPv6();
 #endif
     CPPUNIT_TEST_SUITE_END();
 
     void IPv4();
     void IPv6();

+    void Server();

     void Paths();
     void Paths();

+    void UserAndPass();

     void NormalResolving();
     void ComplexResolving();
     void ReallyComplexResolving();
     void NormalResolving();
     void ComplexResolving();
     void ReallyComplexResolving();


@@ -64,10 +77,14 @@ private:
     void BackwardsResolving();
     void Assignment();
     void Comparison();
     void BackwardsResolving();
     void Assignment();
     void Comparison();

+    void Unescaping();
+    void FileScheme();

 
 #if TEST_URL
     void URLCompat();
 
 #if TEST_URL
     void URLCompat();

+#if 0 && wxUSE_PROTOCOL_HTTP

     void URLProxy();
     void URLProxy();

+#endif

 #endif
 
     DECLARE_NO_COPY_CLASS(URITestCase)
 #endif
 
     DECLARE_NO_COPY_CLASS(URITestCase)


@@ -83,41 +100,37 @@ URITestCase::URITestCase()
 {
 }
 
 {
 }
 

+// apply the given accessor to the URI, check that the result is as expected
+#define URI_ASSERT_PART_EQUAL(uri, expected, accessor) \
+    CPPUNIT_ASSERT_EQUAL(expected, wxURI(uri).accessor)

 
 

-#define URI_TEST(uristring, cond) \
-    uri = new wxURI(wxT(uristring));\
-    CPPUNIT_ASSERT(cond);\
-    delete uri;
+#define URI_ASSERT_HOSTTYPE_EQUAL(uri, expected) \
+    URI_ASSERT_PART_EQUAL((uri), (expected), GetHostType())

 
 

-#define URI_PRINT(uri)\
-    wxPrintf(wxT("SCHEME:%s\n"), uri.GetScheme());\
-    wxPrintf(wxT("USER:%s\n"), uri.GetUser());\
-    wxPrintf(wxT("SERVER:%s\n"), uri.GetServer());\
-    wxPrintf(wxT("PORT:%s\n"), uri.GetPort());\
-    wxPrintf(wxT("PATH:%s\n"), uri.GetPath());\
-    wxPrintf(wxT("QUERY:%s\n"), uri.GetQuery());\
-    wxPrintf(wxT("FRAGMENT:%s\n"), uri.GetFragment());
+#define URI_ASSERT_SERVER_EQUAL(uri, expected) \
+    URI_ASSERT_PART_EQUAL((uri), (expected), GetServer())

 
 

-void URITestCase::IPv4()
-{
-    wxURI* uri;
+#define URI_ASSERT_PATH_EQUAL(uri, expected) \
+    URI_ASSERT_PART_EQUAL((uri), (expected), GetPath())

 
 

+#define URI_ASSERT_USER_EQUAL(uri, expected) \
+    URI_ASSERT_PART_EQUAL((uri), (expected), GetUser())

 
 

-    URI_TEST("http://user:password@192.168.1.100:5050/path",
-            uri->GetHostType() == wxURI_IPV4ADDRESS);
+void URITestCase::IPv4()
+{
+    URI_ASSERT_HOSTTYPE_EQUAL("http://user:password@192.168.1.100:5050/path",
+                            wxURI_IPV4ADDRESS);

 
 

-    URI_TEST("http://user:password@192.255.1.100:5050/path",
-            uri->GetHostType() == wxURI_IPV4ADDRESS);
+    URI_ASSERT_HOSTTYPE_EQUAL("http://user:password@192.255.1.100:5050/path",
+                            wxURI_IPV4ADDRESS);

 
 

-    //bogus ipv4
-    URI_TEST("http://user:password@192.256.1.100:5050/path",
-            uri->GetHostType() != wxURI_IPV4ADDRESS);
+    // bogus ipv4
+    CPPUNIT_ASSERT( wxURI("http://user:password@192.256.1.100:5050/path").
+                    GetHostType() != wxURI_IPV4ADDRESS);

 }
 
 void URITestCase::IPv6()
 {
 }
 
 void URITestCase::IPv6()
 {

-    wxURI* uri;
-

     // IPv6address   =                            6( h16 ":" ) ls32
     //               /                       "::" 5( h16 ":" ) ls32
     //               / [               h16 ] "::" 4( h16 ":" ) ls32
     // IPv6address   =                            6( h16 ":" ) ls32
     //               /                       "::" 5( h16 ":" ) ls32
     //               / [               h16 ] "::" 4( h16 ":" ) ls32


@@ -129,170 +142,248 @@ void URITestCase::IPv6()
     //               / [ *6( h16 ":" ) h16 ] "::"
     // ls32          = ( h16 ":" h16 ) / IPv4address
 
     //               / [ *6( h16 ":" ) h16 ] "::"
     // ls32          = ( h16 ":" h16 ) / IPv4address
 

-    URI_TEST("http://user:password@[aa:aa:aa:aa:aa:aa:192.168.1.100]:5050/path",
-                uri->GetHostType() == wxURI_IPV6ADDRESS);
-
-    URI_TEST("http://user:password@[aa:aa:aa:aa:aa:aa:aa:aa]:5050/path",
-                uri->GetHostType() == wxURI_IPV6ADDRESS);
-
-    URI_TEST("http://user:password@[aa:aa:aa:aa::192.168.1.100]:5050/path",
-                uri->GetHostType() == wxURI_IPV6ADDRESS);
+    URI_ASSERT_HOSTTYPE_EQUAL
+    (
+        "http://user:password@[aa:aa:aa:aa:aa:aa:192.168.1.100]:5050/path",
+        wxURI_IPV6ADDRESS
+    );
+
+    URI_ASSERT_HOSTTYPE_EQUAL
+    (
+        "http://user:password@[aa:aa:aa:aa:aa:aa:aa:aa]:5050/path",
+        wxURI_IPV6ADDRESS
+    );
+
+    URI_ASSERT_HOSTTYPE_EQUAL
+    (
+        "http://user:password@[aa:aa:aa:aa::192.168.1.100]:5050/path",
+        wxURI_IPV6ADDRESS
+    );
+
+    URI_ASSERT_HOSTTYPE_EQUAL
+    (
+        "http://user:password@[aa:aa:aa:aa::aa:aa]:5050/path",
+        wxURI_IPV6ADDRESS
+    );
+}

 
 

-    URI_TEST("http://user:password@[aa:aa:aa:aa::aa:aa]:5050/path",
-                uri->GetHostType() == wxURI_IPV6ADDRESS);
+void URITestCase::Server()
+{
+    URI_ASSERT_SERVER_EQUAL("http://foo/", "foo");
+    URI_ASSERT_SERVER_EQUAL("http://foo-bar/", "foo-bar");
+    URI_ASSERT_SERVER_EQUAL("http://foo/bar/", "foo");
+    URI_ASSERT_SERVER_EQUAL("http://192.168.1.0/", "192.168.1.0");
+    URI_ASSERT_SERVER_EQUAL("http://192.168.1.17/", "192.168.1.17");
+    URI_ASSERT_SERVER_EQUAL("http://192.168.1.255/", "192.168.1.255");
+    URI_ASSERT_SERVER_EQUAL("http://192.168.1.1/index.html", "192.168.1.1");
+    URI_ASSERT_SERVER_EQUAL("http://[aa:aa:aa:aa::aa:aa]/foo", "aa:aa:aa:aa::aa:aa");

 }
 
 void URITestCase::Paths()
 {
 }
 
 void URITestCase::Paths()
 {

-    wxURI* uri;
+    URI_ASSERT_PATH_EQUAL("http://user:password@192.256.1.100:5050/../path",
+                          "/path");

 
 

-    //path tests
-    URI_TEST("http://user:password@192.256.1.100:5050/../path",
-        uri->GetPath() == wxT("/path"));
+    URI_ASSERT_PATH_EQUAL("http://user:password@192.256.1.100:5050/path/../",
+                          "/");

 
 

-    URI_TEST("http://user:password@192.256.1.100:5050/path/../",
-        uri->GetPath() == wxT("/"));
+    URI_ASSERT_PATH_EQUAL("http://user:password@192.256.1.100:5050/path/.",
+                          "/path/");

 
 

-    URI_TEST("http://user:password@192.256.1.100:5050/path/.",
-        uri->GetPath() == wxT("/path/"));
+    URI_ASSERT_PATH_EQUAL("http://user:password@192.256.1.100:5050/path/./",
+                          "/path/");

 
 

-    URI_TEST("http://user:password@192.256.1.100:5050/path/./",
-        uri->GetPath() == wxT("/path/"));
+    URI_ASSERT_PART_EQUAL("path/john/../../../joe",
+                          "../joe", BuildURI());
+}

 
 

-    URI_TEST("path/john/../../../joe",
-        uri->BuildURI() == wxT("../joe"));
+void URITestCase::UserAndPass()
+{
+    URI_ASSERT_USER_EQUAL("http://user:pass@host/path/", "user");
+    URI_ASSERT_USER_EQUAL("http://user@host/path/", "user");
+    URI_ASSERT_USER_EQUAL("http://host/path/", "");

 }
 }

-#undef URI_TEST

 
 

-#define URI_TEST_RESOLVE(string, eq, strict) \
-        uri = new wxURI(wxT(string));\
-        uri->Resolve(masteruri, strict);\
-        CPPUNIT_ASSERT(uri->BuildURI() == wxT(eq));\
-        delete uri;
+#define URI_TEST_RESOLVE_IMPL(string, eq, strict) \
+    { \
+        wxURI uri(string); \
+        uri.Resolve(masteruri, strict); \
+        CPPUNIT_ASSERT_EQUAL(eq, uri.BuildURI()); \
+    }
+
+#define URI_TEST_RESOLVE(string, eq) \
+        URI_TEST_RESOLVE_IMPL(string, eq, true);

 
 

-#define URI_TEST(string, eq) \
-        URI_TEST_RESOLVE(string, eq, true);
+#define URI_TEST_RESOLVE_LAX(string, eq) \
+        URI_TEST_RESOLVE_IMPL(string, eq, false);

 
 
 //examples taken from RFC 2396.bis
 
 void URITestCase::NormalResolving()
 {
 
 
 //examples taken from RFC 2396.bis
 
 void URITestCase::NormalResolving()
 {

-    wxURI masteruri(wxT("http://a/b/c/d;p?q"));
-    wxURI* uri;
-
-    URI_TEST("g:h"  ,"g:h")
-    URI_TEST("g"    ,"http://a/b/c/g")
-    URI_TEST("./g"  ,"http://a/b/c/g")
-    URI_TEST("g/"   ,"http://a/b/c/g/")
-    URI_TEST("/g"   ,"http://a/g")
-    URI_TEST("//g"  ,"http://g")
-    URI_TEST("?y"   ,"http://a/b/c/d;p?y")
-    URI_TEST("g?y"  ,"http://a/b/c/g?y")
-    URI_TEST("#s"   ,"http://a/b/c/d;p?q#s")
-    URI_TEST("g#s"  ,"http://a/b/c/g#s")
-    URI_TEST("g?y#s","http://a/b/c/g?y#s")
-    URI_TEST(";x"   ,"http://a/b/c/;x")
-    URI_TEST("g;x"  ,"http://a/b/c/g;x")
-    URI_TEST("g;x?y#s","http://a/b/c/g;x?y#s")
-
-    URI_TEST(""     ,"http://a/b/c/d;p?q")
-    URI_TEST("."    ,"http://a/b/c/")
-    URI_TEST("./"   ,"http://a/b/c/")
-    URI_TEST(".."   ,"http://a/b/")
-    URI_TEST("../"  ,"http://a/b/")
-    URI_TEST("../g" ,"http://a/b/g")
-    URI_TEST("../..","http://a/")
-    URI_TEST("../../"        ,  "http://a/")
-    URI_TEST("../../g"       ,  "http://a/g")
+    wxURI masteruri("http://a/b/c/d;p?q");
+
+    URI_TEST_RESOLVE("g:h"  ,"g:h")
+    URI_TEST_RESOLVE("g"    ,"http://a/b/c/g")
+    URI_TEST_RESOLVE("./g"  ,"http://a/b/c/g")
+    URI_TEST_RESOLVE("g/"   ,"http://a/b/c/g/")
+    URI_TEST_RESOLVE("/g"   ,"http://a/g")
+    URI_TEST_RESOLVE("//g"  ,"http://g")
+    URI_TEST_RESOLVE("?y"   ,"http://a/b/c/d;p?y")
+    URI_TEST_RESOLVE("g?y"  ,"http://a/b/c/g?y")
+    URI_TEST_RESOLVE("#s"   ,"http://a/b/c/d;p?q#s")
+    URI_TEST_RESOLVE("g#s"  ,"http://a/b/c/g#s")
+    URI_TEST_RESOLVE("g?y#s","http://a/b/c/g?y#s")
+    URI_TEST_RESOLVE(";x"   ,"http://a/b/c/;x")
+    URI_TEST_RESOLVE("g;x"  ,"http://a/b/c/g;x")
+    URI_TEST_RESOLVE("g;x?y#s","http://a/b/c/g;x?y#s")
+
+    URI_TEST_RESOLVE(""     ,"http://a/b/c/d;p?q")
+    URI_TEST_RESOLVE("."    ,"http://a/b/c/")
+    URI_TEST_RESOLVE("./"   ,"http://a/b/c/")
+    URI_TEST_RESOLVE(".."   ,"http://a/b/")
+    URI_TEST_RESOLVE("../"  ,"http://a/b/")
+    URI_TEST_RESOLVE("../g" ,"http://a/b/g")
+    URI_TEST_RESOLVE("../..","http://a/")
+    URI_TEST_RESOLVE("../../"        ,  "http://a/")
+    URI_TEST_RESOLVE("../../g"       ,  "http://a/g")

 }
 
 void URITestCase::ComplexResolving()
 {
 }
 
 void URITestCase::ComplexResolving()
 {

-    wxURI masteruri(wxT("http://a/b/c/d;p?q"));
-    wxURI* uri;
+    wxURI masteruri("http://a/b/c/d;p?q");

 
     //odd path examples
 
     //odd path examples

-    URI_TEST("/./g"   ,"http://a/g")
-    URI_TEST("/../g"  ,"http://a/g")
-    URI_TEST("g."     ,"http://a/b/c/g.")
-    URI_TEST(".g"     ,"http://a/b/c/.g")
-    URI_TEST("g.."    ,"http://a/b/c/g..")
-    URI_TEST("..g"    ,"http://a/b/c/..g")
+    URI_TEST_RESOLVE("../../../g"   , "http://a/g")
+    URI_TEST_RESOLVE("../../../../g", "http://a/g")
+
+    URI_TEST_RESOLVE("/./g"   ,"http://a/g")
+    URI_TEST_RESOLVE("/../g"  ,"http://a/g")
+    URI_TEST_RESOLVE("g."     ,"http://a/b/c/g.")
+    URI_TEST_RESOLVE(".g"     ,"http://a/b/c/.g")
+    URI_TEST_RESOLVE("g.."    ,"http://a/b/c/g..")
+    URI_TEST_RESOLVE("..g"    ,"http://a/b/c/..g")

 }
 }

-   //Should Fail
-   //"../../../g"    =  "http://a/g"
-   //"../../../../g" =  "http://a/g"

 
 void URITestCase::ReallyComplexResolving()
 {
 
 void URITestCase::ReallyComplexResolving()
 {

-    wxURI masteruri(wxT("http://a/b/c/d;p?q"));
-    wxURI* uri;
+    wxURI masteruri("http://a/b/c/d;p?q");

 
     //even more odder path examples
 
     //even more odder path examples

-    URI_TEST("./../g" ,"http://a/b/g")
-    URI_TEST("./g/."  ,"http://a/b/c/g/")
-    URI_TEST("g/./h"  ,"http://a/b/c/g/h")
-    URI_TEST("g/../h" ,"http://a/b/c/h")
-    URI_TEST("g;x=1/./y"     ,  "http://a/b/c/g;x=1/y")
-    URI_TEST("g;x=1/../y"    ,  "http://a/b/c/y")
+    URI_TEST_RESOLVE("./../g" ,"http://a/b/g")
+    URI_TEST_RESOLVE("./g/."  ,"http://a/b/c/g/")
+    URI_TEST_RESOLVE("g/./h"  ,"http://a/b/c/g/h")
+    URI_TEST_RESOLVE("g/../h" ,"http://a/b/c/h")
+    URI_TEST_RESOLVE("g;x=1/./y"     ,  "http://a/b/c/g;x=1/y")
+    URI_TEST_RESOLVE("g;x=1/../y"    ,  "http://a/b/c/y")

 }
 
 void URITestCase::QueryFragmentResolving()
 {
 }
 
 void URITestCase::QueryFragmentResolving()
 {

-    wxURI masteruri(wxT("http://a/b/c/d;p?q"));
-    wxURI* uri;
+    wxURI masteruri("http://a/b/c/d;p?q");

 
     //query/fragment ambigiousness
 
     //query/fragment ambigiousness

-    URI_TEST("g?y/./x","http://a/b/c/g?y/./x")
-    URI_TEST("g?y/../x"      ,  "http://a/b/c/g?y/../x")
-    URI_TEST("g#s/./x","http://a/b/c/g#s/./x")
-    URI_TEST("g#s/../x"      ,  "http://a/b/c/g#s/../x")
+    URI_TEST_RESOLVE("g?y/./x","http://a/b/c/g?y/./x")
+    URI_TEST_RESOLVE("g?y/../x"      ,  "http://a/b/c/g?y/../x")
+    URI_TEST_RESOLVE("g#s/./x","http://a/b/c/g#s/./x")
+    URI_TEST_RESOLVE("g#s/../x"      ,  "http://a/b/c/g#s/../x")

 }
 
 void URITestCase::BackwardsResolving()
 {
 }
 
 void URITestCase::BackwardsResolving()
 {

-    wxURI masteruri(wxT("http://a/b/c/d;p?q"));
-    wxURI* uri;
+    wxURI masteruri("http://a/b/c/d;p?q");

 
     //"NEW"
 
     //"NEW"

-    URI_TEST("http:g" ,  "http:g")         //strict
+    URI_TEST_RESOLVE("http:g" ,  "http:g")         //strict

     //bw compat
     //bw compat

-    URI_TEST_RESOLVE("http:g", "http://a/b/c/g", false);
+    URI_TEST_RESOLVE_LAX("http:g", "http://a/b/c/g");

 }
 
 void URITestCase::Assignment()
 {
 }
 
 void URITestCase::Assignment()
 {

-    wxURI uri1(wxT("http://mysite.com")),
-          uri2(wxT("http://mysite2.com"));
+    wxURI uri1("http://mysite.com"),
+          uri2("http://mysite2.com");

 
     uri2 = uri1;
 
 
     uri2 = uri1;
 

-    CPPUNIT_ASSERT(uri1.BuildURI() == uri2.BuildURI());
+    CPPUNIT_ASSERT_EQUAL(uri1.BuildURI(), uri2.BuildURI());

 }
 
 void URITestCase::Comparison()
 {
 }
 
 void URITestCase::Comparison()
 {

-    CPPUNIT_ASSERT(wxURI(wxT("http://mysite.com")) == wxURI(wxT("http://mysite.com")));
+    CPPUNIT_ASSERT(wxURI("http://mysite.com") == wxURI("http://mysite.com"));
+}
+
+void URITestCase::Unescaping()
+{
+    wxString escaped,
+             unescaped;
+
+    escaped = "http://test.com/of/file%3A%2F%2FC%3A%5Curi%5C"
+              "escaping%5Cthat%5Cseems%5Cbroken%5Csadly%5B1%5D.rss";
+
+    unescaped = wxURI(escaped).BuildUnescapedURI();
+
+    CPPUNIT_ASSERT_EQUAL( "http://test.com/of/file://C:\\uri\\"
+                          "escaping\\that\\seems\\broken\\sadly[1].rss",
+                          unescaped );
+
+    CPPUNIT_ASSERT_EQUAL( unescaped, wxURI::Unescape(escaped) );
+
+
+    escaped = "http://ru.wikipedia.org/wiki/"
+              "%D0%A6%D0%B5%D0%BB%D0%BE%D0%B5_%D1%87%D0%B8%D1%81%D0%BB%D0%BE";
+
+    unescaped = wxURI::Unescape(escaped);
+
+    CPPUNIT_ASSERT_EQUAL( wxString::FromUTF8(
+                            "http://ru.wikipedia.org/wiki/"
+                            "\xD0\xA6\xD0\xB5\xD0\xBB\xD0\xBE\xD0\xB5_"
+                            "\xD1\x87\xD0\xB8\xD1\x81\xD0\xBB\xD0\xBE"
+                          ),
+                          unescaped );
+}
+
+void URITestCase::FileScheme()
+{
+    //file:// variety (NOT CONFORMING TO THE RFC)
+    URI_ASSERT_PATH_EQUAL( "file://e:/wxcode/script1.xml",
+                    "e:/wxcode/script1.xml" );
+
+    //file:/// variety
+    URI_ASSERT_PATH_EQUAL( "file:///e:/wxcode/script1.xml",
+                    "/e:/wxcode/script1.xml" );
+
+    //file:/ variety
+    URI_ASSERT_PATH_EQUAL( "file:/e:/wxcode/script1.xml",
+                    "/e:/wxcode/script1.xml" );
+
+    //file: variety
+    URI_ASSERT_PATH_EQUAL( "file:e:/wxcode/script1.xml",
+                    "e:/wxcode/script1.xml" );

 }
 
 #if TEST_URL
 
 #include "wx/url.h"
 }
 
 #if TEST_URL
 
 #include "wx/url.h"

+#include "wx/file.h"

 
 void URITestCase::URLCompat()
 {
 
 void URITestCase::URLCompat()
 {

-    wxURL url(wxT("http://user:password@wxwidgets.org"));
+    wxURL url("http://user:password@wxwidgets.org");

 
     CPPUNIT_ASSERT(url.GetError() == wxURL_NOERR);
 
 
     CPPUNIT_ASSERT(url.GetError() == wxURL_NOERR);
 

+#if TEST_NETWORK

     wxInputStream* pInput = url.GetInputStream();
 
     CPPUNIT_ASSERT( pInput != NULL );
     wxInputStream* pInput = url.GetInputStream();
 
     CPPUNIT_ASSERT( pInput != NULL );

+#endif

 
 

-    CPPUNIT_ASSERT( url == wxURL(wxT("http://user:password@wxwidgets.org")) );
+    CPPUNIT_ASSERT( url == wxURL("http://user:password@wxwidgets.org") );

 
 

-    wxURI uri(wxT("http://user:password@wxwidgets.org"));
+    wxURI uri("http://user:password@wxwidgets.org");

 
     CPPUNIT_ASSERT( url == uri );
 
 
     CPPUNIT_ASSERT( url == uri );
 


@@ -306,22 +397,62 @@ void URITestCase::URLCompat()
     CPPUNIT_ASSERT( uricopy == url );
     CPPUNIT_ASSERT( uricopy == urlcopy );
     CPPUNIT_ASSERT( uricopy == uri );
     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 ") );
+    CPPUNIT_ASSERT_EQUAL( " A ", wxURI::Unescape("%20%41%20") );
+
+    wxURI test("file:\"myf\"ile.txt");
+
+    CPPUNIT_ASSERT_EQUAL( "file:%22myf%22ile.txt" , test.BuildURI() );
+    CPPUNIT_ASSERT_EQUAL( "file", test.GetScheme() );
+    CPPUNIT_ASSERT_EQUAL( "%22myf%22ile.txt", test.GetPath() );
+
+    // these could be put under a named registry since they take some
+    // time to complete
+#if 0
+    // Test problem urls (reported not to work some time ago by a user...)
+    const wxChar* pszProblemUrls[] = { "http://www.csdn.net",
+                                       "http://www.163.com",
+                                       "http://www.sina.com.cn" };
+
+    for ( size_t i = 0; i < WXSIZEOF(pszProblemUrls); ++i )
+    {
+        wxURL urlProblem(pszProblemUrls[i]);
+        CPPUNIT_ASSERT(urlProblem.GetError() == wxURL_NOERR);
+
+        wxInputStream* is = urlProblem.GetInputStream();
+        CPPUNIT_ASSERT(is != NULL);
+
+        wxFile fOut(_T("test.html"), wxFile::write);
+        wxASSERT(fOut.IsOpened());
+
+        char buf[1001];
+        for( ;; )
+        {
+            is->Read(buf, 1000);
+            size_t n = is->LastRead();
+            if ( n == 0 )
+                break;
+            buf[n] = 0;
+            fOut.Write(buf, n);
+        }
+
+        delete is;
+    }

 #endif
 #endif

-    CPPUNIT_ASSERT( wxURI::Unescape(wxT("%20%41%20")) == wxT(" A ") );
-
-    wxURI test(wxT("file:\"myf\"ile.txt"));
-
-    CPPUNIT_ASSERT( test.BuildURI() == wxT("file:%22myf%22ile.txt") );
-    CPPUNIT_ASSERT( test.GetScheme() == wxT("file") );
-    CPPUNIT_ASSERT( test.GetPath() == wxT("%22myf%22ile.txt") );

 }
 
 }
 

+// the purpose of this test is unclear, it seems to be unfinished so disabling
+// it for now
+#if 0 && wxUSE_PROTOCOL_HTTP

 void URITestCase::URLProxy()
 {
     wxURL url(wxT("http://www.asite.com/index.html"));
     url.SetProxy(wxT("pserv:3122"));
 void URITestCase::URLProxy()
 {
     wxURL url(wxT("http://www.asite.com/index.html"));
     url.SetProxy(wxT("pserv:3122"));

+
+    wxURL::SetDefaultProxy(wxT("fol.singnet.com.sg:8080"));
+    wxURL url2(wxT("http://server-name/path/to/file?query_data=value"));
+    wxInputStream *data = url2.GetInputStream();
+    CPPUNIT_ASSERT(data != NULL);

 }
 }

-#endif
+#endif // wxUSE_PROTOCOL_HTTP

 
 

+#endif // TEST_URL