@wxsince -> @since in Doxygen docs

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

diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index c4aa89dc5cbc70366ec09bdefa1cc0fa5a620b52..8ea7438debddef925e027119ba9f8d56ac7d1ea7 100644 (file)
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -49,9 +49,10 @@ private:
         CPPUNIT_TEST( Assignment );
         CPPUNIT_TEST( Comparison );
         CPPUNIT_TEST( Unescaping );
         CPPUNIT_TEST( Assignment );
         CPPUNIT_TEST( Comparison );
         CPPUNIT_TEST( Unescaping );

+        CPPUNIT_TEST( FileScheme );

 #if TEST_URL
         CPPUNIT_TEST( URLCompat );
 #if TEST_URL
         CPPUNIT_TEST( URLCompat );

-#if wxUSE_PROTOCOL_HTTP
+#if 0 && wxUSE_PROTOCOL_HTTP

         CPPUNIT_TEST( URLProxy  );
 #endif
 #endif
         CPPUNIT_TEST( URLProxy  );
 #endif
 #endif


@@ -68,10 +69,13 @@ private:
     void Assignment();
     void Comparison();
     void Unescaping();
     void Assignment();
     void Comparison();
     void Unescaping();

+    void FileScheme();

 
 #if TEST_URL
     void URLCompat();
 
 #if TEST_URL
     void URLCompat();

+#if 0 && wxUSE_PROTOCOL_HTTP

     void URLProxy();
     void URLProxy();

+#endif

 #endif
 
     DECLARE_NO_COPY_CLASS(URITestCase)
 #endif
 
     DECLARE_NO_COPY_CLASS(URITestCase)


@@ -299,6 +303,26 @@ void URITestCase::Unescaping()
     CPPUNIT_ASSERT(works2.IsSameAs(broken2));
 
 }
     CPPUNIT_ASSERT(works2.IsSameAs(broken2));
 
 }

+
+void URITestCase::FileScheme()
+{
+    //file:// variety (NOT CONFORMANT TO THE RFC)
+    CPPUNIT_ASSERT(wxURI(wxString(wxT("file://e:/wxcode/script1.xml"))).GetPath() 
+                    == wxT("e:/wxcode/script1.xml") );
+
+    //file:/// variety
+    CPPUNIT_ASSERT(wxURI(wxString(wxT("file:///e:/wxcode/script1.xml"))).GetPath() 
+                    == wxT("/e:/wxcode/script1.xml") );
+
+    //file:/ variety
+    CPPUNIT_ASSERT(wxURI(wxString(wxT("file:/e:/wxcode/script1.xml"))).GetPath() 
+                    == wxT("/e:/wxcode/script1.xml") );
+
+    //file: variety
+    CPPUNIT_ASSERT(wxURI(wxString(wxT("file:e:/wxcode/script1.xml"))).GetPath() 
+                    == wxT("e:/wxcode/script1.xml") );
+}
+

 #if TEST_URL
 
 const wxChar* pszProblemUrls[] = { wxT("http://www.csdn.net"),
 #if TEST_URL
 
 const wxChar* pszProblemUrls[] = { wxT("http://www.csdn.net"),


@@ -334,9 +358,6 @@ void URITestCase::URLCompat()
     CPPUNIT_ASSERT( uricopy == url );
     CPPUNIT_ASSERT( uricopy == urlcopy );
     CPPUNIT_ASSERT( uricopy == uri );
     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"));
     CPPUNIT_ASSERT( wxURI::Unescape(wxT("%20%41%20")) == wxT(" A ") );
 
     wxURI test(wxT("file:\"myf\"ile.txt"));


@@ -345,6 +366,9 @@ void URITestCase::URLCompat()
     CPPUNIT_ASSERT( test.GetScheme() == wxT("file") );
     CPPUNIT_ASSERT( test.GetPath() == wxT("%22myf%22ile.txt") );
 
     CPPUNIT_ASSERT( test.GetScheme() == wxT("file") );
     CPPUNIT_ASSERT( test.GetPath() == wxT("%22myf%22ile.txt") );
 

+    // these could be put under a named registry since they take some
+    // time to complete
+#if 0

     // Test problem urls (reported not to work some time ago by a user...)
     for ( size_t i = 0; i < WXSIZEOF(pszProblemUrls); ++i )
     {
     // Test problem urls (reported not to work some time ago by a user...)
     for ( size_t i = 0; i < WXSIZEOF(pszProblemUrls); ++i )
     {


@@ -370,15 +394,22 @@ void URITestCase::URLCompat()
 
         delete is;
     }
 
         delete is;
     }

+#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"));
     url.SetProxy(wxT("pserv:3122"));
 void URITestCase::URLProxy()
 {
     wxURL url(wxT("http://www.asite.com/index.html"));
     url.SetProxy(wxT("pserv:3122"));

+
+    wxURL::SetDefaultProxy(wxT("fol.singnet.com.sg:8080"));
+    wxURL url2(wxT("http://server-name/path/to/file?query_data=value"));
+    wxInputStream *data = url2.GetInputStream();
+    CPPUNIT_ASSERT(data != NULL);

 }
 #endif // wxUSE_PROTOCOL_HTTP
 
 #endif // TEST_URL
 }
 #endif // wxUSE_PROTOCOL_HTTP
 
 #endif // TEST_URL

-