Edition replaced by Edition of libzypp

diff --git a/zypp/solver/testsuite/edition_single.cc b/zypp/solver/testsuite/edition_single.cc
index dc1bfb5..06139fa 100644 (file)
--- a/zypp/solver/testsuite/edition_single.cc
+++ b/zypp/solver/testsuite/edition_single.cc
@@ -21,11 +21,11 @@
  * 02111-1307, USA.
  */
 
-#include <zypp/solver/detail/Edition.h>
+#include <zypp/Edition.h>
 #include <zypp/Arch.h>
 
 using namespace std;
-using namespace zypp::solver::detail;
+using namespace zypp;
 
 //---------------------------------------------------------------------------
 
@@ -51,47 +51,30 @@ bool
 emptyEdition(void)
 {
     Edition edition;
-    return (edition.asString() == "");
+    return (edition.asString() == "EDITION-UNSPEC");
 }
 
-bool
-epochEdition(void)
-{
-    Edition edition(1);
-
-    return (edition.asString() == "1:");
-}
 
 bool
 versionEdition(void)
 {
-    Edition edition(0,"42");
-
-    return (edition.asString() == "0:42");
+    Edition edition("42");
+    return (edition.asString() == "42");
 }
 
 bool
 releaseEdition(void)
 {
-    Edition edition(-1,"42","47.11");
-
+    Edition edition("42","47.11");
     return (edition.asString() == "42-47.11");
 }
 
 bool
-archEdition(void)
-{
-    Edition edition(0, "42", "47.11", zypp::Arch("x86_64"));
-
-    return (edition.asString() == "0:42-47.11.x86_64");
-}
-
-bool
 fullEdition(void)
 {
-    Edition edition(1, "42", "47.11", zypp::Arch("x86_64"));
-
-    return (edition.asString() == "1:42-47.11.x86_64");
+    Edition edition( "42", "47.11", 1);
+    return (edition.asString() == "1:42-47.11");
+    
 }
 
 //---------------------------------------------------------------------------
@@ -107,7 +90,8 @@ main (int argc, char *argv[])
 #define FUN(name)      { #name, name }
 
        FUN(defaultarch), FUN(x86arch),
-       FUN(emptyEdition), FUN(epochEdition), FUN(versionEdition), FUN(releaseEdition), FUN(archEdition), FUN(fullEdition), 
+       FUN(emptyEdition),  FUN(versionEdition), FUN(releaseEdition),
+        FUN(fullEdition),
        NULL, NULL
 
     };

diff --git a/zypp/solver/testsuite/single.out/edition.out b/zypp/solver/testsuite/single.out/edition.out
index a6937f3..abd5eca 100644 (file)
--- a/zypp/solver/testsuite/single.out/edition.out
+++ b/zypp/solver/testsuite/single.out/edition.out
@@ -1,8 +1,6 @@
 defaultarch      PASS
 x86arch          PASS
 emptyEdition     PASS
-epochEdition     PASS
 versionEdition   PASS
 releaseEdition   PASS
-archEdition      FAIL
-fullEdition      FAIL
+fullEdition      PASS

diff --git a/zypp/solver/testsuite/single.out/spec.out b/zypp/solver/testsuite/single.out/spec.out
index d743aed..9b0cd9e 100644 (file)
--- a/zypp/solver/testsuite/single.out/spec.out
+++ b/zypp/solver/testsuite/single.out/spec.out
@@ -2,5 +2,5 @@ emptySpec        PASS
 epochSpec        PASS
 versionSpec      PASS
 releaseSpec      PASS
-archSpec         FAIL
-fullSpec         FAIL
+archSpec         PASS
+fullSpec         PASS

diff --git a/zypp/solver/testsuite/spec_single.cc b/zypp/solver/testsuite/spec_single.cc
index a73c152..479ef93 100644 (file)
--- a/zypp/solver/testsuite/spec_single.cc
+++ b/zypp/solver/testsuite/spec_single.cc
@@ -23,6 +23,7 @@
 
 #include <zypp/solver/detail/Spec.h>
 #include "zypp/ResObject.h"
+#include "zypp/Edition.h"
 
 using namespace std;
 using namespace zypp::solver::detail;
@@ -38,32 +39,29 @@ bool
 epochSpec(void)
 {
     Spec spec(zypp::ResTraits<zypp::Package>::kind, "foo", 1);
-
     return (spec.asString() == "foo-1:");
 }
 
 bool
 versionSpec(void)
 {
-    Spec spec(zypp::ResTraits<zypp::Patch>::kind, "bar", 0,"42");
-    return (spec.asString() == "patch:bar-0:42");
+    Spec spec(zypp::ResTraits<zypp::Patch>::kind, "bar", 1,"42");
+    return (spec.asString() == "patch:bar-1:42");
 }
 
 bool
 releaseSpec(void)
 {
-    Spec spec(zypp::ResTraits<zypp::Package>::kind, "foobar", -1,"42","47.11");
-
+    Spec spec(zypp::ResTraits<zypp::Package>::kind, "foobar", zypp::Edition::noepoch,"42","47.11");
     return (spec.asString() == "foobar-42-47.11");
 }
 
 bool
 archSpec(void)
 {
-    Spec spec(zypp::ResTraits<zypp::Package>::kind, "arch", 0, "42", "47.11",
+    Spec spec(zypp::ResTraits<zypp::Package>::kind, "arch", 1, "42", "47.11",
               zypp::Arch("x86_64"));
-
-    return (spec.asString() == "arch-0:42-47.11.x86_64");
+    return (spec.asString() == "arch-1:42-47.11.x86_64");
 }
 
 bool
@@ -71,7 +69,6 @@ fullSpec(void)
 {
     Spec spec(zypp::ResTraits<zypp::Package>::kind, "full", 1, "42", "47.11",
               zypp::Arch("x86_64"));
-
     return (spec.asString() == "full-1:42-47.11.x86_64");
 }