Small Teamcity fixes

Pazus · Pazus · commit cf4104448b0e · 2017-01-07T15:07:18.000+03:00
diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb
@@ -4,47 +4,42 @@ create or replace type body ut_teamcity_reporter is
   begin
     self.name   := $$plsql_unit;
     self.output := a_output;
-    self.suite_names_stack := ut_varchar2_list();
     return;
   end;
 
   overriding member procedure before_calling_suite(self in out nocopy ut_teamcity_reporter, a_suite in ut_suite) is
   begin
-    self.suite_names_stack.extend();
-    self.suite_names_stack(self.suite_names_stack.last) := nvl(replace(a_suite.description, '.'),a_suite.name);
     self.print_text(
       ut_teamcity_reporter_helper.test_suite_started(
-        a_suite_name => nvl(replace(a_suite.description, '.'),a_suite.name))
+        a_suite_name => nvl(replace(trim(a_suite.description), '.'),a_suite.name))
       );
   end;
 
   overriding member procedure after_calling_suite(self in out nocopy ut_teamcity_reporter, a_suite in ut_suite) is
   begin
     self.print_text(
       ut_teamcity_reporter_helper.test_suite_finished(
-        a_suite_name => nvl(replace(a_suite.description, '.'),a_suite.name))
+        a_suite_name => nvl(replace(trim(a_suite.description), '.'),a_suite.name))
       );
-    self.suite_names_stack.trim();
   end;
 
   overriding member procedure before_calling_test(self in out nocopy ut_teamcity_reporter, a_test in ut_test) is
     l_test_full_name varchar2(4000);
   begin
-
-    l_test_full_name := self.suite_names_stack(self.suite_names_stack.last) || ':' ||
-                        nvl(replace(a_test.description, '.'), a_test.name);
+    
+    l_test_full_name := lower(a_test.item.owner_name)||'.'||lower(a_test.item.object_name)||'.'||lower(a_test.item.procedure_name);
+    
     self.print_text(ut_teamcity_reporter_helper.test_started(a_test_name => l_test_full_name));
   
   end;
 
   overriding member procedure after_calling_test(self in out nocopy ut_teamcity_reporter, a_test in ut_test) is
-    l_index            pls_integer;
     l_assert           ut_assert_result;
     l_test_full_name   varchar2(4000);
-    l_assert_full_name varchar2(4000);
   begin
-    l_test_full_name := self.suite_names_stack(self.suite_names_stack.last) || ':' ||
-                        nvl(replace(a_test.description, '.'), a_test.name);
+--    l_test_full_name := self.suite_names_stack(self.suite_names_stack.last) || ':' ||
+--                        nvl(replace(a_test.description, '.'), a_test.name);
+    l_test_full_name := lower(a_test.item.owner_name)||'.'||lower(a_test.item.object_name)||'.'||lower(a_test.item.procedure_name);                        
 
     if a_test.result = ut_utils.tr_ignore then
       self.print_text(ut_teamcity_reporter_helper.test_ignored(l_test_full_name));
@@ -55,11 +50,12 @@ create or replace type body ut_teamcity_reporter is
 
           l_assert := a_test.results(i);
 
-          if nvl(l_assert.result, ut_utils.tr_error) != ut_utils.tr_success then
+          if l_assert.result > ut_utils.tr_success then
             self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name
-                                                                ,a_msg       => l_assert.message
-                                                                ,a_expected  => l_assert.expected_value_string
-                                                                ,a_actual    => l_assert.actual_value_string));
+                                                                   ,a_msg       => l_assert.message
+                                                                   ,a_expected  => l_assert.expected_value_string
+                                                                   ,a_actual    => l_assert.actual_value_string));
+            -- Teamcity supports only a single failure message
             exit;
           end if;
 
@@ -70,8 +66,7 @@ create or replace type body ut_teamcity_reporter is
         self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name, a_msg => 'Error occured'));
       end if;
 
-      self.print_text(ut_teamcity_reporter_helper.test_finished(l_test_full_name
-                                                ,a_test_duration_milisec => trunc(a_test.execution_time * 1e3)));
+      self.print_text(ut_teamcity_reporter_helper.test_finished(l_test_full_name, trunc(a_test.execution_time * 1e3)));
 
     end if;
     
diff --git a/source/reporters/ut_teamcity_reporter.tps b/source/reporters/ut_teamcity_reporter.tps
@@ -1,6 +1,5 @@
 create or replace type ut_teamcity_reporter under ut_reporter
 (
-  suite_names_stack ut_varchar2_list,
   constructor function ut_teamcity_reporter(a_output ut_output default ut_output_dbms_output()) return self as result,
 
   overriding member procedure before_calling_suite(self in out nocopy ut_teamcity_reporter, a_suite in ut_suite),

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`create or replace type ut_teamcity_reporter under ut_reporter`
`2`	`2`	`(`
`3`		`- suite_names_stack ut_varchar2_list,`
`4`	`3`	`constructor function ut_teamcity_reporter(a_output ut_output default ut_output_dbms_output()) return self as result,`
`5`	`4`
`6`	`5`	`overriding member procedure before_calling_suite(self in out nocopy ut_teamcity_reporter, a_suite in ut_suite),`