Changeset 634 for trunk

Timestamp:

May 9, 2008, 2:37:57 AM (14 years ago)

Author:

Peter Johansson

Message:

undoing commit [633] for stats_test.cc

File:

• trunk/test/stats_test.cc (modified) (5 diffs)

trunk/test/stats_test.cc

@@ -37 +37 @@
 #include <iostream>
 #include <numeric>
-#include <sstream>
 #include <string>
 #include <vector>
@@ -49 +48 @@
   bool test_add(void);
   bool test_blame(void);
-  bool test_cache(const Stats&);
   bool test_classic(void);
   bool test_base_class(const Stats&);
@@ -69 +67 @@
   }
 
-  //  ok &= test_add();
-  //ok &= test_blame();
+  ok &= test_add();
+  ok &= test_blame();
   ok &= test_classic();
                                                                                 
@@ -112 +110 @@
 
   
-  bool test_cache(const Stats& stats)
-  {
-    std::cerr << "test cache " << std::endl;
-    std::stringstream ss;
-    stats.print(ss);
-    ClassicStats new_stats(path());
-    if (!new_stats.load_cache(ss)) {
-      std::cerr << "Failed reloading cache" << std::endl;
-      return false;
-    }
-    std::cerr << "Hello" << std::endl;
-    ss.clear(std::ios::goodbit);
-    if (stats.authors() != new_stats.authors()) {
-      std::cerr << "Error: cache: authors not the same\n";
-      return false;
-    }
-    std::cerr << "Hello2" << std::endl;
-    if (stats.revision()!=new_stats.revision()) {
-      std::cerr << "Error: cache: revision not the same\n";
-      return false;
-    }
-    try {
-      for (int lt=0; lt<1; ++lt) {
-        for (std::set<std::string>::const_iterator a=stats.authors().begin();
-             a!=stats.authors().end(); ++a) {
-          for (svn_revnum_t rev=0; rev<=stats.revision(); ++rev) {
-            std::cerr << "lt: " << lt << std::endl;
-            std::cerr << "author: " << *a << std::endl;
-            std::cerr << "rev: " << rev << std::endl;
-            if (stats(lt, *a, rev)!=new_stats(lt, *a, rev)) {
-              std::cerr << "Error cache:\n";
-              std::cerr << "lt: " << lt << std::endl;
-              std::cerr << "author: " << *a << std::endl;
-              std::cerr << "rev: " << rev << std::endl;
-              std::cerr << stats(lt, *a, rev) << " not equal " 
-                        << new_stats(lt, *a, rev) << std::endl;
-              return false;
-            }
-          }
-        }
-      }
-    }
-    catch (std::runtime_error& e) {
-      std::cerr << "Caught an exception. what(): " << e.what() << "\n";
-      return false;
-    }
-
-    std::stringstream ss2;
-    new_stats.print(ss2);
-    if (ss.str()!=ss2.str()) {
-      std::cerr << "ERROR: reprinted cache not equal first printed cache\n";
-
-      std::string line;
-      std::string line2;
-      std::size_t line_no=1;
-      ss.seekg(0);
-      ss2.seekg(0);
-      assert(ss.good());
-      assert(ss2.good());
-      while (getline(ss, line) && getline(ss2, line2) ) {
-        if (line==line2) {
-          std::cerr << line_no << " " << line << "\n";
-        }
-        else {
-          std::cerr << line_no << "< " << line << "\n";
-          std::cerr << line_no << "> " << line2 << "\n";
-          return false;
-        }
-        ++line_no;
-      }
-      return false;
-    }
-    return true;
-  }
-
-
   bool test_classic(void)
   {
@@ -193 +115 @@
     ClassicStats cs(path());
     cs.parse(path());
-    //ok &= test_base_class(cs);
-    
-    // Peter, should be included in test_base_test()
-    ok &= test_cache(cs);
+    ok &= test_base_class(cs);
 
     // testing copyright lines for peter