Changeset 595

Timestamp:

Apr 14, 2008, 2:10:42 PM (13 years ago)

Author:

Peter Johansson

Message:

working on copyright test. As now the test fails and is therefore tagged under XFAIL_TESTS.

Location:

trunk/test

Files:

• Makefile.am (modified) (1 diff)
• copyright.cc (modified) (2 diffs)

trunk/test/Makefile.am

@@ -36 +36 @@
 endif
 
+# tests not yes passing are listed here
+XFAIL_TESTS = copyright
+
+
 LDADD = $(STATICFLAG) @top_builddir@/lib/libsvndigest.la
 

trunk/test/copyright.cc

@@ -55 +55 @@
 
   is.open(filename.c_str());
-  std::vector<std::string> copyrights=copyright_lines(is);
+  std::vector<std::string> copyrights_old=copyright_lines(is);
   is.close();
   is.clear(std::ios::goodbit);
 
-  if (copyrights.size()!=1) {
+  if (copyrights_old.size()!=1) {
     if (verbose){
-      std::cout << copyrights.size() << " Copyright lines\n";
-      for (size_t i=0; i<copyrights.size(); ++i)
-        std::cout << copyrights[i] << "\n";
+      std::cout << copyrights_old.size() << " Copyright lines\n";
+      for (size_t i=0; i<copyrights_old.size(); ++i)
+        std::cout << copyrights_old[i] << "\n";
     }
     ok = false;
@@ -93 +93 @@
   file.print_copyright(alias, verbose);
 
+  is.open(filename.c_str());
+  std::vector<std::string> copyrights=copyright_lines(is);
+  is.close();
+  is.clear(std::ios::goodbit);
+
+  if (copyrights.size()!=2) {
+    ok = false;
+    if (verbose)
+      std::cout << "ERROR: expected two lines of Copyright (C)\n";
+  }
+  if (verbose) {
+    std::cout << copyrights.size() << " Copyright lines\n";
+    for (size_t i=0; i<copyrights.size(); ++i)
+      std::cout << copyrights[i] << "\n";
+  }
+
   // Restoring file
   std::ofstream os(filename.c_str());