Fixed failing tests.

jgebal · jgebal · commit de982671ecea · 2017-08-22T07:40:04.000+01:00
diff --git a/old_tests/ut/ut.version.sql b/old_tests/ut/ut.version.sql
@@ -1,8 +1,8 @@
 declare
-  l_expected varchar2(100) := 'utPLSQL - Version %.%.%';
+  l_expected varchar2(100) := '%.%.%.%';
 begin
 --Assert
-  if ut.version() like l_expected  then
+  if ut.version() like l_expected then
     :test_result := ut_utils.tr_success;
   else
     dbms_output.put_line('expected version like '''||l_expected ||''' got: '''||ut.version()||'''' );
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -389,12 +389,13 @@ create or replace package body ut_utils is
     c_version_part_regex varchar2(20) := '([0-9]+)';
   begin
 
-    if p_version_no like '%.%.%.%' then
+    if regexp_like(p_version_no,'v?([0-9]+(\.|$)){4}') then
       l_result.major  := regexp_substr(p_version_no, c_version_part_regex, 1, 1, subexpression => 1);
       l_result.minor  := regexp_substr(p_version_no, c_version_part_regex, 1, 2, subexpression => 1);
       l_result.bugfix := regexp_substr(p_version_no, c_version_part_regex, 1, 3, subexpression => 1);
       l_result.build  := regexp_substr(p_version_no, c_version_part_regex, 1, 4, subexpression => 1);
     end if;
+    return l_result;
   end;
 end ut_utils;
 /
diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb
@@ -236,7 +236,7 @@ create or replace package body ut_coverage_report_html_helper is
     l_file_part :=
      chr(10)||
      '</div><div id="footer">' ||
-     'Generated by <a href="http://github.com/utPLSQL/utPLSQL">'||ut_utils.gc_version||'</a><br/>' ||
+     'Generated by <a href="http://github.com/utPLSQL/utPLSQL">utPLSQL '||ut_utils.gc_version||'</a><br/>' ||
      'Based on <a href="http://github.com/colszowka/simplecov-html">simplecov-html</a> v0.10.0 '||l_using||'' ||
      '</div><div class="source_files">';
     ut_utils.append_to_clob(l_result, l_file_part);
diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh
@@ -12,6 +12,7 @@ utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_ST
 -test_path=test -c \
 -f=ut_documentation_reporter  -o=test_results.log -s \
 -f=ut_coverage_sonar_reporter -o=coverage.xml \
+-f=ut_coverage_html_reporter  -o=coverage.html \
 -f=ut_coveralls_reporter      -o=coverage.json \
 -f=ut_sonar_test_reporter     -o=test_results.xml
 
diff --git a/test/ut_utils/test_ut_utils.pkb b/test/ut_utils/test_ut_utils.pkb
@@ -284,14 +284,19 @@ end;';
   end;
 
   procedure test_to_version is
-    l_version ut3.ut_utils.t_version;
+    l_actual        ut3.ut_utils.t_version;
   begin
-    l_version := ut3.ut_utils.to_version();
+    l_actual := ut3.ut_utils.to_version(ut3.ut_utils.gc_version);
     if ut3.ut_utils.gc_version != 'X.X.X.X' then
-      ut.expect(l_version.major).to_be_not_null;
-      ut.expect(l_version.minor).to_be_not_null;
-      ut.expect(l_version.bugfix).to_be_not_null;
-      ut.expect(l_version.build).to_be_not_null;
+      ut.expect(l_actual.major).to_be_not_null;
+      ut.expect(l_actual.minor).to_be_not_null;
+      ut.expect(l_actual.bugfix).to_be_not_null;
+      ut.expect(l_actual.build).to_be_not_null;
+    else
+      ut.expect(l_actual.major).to_be_null;
+      ut.expect(l_actual.minor).to_be_null;
+      ut.expect(l_actual.bugfix).to_be_null;
+      ut.expect(l_actual.build).to_be_null;
     end if;
   end;
 
