Skip to content

Commit 4cf39ac

Browse files
jgebaljgebal
authored
Merge branch 'develop' into bugfix/non_sysdba_install
2 parents 8e8c3e6 + abf5124 commit 4cf39ac

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎old_tests/ut_output_buffer/get_lines.WaitsForMoreDataToAppearForSpecifiedTime.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ declare
33
l_result integer;
44
l_dummy integer;
55
l_output ut_output_buffer_base := ut_output_table_buffer();
6-
l_start_time timestamp := systimestamp;
6+
l_start_time timestamp := localtimestamp;
77
l_wait_seconds integer := 1;
88
begin
99
--Act
1010
l_output.send_line(lpad('a text',4000,',a text'));
1111

1212
select count(*) into l_dummy from table( l_output.get_lines( a_initial_timeout => 0, a_timeout_sec => l_wait_seconds ));
13-
l_result := round(extract(second from (systimestamp - l_start_time)));
13+
l_result := round(extract(second from (localtimestamp - l_start_time)));
1414

1515
--Assert
1616
ut.expect(l_result).to_equal(l_wait_seconds);

‎old_tests/ut_output_buffer/get_lines.WaitsForTheDataToAppearForSpecifiedTime.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ declare
33
l_result integer;
44
l_dummy integer;
55
l_output ut_output_buffer_base := ut_output_table_buffer();
6-
l_start_time timestamp := systimestamp;
6+
l_start_time timestamp := localtimestamp;
77
l_wait_seconds integer := 1;
88
begin
99
--Act
1010
select count(1) into l_dummy from table( l_output.get_lines( a_initial_timeout => l_wait_seconds, a_timeout_sec => 0 ));
11-
l_result := round(extract(second from (systimestamp - l_start_time)));
11+
l_result := round(extract(second from (localtimestamp - l_start_time)));
1212

1313
--Assert
1414
ut.expect(l_result).to_equal(l_wait_seconds);

‎source/core/ut_utils.pks‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is
2121
*
2222
*/
2323

24-
gc_version constant varchar2(50) := 'v3.1.2.1869-develop';
24+
gc_version constant varchar2(50) := 'v3.1.2.1880-develop';
2525

2626
/* Constants: Event names */
2727
subtype t_event_name is varchar2(30);

‎source/expectations/data_values/ut_compound_data_value.tpb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,15 @@ create or replace type body ut_compound_data_value as
132132
l_result integer;
133133
--the XML stylesheet is applied on XML representation of data to exclude column names from comparison
134134
--column names and data-types are compared separately
135+
--user CHR(38) instead of ampersand to eliminate define request when installing through some IDEs
135136
l_xml_data_fmt constant xmltype := xmltype(
136137
q'[<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
137138
<xsl:strip-space elements="*" />
138139
<xsl:template match="/child::*">
139140
<xsl:for-each select="child::node()">
140141
<xsl:choose>
141142
<xsl:when test="*[*]"><xsl:copy-of select="node()"/></xsl:when>
142-
<xsl:when test="position()=last()"><xsl:value-of select="normalize-space(.)"/><xsl:text>&#xD;</xsl:text></xsl:when>
143+
<xsl:when test="position()=last()"><xsl:value-of select="normalize-space(.)"/><xsl:text>'||CHR(38)||'#xD;</xsl:text></xsl:when>
143144
<xsl:otherwise><xsl:value-of select="normalize-space(.)"/>,</xsl:otherwise>
144145
</xsl:choose>
145146
</xsl:for-each>

‎source/install.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
166166
@@install_component.sql 'expectations/data_values/ut_compound_data_diff_tmp.sql'
167167
@@install_component.sql 'expectations/data_values/ut_data_value.tps'
168168
@@install_component.sql 'expectations/data_values/ut_compound_data_value.tps'
169-
@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks'
170169
@@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps'
171170
@@install_component.sql 'expectations/data_values/ut_data_value_collection.tps'
172171
@@install_component.sql 'expectations/data_values/ut_data_value_object.tps'
@@ -182,6 +181,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
182181
@@install_component.sql 'expectations/data_values/ut_data_value_timestamp_ltz.tps'
183182
@@install_component.sql 'expectations/data_values/ut_data_value_varchar2.tps'
184183
@@install_component.sql 'expectations/data_values/ut_data_value_yminterval.tps'
184+
@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks'
185185
@@install_component.sql 'expectations/matchers/ut_matcher.tps'
186186
@@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps'
187187
@@install_component.sql 'expectations/matchers/ut_be_false.tps'

‎source/uninstall.sql‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ drop type ut_expectation_result force;
258258

259259
drop package ut_event_manager;
260260

261-
drop type ut_event_listener force;
262-
263261
drop type ut_event_item force;
264262

265263
drop type ut_key_value_pairs force;

‎test/api/test_ut_run.pkb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ create or replace package body test_ut_run is
6060
g_state varchar2(3) := 'abc';
6161
end;]';
6262
end;/',
63-
start_date => sysdate,
63+
start_date => localtimestamp,
6464
enabled => TRUE,
6565
auto_drop => TRUE,
6666
comments => 'one-time job'
@@ -98,6 +98,7 @@ Failures:%
9898

9999
--Act
100100
select * bulk collect into l_results from table(ut3.ut.run('test_stateful'));
101+
101102
--Assert
102103
ut.fail('Expected exception but nothing was raised');
103104
exception

‎test/core/test_output_buffer.pkb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ create or replace package body test_output_buffer is
5555
--Act
5656
l_expected := lpad('a text',4000,',a text');
5757
l_buffer.send_line(l_expected);
58-
l_start := systimestamp;
58+
l_start := localtimestamp;
5959
select * into l_result from table(l_buffer.get_lines(1,1));
60-
l_duration := systimestamp - l_start;
60+
l_duration := localtimestamp - l_start;
6161

6262
ut.expect(l_result).to_equal(l_expected);
6363
ut.expect(l_duration).to_be_greater_than(interval '1' second);

0 commit comments

Comments
 (0)