- Added result asserts to test_url2, test_url3, test_url4

- Merged test cases test_url and test_url5 into test_url1

diff --git a/testsuite/zypp/tests/Url.cc b/testsuite/zypp/tests/Url.cc
index 8686f9bd97f075a32b04b62e25cda2b91d01013b..0e5535d39b2ec52f85c29b331dc7e8af790b8d34 100644 (file)
--- a/testsuite/zypp/tests/Url.cc
+++ b/testsuite/zypp/tests/Url.cc
@@ -21,7 +21,7 @@ using boost::test_tools::close_at_tolerance;
 
 using namespace zypp;
 
-void test_url(void)
+void test_url1(void)
 {
     std::string str, one, two;
     zypp::Url   url;
@@ -55,7 +55,7 @@ void test_url(void)
     BOOST_CHECK_EQUAL( one, url.asString() );
     BOOST_CHECK_EQUAL( two, url.asCompleteString() );
 
-    // asString shouldn't print the password, asCompleteString should
+    // asString shouldn't print the password, asCompleteString should.
     // further, the "//" at the begin of the path should be keept.
     str = "http://user:pass@localhost//srv/ftp";
     one = "http://user@localhost//srv/ftp";
@@ -64,63 +64,86 @@ void test_url(void)
 
     BOOST_CHECK_EQUAL( one, url.asString() );
     BOOST_CHECK_EQUAL( two, url.asCompleteString() );
-}
-
-void test_url1()
-{
-  std::string str, out;
 
-  str = "file:./srv/ftp";
-  BOOST_CHECK_EQUAL( zypp::Url(str).asString(), str );
+    str = "file:./srv/ftp";
+    BOOST_CHECK_EQUAL( zypp::Url(str).asString(), str );
 
-  str = "ftp://foo//srv/ftp";
-  BOOST_CHECK_EQUAL( zypp::Url(str).asString(), "ftp://foo/%2Fsrv/ftp" );
+    str = "ftp://foo//srv/ftp";
+    BOOST_CHECK_EQUAL( zypp::Url(str).asString(), "ftp://foo/%2Fsrv/ftp" );
 
-  str = "FTP://user@local%68ost/%2f/srv/ftp";
-  BOOST_CHECK_EQUAL( zypp::Url(str).asString(), "ftp://user@localhost/%2f/srv/ftp" );
+    str = "FTP://user@local%68ost/%2f/srv/ftp";
+    BOOST_CHECK_EQUAL( zypp::Url(str).asString(), "ftp://user@localhost/%2f/srv/ftp" );
 
-  str = "http://[::1]/foo/bar";
-  BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
+    str = "http://[::1]/foo/bar";
+    BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
 
-  str = "http://:@just-localhost.example.net:8080/";
-  BOOST_CHECK_EQUAL( zypp::Url(str).asString(), "http://just-localhost.example.net:8080/" );
+    str = "http://:@just-localhost.example.net:8080/";
+    BOOST_CHECK_EQUAL( zypp::Url(str).asString(), "http://just-localhost.example.net:8080/" );
 
-  str = "mailto:feedback@example.com?subject=hello";
-  BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
+    str = "mailto:feedback@example.com?subject=hello";
+    BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
 
-  str = "nfs://nfs-server/foo/bar/trala";
-  BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
+    str = "nfs://nfs-server/foo/bar/trala";
+    BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
 
-  str = "ldap://example.net/dc=example,dc=net?cn,sn?sub?(cn=*)#x";
-  BOOST_CHECK_THROW( zypp::Url(str).asString(), url::UrlNotAllowedException );
+    str = "ldap://example.net/dc=example,dc=net?cn,sn?sub?(cn=*)#x";
+    BOOST_CHECK_THROW( zypp::Url(str).asString(), url::UrlNotAllowedException );
   
-  str = "ldap://example.net/dc=example,dc=net?cn,sn?sub?(cn=*)";
-  BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
+    str = "ldap://example.net/dc=example,dc=net?cn,sn?sub?(cn=*)";
+    BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
+
+    // parseable but invalid, since no host avaliable
+    str = "ldap:///dc=foo,dc=bar";
+    BOOST_CHECK_EQUAL( str, zypp::Url(str).asString());
+    BOOST_CHECK( !zypp::Url(str).isValid());
+
+    // throws:  host is mandatory
+    str = "ftp:///foo/bar";
+    BOOST_CHECK_THROW(zypp::Url(str).asString(), url::UrlNotAllowedException );
+
+    // throws:  host is mandatory
+    str = "http:///%2f/srv/ftp";
+    BOOST_CHECK_THROW(zypp::Url(str).asString(), url::UrlNotAllowedException );
+
+    // OK, host allowed in file-url
+    str = "file://localhost/some/path";
+    BOOST_CHECK_EQUAL( str, zypp::Url(str).asString());
+
+    // throws:  host not allowed
+    str = "cd://localhost/some/path";
+    BOOST_CHECK_THROW(zypp::Url(str).asString(), url::UrlNotAllowedException );
+
+    // throws: no path (email)
+    str = "mailto:";
+    BOOST_CHECK_THROW(zypp::Url(str).asString(), url::UrlNotAllowedException );
+
+    // throws:  no path
+    str = "cd:";
+    BOOST_CHECK_THROW(zypp::Url(str).asString(), url::UrlNotAllowedException );
+
+    // OK, valid (no host, path is there)
+    str = "cd:///some/path";
+    BOOST_CHECK_EQUAL( str, zypp::Url(str).asString());
+    BOOST_CHECK( zypp::Url(str).isValid());
 }
 
 void test_url2(void)
 {
-  std::string str;
+  zypp::Url url("http://user:pass@localhost:/path/to;version=1.1?arg=val#frag");
 
-  str = "http://user:pass@localhost:/path/to;version=1.1?arg=val#frag";
-  std::cout << "STR:  " << str << std::endl << std::endl;
+  BOOST_CHECK_EQUAL( url.asString(),
+  "http://user@localhost/path/to?arg=val#frag" );
 
-  zypp::Url   url;
-  url = str;
+  BOOST_CHECK_EQUAL( url.asString(zypp::url::ViewOptions() +
+                     zypp::url::ViewOptions::WITH_PASSWORD),
+  "http://user:pass@localhost/path/to?arg=val#frag");
 
-  str = url.asString();
-  std::cout << "URL1: " << str << std::endl << std::endl;
+  BOOST_CHECK_EQUAL( url.asString(zypp::url::ViewOptions() +
+                     zypp::url::ViewOptions::WITH_PATH_PARAMS),
+  "http://user@localhost/path/to;version=1.1?arg=val#frag");
 
-  str = url.asString(zypp::url::ViewOptions() +
-                     zypp::url::ViewOptions::WITH_PASSWORD);
-  std::cout << "URL2: " << str << std::endl << std::endl;
-
-  str = url.asString(zypp::url::ViewOptions() +
-                     zypp::url::ViewOptions::WITH_PATH_PARAMS);
-  std::cout << "URL3: " << str << std::endl << std::endl;
-
-  str = url.asCompleteString();
-  std::cout << "URL4: " << str << std::endl << std::endl;
+  BOOST_CHECK_EQUAL( url.asCompleteString(),
+  "http://user:pass@localhost/path/to;version=1.1?arg=val#frag");
 }
 
 void test_url3()
