X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97ad053bffe0fe5d8862578bae4e7492592b5702..1e24c2af0f22f9fff6922885eed7a1bef1b92112:/tests/uris/uris.cpp

diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index 1d05f04541..8ea7438deb 100644
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -52,7 +52,7 @@ private:
         CPPUNIT_TEST( FileScheme );
 #if TEST_URL
         CPPUNIT_TEST( URLCompat );
-#if wxUSE_PROTOCOL_HTTP
+#if 0 && wxUSE_PROTOCOL_HTTP
         CPPUNIT_TEST( URLProxy  );
 #endif
 #endif
@@ -73,7 +73,9 @@ private:
 
 #if TEST_URL
     void URLCompat();
+#if 0 && wxUSE_PROTOCOL_HTTP
     void URLProxy();
+#endif
 #endif
 
     DECLARE_NO_COPY_CLASS(URITestCase)
@@ -356,9 +358,6 @@ 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
     CPPUNIT_ASSERT( wxURI::Unescape(wxT("%20%41%20")) == wxT(" A ") );
 
     wxURI test(wxT("file:\"myf\"ile.txt"));
@@ -398,7 +397,9 @@ void URITestCase::URLCompat()
 #endif
 }
 
-#if wxUSE_PROTOCOL_HTTP
+// 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"));