Changeset 1207

Timestamp:

Oct 7, 2010, 5:25:31 AM (13 years ago)

Author:

Peter Johansson

Message:

new function 'diff' to compare two strings

Location:

trunk/test

Files:

• Suite.cc (modified) (1 diff)
• Suite.h (modified) (1 diff)

trunk/test/Suite.cc

@@ -193 +193 @@
     suite.add(check_total(stats, suite));
     suite.add(check_comment_or_copy(stats, suite));
+    return true;
+  }
+
+
+  bool diff(const std::string& a, const std::string& b)
+  {
+    if (a==b)
+      return false;
+
+    std::istringstream ssa(a);
+    std::istringstream ssb(b);
+
+    std::string linea;
+    std::string lineb;
+    while (ssa || ssb) {
+      if (!ssa) {
+        getline(ssb, lineb);
+        std::cout << "+ " << lineb << "\n";
+      }
+      else if (!ssb) {
+        getline(ssa, linea);
+        std::cout << "- " << lineb << "\n";
+      }
+      else {
+        getline(ssa, linea);
+        getline(ssb, lineb);
+        if (linea==lineb)
+          std::cout << "  " << linea << "\n";
+        else {
+          std::cout << "- " << linea << "\n";
+          std::cout << "+ " << lineb << "\n";
+        }
+      }
+    }
     return true;
   }

trunk/test/Suite.h

@@ -82 +82 @@
   bool consistent(const Stats&, test::Suite&);
 
+  // return true if a and b are different
+  // sends differences to cout
+  bool diff(const std::string& a, const std::string& b);
+
   bool equal(const StatsCollection& a, const StatsCollection& b, 
              test::Suite& suite);