Fixed code and unit tests.

jgebal · jgebal · commit 4571a0a3e9a4 · 2017-08-22T08:17:14.000+01:00
Added missing tests.
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -386,14 +386,14 @@ create or replace package body ut_utils is
 
   function to_version(p_version_no varchar2) return t_version is
     l_result t_version;
-    c_version_part_regex varchar2(20) := '([0-9]+)';
+    c_version_part_regex varchar2(20) := '[0-9]+';
   begin
 
-    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);
+    if regexp_like(p_version_no,'v?([0-9]+(\.|$)){3,4}') then
+      l_result.major  := regexp_substr(p_version_no, c_version_part_regex, 1, 1);
+      l_result.minor  := regexp_substr(p_version_no, c_version_part_regex, 1, 2);
+      l_result.bugfix := regexp_substr(p_version_no, c_version_part_regex, 1, 3);
+      l_result.build  := regexp_substr(p_version_no, c_version_part_regex, 1, 4);
     end if;
     return l_result;
   end;
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -98,10 +98,10 @@ create or replace package ut_utils authid definer is
   gc_null_string              constant varchar2(4) := 'NULL';
 
   type t_version is record(
-    major  positive,
-    minor  positive,
-    bugfix positive,
-    build  positive
+    major  natural,
+    minor  natural,
+    bugfix natural,
+    build  natural
   );
 
 
diff --git a/test/install_tests.sql b/test/install_tests.sql
@@ -8,6 +8,7 @@
 @@ut_reporters/test_coverage.pks
 @@ut_reporters/test_coverage_sonar_reporter.pks
 @@ut_reporters/test_coveralls_reporter.pks
+@@ut_runner/test_ut_runner.pks
 
 @core.pkb
 @ut_utils/test_ut_utils.pkb
@@ -18,6 +19,7 @@
 @@ut_reporters/test_coverage.pkb
 @@ut_reporters/test_coverage_sonar_reporter.pkb
 @@ut_reporters/test_coveralls_reporter.pkb
+@@ut_runner/test_ut_runner.pkb
 
 show errors
 
diff --git a/test/ut_runner/test_ut_runner.pkb b/test/ut_runner/test_ut_runner.pkb
@@ -0,0 +1,22 @@
+create or replace package body test_ut_runner is
+
+  procedure version_comp_check_compare is
+  begin
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.0.0') ).to_be_true;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.123.0') ).to_be_true;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.123.0.0') ).to_be_true;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.13.31.0') ).to_be_true;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.1.0','v3.0.0.0') ).to_be_false;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.1.0.0','v3.0.0.0') ).to_be_false;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v2.0.0.0') ).to_be_false;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v4.0.0.0') ).to_be_false;
+  end;
+  procedure version_comp_check_ignore is
+  begin
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.123','v3.0.0.0') ).to_be_true;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.0.123') ).to_be_true;
+    ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0','v3.0.0.0') ).to_be_true;
+  end;
+
+end;
+/
diff --git a/test/ut_runner/test_ut_runner.pks b/test/ut_runner/test_ut_runner.pks
@@ -0,0 +1,13 @@
+create or replace package test_ut_runner is
+
+  --%suite(ut_runner)
+  --%suitepath(utplsql.core)
+
+  --%test(version_compatibility_check compares major minor bigfix number)
+  procedure version_comp_check_compare;
+
+  --%test(version_compatibility_check ignores build number)
+  procedure version_comp_check_ignore;
+
+end;
+/
diff --git a/test/ut_utils/test_ut_utils.pkb b/test/ut_utils/test_ut_utils.pkb
@@ -303,9 +303,9 @@ end;';
   procedure test_to_version_split is
     l_version ut3.ut_utils.t_version;
   begin
-    l_version := ut3.ut_utils.to_version('v034.123.0456.0333');
+    l_version := ut3.ut_utils.to_version('v034.0.0456.0333');
     ut.expect(l_version.major).to_equal(34);
-    ut.expect(l_version.minor).to_equal(123);
+    ut.expect(l_version.minor).to_equal(0);
     ut.expect(l_version.bugfix).to_equal(456);
     ut.expect(l_version.build).to_equal(333);
   end;
