Changeset 801

Timestamp:

Jul 6, 2009, 4:07:42 AM (13 years ago)

Author:

Peter Johansson

Message:

working on the test for partial cache. refs #338

Location:

trunk

Files:

• lib/StatsCollection.h (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/Suite.cc (modified) (3 diffs)
• test/Suite.h (modified) (2 diffs)
• test/cache_partial_test.cc (modified) (2 diffs)

trunk/lib/StatsCollection.h

@@ -60 +60 @@
 
     /**
-       reset everything
      */
     void print(std::ostream&);

trunk/test/Makefile.am

@@ -4 +4 @@
 
 # Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2009 Peter Johansson
-# Copyright (C) 2008 Peter Johansson
+# Copyright (C) 2008, 2009 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -31 +30 @@
 
 # tests not yet passing are listed here
-XFAIL_TESTS = cache_partial_test
+XFAIL_TESTS = 
 
 noinst_HEADERS = Suite.h

trunk/test/Suite.cc

@@ -25 +25 @@
 #include "environment.h"
 
-#include "utility.h"
+#include "Stats.h"
+#include "StatsCollection.h"
+#include "../lib/utility.h"
 
 #include <cassert>
@@ -90 +92 @@
 
 
+  bool equal(const StatsCollection& a, const StatsCollection& b, 
+             Suite& suite)
+  {
+    if (a.stats().size() != b.stats().size()) {
+      suite.out() << "size mismatch\n";
+      return false;
+    }
+    std::map<std::string, Stats*>::const_iterator iter1 = a.stats().begin();
+    std::map<std::string, Stats*>::const_iterator iter2 = b.stats().begin();
+    while (iter1 != a.stats().end()) {
+      if (iter1->first != iter2->first) {
+        suite.out() << "key mismatch\n";
+        suite.out() << iter1->first << " vs " << iter2->first << "\n";
+        return false;
+      }
+      if (!equal(*iter1->second, *iter2->second, suite)) {
+        suite.out() << "error in " << iter1->first << "\n";
+        return false;
+      }
+      ++iter1;
+      ++iter2;
+    }
+    return true;
+  }
+  
+
+  bool equal(const Stats& a, const Stats& b, test::Suite& suite)
+  {
+    if (a.authors() != b.authors()) {
+      suite.out() << "authors are not equal\n";
+      return false;
+    }
+    if (a.revision() != b.revision()) {
+      suite.out() << "revision mismatch\n";
+      return false;
+    }
+    std::vector<std::string> authors;
+    authors.reserve(a.authors().size()+1);
+    std::copy(a.authors().begin(), a.authors().end(), 
+              std::back_inserter(authors));
+    authors.push_back("all");
+    for (int linetype=0; linetype <= LineTypeParser::total; ++linetype) {
+      for (std::vector<std::string>::const_iterator author=authors.begin(); 
+           author!=authors.end(); ++author) {
+        for (svn_revnum_t rev=0; rev<a.revision(); ++rev) {
+          size_t ax = a(linetype, *author, rev);
+          size_t bx = b(linetype, *author, rev);
+          if (ax != bx) {
+            suite.out() << "error: linetype: " << linetype 
+                        << " author " << *author  
+                        << " rev " << rev << "\n"
+                        << "   a: " << ax << "\n"
+                        << "   b: " << bx << "\n";
+            return false;
+          }
+        }
+      }
+    }
+    return true;
+  }
+
+
   void Suite::update_test_wc(void) const
   {
@@ -114 +178 @@
 
 
+  std::string src_filename(const std::string& path)
+  {
+    return abs_srcdir()+"/"+path;
+  }
+
+
 }}}

trunk/test/Suite.h

@@ -29 +29 @@
 namespace theplu {
 namespace svndigest {
+  class Stats;
+  class StatsCollection;
+
 namespace test {
 
@@ -65 +68 @@
   };
 
+  bool equal(const StatsCollection& a, const StatsCollection& b, 
+             test::Suite& suite);
+
+  bool equal(const Stats& a, const Stats& b, test::Suite& suite);
+
   /**
      \return absolute path to file
-     \param local_path path relative to srcdir
+     \param local_path path relative to builddir
    */
   std::string filename(const std::string& local_path);
 
+  /**
+     \return absolute path to file
+     \param path path relative to srcdir
+   */
+  std::string src_filename(const std::string& path);
 }}}
 

trunk/test/cache_partial_test.cc

@@ -24 +24 @@
 #include "Suite.h"
 
+#include "File.h"
+#include "SVN.h"
+#include "SVNinfo.h"
+
+#include "../lib/utility.h"
+
 #include <iostream>
+
+using namespace theplu::svndigest;
 
 int main( int argc, char* argv[])
 {
-  using namespace theplu::svndigest;
   test::Suite suite(argc, argv, true);
 
-  suite.add(false);
+  mkdir_p(test::filename("toy_project/.svndigest"));
+  std::string root=test::filename("toy_project");
+  std::string filename = root + "/AUTHORS";
+  suite.out() << "Create SVN instance" << std::endl;
+  SVN* svn=SVN::instance(root);
+  if (!svn)
+    return 1;
+  // Extract repository location
+  suite.out() << "Extract repository location" << std::endl;
+  std::string repo=SVNinfo(root).repos_root_url();
+
+  // create file ignoring cache file
+  std::string cache_file = 
+    test::filename("toy_project/.svndigest/AUTHORS.svndigest-cache");
+  File file(0,filename,"");
+  const StatsCollection& stats1 = file.parse(suite.verbose(), true);
+
+  // create file using partial cache
+  copy_file(test::src_filename("data/AUTHORS.svndigest-cache-r61"), cache_file);
+  File file2(0,filename,"");
+  const StatsCollection& stats2 = file2.parse(suite.verbose(), false);
+
+  suite.add(equal(stats1, stats2, suite));
 
   if (suite.ok()) {
@@ -42 +71 @@
 
 
+
+