slather 1.8.3 → 2.0.0

data/spec/slather/coverage_service/cobertura_xml_spec.rb

@@ -5,12 +5,16 @@ describe Slather::CoverageService::CoberturaXmlOutput do
 
   let(:fixtures_project) do
     proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
-    proj.extend(Slather::CoverageService::CoberturaXmlOutput)
+    proj.build_directory = TEMP_DERIVED_DATA_PATH
+    proj.input_format = "profdata"
+    proj.coverage_service = "cobertura_xml"
+    proj.configure
+    proj
   end
 
   describe '#coverage_file_class' do
     it "should return CoverageFile" do
-      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::CoverageFile)
+      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::ProfdataCoverageFile)
     end
   end
 
@@ -33,7 +37,7 @@ describe Slather::CoverageService::CoberturaXmlOutput do
         source_node.content = ''
       end
 
-      EquivalentXml.equivalent?(current_xml_doc, fixture_xml_doc).should be_truthy
+      expect(EquivalentXml.equivalent?(current_xml_doc, fixture_xml_doc)).to be_truthy
     end
 
     it "should create an XML report in the given output directory" do

data/spec/slather/coverage_service/coveralls_spec.rb

@@ -4,12 +4,16 @@ describe Slather::CoverageService::Coveralls do
 
   let(:fixtures_project) do
     proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
-    proj.extend(Slather::CoverageService::Coveralls)
+    proj.build_directory = TEMP_DERIVED_DATA_PATH
+    proj.input_format = "profdata"
+    proj.coverage_service = "coveralls"
+    proj.send(:configure)
+    proj
   end
 
   describe "#coverage_file_class" do
     it "should return CoverallsCoverageFile" do
-      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::CoverallsCoverageFile)
+      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::ProfdataCoverageFile)
     end
   end
 
@@ -27,7 +31,7 @@ describe Slather::CoverageService::Coveralls do
     context "coverage_service is :travis_ci" do
       before(:each) { fixtures_project.ci_service = :travis_ci }
 
-      it "should return valid json for coveralls coverage data" do
+      it "should return valid json for coveralls coverage gcov data" do
         fixtures_project.stub(:travis_job_id).and_return("9182")
         expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql("{\"service_job_id\":\"9182\",\"service_name\":\"travis-ci\"}").excluding("source_files")
         expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql(fixtures_project.send(:coverage_files).map(&:as_json).to_json).at_path("source_files")
@@ -98,25 +102,62 @@ describe Slather::CoverageService::Coveralls do
     end
   end
 
-  describe '#post' do
-    it "should save the coveralls_coverage_data to a file and post it to coveralls" do
-      fixtures_project.stub(:travis_job_id).and_return("9182")
-      expect(fixtures_project).to receive(:`) do |cmd|
-        expect(cmd).to eq("curl -s --form json_file=@coveralls_json_file https://coveralls.io/api/v1/jobs")
-        expect(File.read('coveralls_json_file')).to be_json_eql(fixtures_project.send(:coveralls_coverage_data))
-      end.once
-      fixtures_project.post
-    end
+  describe '#coveralls_coverage_data' do
+    context "coverage_service is :travis_ci" do
+      before(:each) {
+        fixtures_project.ci_service = :travis_ci
+        project_root = Pathname("./").realpath
+        fixtures_project.stub(:profdata_llvm_cov_output).and_return("#{project_root}/spec/fixtures/fixtures/fixtures.m:
+       |    1|//
+       |    2|//  fixtures.m
+       |    3|//  fixtures
+       |    4|//
+       |    5|//  Created by Mark Larsen on 6/24/14.
+       |    6|//  Copyright (c) 2014 marklarr. All rights reserved.
+       |    7|//
+       |    8|
+       |    9|#import \"fixtures.h\"
+       |   10|
+       |   11|@implementation fixtures
+       |   12|
+       |   13|- (void)testedMethod
+      1|   14|{
+      1|   15|    NSLog(@\"tested\");
+      1|   16|}
+       |   17|
+       |   18|- (void)untestedMethod
+      0|   19|{
+      0|   20|    NSLog(@\"untested\");
+      0|   21|}
+       |   22|
+       |   23|@end
+")
+      }
+
+      it "should save the coveralls_coverage_data to a file and post it to coveralls" do
+        fixtures_project.stub(:travis_job_id).and_return("9182")
+        expect(fixtures_project).to receive(:`) do |cmd|
+          expect(cmd).to eq("curl -s --form json_file=@coveralls_json_file https://coveralls.io/api/v1/jobs")
+          expect(File.read('coveralls_json_file')).to be_json_eql(fixtures_project.send(:coveralls_coverage_data))
+        end.once
+        fixtures_project.post
+      end
 
-    it "should always remove the coveralls_json_file after it's done" do
-      fixtures_project.stub(:`)
+      it "should always remove the coveralls_json_file after it's done" do
+        fixtures_project.stub(:`)
+        fixtures_project.stub(:travis_job_id).and_return("9182")
+        fixtures_project.post
+        expect(File.exist?("coveralls_json_file")).to be_falsy
+        fixtures_project.stub(:travis_job_id).and_return(nil)
+        expect { fixtures_project.post }.to raise_error(StandardError)
+        expect(File.exist?("coveralls_json_file")).to be_falsy
+      end
 
-      fixtures_project.stub(:travis_job_id).and_return("9182")
-      fixtures_project.post
-      expect(File.exist?("coveralls_json_file")).to be_falsy
-      fixtures_project.stub(:travis_job_id).and_return(nil)
-      expect { fixtures_project.post }.to raise_error
-      expect(File.exist?("coveralls_json_file")).to be_falsy
+      it "should return valid json for coveralls coverage profdata data" do
+        fixtures_project.stub(:travis_job_id).and_return("9182")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql("{\"service_job_id\":\"9182\",\"service_name\":\"travis-ci\"}").excluding("source_files")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql(fixtures_project.send(:coverage_files).map(&:as_json).to_json).at_path("source_files")
+      end
     end
   end
 end

data/spec/slather/coverage_service/gutter_json_spec.rb

@@ -5,12 +5,16 @@ describe Slather::CoverageService::GutterJsonOutput do
 
   let(:fixtures_project) do
     proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
-    proj.extend(Slather::CoverageService::GutterJsonOutput)
+    proj.build_directory = TEMP_DERIVED_DATA_PATH
+    proj.input_format = "profdata"
+    proj.coverage_service = "gutter_json"
+    proj.configure
+    proj
   end
 
   describe '#coverage_file_class' do
     it "should return CoverageFile" do
-      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::CoverageFile)
+      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::ProfdataCoverageFile)
     end
   end
 

data/spec/slather/coverage_service/hardcover_spec.rb

@@ -4,7 +4,11 @@ describe Slather::CoverageService::Hardcover do
 
   let(:fixtures_project) do
     proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
-    proj.extend(Slather::CoverageService::Hardcover)
+    proj.build_directory = TEMP_DERIVED_DATA_PATH
+    proj.input_format = "profdata"
+    proj.coverage_service = "hardcover"
+    proj.configure
+    proj
   end
 
   let(:fixture_yaml) do
@@ -17,7 +21,7 @@ describe Slather::CoverageService::Hardcover do
 
   describe "#coverage_file_class" do
     it "should return CoverallsCoverageFile" do
-      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::CoverallsCoverageFile)
+      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::ProfdataCoverageFile)
     end
   end
 
@@ -61,6 +65,32 @@ describe Slather::CoverageService::Hardcover do
     before(:each) do
       Slather::Project.stub(:yml).and_return(fixture_yaml)
       fixtures_project.ci_service = :jenkins_ci
+      project_root = Pathname("./").realpath
+      fixtures_project.stub(:profdata_llvm_cov_output).and_return("#{project_root}/spec/fixtures/fixtures/fixtures.m:
+       |    1|//
+       |    2|//  fixtures.m
+       |    3|//  fixtures
+       |    4|//
+       |    5|//  Created by Mark Larsen on 6/24/14.
+       |    6|//  Copyright (c) 2014 marklarr. All rights reserved.
+       |    7|//
+       |    8|
+       |    9|#import \"fixtures.h\"
+       |   10|
+       |   11|@implementation fixtures
+       |   12|
+       |   13|- (void)testedMethod
+      1|   14|{
+      1|   15|    NSLog(@\"tested\");
+      1|   16|}
+       |   17|
+       |   18|- (void)untestedMethod
+      0|   19|{
+      0|   20|    NSLog(@\"untested\");
+      0|   21|}
+       |   22|
+       |   23|@end
+")
     end
 
     it "should save the hardcover_coverage_data to a file and post it to hardcover" do
@@ -80,7 +110,7 @@ describe Slather::CoverageService::Hardcover do
       fixtures_project.post
       expect(File.exist?("hardcover_json_file")).to be_falsy
       fixtures_project.stub(:jenkins_job_id).and_return(nil)
-      expect { fixtures_project.post }.to raise_error
+      expect { fixtures_project.post }.to raise_error(StandardError)
       expect(File.exist?("hardcover_json_file")).to be_falsy
     end
   end

data/spec/slather/coverage_service/html_output_spec.rb

@@ -8,12 +8,7 @@ describe Slather::CoverageService::HtmlOutput do
   let(:fixture_html_files) do
     ["index",
     "fixtures.m",
-    "peekaview.m",
-    "fixtures_cpp.cpp",
-    "fixtures_mm.mm",
-    "fixtures_m.m",
     "Branches.m",
-    "Empty.m",
     "fixturesTests.m",
     "peekaviewTests.m",
     "BranchesTests.m"].map { |file| "#{file}.html"}
@@ -21,18 +16,22 @@ describe Slather::CoverageService::HtmlOutput do
 
   let(:fixtures_project) do
     proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
-    proj.extend(Slather::CoverageService::HtmlOutput)
+    proj.build_directory = TEMP_DERIVED_DATA_PATH
+    proj.input_format = "profdata"
+    proj.coverage_service = "html"
+    proj
   end
 
   describe '#coverage_file_class' do
     it "should return CoverageFile" do
-      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::CoverageFile)
+      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::ProfdataCoverageFile)
     end
   end
 
   describe '#post' do
     before(:each) {
       fixtures_project.stub(:print_path_coverage)
+      fixtures_project.send(:configure)
     }
 
     after(:each) {
@@ -175,5 +174,47 @@ describe Slather::CoverageService::HtmlOutput do
       expect(Dir.exist?(OUTPUT_DIR_PATH)).to be_truthy
     end
 
+    it "should create a valid report when using profdata format" do
+
+      def extract_filepath(doc)
+        (path = doc.at_css('h4.cov_filepath'))? path.text : ""
+      end
+
+      fixtures_project.stub(:input_format).and_return("profdata")
+      fixtures_project.stub(:profdata_llvm_cov_output).and_return("./spec/fixtures/fixtures/other_fixtures.m:
+     |    1|//
+     |    2|//  other_fixtures.m
+     |    3|//  fixtures
+     |    4|//
+     |    5|//  Created by Mark Larsen on 6/24/14.
+     |    6|//  Copyright (c) 2014 marklarr. All rights reserved.
+     |    7|//
+     |    8|
+     |    9|#import \"other_fixtures.h\"
+     |   10|
+     |   11|@implementation other_fixtures
+     |   12|
+     |   13|- (void)testedMethod
+    1|   14|{
+    1|   15|    NSLog(@\"tested\");
+    1|   16|}
+     |   17|
+     |   18|- (void)untestedMethod
+    0|   19|{
+    0|   20|    NSLog(@\"untested\");
+    0|   21|}
+     |   22|
+     |   23|@end
+")
+      fixtures_project.post
+
+      file = File.open(File.join(OUTPUT_DIR_PATH, "other_fixtures.m.html"))
+      doc = Nokogiri::HTML(file)
+      file.close
+
+      expect(extract_header_title(doc)).to eq("other_fixtures.m - Slather")
+      expect(extract_filepath(doc)).to eq("spec/fixtures/fixtures/other_fixtures.m")
+    end
+
   end
 end

data/spec/slather/coverage_service/simple_output_spec.rb

@@ -4,28 +4,27 @@ describe Slather::CoverageService::SimpleOutput do
 
   let(:fixtures_project) do
     proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
-    proj.extend(Slather::CoverageService::SimpleOutput)
+    proj.build_directory = TEMP_DERIVED_DATA_PATH
+    proj.input_format = "profdata"
+    proj.configure
+    proj
   end
 
   describe '#coverage_file_class' do
     it "should return CoverageFile" do
-      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::CoverageFile)
+      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::ProfdataCoverageFile)
     end
   end
 
   describe '#post' do
     it "should print out the coverage for each file, and then total coverage" do
-      ["spec/fixtures/fixtures/fixtures.m: 2 of 4 lines (50.00%)",
-      "spec/fixtures/fixtures/more_files/peekaview.m: 0 of 6 lines (0.00%)",
-      "spec/fixtures/fixtures/fixtures_cpp.cpp: 0 of 0 lines (100.00%)",
-      "spec/fixtures/fixtures/fixtures_mm.mm: 0 of 0 lines (100.00%)",
-      "spec/fixtures/fixtures/fixtures_m.m: 0 of 0 lines (100.00%)",
-      "spec/fixtures/fixtures/more_files/Branches.m: 10 of 20 lines (50.00%)",
-      "spec/fixtures/fixtures/more_files/Empty.m: 0 of 0 lines (100.00%)",
-      "spec/fixtures/fixturesTests/fixturesTests.m: 7 of 7 lines (100.00%)",
-      "spec/fixtures/fixturesTests/peekaviewTests.m: 6 of 6 lines (100.00%)",
-      "spec/fixtures/fixturesTests/BranchesTests.m: 10 of 10 lines (100.00%)",
-      "Test Coverage: 66.04%"].each do |line|
+      ["spec/fixtures/fixtures/fixtures.m: 3 of 6 lines (50.00%)",
+      "spec/fixtures/fixtures/more_files/Branches.m: 13 of 30 lines (43.33%)",
+      "spec/fixtures/fixturesTests/BranchesTests.m: 16 of 16 lines (100.00%)",
+      "spec/fixtures/fixturesTests/fixturesTests.m: 12 of 12 lines (100.00%)",
+      "spec/fixtures/fixturesTests/peekaviewTests.m: 11 of 11 lines (100.00%)",
+      "Test Coverage: 73.33%"
+      ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
       end
 

data/spec/slather/profdata_coverage_spec.rb

@@ -0,0 +1,128 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Slather::ProfdataCoverageFile do
+
+  let(:fixtures_project) do
+    Slather::Project.open(FIXTURES_PROJECT_PATH)
+  end
+
+  let(:profdata_coverage_file) do
+    Slather::ProfdataCoverageFile.new(fixtures_project, "/Users/venmo/ExampleProject/AppDelegate.swift:
+       |    1|//
+       |    2|//  AppDelegate.swift
+       |    3|//  xcode7workbench01
+       |    4|//
+       |    5|//  Created by Simone Civetta on 08/06/15.
+       |    6|//  Copyright © 2015 Xebia IT Architects. All rights reserved.
+       |    7|//
+       |    8|
+       |    9|import UIKit
+       |   10|
+       |   11|@UIApplicationMain
+       |   12|class AppDelegate: UIResponder, UIApplicationDelegate {
+       |   13|
+       |   14|    var window: UIWindow?
+       |   15|
+       |   16|
+      1|   17|    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+      1|   18|        // Override point for customization after application launch.
+      1|   19|        return true
+      1|   20|    }
+       |   21|
+      0|   22|    func applicationWillResignActive(application: UIApplication) {
+      0|   23|        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+      0|   24|        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+      0|   25|    }
+       |   26|
+      0|   27|    func applicationDidEnterBackground(application: UIApplication) {
+      0|   28|        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+      0|   29|        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+      0|   30|    }
+       |   31|
+      0|   32|    func applicationWillEnterForeground(application: UIApplication) {
+      0|   33|        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+      0|   34|    }
+       |   35|
+      1|   36|    func applicationDidBecomeActive(application: UIApplication) {
+      0|   37|        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+      0|   38|    }
+       |   39|
+      0|   40|    func applicationWillTerminate(application: UIApplication) {
+      0|   41|    }
+       |   42|
+       |   43|
+       |   44|}
+       |   45|")
+  end
+
+  describe "#initialize" do
+    it "should create a list of lines" do
+      expect(profdata_coverage_file.line_data.length).to eq(45)
+      expect(profdata_coverage_file.line_data[9]).to eq("       |    9|import UIKit")
+    end
+  end
+
+  describe "#all_lines" do
+    it "should return a list of all the lines" do
+      expect(profdata_coverage_file.all_lines.length).to eq(45)
+      expect(profdata_coverage_file.all_lines[8]).to eq("       |    9|import UIKit")
+    end
+  end
+
+  describe "#line_number_in_line" do
+    it "should return the correct line number" do
+      expect(profdata_coverage_file.line_number_in_line("      0|   40|    func applicationWillTerminate(application: UIApplication) {")).to eq(40)
+    end
+  end
+
+  describe "#coverage_for_line" do
+    it "should return the number of hits for the line" do
+      expect(profdata_coverage_file.coverage_for_line("      10|   40|    func applicationWillTerminate(application: UIApplication) {")).to eq(10)
+    end
+  end
+
+  describe "#num_lines_tested" do
+    it "should count the actual number of line tested" do
+      expect(profdata_coverage_file.num_lines_tested).to eq(5)
+    end
+  end
+
+  describe "#num_lines_testable" do
+    it "should count the actual testable number of line" do
+      expect(profdata_coverage_file.num_lines_testable).to eq(20)
+    end
+  end
+
+  describe "#percentage_line_tested" do
+    it "should count the percentage of tested lines" do
+      expect(profdata_coverage_file.percentage_lines_tested).to eq(25)
+    end
+  end
+
+  describe "#ignored" do
+
+    before(:each) {
+      fixtures_project.stub(:ignore_list).and_return([])
+    }
+
+    it "shouldn't ignore project files" do
+      ignorable_file = Slather::ProfdataCoverageFile.new(fixtures_project, "/Users/venmo/ExampleProject/AppDelegate.swift:
+       |    1|//
+       |    2|//  AppDelegate.swift
+       |    3|//  xcode7workbench01")
+
+      expect(ignorable_file.ignored?).to be_falsy
+    end
+
+    it "should ignore platform files" do
+      ignorable_file = Slather::ProfdataCoverageFile.new(fixtures_project, "../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework/Headers/XCTestAssertionsImpl.h:
+       |    1|//
+       |    2|//  AppDelegate.swift
+       |    3|//  xcode7workbench01")
+
+      expect(ignorable_file.ignored?).to be_truthy
+    end
+
+  end
+
+end