Merge branch 'develop' of github.com:lwasylow/utPLSQL into fix/catercddata

lwasylow · lwasylow · commit 75f69e161c85 · 2018-05-12T11:54:36.000+01:00
diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb
@@ -105,15 +105,15 @@ create or replace package body ut_suite_builder is
     l_annotation_pos binary_integer;
   begin
     l_result.owner := a_object.object_owner;
-    l_result.name  := a_object.object_name;
+    l_result.name  := lower(trim(a_object.object_name));
     l_annotation_no := a_object.annotations.first;
     while l_annotation_no is not null loop
       l_annotation_pos := a_object.annotations(l_annotation_no).position;
       if a_object.annotations(l_annotation_no).subobject_name is null then
         l_result.annotations(l_annotation_pos).name := a_object.annotations(l_annotation_no).name;
         l_result.annotations(l_annotation_pos).text := a_object.annotations(l_annotation_no).text;
       else
-        l_result.annotations(l_annotation_pos).procedure_name        := a_object.annotations(l_annotation_no).subobject_name;
+        l_result.annotations(l_annotation_pos).procedure_name        := lower(trim(a_object.annotations(l_annotation_no).subobject_name));
         l_result.annotations(l_annotation_pos).procedure_annotations := get_procedure_annotations(a_object.annotations, l_annotation_no);
       end if;
       l_annotation_no := a_object.annotations.next(l_annotation_no);
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is
    *
    */
 
-  gc_version                 constant varchar2(50) := 'v3.1.2.1883-develop';
+  gc_version                 constant varchar2(50) := 'v3.1.2.1894-develop';
 
   /* Constants: Event names */
   subtype t_event_name           is varchar2(30);
diff --git a/test/core/reporters/test_junit_reporter.pkb b/test/core/reporters/test_junit_reporter.pkb
@@ -61,7 +61,18 @@ create or replace package body test_junit_reporter as
    execute immediate q'[create or replace package body tst_package_junit_nosuite as
     procedure test1 is begin ut.expect(1).to_equal(1); end;
   end;]';
+  
+  execute immediate q'[create or replace package Tst_Fix_Case_Sensitive as
+      --%suite
+
+      --%test(bugfix)
+      procedure bUgFiX;
+  end;]';
 
+   execute immediate q'[create or replace package body Tst_Fix_Case_Sensitive as
+    procedure bUgFiX is begin ut.expect(1).to_equal(1); end;
+  end;]';  
+  
   execute immediate q'[create or replace package check_fail_escape is
       --%suitepath(core)
       --%suite(checkfailedescape)
@@ -284,7 +295,6 @@ create or replace package body test_junit_reporter as
     ut.expect(l_actual).to_be_like(l_expected);  
   end;
   
-  
   procedure check_failure_escaped is
     l_results   ut3.ut_varchar2_list;
     l_actual    clob;
@@ -300,6 +310,27 @@ Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[som
 ]]>%');
   end;
   
+  procedure check_classname_is_populated is
+    l_results   ut3.ut_varchar2_list;
+    l_actual    clob;
+    l_expected  varchar2(32767):= q'[<testsuites tests="1" disabled="0" errors="0" failures="0" name="" time="%" >
+<testsuite tests="1" id="1" package="tst_fix_case_sensitive"  disabled="0" errors="0" failures="0" name="tst_fix_case_sensitive" time="%" >
+<testcase classname="tst_fix_case_sensitive" assertions="0" name="bugfix" time="%" >
+<system-out/>
+<system-err/>
+</testcase>
+<system-out/>
+<system-err/>
+</testsuite>
+</testsuites>]';
+  begin
+    select *
+      bulk collect into l_results
+    from table(ut3.ut.run('Tst_Fix_Case_Sensitive',ut3.ut_junit_reporter()));
+    l_actual := ut3.ut_utils.table_to_clob(l_results);
+    ut.expect(l_actual).to_be_like(l_expected);  
+  end;
+  
   procedure remove_test_package is
     pragma autonomous_transaction;
   begin
@@ -308,6 +339,7 @@ Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[som
     execute immediate 'drop package tst_package_junit_nodesc';
     execute immediate 'drop package tst_package_junit_nosuite';
     execute immediate 'drop package check_fail_escape';
+    execute immediate 'drop package Tst_Fix_Case_Sensitive';
     reporters.reporters_cleanup;
   end;
 end;
diff --git a/test/core/reporters/test_junit_reporter.pks b/test/core/reporters/test_junit_reporter.pks
@@ -35,6 +35,9 @@ create or replace package test_junit_reporter as
   
   --%test(Report produces expected output)
   procedure reporort_produces_expected_out;
+  
+  --%test( Check classname is populated when procedure is mixed cased - bug #659)
+  procedure check_classname_is_populated;
 
   --%test( Validate that fail with special char are escaped )
   procedure check_failure_escaped;

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`- gc_version constant varchar2(50) := 'v3.1.2.1883-develop';`
	`24`	`+ gc_version constant varchar2(50) := 'v3.1.2.1894-develop';`
`25`	`25`
`26`	`26`	`/* Constants: Event names */`
`27`	`27`	`subtype t_event_name is varchar2(30);`