Author: schubi2
Date: Wed Mar 5 10:43:01 2008
New Revision: 9014
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9014&view=rev
Log:
splitted in two testcases
Added:
trunk/libzypp/tests/zypp/Vendor2_test.cc
Modified:
trunk/libzypp/tests/zypp/CMakeLists.txt
trunk/libzypp/tests/zypp/Vendor_test.cc
Modified: trunk/libzypp/tests/zypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.txt?rev=9014&r1=9013&r2=9014&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/tests/zypp/CMakeLists.txt Wed Mar 5 10:43:01 2008
@@ -1,5 +1,5 @@
ADD_SUBDIRECTORY(base)
-ADD_TESTS(RWPtr Vendor TranslatedText PoolQuery KeyRing MediaSetAccess ResKind Arch Url Edition Capabilities CheckSum PublicKey PathInfo Digest Fetcher FileChecker RepoManager RepoInfo RepoStatus ProgressData )
+ADD_TESTS(RWPtr Vendor Vendor2 TranslatedText PoolQuery KeyRing MediaSetAccess ResKind Arch Url Edition Capabilities CheckSum PublicKey PathInfo Digest Fetcher FileChecker RepoManager RepoInfo RepoStatus ProgressData )
EXEC_PROGRAM( ln ARGS -sf "${CMAKE_CURRENT_SOURCE_DIR}/data" "${CMAKE_CURRENT_BINARY_DIR}/data" )
Added: trunk/libzypp/tests/zypp/Vendor2_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Vendor2_test.cc?rev=9014&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/Vendor2_test.cc (added)
+++ trunk/libzypp/tests/zypp/Vendor2_test.cc Wed Mar 5 10:43:01 2008
@@ -0,0 +1,44 @@
+
+#include <iostream>
+#include <list>
+#include <string>
+
+// Boost.Test
+#include
+
+#include "zypp/base/LogControl.h"
+#include "zypp/base/Logger.h"
+#include "zypp/base/Exception.h"
+#include "zypp/ZYpp.h"
+#include "zypp/VendorAttr.h"
+
+using boost::unit_test::test_case;
+using namespace std;
+using namespace zypp;
+
+namespace zypp
+{
+ void reconfigureZConfig( const Pathname & );
+}
+
+#define DATADIR (Pathname(TESTS_SRC_DIR) + "/zypp/data/Vendor")
+
+
+BOOST_AUTO_TEST_CASE(vendor2_test)
+{
+ reconfigureZConfig( DATADIR / "zypp2.conf" );
+
+ BOOST_REQUIRE( VendorAttr::instance().equivalent("suse", "suse") );
+ BOOST_REQUIRE( VendorAttr::instance().equivalent("equal", "equal") );
+ BOOST_REQUIRE( VendorAttr::instance().equivalent("suse", "SuSE") );
+ BOOST_REQUIRE( VendorAttr::instance().equivalent("opensuse", "SuSE") );
+ BOOST_REQUIRE( !VendorAttr::instance().equivalent("open", "SuSE") );
+ BOOST_REQUIRE( !VendorAttr::instance().equivalent("nothing", "SuSE") );
+ BOOST_REQUIRE( VendorAttr::instance().equivalent("nvidia", "SuSE") );
+ BOOST_REQUIRE( VendorAttr::instance().equivalent("nvidia_new_new", "SuSE") );
+ BOOST_REQUIRE( VendorAttr::instance().equivalent("nvidia", "opensuse") );
+ BOOST_REQUIRE( !VendorAttr::instance().equivalent("ati", "SuSE") );
+ BOOST_REQUIRE( !VendorAttr::instance().equivalent("ati", "nvidia") );
+ BOOST_REQUIRE( VendorAttr::instance().equivalent("ati_new", "ati") );
+}
+
Modified: trunk/libzypp/tests/zypp/Vendor_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Vendor_test.cc?rev=9014&r1=9013&r2=9014&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/Vendor_test.cc (original)
+++ trunk/libzypp/tests/zypp/Vendor_test.cc Wed Mar 5 10:43:01 2008
@@ -36,22 +36,3 @@
BOOST_REQUIRE( !VendorAttr::instance().equivalent("nothing", "SuSE") );
}
-BOOST_AUTO_TEST_CASE(vendor_test2)
-{
- reconfigureZConfig( DATADIR / "zypp2.conf" );
- // No vendor definition files has been readed. So only suse,opensuse vendors are
- // equivalent
- BOOST_REQUIRE( VendorAttr::instance().equivalent("suse", "suse") );
- BOOST_REQUIRE( VendorAttr::instance().equivalent("equal", "equal") );
- BOOST_REQUIRE( VendorAttr::instance().equivalent("suse", "SuSE") );
- BOOST_REQUIRE( !VendorAttr::instance().equivalent("opensuse", "SuSE") );
- BOOST_REQUIRE( !VendorAttr::instance().equivalent("open", "SuSE") );
- BOOST_REQUIRE( !VendorAttr::instance().equivalent("nothing", "SuSE") );
- BOOST_REQUIRE( VendorAttr::instance().equivalent("nvidia", "SuSE") );
- BOOST_REQUIRE( VendorAttr::instance().equivalent("nvidia_new_new", "SuSE") );
- BOOST_REQUIRE( !VendorAttr::instance().equivalent("nvidia", "opensuse") );
- BOOST_REQUIRE( !VendorAttr::instance().equivalent("ati", "SuSE") );
- BOOST_REQUIRE( !VendorAttr::instance().equivalent("ati", "nvidia") );
- BOOST_REQUIRE( VendorAttr::instance().equivalent("ati_new", "ati") );
-}
-
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
