Merge pull request #223 from jgebal/testing_sonar

Pazus · web-flow · commit abce191c44ed · 2017-03-06T14:35:43.000+03:00
Fixed sonar analysis, improved coveralls to be more pesimistic on coverage
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,10 @@ addons:
       - oracle-java8-set-default
   sonarqube:
     token:
-      secure: AmQdR1Fm0tvA9Ees1wz1RqnUl49lZrGdhWCkx7SnIzz+/1Lm2L9aH/e4bL60wIqkJ+AK8tJ1YX4L2B+i7/t5dBSH9Nj8JgbJFwHMqHdMCmaqKpvT5eJRzhbgr0kccm8ECHWTWBL+mIyXXYUm4f/tuRnnngfZS/bxtUpFUDvotcEybuuGUvKSbmc6ew5tfBuX79G/lXbFBceO6EQStoi8SeIHDkgeX/BoQQin0BFVMcsuWKPuQ5P5B19KfxubEk6tiHLZffoaF1q+RbsFcwpr4nyXHiusTRdtLmHb5DvlSQsy15qaakJP6AA073sGjnKxcGiGvP48HbC07tQmtBiZY2Ybkqj9i4aRq0hzX/VXRuZOV/rQARjItS4MKTmD9gET9XkYzc/P8VxSGRFT97guF3f6qtPzcGCu3TbFQpgeP+mgcePLvDl5j/AL+tZAAwSj3mPhEGncr5j+QkcLhl+mM5TymNeJn828qb8I7+mSdqbmPwytc//hwJLeqFJDX2GGnXZD4VkMZDvUO6gq2bQXy0hLgdI7uIQpIzIUlAGoYG6MK4SuHxnx+ZNwsW/nrMGVCJrK67Ii/R++Fg4et5QshTaTbkcQ3Deroady/pnGwlD5FR59LYpjqOVQ+4ey2bf92eGx0j0NWCz+CfirKSXd3o1hESSqamyi8KtOqkqiLEg=
-
+      secure: ${SONAR_TOKEN}
+    branches:
+      - develop
+      - master
 env:
   global:
     - ORACLE_COOKIE=sqldev
@@ -69,7 +71,7 @@ script:
 #  - bash .travis/build_docs.sh
 #  - bash .travis/push_docs_to_gh_pages.sh
   - sonar-scanner
-  - bash .travis/coveralls_uploader.sh  
+  - bash .travis/coveralls_uploader.sh
 
 deploy:
   provider: releases
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -14,6 +14,8 @@ sonar.links.issue=https://github.com/utPLSQL/utPLSQL/issues
 sonar.links.ci=https://travis-ci.org/utPLSQL/utPLSQL
 sonar.links.homepage=https://github.com/utPLSQL/utPLSQL
 sonar.projectDescription=PL/SQL Unit Testing Framework
+sonar.plsql.file.suffixes=sql,tab,pkb,tpb
+sonar.language=plsql
 
 # Encoding of the source code. Default is default system encoding
 #sonar.sourceEncoding=UTF-8
diff --git a/source/reporters/ut_coverage_sonar_reporter.tpb b/source/reporters/ut_coverage_sonar_reporter.tpb
@@ -84,13 +84,15 @@ create or replace type body ut_coverage_sonar_reporter is
     function get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage) return clob is
       l_file_part    varchar2(32767);
       l_result       clob;
-      c_no_lines     constant varchar2(30) := '<lineToCover/>'||chr(10);
       l_line_no      binary_integer;
     begin
       dbms_lob.createtemporary(l_result, true);
       l_line_no := a_unit_coverage.lines.first;
       if l_line_no is null then
-        dbms_lob.writeappend(l_result, length(c_no_lines), c_no_lines);
+        for i in 1 .. a_unit_coverage.total_lines loop
+          l_file_part := '<lineToCover lineNumber="'||i||'" covered="false"/>'||chr(10);
+          dbms_lob.writeappend(l_result, length(l_file_part), l_file_part);
+        end loop;
       else
         while l_line_no is not null loop
           l_file_part :=
diff --git a/source/reporters/ut_coveralls_reporter.tpb b/source/reporters/ut_coveralls_reporter.tpb
@@ -93,7 +93,13 @@ create or replace type body ut_coveralls_reporter is
       dbms_lob.writeappend(l_result, length(c_coverage_header), c_coverage_header);
 
       l_last_line_no := a_unit_coverage.lines.last;
-      if l_last_line_no is not null then
+      if l_last_line_no is null then
+        l_last_line_no := a_unit_coverage.total_lines - 1;
+        for i in 1 .. l_last_line_no loop
+          dbms_lob.writeappend(l_result, 2, '0,');
+        end loop;
+        dbms_lob.writeappend(l_result, 1, '0');
+      else
         for line_no in 1 .. l_last_line_no loop
           l_file_part :=
             case
