Ticket #692: phptools.py.diff

phptools.py

@@ -114 +114 @@
             coverage.append(class_coverage)
 
     def _process_phpunit_coverage(ctxt, element, coverage):
+        def _process_line_data(data):
+            line_hits = []
+            line_nums = data.keys()
+            line_nums.sort()
+            for num in line_nums:
+                line_hits.extend((num - len(line_hits) - 1) * ['-'])
+                line_hits.append(str(data[num]))
+            return ' '.join(line_hits) 
         for cls in element._node.getElementsByTagName('class'):
             sourcefile = cls.parentNode.getAttribute('name')
             if not os.path.isabs(sourcefile):
                 sourcefile = os.path.join(ctxt.basedir, sourcefile)
             if sourcefile.startswith(ctxt.basedir):
+                line_data = {}
                 loc, ncloc = 0, 0.0
                 for line in cls.parentNode.getElementsByTagName('line'):
+                    num = int(line.getAttribute('num'))
+                    cnt = int(line.getAttribute('count'))
+                    line_data[num] = cnt
                     if str(line.getAttribute('type')) == 'stmt':
                         loc += 1
-                        if int(line.getAttribute('count')) == 0:
+                        if cnt == 0:
                             ncloc += 1
                 if loc > 0:
                     percentage = 100 - (ncloc / loc * 100)
                 else:
                     percentage = 100
 
+                
+
                 if sourcefile.startswith(ctxt.basedir):
                     sourcefile = sourcefile[len(ctxt.basedir) + 1:]
                 class_coverage = xmlio.Element('coverage',
                                     name=cls.getAttribute('name'),
                                     lines=int(loc),
+                                    line_hits=_process_line_data(line_data),
                                     percentage=int(percentage),
                                     file=sourcefile.replace(os.sep, '/'))
                 coverage.append(class_coverage)