From f76670f6f5aee9672f4e44de65849bb04df0a3c5 Mon Sep 17 00:00:00 2001 From: Pazus Date: Fri, 10 May 2019 10:11:17 +0300 Subject: [PATCH 1/4] fix message_id increment --- test/ut3_tester/core/test_output_buffer.pkb | 18 ++++++++++++++++++ test/ut3_tester/core/test_output_buffer.pks | 3 +++ 2 files changed, 21 insertions(+) diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index d8157a687..f3a5a337f 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -46,6 +46,24 @@ create or replace package body test_output_buffer is ut.expect(l_cur).to_be_empty; end; + + procedure test_doesnt_send_multiline_on_null_text is + l_cur sys_refcursor; + l_result integer; + l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + l_message_id varchar2(255); + l_text varchar2(4000); + begin + ut3_tester_helper.run_helper.delete_buffer(); + --Act + l_buffer.send_lines(ut_varchar2_rows(null)); + l_buffer.send_lines(ut_varchar2_rows('test')); + + select message_id, text into l_message_id, l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); + ut.expect(l_message_id).to_equal('1'); + ut.expect(l_text).to_equal('test'); + end; + procedure test_send_line is l_result varchar2(4000); c_expected constant varchar2(4000) := lpad('a text',4000,',a text'); diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks index 9a4cfa68a..420f09244 100644 --- a/test/ut3_tester/core/test_output_buffer.pks +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -9,6 +9,9 @@ create or replace package test_output_buffer is --%test(Does not send line if null text given) procedure test_doesnt_send_on_null_text; + --%test(Does not send line if null text given for multiline case) + procedure test_doesnt_send_multiline_on_null_text; + --%test(Sends a line into buffer table) procedure test_send_line; From 40c64d6a575e74f25e25771f74727ea17cd9ed10 Mon Sep 17 00:00:00 2001 From: Pazus Date: Fri, 10 May 2019 10:12:47 +0300 Subject: [PATCH 2/4] the fix --- source/core/output_buffers/ut_output_clob_table_buffer.tpb | 2 +- source/core/output_buffers/ut_output_table_buffer.tpb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index 7b97c70ca..56873a418 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -66,7 +66,7 @@ create or replace type body ut_output_clob_table_buffer is select self.output_id, self.last_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_message_id := self.last_message_id + a_text_list.count; + self.last_message_id := self.last_message_id + SQL%rowcount; commit; end; diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 2b29e8ee5..afcbcbc95 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -75,7 +75,7 @@ create or replace type body ut_output_table_buffer is select self.output_id, self.last_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_message_id := self.last_message_id + a_text_list.count; + self.last_message_id := self.last_message_id + SQL%rowcount; commit; end; From 8030a09375efe5b2c7cf48a41c29a1fe2ae18309 Mon Sep 17 00:00:00 2001 From: Pazus Date: Fri, 10 May 2019 10:21:34 +0300 Subject: [PATCH 3/4] shorten test name --- test/ut3_tester/core/test_output_buffer.pkb | 2 +- test/ut3_tester/core/test_output_buffer.pks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index f3a5a337f..93062f4a6 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -47,7 +47,7 @@ create or replace package body test_output_buffer is end; - procedure test_doesnt_send_multiline_on_null_text is + procedure test_doesnt_send_on_null_elem is l_cur sys_refcursor; l_result integer; l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks index 420f09244..8f4d5873d 100644 --- a/test/ut3_tester/core/test_output_buffer.pks +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -10,7 +10,7 @@ create or replace package test_output_buffer is procedure test_doesnt_send_on_null_text; --%test(Does not send line if null text given for multiline case) - procedure test_doesnt_send_multiline_on_null_text; + procedure test_doesnt_send_on_null_elem; --%test(Sends a line into buffer table) procedure test_send_line; From 1b1d86ce2dfd10197c4c535d2eae033ce37d43f3 Mon Sep 17 00:00:00 2001 From: Pazus Date: Fri, 10 May 2019 10:37:15 +0300 Subject: [PATCH 4/4] fix type --- test/ut3_tester/core/test_output_buffer.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index 93062f4a6..40af7e0b0 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -56,8 +56,8 @@ create or replace package body test_output_buffer is begin ut3_tester_helper.run_helper.delete_buffer(); --Act - l_buffer.send_lines(ut_varchar2_rows(null)); - l_buffer.send_lines(ut_varchar2_rows('test')); + l_buffer.send_lines(ut3.ut_varchar2_rows(null)); + l_buffer.send_lines(ut3.ut_varchar2_rows('test')); select message_id, text into l_message_id, l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); ut.expect(l_message_id).to_equal('1');