From e0ccb31492029204c8b2bb9e186fe8303df81d2e Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Tue, 3 Nov 2009 06:30:12 -0500
Subject: Make the naming of Results attributes more consistent.

---
 coverage/htmlfiles/index.html  | 10 +++++-----
 coverage/htmlfiles/pyfile.html |  4 ++--
 coverage/results.py            | 16 ++++++++--------
 coverage/summary.py            |  7 ++++---
 4 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'coverage')

diff --git a/coverage/htmlfiles/index.html b/coverage/htmlfiles/index.html
index 1e11e9e..646851a 100644
--- a/coverage/htmlfiles/index.html
+++ b/coverage/htmlfiles/index.html
@@ -10,7 +10,7 @@
 <div id='header'>
     <div class='content'>
         <h1>Coverage report: 
-            <span class='pc_cov'>{{totals.percent_covered|format_pct}}%</span>
+            <span class='pc_cov'>{{totals.pc_covered|format_pct}}%</span>
         </h1>
     </div>
 </div>
@@ -31,23 +31,23 @@
 <tr class='file'>
     <td class='name'><a href='{{file.html_filename}}'>{{file.cu.name}}</a></td>
     <td>{{file.nums.n_statements}}</td>
-    <td>{{file.nums.n_run}}</td>
+    <td>{{file.nums.n_executed}}</td>
     <td>{{file.nums.n_excluded}}</td>
     {% if arcs %}
     <td>{{file.par}}</td>
     {% endif %}
-    <td>{{file.nums.percent_covered|format_pct}}%</td>
+    <td>{{file.nums.pc_covered|format_pct}}%</td>
 </tr>
 {% endfor %}
 <tr class='total'>
 <td class='name'>Total</td>
 <td>{{totals.n_statements}}</td>
-<td>{{totals.n_run}}</td>
+<td>{{totals.n_executed}}</td>
 <td>{{totals.n_excluded}}</td>
 {% if arcs %}
 <td>{{total_par}}</td>
 {% endif %}
-<td>{{totals.percent_covered|format_pct}}%</td>
+<td>{{totals.pc_covered|format_pct}}%</td>
 </tr>
 </table>
 </div>
diff --git a/coverage/htmlfiles/pyfile.html b/coverage/htmlfiles/pyfile.html
index 5c9509b..8ae27ea 100644
--- a/coverage/htmlfiles/pyfile.html
+++ b/coverage/htmlfiles/pyfile.html
@@ -23,11 +23,11 @@ function toggle_lines(btn, cls) {
 <div id='header'>
     <div class='content'>
         <h1>Coverage for <b>{{cu.name|escape}}</b> :
-            <span class='pc_cov'>{{nums.percent_covered|format_pct}}%</span>
+            <span class='pc_cov'>{{nums.pc_covered|format_pct}}%</span>
         </h1>
         <h2 class='stats'>
             {{nums.n_statements}} statements
-            <span class='{{c_run.strip}}' onclick='toggle_lines(this, "run")'>{{nums.n_run}} run</span>
+            <span class='{{c_run.strip}}' onclick='toggle_lines(this, "run")'>{{nums.n_executed}} run</span>
             <span class='{{c_exc.strip}}' onclick='toggle_lines(this, "exc")'>{{nums.n_excluded}} excluded</span>
             <span class='{{c_mis.strip}}' onclick='toggle_lines(this, "mis")'>{{nums.n_missing}} missing</span>
             {% if arcs %}
diff --git a/coverage/results.py b/coverage/results.py
index b7156bd..2374d3a 100644
--- a/coverage/results.py
+++ b/coverage/results.py
@@ -30,9 +30,9 @@ class Analysis(object):
         self.statements, self.excluded = self.parser.parse_source()
 
         # Identify missing statements.
-        self.missing = []
-        self.executed = self.coverage.data.executed_lines(self.filename)
-        exec1 = self.parser.first_lines(self.executed)
+        executed = self.coverage.data.executed_lines(self.filename)
+        exec1 = [l for l in self.parser.first_lines(executed) if l in self.statements]
+        exec1 = self.parser.first_lines(executed)
         self.missing = sorted(set(self.statements) - set(exec1))
 
         self.numbers = Numbers(
@@ -125,19 +125,19 @@ class Numbers(object):
         self.n_excluded = n_excluded
         self.n_missing = n_missing
 
-    def _get_n_run(self):
+    def _get_n_executed(self):
         """Returns the number of executed statements."""
         return self.n_statements - self.n_missing
-    n_run = property(_get_n_run)
+    n_executed = property(_get_n_executed)
     
-    def _get_percent_covered(self):
+    def _get_pc_covered(self):
         """Returns a single percentage value for coverage."""
         if self.n_statements > 0:
-            pc_cov = 100.0 * self.n_run / self.n_statements
+            pc_cov = 100.0 * self.n_executed / self.n_statements
         else:
             pc_cov = 100.0
         return pc_cov
-    percent_covered = property(_get_percent_covered)
+    pc_covered = property(_get_pc_covered)
 
     def __add__(self, other):
         nums = Numbers()
diff --git a/coverage/summary.py b/coverage/summary.py
index c1440ec..00e4af8 100644
--- a/coverage/summary.py
+++ b/coverage/summary.py
@@ -43,8 +43,8 @@ class SummaryReporter(Reporter):
                 analysis = self.coverage._analyze(cu)
                 nums = analysis.numbers
                 args = (
-                    cu.name, nums.n_statements, nums.n_run,
-                    nums.percent_covered
+                    cu.name, nums.n_statements, nums.n_executed,
+                    nums.pc_covered
                     )
                 if self.show_missing:
                     args = args + (analysis.missing_formatted(),)
@@ -60,7 +60,8 @@ class SummaryReporter(Reporter):
         if total.n_files > 1:
             outfile.write(rule)
             args = (
-                "TOTAL", total.n_statements, total.n_run, total.percent_covered
+                "TOTAL", total.n_statements, total.n_executed,
+                total.pc_covered
                 )
             if self.show_missing:
                 args = args + ("",)
-- 
cgit v1.2.1