Fix extraction of standard command line arguments in wxX11.

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

diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index f2cc591394b5fff3f31e92aab102661bf72d27ee..5b2f04feab33785fa08c23b6e2f80afaf311172a 100644 (file)
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -27,11 +27,6 @@
 // Test wxURL & wxURI compat?
 #define TEST_URL wxUSE_URL
 
 // Test wxURL & wxURI compat?
 #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
 // ----------------------------------------------------------------------------


@@ -373,14 +368,7 @@ void URITestCase::URLCompat()
 {
     wxURL url("http://user:password@wxwidgets.org");
 
 {
     wxURL url("http://user:password@wxwidgets.org");
 

-    CPPUNIT_ASSERT(url.GetError() == wxURL_NOERR);
-
-#if TEST_NETWORK
-    wxInputStream* pInput = url.GetInputStream();
-
-    CPPUNIT_ASSERT( pInput != NULL );
-#endif
-
+    CPPUNIT_ASSERT( url.GetError() == wxURL_NOERR );

     CPPUNIT_ASSERT( url == wxURL("http://user:password@wxwidgets.org") );
 
     wxURI uri("http://user:password@wxwidgets.org");
     CPPUNIT_ASSERT( url == wxURL("http://user:password@wxwidgets.org") );
 
     wxURI uri("http://user:password@wxwidgets.org");


@@ -421,7 +409,7 @@ void URITestCase::URLCompat()
         wxInputStream* is = urlProblem.GetInputStream();
         CPPUNIT_ASSERT(is != NULL);
 
         wxInputStream* is = urlProblem.GetInputStream();
         CPPUNIT_ASSERT(is != NULL);
 

-        wxFile fOut(_T("test.html"), wxFile::write);
+        wxFile fOut(wxT("test.html"), wxFile::write);

         wxASSERT(fOut.IsOpened());
 
         char buf[1001];
         wxASSERT(fOut.IsOpened());
 
         char buf[1001];