reporting changes

Pazus · Pazus · commit 16d4e8fca43b · 2016-11-12T11:18:55.000+03:00
diff --git a/source/types/ut_teamcity_reporter.tpb b/source/types/ut_teamcity_reporter.tpb
@@ -36,44 +36,51 @@ create or replace type body ut_teamcity_reporter is
   end;
 
   overriding member procedure after_suite_item(self in out nocopy ut_teamcity_reporter, a_suite in ut_object, a_item_index pls_integer) is
-    l_suite   ut_test_suite;
-    l_item    ut_test_object;
-    l_test    ut_test;
-    l_index   pls_integer;
-    l_assert  ut_assert_result;
-    l_msg_str varchar2(4000);
+    l_suite            ut_test_suite;
+    l_item             ut_test_object;
+    l_test             ut_test;
+    l_index            pls_integer;
+    l_assert           ut_assert_result;
+    l_test_full_name   varchar2(4000);
+    l_assert_full_name varchar2(4000);
   begin
     l_suite := treat(a_suite as ut_test_suite);
     l_item  := treat(l_suite.items(a_item_index) as ut_test_object);
   
     if l_item is of(ut_test) then
     
       l_test := treat(l_item as ut_test);
+    
+      l_test_full_name := l_suite.object_name || '.' || l_item.object_name;
       if l_test.items is not null and l_test.items.count > 0 then
         for i in 1 .. l_test.items.count loop
         
           l_assert := treat(l_test.items(i) as ut_assert_result);
         
-          l_msg_str := '##teamcity[message text=''' || l_assert.message || '''';
+          l_assert_full_name := l_test_full_name || '.assert' || to_char(i);
+        
+          dbms_output.put_line('##teamcity[testStarted name=''' || l_assert_full_name || ''']');
+          --l_msg_str := '##teamcity[testStarted name=''' || l_suite.object_name || '.' || l_item.object_name ||'.assert'||i||''']';
+          --''' duration=''' || trunc(l_test.execution_time*1e3) || 
+        
+          --l_msg_str := '##teamcity[message text=''' || l_assert.message || '''';
         
           if l_assert.result = ut_utils.tr_success then
             null;
           else
-            l_msg_str := l_msg_str || ' status=''ERROR''';
+            dbms_output.put_line('##teamcity[testFailed name=''' || l_assert_full_name || ''' message=''' ||
+                                 l_assert.message || ''']');
           end if;
-          l_msg_str := l_msg_str || ']';
+          dbms_output.put_line('##teamcity[testFinished name=''' || l_assert_full_name || ''']');
         
-          dbms_output.put_line(l_msg_str);
         end loop;
       end if;
     
-      if l_test.result = ut_utils.tr_success then
-        l_msg_str := '##teamcity[testFinished name=''' || l_suite.object_name || '.' || l_item.object_name ||
-                     ''' duration=''' || trunc(l_test.execution_time*1e3) || '''  ]';
-      else
-        l_msg_str := '##teamcity[testFailed name=''' || l_suite.object_name || '.' || l_item.object_name || ''']';
+      if l_test.result != ut_utils.tr_success or l_test.result is null then
+        dbms_output.put_line('##teamcity[testFailed name=''' || l_test_full_name || ''']');
       end if;
-      dbms_output.put_line(l_msg_str);
+      dbms_output.put_line('##teamcity[testFinished name=''' || l_test_full_name || ''' duration=''' ||
+                   trunc(l_test.execution_time * 1e3) || ''']');
     end if;
   end;
 
