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 e4920fcec65df1b7c8aa2ede45a691167f8add08..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
 // ----------------------------------------------------------------------------


@@ -47,6 +42,7 @@ private:
         CPPUNIT_TEST( IPv6 );
         CPPUNIT_TEST( Server );
         CPPUNIT_TEST( Paths );
         CPPUNIT_TEST( IPv6 );
         CPPUNIT_TEST( Server );
         CPPUNIT_TEST( Paths );

+        CPPUNIT_TEST( UserAndPass );

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


@@ -68,6 +64,7 @@ private:
     void IPv6();
     void Server();
     void Paths();
     void IPv6();
     void Server();
     void Paths();

+    void UserAndPass();

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


@@ -111,6 +108,9 @@ URITestCase::URITestCase()
 #define URI_ASSERT_PATH_EQUAL(uri, expected) \
     URI_ASSERT_PART_EQUAL((uri), (expected), GetPath())
 
 #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())
+

 void URITestCase::IPv4()
 {
     URI_ASSERT_HOSTTYPE_EQUAL("http://user:password@192.168.1.100:5050/path",
 void URITestCase::IPv4()
 {
     URI_ASSERT_HOSTTYPE_EQUAL("http://user:password@192.168.1.100:5050/path",


@@ -192,6 +192,13 @@ void URITestCase::Paths()
                           "../joe", BuildURI());
 }
 
                           "../joe", BuildURI());
 }
 

+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/", "");
+}
+

 #define URI_TEST_RESOLVE_IMPL(string, eq, strict) \
     { \
         wxURI uri(string); \
 #define URI_TEST_RESOLVE_IMPL(string, eq, strict) \
     { \
         wxURI uri(string); \


@@ -361,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");


@@ -409,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];