Skip to content

Commit f342195

Browse files
committed
Reverting rollback changes - they should go as a separate PR.
1 parent d211348 commit f342195

File tree

5 files changed

+19
-23
lines changed

5 files changed

+19
-23
lines changed

development/releasing.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ To create a release:
99
- wait for th build to complete successfully
1010
- merge the release branch to master and wait for master build to complete successfully
1111
- create a release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release.
12-
To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state)
12+
To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state).
13+
Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+)
1314

1415
The following will happen:
1516
- build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name

source/api/ut_runner.pkb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ create or replace package body ut_runner is
8383
a_include_objects ut_varchar2_list := null,
8484
a_exclude_objects ut_varchar2_list := null,
8585
a_fail_on_errors boolean := false,
86-
a_client_character_set varchar2 := null,
87-
a_perform_rollback boolean := true
86+
a_client_character_set varchar2 := null
8887
) is
8988
l_run ut_run;
9089
l_coverage_schema_names ut_varchar2_rows;
@@ -142,17 +141,13 @@ create or replace package body ut_runner is
142141
l_run.do_execute();
143142

144143
finish_run(l_run);
145-
if a_perform_rollback then
146-
rollback;
147-
end if;
144+
rollback;
148145
exception
149146
when others then
150147
finish_run(l_run);
151148
dbms_output.put_line(dbms_utility.format_error_backtrace);
152149
dbms_output.put_line(dbms_utility.format_error_stack);
153-
if a_perform_rollback then
154-
rollback;
155-
end if;
150+
rollback;
156151
raise;
157152
end;
158153
if a_fail_on_errors and l_run.result in (ut_utils.gc_failure, ut_utils.gc_error) then

source/api/ut_runner.pks

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ create or replace package ut_runner authid current_user is
4444
* @param a_exclude_objects list of database objects (in format 'owner.name') that coverage should be skipped for
4545
* @param a_fail_on_errors true/false - should an exception be thrown when tests are completed with failures/errors
4646
* @param a_client_character_set if provided, affects some of reporters by setting specific character set for XML/HTML reports
47-
* @param a_perform_rollback true/false - should rollback be performed as part of test execution (default true)
48-
4947
*
5048
* @example
5149
* Parameter `a_paths` accepts values of the following formats:
@@ -68,8 +66,7 @@ create or replace package ut_runner authid current_user is
6866
a_include_objects ut_varchar2_list := null,
6967
a_exclude_objects ut_varchar2_list := null,
7068
a_fail_on_errors boolean := false,
71-
a_client_character_set varchar2 := null,
72-
a_perform_rollback boolean := true
69+
a_client_character_set varchar2 := null
7370
);
7471

7572
/**

source/api/ut_suite_item_info.tps

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ create or replace type ut_suite_item_info as object (
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
*/
18-
object_owner varchar2(250),
19-
object_name varchar2(250),
20-
item_name varchar2(250),
21-
item_description varchar2(250),
22-
item_type varchar2(250),
23-
item_line_no integer,
24-
path varchar2(4000),
25-
disabled_flag integer
18+
object_owner varchar2( 250 ), -- the owner of test suite packages
19+
object_name varchar2( 250 ), -- the name of test suite package
20+
item_name varchar2( 250 ), -- the name of suite/test
21+
item_description varchar2( 250 ), -- the description of suite/suite item
22+
item_type varchar2( 250 ), -- the type of item (UT_SUITE/UT_SUITE_CONTEXT/UT_TEST)
23+
item_line_no integer, -- line_number where annotation identifying the item exists
24+
path varchar2( 4000 ),-- suitepath of the item
25+
disabled_flag integer -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation
2626
)
2727
/

test/api/test_ut_runner.pkb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,16 @@ end;';
8181

8282
procedure keep_an_open_transaction is
8383
l_expected varchar2(300);
84+
l_output_data dbms_output.chararr;
85+
l_num_lines integer := 100000;
8486
begin
8587
--Arrange
8688
create_test_spec();
8789
create_test_body(0);
8890
l_expected := dbms_transaction.local_transaction_id(true);
8991
--Act
90-
ut3.ut_runner.run(ut3.ut_varchar2_list('test_cache'),null, a_perform_rollback => false);
92+
ut3.ut.run('test_cache');
93+
dbms_output.get_lines( l_output_data, l_num_lines);
9194
--Assert
9295
ut.expect(dbms_transaction.local_transaction_id()).to_equal(l_expected);
9396
drop_test_package();
@@ -102,7 +105,7 @@ end;';
102105
create_test_body(0);
103106
rollback;
104107
--Act
105-
ut3.ut_runner.run(ut3.ut_varchar2_list('test_cache'),null);
108+
ut3.ut.run('test_cache');
106109
dbms_output.get_lines( l_output_data, l_num_lines);
107110
--Assert
108111
ut.expect(dbms_transaction.local_transaction_id()).to_be_null();

0 commit comments

Comments
 (0)