fixed bug generating extra suitefinished message for teamcity reporter

Pazus · Pazus · commit 0d03adfad3f1 · 2017-02-26T15:32:02.000+03:00
added reporting stdout for Teamcity
added test for Teamcity reporting stdout
diff --git a/source/core/ut_output_buffer.pkb b/source/core/ut_output_buffer.pkb
@@ -102,8 +102,8 @@ create or replace package body ut_output_buffer is
     l_lines := ut_output_buffer.get_lines_cursor(a_reporter_id, a_timeout_sec);
     loop
       fetch l_lines into l_line;
-      dbms_output.put_line(l_line);
       exit when l_lines%notfound;
+      dbms_output.put_line(l_line);
     end loop;
     close l_lines;
   end;
diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb
@@ -66,6 +66,8 @@ create or replace type body ut_documentation_reporter is
       failed_test_running_count := failed_test_running_count + 1;
       self.print_red_text(l_message || ' (FAILED - '||failed_test_running_count||')');
     end if;
+    
+    -- reproduce the output from before/after procedures and the test
     print_output(a_test.before_each);
     print_output(a_test.before_test);
     print_output(a_test.item);
diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb
@@ -51,6 +51,16 @@ create or replace type body ut_teamcity_reporter is
   overriding member procedure after_calling_test(self in out nocopy ut_teamcity_reporter, a_test in ut_test) is
     l_assert           ut_assert_result;
     l_test_full_name   varchar2(4000);
+    procedure print_output(a_exectable ut_executable) is
+      l_lines ut_varchar2_list;
+    begin
+      if a_exectable is not null and a_exectable.is_defined and a_exectable.serveroutput is not null and dbms_lob.getlength(a_exectable.serveroutput) > 0 then
+        l_lines := ut_utils.clob_to_table(a_exectable.serveroutput);
+        for i in 1..l_lines.count loop
+          self.print_text(l_lines(i));
+        end loop;
+      end if;
+    end;
   begin
 --    l_test_full_name := self.suite_names_stack(self.suite_names_stack.last) || ':' ||
 --                        nvl(replace(a_test.description, '.'), a_test.name);
@@ -59,6 +69,13 @@ create or replace type body ut_teamcity_reporter is
     if a_test.result = ut_utils.tr_ignore then
       self.print_text(ut_teamcity_reporter_helper.test_ignored(l_test_full_name));
     else
+      
+      -- reproduce the output from before/after procedures and the test
+      print_output(a_test.before_each);
+      print_output(a_test.before_test);
+      print_output(a_test.item);
+      print_output(a_test.after_test);
+      print_output(a_test.after_each);
 
       if a_test.results is not null and a_test.results.count > 0 then
         for i in 1 .. a_test.results.count loop
diff --git a/tests/RunAll.sql b/tests/RunAll.sql
@@ -152,6 +152,7 @@ create table ut$test_table (val varchar2(1));
 @@lib/RunTest.sql ut_test/ut_test.BeforeEachProcedureNameInvalid.sql
 @@lib/RunTest.sql ut_test/ut_test.BeforeEachProcedureNameNull.sql
 @@lib/RunTest.sql ut_test/ut_test.TestOutputGathering.sql
+@@lib/RunTest.sql ut_test/ut_test.TestOutputGatheringForTeamcity.sql
 
 @@lib/RunTest.sql ut_test_suite/ut_test_suite.ErrorsATestWhenAfterTestFails.sql
 @@lib/RunTest.sql ut_test_suite/ut_test_suite.ErrorsATestWhenBeforeTestFails.sql
diff --git a/tests/ut_test/ut_test.TestOutputGathering.sql b/tests/ut_test/ut_test.TestOutputGathering.sql
@@ -58,17 +58,21 @@ end;
 declare
   l_output_data       dbms_output.chararr;
   l_num_lines         integer := 100000;
+  l_output            clob;
 begin
   --act
   ut.run('ut_output_tests');
 
   --assert
   dbms_output.get_lines( l_output_data, l_num_lines);
+  dbms_lob.createtemporary(l_output,true);
   for i in 1 .. l_num_lines loop
-    if l_output_data(i) like '%<!beforeeach!>%<!beforetest!>%<!thetest!>%<!aftertest!>%<!aftereach!>%1 tests, 0 failed, 0 errored%' then
-      :test_result := ut_utils.tr_success;
-    end if;
+    dbms_lob.append(l_output,l_output_data(i));
   end loop;
+  
+  if l_output like '%<!beforeeach!>%<!beforetest!>%<!thetest!>%<!aftertest!>%<!aftereach!>%1 tests, 0 failed, 0 errored%' then
+    :test_result := ut_utils.tr_success;
+  end if;
 
   if :test_result != ut_utils.tr_success or :test_result is null then
     for i in 1 .. l_num_lines loop
diff --git a/tests/ut_test/ut_test.TestOutputGatheringForTeamcity.sql b/tests/ut_test/ut_test.TestOutputGatheringForTeamcity.sql
@@ -0,0 +1,87 @@
+create or replace package ut_output_tests
+as
+ --%suite
+  
+ --%beforeeach
+ procedure beforeeach;
+ 
+ --%aftereach
+ procedure aftereach;
+ 
+ --%test
+ --%beforetest(beforetest)
+ --%aftertest(aftertest)
+ procedure ut_passing_test;
+ 
+ procedure beforetest;
+ 
+ procedure aftertest;
+ 
+end;
+/
+
+create or replace package body ut_output_tests
+as
+
+ procedure beforetest as
+ begin
+   dbms_output.put_line('<!beforetest!>');
+ end;
+
+ procedure aftertest
+ as
+ begin
+   dbms_output.put_line('<!aftertest!>');
+ end;
+ 
+ procedure beforeeach as
+ begin
+   dbms_output.put_line('<!beforeeach!>');
+ end;
+
+ procedure aftereach
+ as
+ begin
+   dbms_output.put_line('<!aftereach!>');
+ end;
+
+ procedure ut_passing_test
+ as
+ begin
+   dbms_output.put_line('<!thetest!>');
+   ut.expect(1,'Test 1 Should Pass').to_equal(1);
+ end;
+
+end;
+/
+
+declare
+  l_output_data       dbms_output.chararr;
+  l_num_lines         integer := 100000;
+  l_output            clob;
+begin
+  --act
+  ut.run('ut_output_tests',ut_teamcity_reporter);
+
+  --assert
+  dbms_output.get_lines( l_output_data, l_num_lines);
+  dbms_lob.createtemporary(l_output,true);
+  for i in 1 .. l_num_lines loop
+    dbms_lob.append(l_output,l_output_data(i));
+  end loop;
+  if l_output like '%##teamcity[testStarted%<!beforeeach!>%<!beforetest!>%<!thetest!>%<!aftertest!>%<!aftereach!>%##teamcity[testFinished%' then
+    :test_result := ut_utils.tr_success;
+  end if;
+
+  if :test_result != ut_utils.tr_success or :test_result is null then
+    for i in 1 .. l_num_lines loop
+      dbms_output.put_line(l_output_data(i));
+    end loop;
+    dbms_output.put_line('Failed: Wrong output');
+  end if;
+end;
+/
+
+drop package ut_output_tests
+/
+
