- delta test: version check added

diff --git a/tests/zypp/Deltarpm_test.cc b/tests/zypp/Deltarpm_test.cc
index 76dfa27..b3a3223 100644 (file)
--- a/tests/zypp/Deltarpm_test.cc
+++ b/tests/zypp/Deltarpm_test.cc
@@ -55,12 +55,21 @@ BOOST_AUTO_TEST_CASE(delta)
   std::list<packagedelta::DeltaRpm> deltas = dc.deltaRpms(0);
   for_ (it,deltas.begin(),deltas.end())
   {
-    BOOST_CHECK(it->name()=="libzypp");
-//    BOOST_CHECK((it->edition()==Edition("0:4.21.3-2"))); 
-//    BOOST_CHECK(it->arch()=="i386");
-    BOOST_CHECK((it->baseversion().edition() == Edition("4.21.3-1")) 
-      ||(it->baseversion().edition() == Edition("4.21.2-3")));
-    cout << it->name() << " - " << it->edition() << " - " <<  it->arch() << " base: " << it->baseversion().edition() << endl;
+    BOOST_CHECK(it->name() == "libzypp");
+    BOOST_CHECK(it->edition() == Edition("4.21.3-2"));
+    BOOST_CHECK(it->arch() == "i386");
+    BOOST_CHECK(it->baseversion().edition().match(Edition("4.21.3-1")) 
+      ||it->baseversion().edition().match(Edition("4.21.2-3")));
+
+    cout << it->name() << " - " << it->edition() << " - " <<  it->arch()
+      << " base: " << it->baseversion().edition() << endl;
+
+    cout << (it->edition() == "4.21.3-2") << endl;              // fine
+    cout << (it->edition() == Edition("4.21.3-2")) << endl;     // fine
+    cout << (it->edition().match(Edition("4.21.3-2"))) << endl; //! \todo FIXME says no 
+    cout << (it->edition().match("4.21.3-2")) << endl;          //! \todo FIXME says no
   }
+
+  //! \todo FIXME Edition("0:4.21.3-2") != Edition("4.21.3-2") (not even does Edition("0:4.21.3-2").match(Edition("4.21.3-2"))
   rm.cleanCache(updates);
 }

diff --git a/zypp/repo/DeltaCandidates.cc b/zypp/repo/DeltaCandidates.cc
index e02f86f..617e4a4 100644 (file)
--- a/zypp/repo/DeltaCandidates.cc
+++ b/zypp/repo/DeltaCandidates.cc
@@ -99,6 +99,7 @@ namespace zypp
       for ( std::list<Repository>::const_iterator it = _pimpl->repos.begin();
             it != _pimpl->repos.end(); ++it )
       {
+        DBG << "package: " << package << endl;
         for (int i = 0; i < it->get()->nextra; ++i)
         {
           ::Dataiterator di;
@@ -111,14 +112,13 @@ namespace zypp
           while (::dataiterator_step(&di))
           {
             DeltaRpm delta(*it, di.solvid);
-            DBG << "got delta: " << delta << endl;
-            DBG << "package: " << package << endl;
+            DBG << "checking delta: " << delta << endl;
             if ( ! package
                 || (    package->name()    == delta.name()
                      && package->edition() == delta.edition()
                      && package->arch()    == delta.arch() ) )
             {
-              DBG << "got delta candidate: " << delta << endl;
+              DBG << "got delta candidate" << endl;
               candidates.push_back( delta );
             }
           }