Changeset 603

Timestamp:

Apr 16, 2008, 5:39:33 AM (14 years ago)

Author:

Peter Johansson

Message:

avoid copy and paste code

File:

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

trunk/test/stats_test.cc

@@ -33 +33 @@
 #include <algorithm>
 #include <cassert>
+#include <cstddef>
 #include <iterator>
 #include <iostream>
 #include <numeric>
 #include <string>
+#include <vector>
 
 namespace theplu{
 namespace svndigest{
 
+  bool check(const Stats& stats, const std::vector<size_t>& correct,
+             int linetype, const std::string& descr, const std::string& author);
   bool test_add(void);
   bool test_blame(void);
@@ -51 +55 @@
 {
   using namespace theplu::svndigest;
+  bool verbose=false;
   bool ok=true;
+  if (argc>1 && argv[1]==std::string("-v") )
+    verbose=true;
   SVN* svn=SVN::instance(test::filename("toy_project"));
   if (!svn){
@@ -62 +69 @@
   ok &= test_classic();
                                                                                 
+  if (verbose)
+    if (ok)
+      std::cout << "Test is ok.\n";
+    else
+      std::cout << "Test failed.\n";
   if (ok)
     return 0;
@@ -101 +113 @@
 
     // testing copyright lines for peter
-    std::vector<size_t> correct(48);
+    std::vector<size_t> correct(48,0);
     correct[47]=2;
-    
-    std::partial_sum(correct.begin(), correct.end(), correct.begin());
-    for (size_t rev=0; rev<correct.size(); ++rev)
-      if (cs(LineTypeParser::copyright, "peter", rev)!=correct[rev]){
-        std::cerr << "error: copyright peter rev:" << rev << ": found " 
-                  << cs(LineTypeParser::copyright, "peter", rev)
-                  << " expected " << correct[rev] << "\n";
-        ok = false;
-      }
+    ok &= check(cs, correct, LineTypeParser::copyright, "copyright", "peter");
 
     // testing code lines for jari
-    correct = std::vector<size_t>(48,0);
+    correct.resize(0);
+    correct.resize(48,0);
     correct[15]=20;
     correct[16]=1;
@@ -120 +125 @@
     correct[28]=8;
     correct[30]=54;
-    
-    std::partial_sum(correct.begin(), correct.end(), correct.begin());
-    for (size_t rev=0; rev<correct.size(); ++rev)
-      if (cs(LineTypeParser::code, "jari", rev)!=correct[rev]){
-        std::cerr << "error: code jari rev:" << rev << ": found " 
-                  << cs(LineTypeParser::code, "jari", rev)
-                  << " expected " << correct[rev] << "\n";
-        ok = false;
-      }
+    ok &= check(cs, correct, LineTypeParser::code, "code", "jari");
 
     // testing comment lines for jari
-    correct = std::vector<size_t>(48,0);
+    correct.resize(0);
+    correct.resize(48,0);
     correct[15]=1;
     correct[28]=13;
     correct[30]=7;
-    
-    std::partial_sum(correct.begin(), correct.end(), correct.begin());
-    for (size_t rev=0; rev<correct.size(); ++rev)
-      if (cs(LineTypeParser::comment, "jari", rev)!=correct[rev]){
-        std::cerr << "error: comment jari rev:" << rev << ": found " 
-                  << cs(LineTypeParser::comment, "jari", rev)
-                  << " expected " << correct[rev] << "\n";
-        ok = false;
-      }
+    ok &= check(cs, correct, LineTypeParser::comment, "comment", "jari");
 
     // testing blank lines for jari
-    correct = std::vector<size_t>(48,0);
+    correct.resize(0);
+    correct.resize(48,0);
     correct[15]=10;
     correct[28]=10;
     correct[30]=2;
-    
-    std::partial_sum(correct.begin(), correct.end(), correct.begin());
-    for (size_t rev=0; rev<correct.size(); ++rev)
-      if (cs(LineTypeParser::other, "jari", rev)!=correct[rev]){
-        std::cerr << "error: other jari rev:" << rev << ": found " 
-                  << cs(LineTypeParser::other, "jari", rev)
-                  << " expected " << correct[rev] << "\n";
-        ok = false;
-      }
+    ok &= check(cs, correct, LineTypeParser::other, "other", "jari");
 
     // testing code all lines for total
-    correct = std::vector<size_t>(48,0);
+    correct.resize(0);
+    correct.resize(48,0);
     correct[15]=31;
     correct[16]=1;
@@ -168 +152 @@
     correct[30]=63;
     correct[47]=2;
-
-    std::partial_sum(correct.begin(), correct.end(), correct.begin());
-    for (size_t rev=0; rev<correct.size(); ++rev)
-      if (cs(LineTypeParser::total, "all", rev)!=correct[rev]){
-        std::cerr << "error: total all rev:" << rev << ": found " 
-                  << cs(LineTypeParser::total, "all", rev)
-                  << " expected " << correct[rev] << "\n";
-        ok = false;
-      }
+    ok &= check(cs, correct, LineTypeParser::total, "total", "all");
 
     return ok;
   }
   
+  bool check(const Stats& stats, const std::vector<size_t>& correct,
+             int linetype, const std::string& descr, const std::string& author)
+  {
+    bool ok=true;
+    std::vector<size_t> sum(correct.size());
+    std::partial_sum(correct.begin(), correct.end(), sum.begin());
+    for (size_t rev=0; rev<sum.size(); ++rev){
+      size_t n = stats(linetype, author, rev);
+      if (n != sum[rev]){
+        std::cerr << "error: " << descr << " " << author << " rev:" << rev 
+                  << ": found " << n << " expected " << sum[rev] << "\n";
+        ok = false;
+      }
+    }
+    return true;
+  }
+
 }} // end of namespace svndigest and theplu