@@ -133,124 +156,84 @@ void test_url3()
   key = "hoho";
   val = "ha ha";
   url.setQueryParam(key, val);
-  std::cout << "ADD1: '" << key << "' = '" << val << "'" << std::endl;
-  std::cout << "URL1: " << url.asString() << std::endl << std::endl;
+  BOOST_CHECK_EQUAL( url.asString(),
+  "http://localhost/path/to?hoho=ha%20ha#frag");
 
   // will be encoded as "foo%3Dbar%26key=foo%26bar%3Dvalue"
   key = "foo=bar&key";
   val = "foo&bar=value";
   url.setQueryParam(key, val);
-  std::cout << "ADD2: '" << key << "' = '" << val << "'" << std::endl;
-  std::cout << "URL2: " << url.asString() << std::endl << std::endl;
+  BOOST_CHECK_EQUAL( url.asString(),
+  "http://localhost/path/to?foo%3Dbar%26key=foo%26bar%3Dvalue&hoho=ha%20ha#frag");
 
   // will be encoded as "foo%25bar=is%25de%25ad"
   key = "foo%bar";
   val = "is%de%ad";
   url.setQueryParam(key, val);
-  std::cout << "ADD3: '" << key << "' = '" << val << "'" << std::endl;
-  std::cout << "URL3: " << url.asString() << std::endl << std::endl;
+  BOOST_CHECK_EQUAL( url.asString(),
+  "http://localhost/path/to?foo%25bar=is%25de%25ad&foo%3Dbar%26key=foo%26bar%3Dvalue&hoho=ha%20ha#frag");
 
-  // get encoded query parameters:
-  std::cout << "QUERY PARAMS:" << std::endl;
+  // get encoded query parameters and compare with results:
   zypp::url::ParamVec params( url.getQueryStringVec());
+  const char * const  result[] = {
+    "foo%25bar=is%25de%25ad",
+    "foo%3Dbar%26key=foo%26bar%3Dvalue",
+    "hoho=ha%20ha"
+  };
+  BOOST_CHECK( params.size() == (sizeof(result)/sizeof(result[0])));
   for( size_t i=0; i<params.size(); i++)
   {
-    std::cout << "\t" << params[i] << std::endl;
+      BOOST_CHECK_EQUAL( params[i], result[i]);
   }
