reapack

commit 4e691a52ed7841e72e475c3a624b94877b9dbac4
parent 984a62cddb9779c28979bb652d79f498041ad2bb
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Mon, 18 Jan 2016 18:47:23 -0500

yet another refactoring commit

Diffstat:
M
src/registry.hpp
 | 
2
+-
M
src/report.cpp
 | 
2
+-
M
test/registry.cpp
 | 
8
++++----

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/registry.hpp b/src/registry.hpp
@@ -40,7 +40,7 @@ public:
 
   struct QueryResult {
     Status status;
-    uint64_t versionCode;
+    uint64_t version;
   };
 
   void push(Version *);
diff --git a/src/report.cpp b/src/report.cpp
@@ -93,7 +93,7 @@ void Report::formatUpdates(ostringstream &text)
     const VersionSet &versions = pkg->versions();
 
     for(Version *ver : versions | boost::adaptors::reversed) {
-      if(ver->code() <= regEntry.versionCode)
+      if(ver->code() <= regEntry.version)
         break;
 
       text << NL << ver->fullName() << NL;
diff --git a/test/registry.cpp b/test/registry.cpp
@@ -24,7 +24,7 @@ TEST_CASE("query uninstalled package", M) {
 
   const Registry::QueryResult res = reg.query(&pkg);
   REQUIRE(res.status == Registry::Uninstalled);
-  REQUIRE(res.versionCode == 0);
+  REQUIRE(res.version == 0);
 }
 
 TEST_CASE("query up to date pacakge", M) {
@@ -35,7 +35,7 @@ TEST_CASE("query up to date pacakge", M) {
 
   const Registry::QueryResult res = reg.query(&pkg);
   REQUIRE(res.status == Registry::UpToDate);
-  REQUIRE(res.versionCode == Version("1.0").code());
+  REQUIRE(res.version == Version("1.0").code());
 }
 
 TEST_CASE("bump version", M) {
@@ -50,10 +50,10 @@ TEST_CASE("bump version", M) {
 
   const Registry::QueryResult res1 = reg.query(&pkg);
   REQUIRE(res1.status == Registry::UpdateAvailable);
-  REQUIRE(res1.versionCode == Version("1.0").code());
+  REQUIRE(res1.version == Version("1.0").code());
 
   reg.push(ver2);
   const Registry::QueryResult res2 = reg.query(&pkg);
   REQUIRE(res2.status == Registry::UpToDate);
-  REQUIRE(res2.versionCode == Version("2.0").code());
+  REQUIRE(res2.version == Version("2.0").code());
 }