Fixed output buffer and related test.

utPLSQL · pesse · Mar 8, 2018 · Jul 14, 2017 · Feb 12, 2018 · Feb 12, 2018
commit 43b8754ebb2957587f3890acaaec1bf8d2f5cd87
diff --git a/old_tests/ut_output_buffer/get_lines.WaitsForMoreDataToAppearForSpecifiedTime.sql b/old_tests/ut_output_buffer/get_lines.WaitsForMoreDataToAppearForSpecifiedTime.sql
@@ -18,7 +18,7 @@ begin
   if ut_expectation_processor.get_status = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
   else
-    dbms_output.put_line(ut_expectation_processor.get_expectations_results()(1).get_result_clob);
+    dbms_output.put_line(ut_expectation_processor.get_failed_expectations()(1).get_result_clob);
   end if;
 end;
 /
diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql
@@ -21,15 +21,12 @@ create table ut_output_buffer_tmp$(
   message_id     number(38,0) not null,
   text           varchar2(4000),
   is_finished    number(1,0) default 0 not null,
-  start_date     date not null,
   constraint ut_output_buffer_tmp_pk primary key(output_id, message_id),
   constraint ut_output_buffer_tmp_ck check(is_finished = 0 and text is not null or is_finished = 1 and text is null),
   constraint ut_output_buffer_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id)
 ) organization index overflow nologging initrans 100
 ;
 
-create index ut_output_buffer_tmp_i on ut_output_buffer_tmp$(start_date) initrans 100 nologging;
-
 -- This is needed to be EBR ready as editioning view can only be created by edition enabled user
 declare
   ex_nonedition_user exception;
@@ -62,7 +59,6 @@ select output_id
       ,message_id
       ,text
       ,is_finished
-      ,start_date
   from ut_output_buffer_tmp$';
 
   execute immediate 'create or replace editioning view '||v_view_source;

diff --git a/test/core/test_output_buffer.pkb b/test/core/test_output_buffer.pkb
@@ -4,41 +4,29 @@ create or replace package body test_output_buffer is
     l_result   varchar2(4000);
     l_remaining integer;
     l_expected varchar2(4000);
-    l_reporter ut3.ut_reporter_base :=ut3. ut_documentation_reporter();
+    l_buffer   ut3.ut_output_buffer_base := ut3.ut_output_table_buffer();
   begin
   --Act
     l_expected := lpad('a text',4000,',a text');
-    ut3.ut_output_buffer.send_line(l_reporter, l_expected);
+    l_buffer.send_line(l_expected);
 
-    select * into l_result from table(ut3.ut_output_buffer.get_lines(l_reporter.reporter_id,0));
+    select * into l_result from table(l_buffer.get_lines(0,0));
 
     ut.expect(l_result).to_equal(l_expected);
 
-    select count(1) into l_remaining from ut3.ut_output_buffer_tmp where reporter_id = l_reporter.reporter_id;
+    select count(1) into l_remaining from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id;
 
     ut.expect(l_remaining).to_equal(0);
   end;
 
-  procedure test_doesnt_send_on_null_id is
-    l_cur sys_refcursor;
-  begin
-    delete from ut3.ut_output_buffer_tmp;
-    --Act
-    ut3.ut_output_buffer.send_line(null,'a text to send');
-
-    open l_cur for select * from ut3.ut_output_buffer_tmp;
-
-    ut.expect(l_cur).to_be_empty;
-  end;
-
   procedure test_doesnt_send_on_null_text is
-    l_cur sys_refcursor;
+    l_cur    sys_refcursor;
     l_result integer;
-    l_reporter ut3.ut_reporter_base := ut3.ut_documentation_reporter();
+    l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer();
   begin
     delete from ut3.ut_output_buffer_tmp;
     --Act
-    ut3.ut_output_buffer.send_line(l_reporter,null);
+    l_buffer.send_line(null);
 
     open l_cur for select * from ut3.ut_output_buffer_tmp;
     ut.expect(l_cur).to_be_empty;
@@ -47,30 +35,33 @@ create or replace package body test_output_buffer is
   procedure test_send_line is
     l_result   varchar2(4000);
     c_expected constant varchar2(4000) := lpad('a text',4000,',a text');
-    l_reporter ut3.ut_reporter_base := ut3.ut_documentation_reporter();
+    l_buffer   ut3.ut_output_buffer_base := ut3.ut_output_table_buffer();
   begin
-    ut3.ut_output_buffer.send_line(l_reporter, c_expected);
+    l_buffer.send_line(c_expected);
 
-    select text into l_result from ut3.ut_output_buffer_tmp where reporter_id = l_reporter.reporter_id;
+    select text into l_result from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id;
 
     ut.expect(l_result).to_equal(c_expected);
   end;
 
   procedure test_waiting_for_data is
-    l_result   varchar2(4000);
+    l_result    varchar2(4000);
     l_remaining integer;
-    l_expected varchar2(4000);
-    l_reporter ut3.ut_reporter_base := ut3.ut_documentation_reporter();
+    l_expected  varchar2(4000);
+    l_buffer    ut3.ut_output_buffer_base := ut3.ut_output_table_buffer();
+    l_start     timestamp;
+    l_duration  interval day to second;
   begin
   --Act
     l_expected := lpad('a text',4000,',a text');
-    ut3.ut_output_buffer.send_line(l_reporter, l_expected);
-
-    select * into l_result from table(ut3.ut_output_buffer.get_lines(l_reporter.reporter_id,0));
+    l_buffer.send_line(l_expected);
+    l_start := systimestamp;
+    select * into l_result from table(l_buffer.get_lines(1,1));
+    l_duration := systimestamp - l_start;
 
     ut.expect(l_result).to_equal(l_expected);
-
-    select count(1) into l_remaining from ut3.ut_output_buffer_tmp where reporter_id = l_reporter.reporter_id;
+    ut.expect(l_duration).to_be_greater_than(interval '1' second);
+    select count(1) into l_remaining from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id;
 
     ut.expect(l_remaining).to_equal(0);
 

diff --git a/test/core/test_output_buffer.pks b/test/core/test_output_buffer.pks
@@ -6,9 +6,6 @@ create or replace package test_output_buffer is
   --%test(Recieves a line from buffer table and deletes)
   procedure test_recieve;
 
-  --%test(Does not send line if null reporter id given)
-  procedure test_doesnt_send_on_null_id;
-
   --%test(Does not send line if null text given)
   procedure test_doesnt_send_on_null_text;