Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct html rendering when using profdata format #124

Merged
merged 2 commits into from
Feb 3, 2016
Merged

Correct html rendering when using profdata format #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d990d2
fix test fixtures hiding html output failures
cutz Jan 20, 2016
c97cd8d
use coverage_file.coverage_for_line when determining hits and css class
cutz Jan 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions lib/slather/coverage_service/html_output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ def create_html_from_file(coverage_file)
next unless line_number > 0

coverage_data = data[0].strip
line_data = [line_number, data[2], hits_for_coverage_data(coverage_data)]
line_data = [line_number, data[2], hits_for_coverage_line(coverage_file, line)]
classes = ["num", "src", "coverage"]

cov.tr(:class => class_for_coverage_data(coverage_data)) {
cov.tr(:class => class_for_coverage_line(coverage_file,line)) {
line_data.each_with_index { |line, idx|
if idx != 1
cov.td(line, :class => classes[idx])
Expand Down Expand Up @@ -221,19 +221,21 @@ def gem_root_path
File.expand_path File.join(File.dirname(__dir__), "../..")
end

def class_for_coverage_data(coverage_data)
case coverage_data
when /\d/ then "covered"
when /#/ then "missed"
else "never"
def class_for_coverage_line(coverage_file, coverage_line)
hits = coverage_file.coverage_for_line(coverage_line)
case
when hits == nil then "never"
when hits > 0 then "covered"
else "missed"
end
end

def hits_for_coverage_data(coverage_data)
case coverage_data
when /\d/ then (coverage_data.to_i > 0) ? "#{coverage_data}x" : ""
when /#/ then "!"
else ""
def hits_for_coverage_line(coverage_file, coverage_line)
hits = coverage_file.coverage_for_line(coverage_line)
case
when hits == nil then ""
when hits > 0 then "#{hits}x"
else "!"
end
end

Expand Down
68 changes: 34 additions & 34 deletions spec/fixtures/fixtures_html/Branches.m.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ <h4 class="cov_filepath">spec/fixtures/fixtures/more_files/Branches.m</h4>
<td class="src"><pre><code class="objc"> if (!skipBranches) {</code></pre></td>
<td class="coverage">1x</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">19</td>
<td class="src"><pre><code class="objc"> NSLog(@"not skipped.");</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">20</td>
<td class="src"><pre><code class="objc"> }</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<td class="num">21</td>
Expand Down Expand Up @@ -152,80 +152,80 @@ <h4 class="cov_filepath">spec/fixtures/fixtures/more_files/Branches.m</h4>
<td class="src"><pre><code class="objc"> }</code></pre></td>
<td class="coverage">2x</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">29</td>
<td class="src"><pre><code class="objc"> switch (i) {</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">30</td>
<td class="src"><pre><code class="objc"> case 0:</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">31</td>
<td class="src"><pre><code class="objc"> NSLog(@"0");</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">32</td>
<td class="src"><pre><code class="objc"> break;</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">33</td>
<td class="src"><pre><code class="objc"> </code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">34</td>
<td class="src"><pre><code class="objc"> case 1:</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">35</td>
<td class="src"><pre><code class="objc"> NSLog(@"1");</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">36</td>
<td class="src"><pre><code class="objc"> break;</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">37</td>
<td class="src"><pre><code class="objc"> case 5:</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">38</td>
<td class="src"><pre><code class="objc"> NSLog(@"5");</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">39</td>
<td class="src"><pre><code class="objc"> break;</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">40</td>
<td class="src"><pre><code class="objc"> default:</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">41</td>
<td class="src"><pre><code class="objc"> break;</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">42</td>
<td class="src"><pre><code class="objc"> }</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">43</td>
<td class="src"><pre><code class="objc">}</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="never">
<td class="num">44</td>
Expand Down
12 changes: 6 additions & 6 deletions spec/fixtures/fixtures_html/fixtures.m.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,20 +102,20 @@ <h4 class="cov_filepath">spec/fixtures/fixtures/fixtures.m</h4>
<td class="src"><pre><code class="objc">- (void)untestedMethod</code></pre></td>
<td class="coverage"></td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">19</td>
<td class="src"><pre><code class="objc">{</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">20</td>
<td class="src"><pre><code class="objc"> NSLog(@"untested");</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="covered">
<tr class="missed">
<td class="num">21</td>
<td class="src"><pre><code class="objc">}</code></pre></td>
<td class="coverage"></td>
<td class="coverage">!</td>
</tr>
<tr class="never">
<td class="num">22</td>
Expand Down