Merge pull request #34 from codacy/FT-3155

Add zero lines to coverage reports

Author: rtfpessoa

.circleci/config.yml

@@ -0,0 +1,24 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/circleci-working-dir
+    docker:
+      - image: circleci/python:2.7.13
+      # - image: circleci/python:3.6.2
+    steps:
+      - checkout
+      - run:
+          command: |
+            sudo python -m pip install --upgrade pip setuptools wheel
+            sudo python -m pip install --upgrade pep8 pyflakes coverage tox
+            sudo python -m pip install --upgrade virtualenv==12.0.2
+      - run:
+          command: |
+            tox -e py27,py350,pep8,pyflakes,coverage
+            sudo python setup.py develop
+      - deploy:
+          name: Push coverage
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              tox -e upload_coverage
+            fi

circle.yml

@@ -141,9 +141,7 @@ def percent(s):
         }
         for line in lines:
             hits = int(line.attributes['hits'].value)
-            if hits >= 1:
-                # The API assumes 0 if a line is missing
-                file_report['coverage'][line.attributes['number'].value] = hits
+            file_report['coverage'][line.attributes['number'].value] = hits
         report['fileReports'] += [file_report]
 
     report['codeLines'] = total_lines

src/codacy/reporter.py

@@ -8,6 +8,7 @@
       "coverage": {
         "4": 1,
         "5": 1,
+        "6": 0,
         "7": 2
       },
       "filename": "src/test/resources/TestSourceFile1.scala"
@@ -16,6 +17,7 @@
       "total": 66,
       "codeLines": 3,
       "coverage": {
+        "5": 0,
         "9": 1,
         "10": 1
       },
@@ -25,7 +27,11 @@
       "total": 20,
       "codeLines": 5,
       "coverage": {
-        "2": 1
+        "1": 0,
+        "2": 1,
+        "3": 0,
+        "4": 0,
+        "7": 0
       },
       "filename": "src/test/resources/TestSourceFile3.scala"
     },
@@ -34,7 +40,8 @@
       "codeLines": 3,
       "coverage": {
         "1": 1,
-        "4": 1
+        "4": 1,
+        "5": 0
       },
       "filename": "src/codacy/__init__.py"
     },
@@ -70,7 +77,37 @@
         "51": 1,
         "36": 1,
         "34": 1,
-        "57": 1
+        "57": 1,
+        "21": 0,
+        "23": 0,
+        "62": 0,
+        "63": 0,
+        "64": 0,
+        "69": 0,
+        "71": 0,
+        "73": 0,
+        "74": 0,
+        "76": 0,
+        "77": 0,
+        "81": 0,
+        "82": 0,
+        "83": 0,
+        "84": 0,
+        "86": 0,
+        "88": 0,
+        "89": 0,
+        "91": 0,
+        "92": 0,
+        "93": 0,
+        "95": 0,
+        "96": 0,
+        "98": 0,
+        "99": 0,
+        "100": 0,
+        "102": 0,
+        "103": 0,
+        "105": 0,
+        "106": 0
       },
       "filename": "src/codacy/reporter.py"
     }

tests/coverage-merge/coverage-merge.json

@@ -8,6 +8,7 @@
       "coverage": {
         "4": 1,
         "5": 1,
+        "6": 0,
         "7": 2
       },
       "filename": "src/test/resources/TestSourceFile1.scala"
@@ -16,6 +17,7 @@
       "total": 66,
       "codeLines": 3,
       "coverage": {
+        "5": 0,
         "9": 1,
         "10": 1
       },
@@ -25,7 +27,11 @@
       "total": 20,
       "codeLines": 5,
       "coverage": {
-        "2": 1
+        "1": 0,
+        "2": 1,
+        "3": 0,
+        "4": 0,
+        "7": 0
       },
       "filename": "src/test/resources/TestSourceFile3.scala"
     }

tests/coverage3/coverage.json

@@ -43,7 +43,37 @@
         "51": 1,
         "36": 1,
         "34": 1,
-        "57": 1
+        "57": 1,
+        "21": 0,
+        "23": 0,
+        "62": 0,
+        "63": 0,
+        "64": 0,
+        "69": 0,
+        "71": 0,
+        "73": 0,
+        "74": 0,
+        "76": 0,
+        "77": 0,
+        "81": 0,
+        "82": 0,
+        "83": 0,
+        "84": 0,
+        "86": 0,
+        "88": 0,
+        "89": 0,
+        "91": 0,
+        "92": 0,
+        "93": 0,
+        "95": 0,
+        "96": 0,
+        "98": 0,
+        "99": 0,
+        "100": 0,
+        "102": 0,
+        "103": 0,
+        "105": 0,
+        "106": 0
       },
       "filename": "src/codacy/reporter.py"
     }

tests/coverage4/coverage.json

@@ -7,7 +7,8 @@
       "codeLines": 3,
       "coverage": {
         "1": 1,
-        "4": 1
+        "4": 1,
+        "5": 0
       },
       "filename": "__init__.py"
     },
@@ -43,7 +44,37 @@
         "51": 1,
         "36": 1,
         "34": 1,
-        "57": 1
+        "57": 1,
+        "21": 0,
+        "23": 0,
+        "62": 0,
+        "63": 0,
+        "64": 0,
+        "69": 0,
+        "71": 0,
+        "73": 0,
+        "74": 0,
+        "76": 0,
+        "77": 0,
+        "81": 0,
+        "82": 0,
+        "83": 0,
+        "84": 0,
+        "86": 0,
+        "88": 0,
+        "89": 0,
+        "91": 0,
+        "92": 0,
+        "93": 0,
+        "95": 0,
+        "96": 0,
+        "98": 0,
+        "99": 0,
+        "100": 0,
+        "102": 0,
+        "103": 0,
+        "105": 0,
+        "106": 0
       },
       "filename": "reporter.py"
     }

tests/filepath/coverage.json

@@ -17,10 +17,20 @@ def file_get_contents(filename):
             with open(filename) as f:
                 return f.read()
 
+        def to_utf8(d):
+            if type(d) is dict:
+                result = {}
+                for key, value in d.items():
+                    result[to_utf8(key)] = to_utf8(value)
+            elif type(d) is unicode:
+                return d.encode('utf8')
+            else:
+                return d
+
         json_content = file_get_contents(expected_filename)
         expected = json.loads(json_content)
 
-        self.assertEqual(generated, expected)
+        self.assertEqual(to_utf8(generated), to_utf8(expected))
 
     def test_parser_coverage3(self):
         self.maxDiff = None