8000 Changed ordering of tests for suites with context by jgebal · Pull Request #1037 · utPLSQL/utPLSQL · GitHub
[go: up one dir, main page]
Skip to content

Changed ordering of tests for suites with context #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 4, 2020
Merged

Changed ordering of tests for suites with context #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d02ac94
Changed ordering of tests for suites with context
jgebal Dec 29, 2019
0a4edaf
Test name fix
jgebal Dec 29, 2019
326e055
Added documenting comments for ordering of data from suite_cache.
jgebal Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions source/core/ut_suite_cache_manager.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,24 @@ create or replace package body ut_suite_cache_manager is
return case
when a_random_seed is null then q'[
replace(
case
when c.obj.self_type in ( 'UT_TEST' )
then substr(c.obj.path, 1, instr(c.obj.path, '.', -1) )
else c.obj.path
end, '.', chr(0)
--suite path until objects name (excluding contexts and test path) with trailing dot (full stop)
substr( c.obj.path, 1, instr( c.obj.path, lower(c.obj.object_name), -1 ) + length(c.obj.object_name) ),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find this very hard to read/understand. I guess extracting to a helper function would be too much overhead - can we add a comment to explain the intention?
-- get path until object's name

8000 Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is documented properly now.
Thanks for this comment. It helps me a lot to see what is not obvious/clear.

'.',
--'.' replaced with chr(0) to assure that child elements come before parent when sorting in descending oder
chr(0)
) desc nulls last,
c.obj.object_name desc,
c.obj.line_no,
case when c.obj.self_type = 'UT_SUITE_CONTEXT' then
( select max( x.line_no ) + 1
from ut_suite_cache x
where c.obj.object_owner = x.object_owner
and c.obj.object_name = x.object_name
and x.path like c.obj.path || '.%'
)
else
c.obj.line_no
end,
--assures that child contexts come before parent contexts
regexp_count(c.obj.path,'\.') desc,
:a_random_seed]'
else
' ut_runner.hash_suite_path(
Expand Down
118 changes: 60 additions & 58 deletions test/ut3_tester/core/test_suite_builder.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,9 @@ create or replace package body test_suite_builder is
'<UT_LOGICAL_SUITE>' ||
'%<WARNINGS/>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>a_context</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.a_context</PATH>' ||
'%<ITEMS>' ||
Expand All @@ -661,9 +664,6 @@ create or replace package body test_suite_builder is
'%</BEFORE_ALL_LIST>' ||
'<AFTER_ALL_LIST/>' ||
'</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>suite_level_beforeall</PROCEDURE_NAME>' ||
Expand Down Expand Up @@ -710,26 +710,14 @@ create or replace package body test_suite_builder is
'<UT_LOGICAL_SUITE>' ||
'%<WARNINGS/>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>a_context</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.a_context</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>nested_context_2</NAME><DESCRIPTION>nested_context_2</DESCRIPTION><PATH>some_package.a_context.nested_context_2</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>nested_context_#1</NAME><DESCRIPTION>a_nested_context_3</DESCRIPTION><PATH>some_package.a_context.nested_context_2.nested_context_#1</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_nested_context_3</NAME><DESCRIPTION>Test in nested context</DESCRIPTION><PATH>some_package.a_context.nested_context_2.nested_context_#1.test_in_nested_context_3</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST/>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_nested_context_2</NAME><DESCRIPTION>Test in nested context</DESCRIPTION><PATH>some_package.a_context.nested_context_2.test_in_nested_context_2</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST/>' ||
'%<NAME>first_test_in_a_context</NAME><DESCRIPTION>First test in context</DESCRIPTION><PATH>some_package.a_context.first_test_in_a_context</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>a_nested_context</NAME><DESCRIPTION>A nested context</DESCRIPTION><PATH>some_package.a_context.a_nested_context</PATH>' ||
Expand All @@ -743,7 +731,22 @@ create or replace package body test_suite_builder is
'%</BEFORE_ALL_LIST>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>first_test_in_a_context</NAME><DESCRIPTION>First test in context</DESCRIPTION><PATH>some_package.a_context.first_test_in_a_context</PATH>' ||
'%<NAME>nested_context_2</NAME><DESCRIPTION>nested_context_2</DESCRIPTION><PATH>some_package.a_context.nested_context_2</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_nested_context_2</NAME><DESCRIPTION>Test in nested context</DESCRIPTION><PATH>some_package.a_context.nested_context_2.test_in_nested_context_2</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>nested_context_#1</NAME><DESCRIPTION>a_nested_context_3</DESCRIPTION><PATH>some_package.a_context.nested_context_2.nested_context_#1</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_nested_context_3</NAME><DESCRIPTION>Test in nested context</DESCRIPTION><PATH>some_package.a_context.nested_context_2.nested_context_#1.test_in_nested_context_3</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST/>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST/>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>second_test_in_a_context</NAME><DESCRIPTION>Second test in context</DESCRIPTION><PATH>some_package.a_context.second_test_in_a_context</PATH>' ||
Expand All @@ -754,9 +757,6 @@ create or replace package body test_suite_builder is
'%</BEFORE_ALL_LIST>' ||
'<AFTER_ALL_LIST/>' ||
'</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>suite_level_beforeall</PROCEDURE_NAME>' ||
Expand Down Expand Up @@ -859,6 +859,10 @@ create or replace package body test_suite_builder is
'<ROWSET><ROW>'||
'<UT_LOGICAL_SUITE>' ||
'%<ITEMS>' ||
'%<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME>' ||
'%<ITEM>%<PROCEDURE_NAME>suite_level_test</PROCEDURE_NAME>%</ITEM>' ||
'%</UT_SUITE_ITEM>' ||
'%<UT_SUITE_ITEM>' ||
'%<NAME>nested_context_#1</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.nested_context_#1</PATH>' ||
'%<ITEMS>' ||
Expand All @@ -872,10 +876,6 @@ create or replace package body test_suite_builder is
'%<BEFORE_ALL_LIST>%<PROCEDURE_NAME>context_beforeall</PROCEDURE_NAME>%</BEFORE_ALL_LIST>' ||
'%<AFTER_ALL_LIST>%<PROCEDURE_NAME>context_afterall</PROCEDURE_NAME>%</AFTER_ALL_LIST>' ||
'%</UT_SUITE_ITEM>' ||
'%<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME>' ||
'%<ITEM>%<PROCEDURE_NAME>suite_level_test</PROCEDURE_NAME>%</ITEM>' ||
'%</UT_SUITE_ITEM>' ||
'%</ITEMS>' ||
'%</UT_LOGICAL_SUITE>'||
'</ROW></ROWSET>'
Expand Down Expand Up @@ -909,6 +909,12 @@ create or replace package body test_suite_builder is
'<ROWSET><ROW>'||
'<UT_LOGICAL_SUITE>' ||
'%<ITEMS>' ||
'%<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME>' ||
'%<BEFORE_EACH_LIST>%<PROCEDURE_NAME>suite_level_beforeeach</PROCEDURE_NAME>%</BEFORE_EACH_LIST>' ||
'%<ITEM>%<PROCEDURE_NAME>suite_level_test</PROCEDURE_NAME>%</ITEM>' ||
'%<AFTER_EACH_LIST>%<PROCEDURE_NAME>suite_level_aftereach</PROCEDURE_NAME>%</AFTER_EACH_LIST>' ||
'%</UT_SUITE_ITEM>' ||
'%<UT_SUITE_ITEM>' ||
'%<NAME>nested_context_#1</NAME><DESCRIPTION>nested_context_#1</DESCRIPTION><PATH>some_package.nested_context_#1</PATH>' ||
'%<ITEMS>' ||
Expand All @@ -920,12 +926,6 @@ create or replace package body test_suite_builder is
'%</UT_SUITE_ITEM>' ||
'%</ITEMS>' ||
'%</UT_SUITE_ITEM>' ||
'%<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME>' ||
'%<BEFORE_EACH_LIST>%<PROCEDURE_NAME>suite_level_beforeeach</PROCEDURE_NAME>%</BEFORE_EACH_LIST>' ||
'%<ITEM>%<PROCEDURE_NAME>suite_level_test</PROCEDURE_NAME>%</ITEM>' ||
'%<AFTER_EACH_LIST>%<PROCEDURE_NAME>suite_level_aftereach</PROCEDURE_NAME>%</AFTER_EACH_LIST>' ||
'%</UT_SUITE_ITEM>' ||
'%</ITEMS>' ||
'%<BEFORE_ALL_LIST>%<PROCEDURE_NAME>suite_level_beforeall</PROCEDURE_NAME>%</BEFORE_ALL_LIST>' ||
'%<AFTER_ALL_LIST>%<PROCEDURE_NAME>suite_level_afterall</PROCEDURE_NAME>%</AFTER_ALL_LIST>' ||
Expand Down Expand Up @@ -961,18 +961,20 @@ create or replace package body test_suite_builder is
'<ROWSET><ROW>'||
'<UT_LOGICAL_SUITE>' ||
'%<ITEMS>' ||
'%<NAME>a_context</NAME><DESCRIPTION>Some context</DESCRIPTION><PATH>some_package.a_context</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_a_context</NAME><DESCRIPTION>In context</DESCRIPTION><PATH>some_package.a_context.test_in_a_context</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>context_setup</PROCEDURE_NAME>' ||
'%</BEFORE_ALL_LIST>' ||
'%<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'%<UT_SUITE_ITEM>' ||
'%<NAME>a_context</NAME><DESCRIPTION>Some context</DESCRIPTION><PATH>some_package.a_context</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_a_context</NAME><DESCRIPTION>In context</DESCRIPTION><PATH>some_package.a_context.test_in_a_context</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>context_setup</PROCEDURE_NAME>' ||
'%</BEFORE_ALL_LIST>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>suite_level_beforeall</PROCEDURE_NAME>' ||
Expand Down Expand Up @@ -1010,6 +1012,9 @@ create or replace package body test_suite_builder is
'<ROWSET><ROW>'||
'<UT_LOGICAL_SUITE>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>a_context</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.a_context</PATH>' ||
'%<ITEMS>' ||
Expand All @@ -1022,9 +1027,6 @@ create or replace package body test_suite_builder is
'%</BEFORE_ALL_LIST>' ||
'<AFTER_ALL_LIST/>' ||
'</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>suite_level_beforeall</PROCEDURE_NAME>' ||
Expand Down Expand Up @@ -1067,32 +1069,32 @@ create or replace package body test_suite_builder is
'<UT_LOGICAL_SUITE>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>nested_context_#2</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.nested_context_#2</PATH>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>a_context</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.a_context</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_duplicated_context</NAME><DESCRIPTION>In duplicated context</DESCRIPTION><PATH>some_package.nested_context_#2.test_in_duplicated_context</PATH>' ||
'%<NAME>test_in_a_context</NAME><DESCRIPTION>In context</DESCRIPTION><PATH>some_package.a_context.test_in_a_context</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>setup_in_duplicated_context</PROCEDURE_NAME>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>context_setup</PROCEDURE_NAME>' ||
'%</BEFORE_ALL_LIST>' ||
'<AFTER_ALL_LIST/>' ||
'</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>a_context</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.a_context</PATH>' ||
'%<NAME>nested_context_#2</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.nested_context_#2</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_a_context</NAME><DESCRIPTION>In context</DESCRIPTION><PATH>some_package.a_context.test_in_a_context</PATH>' ||
'%<NAME>test_in_duplicated_context</NAME><DESCRIPTION>In duplicated context</DESCRIPTION><PATH>some_package.nested_context_#2.test_in_duplicated_context</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>context_setup</PROCEDURE_NAME>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>setup_in_duplicated_context</PROCEDURE_NAME>' ||
'%</BEFORE_ALL_LIST>' ||
'<AFTER_ALL_LIST/>' ||
'</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST>' ||
'%<OBJECT_NAME>some_package</OBJECT_NAME><PROCEDURE_NAME>suite_level_beforeall</PROCEDURE_NAME>' ||
Expand Down Expand Up @@ -1341,20 +1343,20 @@ create or replace package body test_suite_builder is
'<UT_LOGICAL_SUITE>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>nested_context_#2</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.nested_context_#2</PATH>' ||
'%<NAME>nested_context_#1</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.nested_context_#1</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_a_context2</NAME><DESCRIPTION>In context2</DESCRIPTION><PATH>some_package.nested_context_#2.test_in_a_context2</PATH>' ||
'%<NAME>test_in_a_context1</NAME><DESCRIPTION>In context1</DESCRIPTION><PATH>some_package.nested_context_#1.test_in_a_context1</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST/>' ||
'<AFTER_ALL_LIST/>' ||
'</UT_SUITE_ITEM>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>nested_context_#1</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.nested_context_#1</PATH>' ||
'%<NAME>nested_context_#2</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.nested_context_#2</PATH>' ||
'%<ITEMS>' ||
'<UT_SUITE_ITEM>' ||
'%<NAME>test_in_a_context1</NAME><DESCRIPTION>In context1</DESCRIPTION><PATH>some_package.nested_context_#1.test_in_a_context1</PATH>' ||
'%<NAME>test_in_a_context2</NAME><DESCRIPTION>In context2</DESCRIPTION><PATH>some_package.nested_context_#2.test_in_a_context2</PATH>' ||
'%</UT_SUITE_ITEM>' ||
'</ITEMS>' ||
'<BEFORE_ALL_LIST/>' ||
Expand Down
2 changes: 1 addition & 1 deletion test/ut3_tester/core/test_suite_builder.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ create or replace package test_suite_builder is
--%test(Is ignored when name value is empty)
procedure name_empty_value;

--%test(Is ignored when name value is empty)
--%test(Is applied to corresponding context when multiple contexts used)
procedure multiple_contexts;

--%endcontext
Expand Down
0