INTEGRATION: CWS sb19 (1.23.10); FILE MERGED

2004/12/21 09:32:56 sb 1.23.10.3: RESYNC: (1.26-1.27); FILE MERGED
2004/12/09 03:08:44 sb 1.23.10.2: RESYNC: (1.23-1.26); FILE MERGED
2004/10/20 08:36:33 sb 1.23.10.1: #108948# Added INetURLObject::GetAbsURL as an easy replacement for INetURLObject::RelToAbs.

1 files changed, 29 insertions, 24 deletions

diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx
index 0a12ccbff223..0c7ee5e39ce2 100644
--- a/tools/workben/urltest.cxx
+++ b/tools/workben/urltest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: urltest.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: hr $ $Date: 2004-12-13 13:25:31 $
+ *  last change: $Author: rt $ $Date: 2005-01-11 13:14:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,29 +146,34 @@ bool testRelToAbs(RelToAbsTest const * pTest, std::size_t nSize)
         if (pTest[i].m_pBase)
         {
             aBase.SetURL(pTest[i].m_pBase);
-            if (!aBase.HasError())
-            {
-                aTest = aBase.GetMainURL(INetURLObject::NO_DECODE);
-                printf("Base %s\n", ByteString(aTest,
-                    RTL_TEXTENCODING_ISO_8859_1).GetBuffer());
-            }
         }
         if (aBase.HasError())
         {
             printf(" BAD BASE %s\n",
                    pTest[i].m_pBase ? pTest[i].m_pBase : "");
+            bSuccess = false;
             continue;
         }
         INetURLObject aAbs;
         aBase.GetNewAbsURL(pTest[i].m_pRel, &aAbs);
-        aTest = aAbs.GetMainURL(INetURLObject::NO_DECODE);
-        ByteString aTheAbs(aTest, RTL_TEXTENCODING_ISO_8859_1);
-        if (aTheAbs.Equals(pTest[i].m_pAbs)
-            || pTest[i].m_pAlt && aTheAbs.Equals(pTest[i].m_pAlt))
-            printf("  ok %s -> %s\n", pTest[i].m_pRel, aTheAbs.GetBuffer());
-        else
+        ByteString aTheAbs(aAbs.GetMainURL(INetURLObject::NO_DECODE),
+                           RTL_TEXTENCODING_ISO_8859_1);
+        if (!(aTheAbs.Equals(pTest[i].m_pAbs)
+              || pTest[i].m_pAlt && aTheAbs.Equals(pTest[i].m_pAlt)))
+        {
+            printf(" BAD GetNewAbsURL %s -> %s (%s)\n", pTest[i].m_pRel,
+                   aTheAbs.GetBuffer(), pTest[i].m_pAbs);
+            bSuccess = false;
+        }
+        aTheAbs = ByteString(
+            INetURLObject::GetAbsURL(
+                aBase.GetMainURL(INetURLObject::NO_DECODE),
+                UniString(pTest[i].m_pRel, RTL_TEXTENCODING_ISO_8859_1)),
+            RTL_TEXTENCODING_ISO_8859_1);
+        if (!(aTheAbs.Equals(pTest[i].m_pAbs)
+              || pTest[i].m_pAlt && aTheAbs.Equals(pTest[i].m_pAlt)))
         {
-            printf(" BAD %s -> %s (%s)\n", pTest[i].m_pRel,
+            printf(" BAD GetAbsURL %s -> %s (%s)\n", pTest[i].m_pRel,
                    aTheAbs.GetBuffer(), pTest[i].m_pAbs);
             bSuccess = false;
         }
@@ -299,21 +304,21 @@ main()
 {
     bool bSuccess = true;
 
-    if (false)
+    if (true)
     {
         // The data for this test is taken from the files
         // <http://www.ics.uci.edu/~fielding/url/testN.html> with N = 1,
         // ..., 3, as of August 28, 2000:
         static RelToAbsTest const aTest[]
-            = { { "http://a/b/c/d;p?q", "g:h", "g:h", 0 },
-                { 0, "g", "http://a/b/c/g", 0 },
+            = { //{ "http://a/b/c/d;p?q", "g:h", "g:h", 0 },
+                { "http://a/b/c/d;p?q", "g", "http://a/b/c/g", 0 },
                 { 0, "./g", "http://a/b/c/g", 0 },
                 { 0, "g/", "http://a/b/c/g/", 0 },
                 { 0, "/g", "http://a/g", 0 },
-                { 0, "//g", "http://g", 0 },
-                { 0, "?y", "http://a/b/c/d;p?y", 0 },
+                { 0, "//g", "http://g", "http://g/" },
+                //{ 0, "?y", "http://a/b/c/d;p?y", 0 },
                 { 0, "g?y", "http://a/b/c/g?y", 0 },
-                { 0, "#s", "http://a/b/c/d;p?q#s", 0 },
+                //{ 0, "#s", "http://a/b/c/d;p?q#s", 0 },
                 { 0, "g#s", "http://a/b/c/g#s", 0 },
                 { 0, "g?y#s", "http://a/b/c/g?y#s", 0 },
                 { 0, ";x", "http://a/b/c/;x", 0 },
@@ -327,7 +332,7 @@ main()
                 { 0, "../..", "http://a/", 0 },
                 { 0, "../../", "http://a/", 0 },
                 { 0, "../../g", "http://a/g", 0 },
-                { 0, "", "http://a/b/c/d;p?q", 0 },
+                //{ 0, "", "http://a/b/c/d;p?q", 0 },
                 { 0, "../../../g", "http://a/../g", "http://a/g" },
                 { 0, "../../../../g", "http://a/../../g", "http://a/g" },
                 { 0, "/./g", "http://a/./g", 0 },
@@ -347,12 +352,12 @@ main()
                 { 0, "g#s/./x", "http://a/b/c/g#s/./x", 0 },
                 { 0, "g#s/../x", "http://a/b/c/g#s/../x", 0 },
                 { 0, "http:g", "http:g", "http://a/b/c/g" },
-                { 0, "http:", "http:", 0 },
+                //{ 0, "http:", "http:", 0 },
                 { "http://a/b/c/d;p?q=1/2", "g", "http://a/b/c/g", 0 },
                 { 0, "./g", "http://a/b/c/g", 0 },
                 { 0, "g/", "http://a/b/c/g/", 0 },
                 { 0, "/g", "http://a/g", 0 },
-                { 0, "//g", "http://g", 0 },
+                { 0, "//g", "http://g", "http://g/" },
                 { 0, "g?y", "http://a/b/c/g?y", 0 },
                 { 0, "g?y/./x", "http://a/b/c/g?y/./x", 0 },
                 { 0, "g?y/../x", "http://a/b/c/g?y/../x", 0 },