Changeset 309

Timestamp:

May 12, 2007, 3:26:38 PM (16 years ago)

Author:

Peter Johansson

Message:

added test for Trac class. fixes #189

Location:

trunk

Files:

• lib/Trac.cc (modified) (13 diffs)
• lib/Trac.h (modified) (3 diffs)
• lib/html_utility.cc (modified) (1 diff)
• lib/utility.cc (modified) (2 diffs)
• lib/utility.h (modified) (2 diffs)
• test/Makefile.am (modified) (3 diffs)
• test/trac.cc (added)

trunk/lib/Trac.cc

@@ -96 +96 @@
       return false;
     const std::string::const_iterator first_orig(first);
-    if (match(first, last, Str("changeset:")).empty()){
+    if (match(first, last, std::string("changeset:")).empty()){
       first = first_orig;
       return false;
@@ -118 +118 @@
 
     const std::string::const_iterator first_orig(first);
-    if (match(first, last, Str("comment:ticket:")).empty()){
+    if (match(first, last, std::string("comment:ticket:")).empty()){
       first = first_orig;
       return false;
@@ -153 +153 @@
                   const std::string::const_iterator& last)
   {
+    if (diff3(first, last))
+      return true;
     if (diff1(first, last))
-      return true;
-    if (diff3(first, last))
       return true;
     if (diff2(first, last))
@@ -170 +170 @@
 
     const std::string::const_iterator first_orig(first);
-    if (match(first, last, Str("diff:")).empty()){
+    if (match(first, last, std::string("diff:")).empty()){
       first = first_orig;
       return false;
@@ -198 +198 @@
       href = std::string(Configuration::instance().trac_root()+
                          "changeset?new="+new_rev+"&new_path="+node+"&old="+
-                         old_rev+"&oldpath="+node);
+                         old_rev+"&old_path="+node);
     hs_.stream() << anchor(href, std::string(first_orig, first)); 
     return true;
@@ -211 +211 @@
 
     const std::string::const_iterator first_orig(first);
-    if (match(first, last, Str("diff:")).empty()){
+    if (match(first, last, std::string("diff:")).empty()){
       first = first_orig;
       return false;
@@ -241 +241 @@
 
     const std::string::const_iterator first_orig(first);
-    if (match(first, last, Str("diff:")).empty()){
+    if (match(first, last, std::string("diff:")).empty()){
       first = first_orig;
       return false;
@@ -252 +252 @@
     ++first;
     std::string old_rev(match(first, last, AlNum()));
-    if (!match_begin(first, first+1, std::string("//"))) {
-      first = first_orig;
-      return false;
-    }
-    first+2;
+    if (match(first, last, std::string("//")).empty()) {
+      first = first_orig;
+      return false;
+    }
     std::string new_path = match(first, last, not2Char('@', ' '));
     if (*first!='@'){
@@ -341 +340 @@
       return false;
     }
+    ++first; // eating ']'
     std::string href(Configuration::instance().trac_root()+"log/?rev="+
                      rev+"&stop_rev="+stop_rev);
@@ -396 +396 @@
     const std::string::const_iterator first_orig(first);
 
-    if (match(first, last, Str("milestone:")).empty()){
+    if (match(first, last, std::string("milestone:")).empty()){
       first = first_orig;
       return false;
@@ -427 +427 @@
       if (log(first, str.end()))
         continue;
+      if (comment(first, str.end()))
+        continue;
       if (ticket(first, str.end()))
-        continue;
-      if (comment(first, str.end()))
         continue;
       if (changeset(first, str.end()))
@@ -453 +453 @@
     const std::string::const_iterator first_orig(first);
 
-    if (match(first, last, Str("source:")).empty()){
+    if (match(first, last, std::string("source:")).empty()){
       first = first_orig;
       return false;
@@ -531 +531 @@
     const std::string::const_iterator first_orig(first);
 
-    if (match(first, last, Str("ticket:")).empty()){
-      first = first_orig;
-      return false;
-    }
-      
+    if (match(first, last, std::string("ticket:")).empty()){
+      first = first_orig; 
+      return false;
+    }
     std::string ticket = match(first, last, Digit());
 
     const Configuration& conf = Configuration::instance();
-    hs_.stream() << anchor(conf.trac_root()+"ticket/"+ticket,"#"+ticket); 
+    hs_.stream() << anchor(conf.trac_root()+"ticket/"+ticket,
+                           std::string(first_orig, first)); 
     return true;
   }

trunk/lib/Trac.h

@@ -119 +119 @@
 
     ///
-    /// \brief search for diff:trunk@12+:123
+    /// \brief search for diff:trunk@12:123
     ///
     /// Search in range [\a first, \a last) for expression
@@ -136 +136 @@
 
     ///
-    /// @brief search for diff:tags/1.0 or diff:tags/1.0//1.0.1
+    /// @brief search for diff:tags/1.0 or diff:tags/1.0//tags/1.0.1
     ///
     /// Search in range [\a first, \a last) for expression
@@ -162 +162 @@
     ///
     /// The created anchor goes to
-    /// trac-root/changeset?new=236&new_path=trunk&old=236&old_path=tags/1.0
+    /// trac-root/changeset?new=236&new_path=trunk&old=123&old_path=tags/1.0
     ///
     /// @return true if expression is found

trunk/lib/html_utility.cc

@@ -46 +46 @@
     for (size_t i=0; i<level; ++i)
       ss << "../";
-    hs << href; 
+    ss << href; 
     ss << "\">"; 
     hs << name; 

trunk/lib/utility.cc

@@ -174 +174 @@
 
 
+  std::string match(std::string::const_iterator& first,
+                    const std::string::const_iterator& last,
+                    std::string str)
+  {
+    if (match_begin(first, last, str)){
+      first+=str.size();
+      return str;
+    }
+    return std::string();
+  }
+
   notChar::notChar(char c)
     : char_(c)
@@ -183 +194 @@
   {}
     
-
-  Str::Str(std::string s)
-    : str_(s)
-  {}
-
 
   not2Str::not2Str(std::string s1, std::string s2)

trunk/lib/utility.h

@@ -150 +150 @@
   }
 
+
+  std::string match(std::string::const_iterator& first,
+                    const std::string::const_iterator& last,
+                    std::string);
+
   struct AlNum
   {
@@ -183 +188 @@
     const char char1_;
     const char char2_;
-  };
-
-  class Str
-  {
-  public:
-    Str(std::string);
-    inline bool operator()(std::string::const_iterator i) const 
-    { return (std::equal(str_.begin(), str_.end(), i)); } 
-
-  private:
-    const std::string str_;
   };
 

trunk/test/Makefile.am

@@ -4 +4 @@
 
 # Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2007 Peter Johansson
 #
 # This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -22 +23 @@
 # 02111-1307, USA.
 
-check_PROGRAMS = gnuplot_pipe parser
+check_PROGRAMS = gnuplot_pipe parser trac
 
 TESTS = $(check_PROGRAMS)
@@ -36 +37 @@
 gnuplot_pipe_SOURCES = gnuplot_pipe.cc
 parser_SOURCES = parser.cc
+trac_SOURCES = trac.cc
 
 test_repo.sh: test_repo.sh.in Makefile.am