enable and refix media tests

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0d5d8c7fc1b5a9d99c358288c176f4ffc6c8583e..23c301983f2d7400ca5a82d16ab46251794a5cbc 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@ ENABLE_TESTING()
 
 ADD_DEFINITIONS( -DTESTS_SRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" )
 
-#ADD_SUBDIRECTORY( media EXCLUDE_FROM_ALL )
+ADD_SUBDIRECTORY( media EXCLUDE_FROM_ALL )
 ADD_SUBDIRECTORY( zypp )
 ADD_SUBDIRECTORY( parser )
 ADD_SUBDIRECTORY( repo )

diff --git a/tests/media/file_exists_test.cc b/tests/media/file_exists_test.cc
index 3a06301c3b56b3844d9495c5534e1dd5cab744e0..f05645767c8e6f5953b07754ac0cd792cfcd0451 100644 (file)
--- a/tests/media/file_exists_test.cc
+++ b/tests/media/file_exists_test.cc
@@ -9,6 +9,7 @@
 #include <unistd.h>
 
 #include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
 
 #include "mymediaverifier.h"
 
@@ -18,6 +19,41 @@ using namespace zypp::media;
 using boost::unit_test::test_suite;
 using boost::unit_test::test_case;
 
+BOOST_AUTO_TEST_CASE(curl_params_reset)
+{
+  MediaManager     mm;
+  media::MediaId   id;
+  
+  Url url("http://ftp.kernel.org/pub/");
+  
+  id = mm.open( url, "");
+  mm.attach(id);
+
+  Pathname dest;
+  Pathname src("/README");
+  mm.doesFileExist(id, src);
+  mm.provideFile(id, src);
+  dest = mm.localPath(id, src);
+  BOOST_REQUIRE( PathInfo(dest).size() != 0 );
+    
+  mm.doesFileExist(id, src);
+  mm.provideFile(id, src);
+  dest = mm.localPath(id, src);
+  BOOST_REQUIRE( PathInfo(dest).size() != 0 );
+
+  mm.doesFileExist(id, src);
+  mm.provideFile(id, src);
+  dest = mm.localPath(id, src);
+  BOOST_REQUIRE( PathInfo(dest).size() != 0 );
+
+  mm.doesFileExist(id, src);
+  mm.provideFile(id, src);
+  dest = mm.localPath(id, src);
+  BOOST_CHECK_EQUAL( PathInfo(dest).size() , 1 );
+
+  mm.release(id);   
+}
+
 BOOST_AUTO_TEST_CASE(http_test)
 {
   //MediaVerifierRef verifier( new MyMediaVerifier() );
@@ -38,7 +74,7 @@ BOOST_AUTO_TEST_CASE(http_test)
   mm.release(id); 
 }
 
-void ftp_test()
+BOOST_AUTO_TEST_CASE(ftp_test)
 {
   //MediaVerifierRef verifier( new MyMediaVerifier() );
   MediaManager     mm;
@@ -62,7 +98,7 @@ BOOST_AUTO_TEST_CASE(isotest)
 {
    if ( geteuid() != 0 )
    {
-     BOOST_ERROR( "ISO test requires root permissions! (mount)");
+     BOOST_WARN( "ISO test requires root permissions! (mount)");
      return;
    }
   
@@ -87,7 +123,7 @@ BOOST_AUTO_TEST_CASE(nfs_tst)
 {
    if ( geteuid() != 0 )
    {
-     BOOST_ERROR( "NFS test requires root permissions! (mount)");
+     BOOST_WARN( "NFS test requires root permissions! (mount)");
      return;
    }
   

diff --git a/tests/media/media1_test.cc b/tests/media/media1_test.cc
index 31e12c50b17c7695f8a556d71d8a0b3cb085cc20..fbd772146e0133b7d8b1bfa868decb2222cc38c9 100644 (file)
--- a/tests/media/media1_test.cc
+++ b/tests/media/media1_test.cc
@@ -8,6 +8,7 @@
 #include <iostream>
 
 #include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
 
 #include "mymediaverifier.h"
 

diff --git a/tests/media/media2_test.cc b/tests/media/media2_test.cc
index aa3defed6d426783b5c217e63242b09064f968b3..bdf21ef66deb429f47a9f6e3e4ca3e0c3e1abe2d 100644 (file)
--- a/tests/media/media2_test.cc
+++ b/tests/media/media2_test.cc
@@ -13,6 +13,7 @@
 #include "mymediaverifier.h"
 
 #include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
 
 using boost::unit_test::test_suite;
 using boost::unit_test::test_case;

diff --git a/tests/media/media3_test.cc b/tests/media/media3_test.cc
index 75911245eb78e1adadf775e4410720366f065c8e..cc11a8b502790539ac7680d2b9b44228a371775f 100644 (file)
--- a/tests/media/media3_test.cc
+++ b/tests/media/media3_test.cc
@@ -13,6 +13,7 @@
 #include "mymediaverifier.h"
 
 #include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
 
 using boost::unit_test::test_suite;
 using boost::unit_test::test_case;

diff --git a/tests/media/media4_test.cc b/tests/media/media4_test.cc
index 4f4e93a07c06383c642759b1a6bb84defc30718c..e905c492742bdbed20ea4b2ba29e358ab2f3f9f7 100644 (file)
--- a/tests/media/media4_test.cc
+++ b/tests/media/media4_test.cc
@@ -14,6 +14,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
 
 using boost::unit_test::test_suite;
 using boost::unit_test::test_case;

diff --git a/tests/media/throw_if_not_exists_test.cc b/tests/media/throw_if_not_exists_test.cc
index 55783c82a28d49694b57ed0a281c90d9e4cca3e8..d712d85a2a62a2f4fe44a8d709af3918405b0e6d 100644 (file)
--- a/tests/media/throw_if_not_exists_test.cc
+++ b/tests/media/throw_if_not_exists_test.cc
@@ -9,6 +9,7 @@
 #include <unistd.h>
 
 #include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
 
 #include "mymediaverifier.h"
 
@@ -18,7 +19,7 @@ using namespace zypp::media;
 using boost::unit_test::test_suite;
 using boost::unit_test::test_case;
 
-void http_test()
+BOOST_AUTO_TEST_CASE(http_test)
 {
   //MediaVerifierRef verifier( new MyMediaVerifier() );
   MediaManager     mm;
@@ -33,18 +34,4 @@ void http_test()
   mm.release(id); 
 }
 
-test_suite*
-init_unit_test_suite( int, char* [] )
-{
-  test_suite* test= BOOST_TEST_SUITE( "throw_if_not_exists" );
-  //test->add( BOOST_TEST_CASE( &nfs_test ), 0 /* expected zero error */ );
-  test->add( BOOST_TEST_CASE( &http_test ), 0 /* expected zero error */ );
-  //test->add( BOOST_TEST_CASE( &ftp_test ), 0 /* expected zero error */ );
-  //test->add( BOOST_TEST_CASE( &iso_test ), 0 /* expected zero error */ );
-  //test->add( BOOST_TEST_CASE( &nfs_test ), 0 /* expected zero error */ );
-  return test;
-}
-
-
-
 // vim: set ts=2 sts=2 sw=2 ai et: