X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/402ccadcdd6f642ef08bce00c84c090b698eb0b6..d002ff4e31716ec5c165d74c1caf616e09455ac3:/tests/uris/uris.cpp

diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index 1f4a892843..65dcdcf885 100644
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -25,7 +25,12 @@
 #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
@@ -338,9 +343,11 @@ void URITestCase::URLCompat()
 
     CPPUNIT_ASSERT(url.GetError() == wxURL_NOERR);
 
+#if TEST_NETWORK
     wxInputStream* pInput = url.GetInputStream();
 
     CPPUNIT_ASSERT( pInput != NULL );
+#endif
 
     CPPUNIT_ASSERT( url == wxURL(wxT("http://user:password@wxwidgets.org")) );
 
@@ -358,9 +365,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"));