Changeset 150

Timestamp:

21-03-07 00:30:25 (6 years ago)

Author:

thomas

Message:

• moap/test/test_util_ctags.py (TestTag?.testRepr, TestTag?.testParse, TestCTags.testGetLastTwo, TestCTags.testGetLastTag, TestCTagsFromString, TestCTagsFromString.testFromEmptyString, TestCTagsFromString.testFromString, TestCTagsFromString.testFromWrongString):
• moap/util/ctags.py (CTags.getTags): Increase coverage to 100%. Fix small bugs exposed by adding tests to increase coverage.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/test/test_util_ctags.py (modified) (2 diffs)
• moap/util/ctags.py (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-03-21  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * moap/test/test_util_ctags.py (TestTag.testRepr, TestTag.testParse,
+          TestCTags.testGetLastTwo, TestCTags.testGetLastTag,
+          TestCTagsFromString, TestCTagsFromString.testFromEmptyString,
+          TestCTagsFromString.testFromString,
+          TestCTagsFromString.testFromWrongString):
+        * moap/util/ctags.py (CTags.getTags):
+          Increase coverage to 100%.
+          Fix small bugs exposed by adding tests to increase coverage.
+
 2007-03-21  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/test/test_util_ctags.py

@@ -11 +11 @@
     def setUp(self):
         self.tag = ctags.Tag()
+
+    def testRepr(self):
+        self.failUnless(repr(self.tag))
 
     def testParse(self):
@@ -56 +59 @@
         self.assertEquals(tags[0].name, 'detect')
 
+    def testGetLastTwo(self):
+        # update starts on 106
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 105, 1)
+        self.assertEquals(len(tags), 2)
+        self.assertEquals(tags[0].name, 'diff')
+        self.assertEquals(tags[1].name, 'update')
+
     def testGetLastTag(self):
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 107, 0)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 106, 0)
         self.assertEquals(len(tags), 1)
         self.assertEquals(tags[0].name, 'update')
+
+class TestCTagsFromString(unittest.TestCase):
+    def testFromEmptyString(self):
+        self.ctags = ctags.CTags()
+        self.ctags.addString('')
+
+    def testFromString(self):
+        self.ctags = ctags.CTags()
+        self.ctags.addString('!_TAG_')
+
+    def testFromWrongString(self):
+        self.ctags = ctags.CTags()
+        self.assertRaises(KeyError, self.ctags.addString, 'wrongtype')

trunk/moap/util/ctags.py

@@ -87 +87 @@
         starts.sort()
         i = 0
-        # look for first tag beyond the line number
-        while tags[starts[i]].line < line:
+        # look for the tag right before the given line number
+        while tags[starts[i]].line <= line:
             i += 1
             if i == len(starts):
                 # line number is past the last tag, so we only return
                 # the last tag
+                self.debug('Returning only tag starting on %d' % starts[-1])
                 return [tags[starts[-1]], ]
 
-        # go back one if we are not exactly on a tag start line
-        if tags[starts[i]].line > line:
-            i -= 1
+        # now i points to a tag on or beyond the given line number, so go back
+        # one
+        i -= 1
             
         if i >= 0:
-            # there is in fact a tag started before the given line
+            # there is in fact a tag started before the given line, so append it
+            self.debug('appending tag starting on line %d' % starts[i])
             ret.append(tags[starts[i]])
+
+        # now we go back to the first tag starting on or past the given line
+        # number
         i += 1
-        
+
         # now find all tags in the given range and append
-        while tags[starts[i]].line < line + count:
+        # it is possible we are already past the end of starts
+        while count and tags[starts[i]].line <= line + count:
+            self.debug('appending tag starting on line %d' % starts[i])
             ret.append(tags[starts[i]])
             i += 1
@@ -111 +118 @@
                 break
 
+        self.debug('returning %d tags' % len(ret))
         return ret