From ba69ca37dde7011b23c5091ab36ea62051883729 Mon Sep 17 00:00:00 2001
From: Porter Schutz <schmutz@lindenlab.com>
Date: Tue, 30 Oct 2012 15:16:07 -0700
Subject: [PATCH] Fixing gemspec and tests.

---
 simplecov-json.gemspec      |  4 +--
 test/test_simplecov_json.rb | 56 +++++++++++++++++++++++++++++++------
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/simplecov-json.gemspec b/simplecov-json.gemspec
index b779fb6..3b74e2c 100644
--- a/simplecov-json.gemspec
+++ b/simplecov-json.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "simplecov-json"
-  s.version     = '0.1.1'
+  s.version     = '0.1.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Vicent Llongo"]
   s.email       = ["villosil@gmail.com"]
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "simplecov-json"
   s.files         = ['lib/simplecov-json.rb']
-  s.test_files    = ['test/helper', 'test/test_simplecov_json.rb']
+  s.test_files    = ['test/helper.rb', 'test/test_simplecov_json.rb']
   s.require_paths = ["lib"]
   
   s.add_dependency(%q<simplecov>, [">= 0"])
diff --git a/test/test_simplecov_json.rb b/test/test_simplecov_json.rb
index c39b77d..cb3f4ff 100644
--- a/test/test_simplecov_json.rb
+++ b/test/test_simplecov_json.rb
@@ -4,16 +4,35 @@ class TestSimpleCovHtml < Test::Unit::TestCase
   def test_format
     formatter = SimpleCov::Formatter::JSONFormatter.new
     result = mock()
+    foo = mock()
+    bar = mock()
     created_at = DateTime.now.to_s
-    
     result.expects(:created_at).returns(created_at)
     result.expects(:command_name).returns('RSpec')
-    result.expects(:original_result).returns({
-      '/lib/foo.rb' => [1, nil, 0, 0, nil, 1, nil],
-      '/lib/bar.rb' => [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil],
-      '/test/test.rb' => [nil, 1, 1, 1, 1]
-    })
-    result.expects(:filenames).returns(['/lib/foo.rb', '/lib/bar.rb'])
+    
+    fooLineList = mock()
+    fooLineList.expects(:count).returns(2)
+
+    barLineList = mock()
+    barLineList.expects(:count).returns(5)
+
+    foo.expects(:filename).returns('/lib/foo.rb')
+    foo.expects(:filename).returns('/lib/foo.rb')
+    foo.expects(:covered_percent).returns(50.0)
+    foo.expects(:coverage).returns([1, nil, 0, 0, nil, 1, nil])
+    foo.expects(:covered_strength).returns(0.50)
+    foo.expects(:covered_lines).returns(fooLineList)
+    foo.expects(:lines_of_code).returns(4)
+    
+    bar.expects(:filename).returns('/lib/bar.rb')
+    bar.expects(:filename).returns('/lib/bar.rb')
+    bar.expects(:covered_percent).returns(71.42)
+    bar.expects(:coverage).returns([nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil])
+    bar.expects(:covered_strength).returns(0.71)
+    bar.expects(:covered_lines).returns(barLineList)
+    bar.expects(:lines_of_code).returns(7)
+
+    result.expects(:files).returns([foo, bar])
     result.expects(:filenames).returns(['/lib/foo.rb', '/lib/bar.rb'])
     result.expects(:filenames).returns(['/lib/foo.rb', '/lib/bar.rb'])
     result.expects(:groups).returns(['controllers', 'models'])
@@ -27,12 +46,31 @@ class TestSimpleCovHtml < Test::Unit::TestCase
     result.expects(:total_lines).returns(15)
     result.expects(:covered_percent).returns(73.33)
 
+
+# filename
+# covered_percent
+# coverage
+# covered_strength
+# covered_lines
+# lines_of_code
     assert_equal(formatter.format(result), {
       'timestamp' => created_at.to_i, 
       'command_name' => 'RSpec', 
       'files' => [
-        {'filename' => '/lib/foo.rb', 'coverage' => [1, nil, 0, 0, nil, 1, nil]},
-        {'filename' => '/lib/bar.rb', 'coverage' => [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil]},
+        {'filename' => '/lib/foo.rb',
+          'covered_percent' => 50.0,
+          'coverage' => [1, nil, 0, 0, nil, 1, nil],
+          'covered_strength' => 0.50,
+          'covered_lines' => 2,
+          'lines_of_code' => 4
+        },
+        {'filename' => '/lib/bar.rb',
+          'covered_percent' => 71.42,
+          'coverage' => [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil],
+          'covered_strength' => 0.71,
+          'covered_lines' => 5,
+          'lines_of_code' => 7
+        },
       ],
       'groups' =>['controllers', 'models'],
       'metrics' => {