Merge pull request #550 from lwasylow/xunitreportergetpath

jgebal · web-flow · commit 8de954ba426b · 2018-01-04T12:44:30.000Z
Xunitreportergetpath
diff --git a/source/reporters/ut_xunit_reporter.tpb b/source/reporters/ut_xunit_reporter.tpb
@@ -29,7 +29,7 @@ create or replace type body ut_xunit_reporter is
 
     function get_path(a_path_with_name varchar2, a_name varchar2) return varchar2 is
     begin
-      return substr(a_path_with_name, 1, instr(a_path_with_name, '.' || a_name) - 1);
+      return regexp_substr(a_path_with_name, '(.*)\.' ||a_name||'$',subexpression=>1);
     end;
 
     procedure print_test_elements(a_test ut_test) is
diff --git a/test/core/reporters/test_xunit_reporter.pkb b/test/core/reporters/test_xunit_reporter.pkb
@@ -8,13 +8,31 @@ create or replace package body test_xunit_reporter as
 
       --%test(A test with <tag>)
       procedure test_do_stuff;
+      
     end;]';
     execute immediate q'[create or replace package body check_xunit_reporting is
       procedure test_do_stuff is
       begin
         ut3.ut.expect(1).to_equal(1);
         ut3.ut.expect(1).to_equal(2);
       end;
+
+    end;]';
+    
+    execute immediate q'[create or replace package check_xunit_rep_suitepath is
+      --%suitepath(core)
+      --%suite(check_xunit_rep_suitepath)
+      --%displayname(Check XUNIT Get path for suitepath)
+            
+      --%test(check_xunit_rep_suitepath)
+      --%displayname(Check XUNIT Get path for suitepath)
+      procedure check_xunit_rep_suitepath;
+    end;]';
+    execute immediate q'[create or replace package body check_xunit_rep_suitepath is
+      procedure check_xunit_rep_suitepath is
+      begin
+        ut3.ut.expect(1).to_equal(1);
+      end;
     end;]';
   end;
 
@@ -59,10 +77,36 @@ create or replace package body test_xunit_reporter as
     ut.expect(l_actual).to_be_like('%at "%.CHECK_XUNIT_REPORTING%", line %');
   end;
 
+  procedure check_classname_suite is
+    l_results   ut3.ut_varchar2_list;
+    l_actual    clob;    
+  begin
+    --Act
+    select *
+      bulk collect into l_results
+      from table(ut3.ut.run('check_xunit_reporting',ut3.ut_xunit_reporter()));
+    l_actual := ut3.ut_utils.table_to_clob(l_results);
+    --Assert
+    ut.expect(l_actual).to_be_like('%testcase classname="check_xunit_reporting"%');   
+  end;
+
+  procedure check_classname_suitepath is
+    l_results   ut3.ut_varchar2_list;
+    l_actual    clob;    
+  begin
+    --Act
+    select *
+      bulk collect into l_results
+      from table(ut3.ut.run('check_xunit_rep_suitepath',ut3.ut_xunit_reporter()));
+    l_actual := ut3.ut_utils.table_to_clob(l_results);
+    --Assert
+    ut.expect(l_actual).to_be_like('%testcase classname="core.check_xunit_rep_suitepath"%');   
+  end;
   procedure remove_test_package is
     pragma autonomous_transaction;
   begin
     execute immediate 'drop package check_xunit_reporting';
+    execute immediate 'drop package check_xunit_rep_suitepath';
   end;
 end;
 /
diff --git a/test/core/reporters/test_xunit_reporter.pks b/test/core/reporters/test_xunit_reporter.pks
@@ -15,6 +15,12 @@ create or replace package test_xunit_reporter as
   --%test(Reports failed line of test)
   procedure reports_failed_line;
 
+  --%test(Check that classname is returned correct suite)
+  procedure check_classname_suite;
+
+  --%test(Check that classname is returned correct suitepath)
+  procedure check_classname_suitepath;
+
   --%afterall
   procedure remove_test_package;
 end;
