Imported Upstream version 17.22.1

[platform/upstream/libzypp.git] / tests / repo / susetags / Downloader_test.cc

diff --git a/tests/repo/susetags/Downloader_test.cc b/tests/repo/susetags/Downloader_test.cc
index f05df92..9ad85b1 100644 (file)
--- a/tests/repo/susetags/Downloader_test.cc
+++ b/tests/repo/susetags/Downloader_test.cc
@@ -4,8 +4,6 @@
 #include <vector>
 #include <list>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/parameterized_test.hpp>
-#include <boost/test/unit_test_log.hpp>
 
 #include "zypp/base/Logger.h"
 #include "zypp/Url.h"
@@ -20,32 +18,35 @@ using std::endl;
 using std::string;
 using namespace zypp;
 using namespace boost::unit_test;
-
 using namespace zypp::repo;
 
-void susetags_download_test(const string &dir)
+#define DATADIR (Pathname(TESTS_SRC_DIR) + "/repo/susetags/data")
+
+BOOST_AUTO_TEST_CASE(susetags_download)
 {
   KeyRingTestReceiver keyring_callbacks;
-  keyring_callbacks.answerTrustKey(true);
+  keyring_callbacks.answerAcceptKey(KeyRingReport::KEY_TRUST_TEMPORARILY);
 
-  Pathname p = dir + "/stable-x86-subset";
-  Url url("dir:" + p.asString());
-  MediaSetAccess media(url);
-  susetags::Downloader downloader("/");
+  Pathname p = DATADIR + "/stable-x86-subset";
+  MediaSetAccess media(p.asDirUrl());
+  RepoInfo repoinfo;
+  repoinfo.setAlias("testrepo");
+  repoinfo.setPath("/");
+  susetags::Downloader downloader(repoinfo);
   filesystem::TmpDir tmp;
-  
+
   Pathname localdir(tmp.path());
-  
+
   downloader.download(media,localdir);
-  
+
   MIL << "All files downloaded" << endl;
-  
+
   const char* files[] =
   {
     "/suse",
     "/suse/setup",
     "/suse/setup/descr",
-    "/suse/setup/descr/kde-10.3-71.i586.pat",
+    "/suse/setup/descr/kde-10.3-71.noarch.pat",
     "/suse/setup/descr/packages",
     "/suse/setup/descr/packages.DU",
     "/suse/setup/descr/packages.en",
@@ -69,7 +70,7 @@ void susetags_download_test(const string &dir)
     "/gpg-pubkey-0dfb3188-41ed929b.asc",
     NULL
   };
-  
+
   int i=0;
   while ( files[i] != NULL )
   {
@@ -79,27 +80,29 @@ void susetags_download_test(const string &dir)
 
 }
 
-void susetags_gz_download_test(const string &dir)
+BOOST_AUTO_TEST_CASE(susetags_gz_download)
 {
   KeyRingTestReceiver keyring_callbacks;
-  keyring_callbacks.answerTrustKey(true);
+  keyring_callbacks.answerAcceptKey(KeyRingReport::KEY_TRUST_TEMPORARILY);
 
-  Pathname p = dir + "/stable-x86-subset-gz";
-  Url url("dir:" + p.asString());
-  MediaSetAccess media(url);
-  susetags::Downloader downloader("/");
+  Pathname p = DATADIR + "/stable-x86-subset-gz";
+  MediaSetAccess media(p.asDirUrl());
+  RepoInfo repoinfo;
+  repoinfo.setAlias("testrepo");
+  repoinfo.setPath("/");
+  susetags::Downloader downloader(repoinfo);
   filesystem::TmpDir tmp;
-  
+
   Pathname localdir(tmp.path());
-  
+
   downloader.download(media,localdir);
-  
+
   const char* files[] =
   {
     "/suse",
     "/suse/setup",
     "/suse/setup/descr",
-    "/suse/setup/descr/kde-10.3-71.i586.pat.gz",
+    "/suse/setup/descr/kde-10.3-71.noarch.pat.gz",
     "/suse/setup/descr/packages.gz",
     "/suse/setup/descr/packages.DU.gz",
     "/suse/setup/descr/packages.en.gz",
@@ -125,7 +128,7 @@ void susetags_gz_download_test(const string &dir)
     "/gpg-pubkey-0dfb3188-41ed929b.asc",
     NULL
   };
-  
+
   int i=0;
   while ( files[i] != NULL )
   {
@@ -135,32 +138,4 @@ void susetags_gz_download_test(const string &dir)
 
 }
 
-test_suite*
-init_unit_test_suite( int argc, char *argv[] )
-{
-  string datadir;
-  if (argc < 2)
-  {
-    datadir = TESTS_SRC_DIR;
-    datadir = (Pathname(datadir) + "/repo/susetags/data").asString();
-    cout << "SUSETags Downloader_test:"
-      " path to directory with test data required as parameter. Using " << datadir  << endl;
-    //return (test_suite *)0;
-    
-  }
-  else
-  {
-    datadir = argv[1];
-  }
-  
-  test_suite* test= BOOST_TEST_SUITE("SUSETags Downloader");
-  
-  std::string const params[] = { datadir };
-  test->add(BOOST_PARAM_TEST_CASE(&susetags_download_test,
-                                 (std::string const*)params, params+1));
-  test->add(BOOST_PARAM_TEST_CASE(&susetags_gz_download_test,
-                                 (std::string const*)params, params+1));
-  return test;
-}
-
 // vim: set ts=2 sts=2 sw=2 ai et: