RubyGems - danger-jacoco-instacart - Versions diffs - 0.1.10 → 0.1.11 - Mend

danger-jacoco-instacart 0.1.10 → 0.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9360d314e746b8e23358b48545351a54693c9878bc1d50372e05e5993cd4436d
-  data.tar.gz: 2a07dd89fe99cf04811be5f2f5d7363cf6a08181bd397ffa99f2a235e2377f89
+  metadata.gz: e9fec5fb323f06e8bdffbfdc200b32801b1a74aaf596c374618afca9248326f1
+  data.tar.gz: 60d06a3074b5aa763632d8bd5661ebc82908cb514346e172b5d383d053d061ae
 SHA512:
-  metadata.gz: 83392c62d27ccb28bfb4b345dc87e11e8f595e558c0339c50b592860c648b09c02e0a0830bb40f57fb1298f3f2c01b74fbfaa050892b15a3e62f66ce7f46d6ff
-  data.tar.gz: f64fc4aade681283072b6acc84c33ae9b2ecec84f0dec1d4bc19bcbc437a85e75175bf3d216a5fbad75e33fb8df8bf44a514380217eae4e99e825af8b8130d01
+  metadata.gz: 2d29d01cf0b2971a5fda3d26e7d82085b42853b852388d1ac84c284bc9856de86628d98d4f44b29e8bb68ccb9628c73a028271153cd8248551bb3e572f1be1ad
+  data.tar.gz: 02da2696139039613c08b30e576a2b2e512d8ce5770780e6e186af6fefff990c6030388b749d242932143da338c20b61bb12c1230cd13b0b91f6686650c4c2c4

data/.yardoc/checksums CHANGED Viewed

@@ -1,6 +1,6 @@
 /Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/danger_jacoco.rb 38229d934b3315bb2a5a4eec18eb65f3c54d304f
-/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/gem_version.rb fc0b799df58ae240e5bc7ee0aeab413449d1b49f
-/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/plugin.rb faba0fa9900efd1df07bebd0571c4c9f02129b61
+/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/gem_version.rb ed9d8db86045983fb4286a8695d1d67276512c90
+/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/plugin.rb 4d411eb29a16b42105f2775fd15d9ca0dc8e3093
 /Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/sax_parser.rb 370e2799f8dbdf7d642c820214e6ea84c30c9cb0
 /Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/model/counter.rb 368f4a9811617b7a174ddf837a8fac49a4bc32a6
 /Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/model/report.rb 7cf45ee71ff347a130320f6190ddb25525c7095d

data/.yardoc/object_types CHANGED Viewed

Binary file

data/.yardoc/objects/root.dat CHANGED Viewed

Binary file

data/lib/jacoco/gem_version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Jacoco
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/lib/jacoco/plugin.rb CHANGED Viewed

@@ -184,10 +184,8 @@ module Danger
     private
     def coverage_counter(jacoco_class)
-      counters = jacoco_class.counters
-      branch_counter = counters.detect { |e| e.type.eql? 'BRANCH' }
-      line_counter = counters.detect { |e| e.type.eql? 'LINE' }
-      counter = branch_counter.nil? ? line_counter : branch_counter
+      all_class_counters = jacoco_class.counters
+      counter = class_counter(all_class_counters)
       if counter.nil?
         no_coverage_data_found_message = "No coverage data found for #{jacoco_class.name}"
@@ -200,6 +198,19 @@ module Danger
       counter
     end
+    def class_counter(all_class_counters)
+      instruction_counter = all_class_counters.detect { |e| e.type.eql? 'INSTRUCTION' }
+      branch_counter = all_class_counters.detect { |e| e.type.eql? 'BRANCH' }
+      line_counter = all_class_counters.detect { |e| e.type.eql? 'LINE' }
+      if !instruction_counter.nil?
+        instruction_counter
+      elsif !branch_counter.nil?
+        branch_counter
+      else
+        line_counter
+      end
+    end
     # rubocop:disable Style/SignalException
     def report_fails(class_coverage_above_minimum, total_covered)
       if total_covered[:covered] < minimum_project_coverage_percentage

data/spec/fixtures/output_a.xml CHANGED Viewed

@@ -10,7 +10,7 @@
         <counter type="COMPLEXITY" missed="0" covered="1"/>
         <counter type="METHOD" missed="0" covered="1"/>
       </method>
-      <counter type="INSTRUCTION" missed="0" covered="46"/>
+      <counter type="INSTRUCTION" missed="46" covered="46"/>
       <counter type="LINE" missed="0" covered="14"/>
       <counter type="COMPLEXITY" missed="5" covered="7"/>
       <counter type="METHOD" missed="0" covered="7"/>

data/spec/fixtures/output_b.xml CHANGED Viewed

@@ -9,7 +9,6 @@
         <counter type="COMPLEXITY" missed="0" covered="1"/>
         <counter type="METHOD" missed="0" covered="1"/>
       </method>
