Changeset 649

Timestamp:

Jun 8, 2008, 4:46:28 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes #313

Location:

trunk

Files:

• lib/Stats.cc (modified) (2 diffs)
• test/stats_test.cc (modified) (4 diffs)

trunk/lib/Stats.cc

@@ -266 +266 @@
         ss >> rev;
         ss >> count;
+        assert(rev<=revision_);
         if (!count)
           break;
-        if (rev+1 < static_cast<svn_revnum_t>(vec.size()) )
-          vec.resize(rev+1);
+        vec.resize(std::max(vec.size(),static_cast<size_t>(rev+1)));
         vec[rev]=count;
       }
@@ -297 +297 @@
     }
     getline(is, str);
-    if (str!=cache_check_str())
+    if (str!=cache_check_str()) {
       return false;
+    }
     for (size_t i=0; i<stats_.size(); ++i){
       load(is, stats_[i]);
       getline(is, str);
-      if (str!=cache_check_str())
+      if (str!=cache_check_str()) {
         return false;
+      }
     }
     return true;

trunk/test/stats_test.cc

@@ -38 +38 @@
 #include <numeric>
 #include <string>
+#include <sstream>
 #include <vector>
 
@@ -50 +51 @@
   bool test_classic(void);
   bool test_base_class(const Stats&);
+  bool test_cache(const Stats&);
   
 }} // end of namespace svndigest and theplu
@@ -110 +112 @@
 
   
+  bool test_cache(const Stats& stats)
+  {
+    std::stringstream out;
+    stats.print(out);
+    std::stringstream in(out.str());
+    ClassicStats stats2(path());
+    assert(in.good());
+    if (!stats2.load_cache(in)){
+      std::cout << "load_cache() failed\n";
+      return false;
+    }
+
+    std::stringstream out2;
+    stats2.print(out2);
+    
+    if (out.str()!=out2.str()) {
+      std::cout << "test_cache() failed\n";
+      return false;
+    }
+    return true;
+  }
+
+
   bool test_classic(void)
   {
@@ -181 +206 @@
   bool test_base_class(const Stats& s)
   {
+    if (!test_cache(s))
+      return false;
     if (s.code()+s.comments()+s.empty()!=s.lines()){
       std::cerr << "Code plus comments plus empty do not add up to lines\n";