X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/113e181a8a9e3ed226615c1b14954e8684ddc9a6..8c249a59944ffc03e15369ba58fc7d73b3506668:/tests/uris/uris.cpp?ds=sidebyside

diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index b12a8f680a..959c3e2928 100644
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -11,7 +11,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/wxprec.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -24,10 +24,8 @@
 #include "wx/uri.h"
 #include "wx/url.h"
 
-#include "wx/cppunit.h"
-
 // Test wxURL & wxURI compat?
-#define TEST_URL ( 0 && wxUSE_URL )
+#define TEST_URL ( 1 && wxUSE_URL )
 
 // ----------------------------------------------------------------------------
 // test class
@@ -52,6 +50,9 @@ private:
         CPPUNIT_TEST( Comparison );
 #if TEST_URL
         CPPUNIT_TEST( URLCompat );
+#if wxUSE_PROTOCOL_HTTP
+        CPPUNIT_TEST( URLProxy  );
+#endif
 #endif
     CPPUNIT_TEST_SUITE_END();
 
@@ -68,6 +69,7 @@ private:
 
 #if TEST_URL
     void URLCompat();
+    void URLProxy();
 #endif
 
     DECLARE_NO_COPY_CLASS(URITestCase)
@@ -279,7 +281,6 @@ void URITestCase::Comparison()
 #if TEST_URL
 
 #include "wx/url.h"
-#include "wx/mimetype.h"
 
 void URITestCase::URLCompat()
 {
@@ -317,8 +318,14 @@ void URITestCase::URLCompat()
     CPPUNIT_ASSERT( test.BuildURI() == wxT("file:%22myf%22ile.txt") );
     CPPUNIT_ASSERT( test.GetScheme() == wxT("file") );
     CPPUNIT_ASSERT( test.GetPath() == wxT("%22myf%22ile.txt") );
-//    CPPUNIT_ASSERT( wxURI::Unescape(wxT("%22myf%22ile.txt"))  );
-    wxPrintf(wxURI::Unescape(wxT("%22myf%22ile.txt")) );
 }
 
+#if wxUSE_PROTOCOL_HTTP
+void URITestCase::URLProxy()
+{
+    wxURL url(wxT("http://www.asite.com/index.html"));
+    url.SetProxy(wxT("pserv:3122"));
+}
+#endif // wxUSE_PROTOCOL_HTTP
 #endif
+