-      <counter type="INSTRUCTION" missed="0" covered="46"/>
       <counter type="COMPLEXITY" missed="5" covered="7"/>
       <counter type="METHOD" missed="0" covered="7"/>
       <counter type="CLASS" missed="0" covered="1"/>
@@ -17,7 +16,6 @@
     <sourcefile name="CachedRepository.java">
       <line nr="16" mi="0" ci="2" mb="0" cb="0"/>
       <line nr="17" mi="0" ci="3" mb="0" cb="0"/>
-      <counter type="INSTRUCTION" missed="2" covered="98"/>
       <counter type="COMPLEXITY" missed="2" covered="11"/>
       <counter type="METHOD" missed="2" covered="11"/>
       <counter type="CLASS" missed="2" covered="4"/>

data/spec/fixtures/output_c.xml CHANGED Viewed

@@ -10,7 +10,7 @@
         <counter type="COMPLEXITY" missed="0" covered="1"/>
         <counter type="METHOD" missed="0" covered="1"/>
       </method>
-      <counter type="INSTRUCTION" missed="0" covered="46"/>
+      <counter type="INSTRUCTION" missed="46" covered="46"/>
       <counter type="LINE" missed="0" covered="14"/>
       <counter type="COMPLEXITY" missed="5" covered="7"/>
       <counter type="METHOD" missed="0" covered="7"/>
@@ -41,7 +41,7 @@
         <counter type="COMPLEXITY" missed="0" covered="1"/>
         <counter type="METHOD" missed="0" covered="1"/>
       </method>
-      <counter type="INSTRUCTION" missed="0" covered="36"/>
+      <counter type="INSTRUCTION" missed="18" covered="36"/>
       <counter type="LINE" missed="0" covered="12"/>
       <counter type="COMPLEXITY" missed="5" covered="8"/>
       <counter type="METHOD" missed="0" covered="9"/>

data/spec/fixtures/output_d.xml ADDED Viewed

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><!DOCTYPE report PUBLIC "-//JACOCO//DTD Report 1.0//EN"
+        "report.dtd">
+<report name="test_report">
+  <sessioninfo id="test-id" start="1480057517395" dump="1480057526412"/>
+  <package name="com/example">
+    <class name="com/example/CachedRepository">
+      <method name="&lt;init&gt;" desc="()V" line="17">
+        <counter type="INSTRUCTION" missed="0" covered="11"/>
+        <counter type="COMPLEXITY" missed="0" covered="1"/>
+        <counter type="METHOD" missed="0" covered="1"/>
+      </method>
+      <counter type="INSTRUCTION" missed="46" covered="118"/>
+      <counter type="LINE" missed="1" covered="14"/>
+      <counter type="COMPLEXITY" missed="5" covered="7"/>
+      <counter type="METHOD" missed="0" covered="7"/>
+      <counter type="CLASS" missed="0" covered="1"/>
+      <counter type="BRANCH" missed="2" covered="3" />
+    </class>
+    <sourcefile name="CachedRepository.java">
+      <line nr="16" mi="0" ci="2" mb="0" cb="0"/>
+      <line nr="17" mi="0" ci="3" mb="0" cb="0"/>
+      <counter type="COMPLEXITY" missed="2" covered="11"/>
+      <counter type="METHOD" missed="2" covered="11"/>
+      <counter type="CLASS" missed="2" covered="4"/>
+    </sourcefile>
+    <counter type="INSTRUCTION" missed="80" covered="324"/>
+    <counter type="COMPLEXITY" missed="11" covered="39"/>
+    <counter type="METHOD" missed="9" covered="37"/>
+    <counter type="CLASS" missed="2" covered="10"/>
+  </package>
+  <counter type="INSTRUCTION" missed="39399" covered="19321"/>
+  <counter type="COMPLEXITY" missed="5517" covered="1444"/>
+  <counter type="METHOD" missed="3382" covered="1120"/>
+  <counter type="CLASS" missed="491" covered="370"/>
+</report>

data/spec/fixtures/output_e.xml ADDED Viewed

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><!DOCTYPE report PUBLIC "-//JACOCO//DTD Report 1.0//EN"
+        "report.dtd">
+<report name="test_report">
+  <sessioninfo id="test-id" start="1480057517395" dump="1480057526412"/>
+  <package name="com/example">
+    <class name="com/example/CachedRepository">
+      <method name="&lt;init&gt;" desc="()V" line="17">
+        <counter type="INSTRUCTION" missed="0" covered="11"/>
+        <counter type="COMPLEXITY" missed="0" covered="1"/>
+        <counter type="METHOD" missed="0" covered="1"/>
+      </method>
+      <counter type="LINE" missed="1" covered="14"/>
+      <counter type="COMPLEXITY" missed="5" covered="7"/>
+      <counter type="METHOD" missed="0" covered="7"/>
+      <counter type="CLASS" missed="0" covered="1"/>
+      <counter type="BRANCH" missed="4" covered="3" />
+    </class>
+    <sourcefile name="CachedRepository.java">
+      <line nr="16" mi="0" ci="2" mb="0" cb="0"/>
+      <line nr="17" mi="0" ci="3" mb="0" cb="0"/>
+      <counter type="COMPLEXITY" missed="2" covered="11"/>
+      <counter type="METHOD" missed="2" covered="11"/>
+      <counter type="CLASS" missed="2" covered="4"/>
+    </sourcefile>
+    <counter type="INSTRUCTION" missed="80" covered="324"/>
+    <counter type="COMPLEXITY" missed="11" covered="39"/>
+    <counter type="METHOD" missed="9" covered="37"/>
+    <counter type="CLASS" missed="2" covered="10"/>
+  </package>
+  <counter type="INSTRUCTION" missed="39399" covered="19321"/>
+  <counter type="COMPLEXITY" missed="5517" covered="1444"/>
+  <counter type="METHOD" missed="3382" covered="1120"/>
+  <counter type="CLASS" missed="491" covered="370"/>
+</report>