-  std::cout << std::endl;
 }
 
 void test_url4()
 {
   try
   {
-    std::string str;
-    zypp::Url   url;
-
-    str = "ldap://example.net/dc=example,dc=net?cn,sn?sub?(cn=*)";
-    std::cout << "STR: " << str << std::endl;
-
-    url = str;
-    std::cout << "URL: " << url.asString() << std::endl;
+    zypp::Url url("ldap://example.net/dc=example,dc=net?cn,sn?sub?(cn=*)");
 
+    // fetch query params as vector
     zypp::url::ParamVec pvec( url.getQueryStringVec());
-    zypp::url::ParamVec::const_iterator v;
-    for(v=pvec.begin(); v!=pvec.end(); ++v)
-    {
-      std::cout << "PARAM: " << *v << std::endl;
-    }
-    std::cout << std::endl;
+    BOOST_CHECK( pvec.size() == 3);
+    BOOST_CHECK_EQUAL( pvec[0], "cn,sn");
+    BOOST_CHECK_EQUAL( pvec[1], "sub");
+    BOOST_CHECK_EQUAL( pvec[2], "(cn=*)");
 
+    // fetch the query params map
+    // with its special ldap names/keys
     zypp::url::ParamMap pmap( url.getQueryStringMap());
     zypp::url::ParamMap::const_iterator m;
     for(m=pmap.begin(); m!=pmap.end(); ++m)
     {
-      std::cout << "KEY: " << m->first  << std::endl;
-      std::cout << "VAL: " << m->second << std::endl;
-      std::cout << std::endl;
-    }
-
-    url.setQueryParam("attrs", "cn,sn,uid");
-    std::cout << "OUT: " << url.asString() << std::endl;
-  }
-  catch(const zypp::url::UrlException &e)
-  {
-    ZYPP_CAUGHT(e);
-  }
-}
-
-void test_url5()
-{
-  struct Test {
-    char *str;
-    char *inf;
-    int  exp;
-  };
-  struct Test tests[] = {
-    {"ldap:///dc=foo,dc=bar",      "invalid: no host is ok for ldap", 1},
-    {"ftp:///foo/bar",             "throws:  host is mandatory",      2},
-    {"http:///%2f/srv/ftp",        "throws:  host is mandatory",      2},
-    {"file://localhost/some/path", "valid:   host is allowed",        0},
-    {"cd://localhost/some/path",   "throws:  host not allowed",       2},
-    {"mailto:",                    "throws:  no path (email)",        2},
-    {"cd:",                        "throws:  no path",                2},
-    {"cd:///some/path",            "valid:   no host, path is there", 0},
-    {NULL}
-  };
-
-  try
-  {
-    zypp::Url url;
-    for(struct Test *test=tests; test && test->str; test++)
-    {
-      std::cout << "STR: " << test->str << std::endl;
-      std::cout << "INF: " << test->inf << std::endl;
-      try
+      if("attrs"  == m->first)
       {
-        url = test->str;
-
-        std::cout << "URL: " << url.asString() << std::endl;
-
-        bool valid = url.isValid();
-        std::cout << "OK?: " << (valid ? "valid" : "invalid")
-                             << std::endl;
-
-        if( valid && test->exp != 0)
-            ZYPP_THROW(zypp::Exception("Unexpected result: exp != 0"));
-        else
-        if( !valid && test->exp != 1)
-            ZYPP_THROW(zypp::Exception("Unexpected result: exp == 1"));
+        BOOST_CHECK_EQUAL( m->second, "cn,sn");
       }
-      catch(const zypp::url::UrlException &)
+      else
+      if("filter" == m->first)
       {
-        std::cout << "ERR: exception caught" << std::endl;
-        if(test->exp != 2)
-          ZYPP_THROW(zypp::Exception("Unexpected result exp != 2"));
+        BOOST_CHECK_EQUAL( m->second, "(cn=*)");
+      }
+      else
+      if("scope"  == m->first)
+      {
+        BOOST_CHECK_EQUAL( m->second, "sub");
+      }
+      else
+      {
+        BOOST_FAIL("Unexpected LDAP query parameter name in the map!");
       }
-      std::cout << std::endl;
     }
+
+    url.setQueryParam("attrs", "cn,sn,uid");
+    url.setQueryParam("filter", "(|(sn=foo)(cn=bar))");
+
+    BOOST_CHECK_EQUAL(url.getQueryParam("attrs"),  "cn,sn,uid");
+    BOOST_CHECK_EQUAL(url.getQueryParam("filter"), "(|(sn=foo)(cn=bar))");
+
   }
-  catch(const zypp::Exception &e)
+  catch(const zypp::url::UrlException &e)
   {
     ZYPP_CAUGHT(e);
   }
@@ -260,11 +243,10 @@ test_suite*
 init_unit_test_suite( int, char* [] )
 {
     test_suite* test= BOOST_TEST_SUITE( "Url" );
-    test->add( BOOST_TEST_CASE( &test_url ), 0 /* expected zero error */ );
+    test->add( BOOST_TEST_CASE( &test_url1 ), 0 /* expected zero error */ );
     test->add( BOOST_TEST_CASE( &test_url2 ), 0 );
     test->add( BOOST_TEST_CASE( &test_url3 ), 0 );
     test->add( BOOST_TEST_CASE( &test_url4 ), 0 );
-    test->add( BOOST_TEST_CASE( &test_url5 ), 0 );
     return test;
 }