data/spec/fixtures/output_f.xml ADDED Viewed

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><!DOCTYPE report PUBLIC "-//JACOCO//DTD Report 1.0//EN"
+        "report.dtd">
+<report name="test_report">
+  <sessioninfo id="test-id" start="1480057517395" dump="1480057526412"/>
+  <package name="com/example">
+    <class name="com/example/CachedRepository">
+      <method name="&lt;init&gt;" desc="()V" line="17">
+        <counter type="INSTRUCTION" missed="0" covered="11"/>
+        <counter type="COMPLEXITY" missed="0" covered="1"/>
+        <counter type="METHOD" missed="0" covered="1"/>
+      </method>
+      <counter type="LINE" missed="1" covered="14"/>
+      <counter type="COMPLEXITY" missed="5" covered="7"/>
+      <counter type="METHOD" missed="0" covered="7"/>
+      <counter type="CLASS" missed="0" covered="1"/>
+    </class>
+    <sourcefile name="CachedRepository.java">
+      <line nr="16" mi="0" ci="2" mb="0" cb="0"/>
+      <line nr="17" mi="0" ci="3" mb="0" cb="0"/>
+      <counter type="COMPLEXITY" missed="2" covered="11"/>
+      <counter type="METHOD" missed="2" covered="11"/>
+      <counter type="CLASS" missed="2" covered="4"/>
+    </sourcefile>
+    <counter type="INSTRUCTION" missed="80" covered="324"/>
+    <counter type="COMPLEXITY" missed="11" covered="39"/>
+    <counter type="METHOD" missed="9" covered="37"/>
+    <counter type="CLASS" missed="2" covered="10"/>
+  </package>
+  <counter type="INSTRUCTION" missed="39399" covered="19321"/>
+  <counter type="COMPLEXITY" missed="5517" covered="1444"/>
+  <counter type="METHOD" missed="3382" covered="1120"/>
+  <counter type="CLASS" missed="491" covered="370"/>
+</report>

data/spec/jacoco_spec.rb CHANGED Viewed

@@ -295,6 +295,36 @@ module Danger
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| New files | Covered | Required | Status |')
       end
+      it 'instruction coverage takes over all the rest coverages for classes' do
+        path_a = "#{File.dirname(__FILE__)}/fixtures/output_d.xml"
+        @my_plugin.minimum_class_coverage_percentage = 50
+        @my_plugin.report path_a
+        expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 71% | 50% | :white_check_mark: |')
+      end
+      it 'branch coverage takes over line coverage for classes, when instruction coverage is not available' do
+        path_a = "#{File.dirname(__FILE__)}/fixtures/output_e.xml"
+        @my_plugin.minimum_class_coverage_percentage = 50
+        @my_plugin.report path_a
+        expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 42% | 50% | :warning: |')
+      end
+      it 'line coverage takes over for classes, when both instruction coverage and branch coverage are not available' do
+        path_a = "#{File.dirname(__FILE__)}/fixtures/output_f.xml"
+        @my_plugin.minimum_class_coverage_percentage = 50
+        @my_plugin.report path_a
+        expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 93% | 50% | :white_check_mark: |')
+      end
     end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-jacoco-instacart
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Anton Malinskiy
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -208,6 +208,9 @@ files:
 - spec/fixtures/output_a.xml
 - spec/fixtures/output_b.xml
 - spec/fixtures/output_c.xml
+- spec/fixtures/output_d.xml
+- spec/fixtures/output_e.xml
+- spec/fixtures/output_f.xml
 - spec/jacoco_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/alexanderbezverhni/danger-jacoco
@@ -237,5 +240,8 @@ test_files:
 - spec/fixtures/output_a.xml
 - spec/fixtures/output_b.xml
 - spec/fixtures/output_c.xml
+- spec/fixtures/output_d.xml
+- spec/fixtures/output_e.xml
+- spec/fixtures/output_f.xml
 - spec/jacoco_spec.rb
 - spec/spec_helper.rb