Skip to content

Commit adbc76e

Browse files
committed
Address too long identified in 11g.
Address flaky expression checker to be reworked.
1 parent 0daab33 commit adbc76e

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

source/api/ut_runner.pkb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,13 @@ create or replace package body ut_runner is
9595
ut_event_manager.trigger_event(ut_event_manager.gc_initialize);
9696
ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info());
9797

98-
--Verify tag tag expression is valid
99-
if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!]+[-!]|[-!|&][)]')
98+
--TODO:Verify tag tag expression is valid
99+
/*
100+
if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!,]+[-!]|[-!|&][)]')
100101
or (regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)')) then
101102
raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression');
102103
end if;
104+
*/
103105
if a_random_test_order_seed is not null then
104106
l_random_test_order_seed := a_random_test_order_seed;
105107
elsif a_random_test_order then

source/core/ut_suite_cache_manager.pkb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ create or replace package body ut_suite_cache_manager is
270270
l_tags := replace(replace_legacy_tag_notation(l_tags),' ');
271271
end if;
272272
l_tags := REGEXP_REPLACE(l_tags,
273-
'(\(|\)|\||\!|\&)?([^|&!-]+)(\(|\)|\||\!|\&)?',
273+
'(\(|\)|\||\!|\&)?([^|&!-()]+)(\(|\)|\||\!|\&)?',
274274
q'[\1q'<\2>' member of tags\3]');
275275
--replace operands to XPath
276276
l_tags := REGEXP_REPLACE(l_tags, '\|',' or ');
@@ -310,23 +310,23 @@ with
310310
from suites_mv c where c.self_type in ('UT_TEST')
311311
and ]'||l_tags||q'[
312312
),
313-
tests_with_tags_inherited_from_suite as (
313+
tests_with_tags_inh_from_suite as (
314314
select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner
315315
from suites_mv c join suites_matching_expr t
316316
on (c.path||'.' like t.path || '.%' /*all descendants and self*/ and c.object_owner = t.object_owner)
317317
),
318-
tests_with_tags_promoted_to_suites as (
318+
tests_with_tags_prom_to_suite as (
319319
select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner
320320
from suites_mv c join tests_matching_expr t
321321
on (t.path||'.' like c.path || '.%' /*all ancestors and self*/ and c.object_owner = t.object_owner)
322322
)
323323
select obj from suites_mv c,
324324
(select id,row_number() over (partition by id order by id) r_num from
325325
(select id
326-
from tests_with_tags_promoted_to_suites tst
326+
from tests_with_tags_prom_to_suite tst
327327
where ]'||l_tags||q'[
328328
union all
329-
select id from tests_with_tags_inherited_from_suite tst
329+
select id from tests_with_tags_inh_from_suite tst
330330
where ]'||l_tags||q'[
331331
)
332332
) t where c.id = t.id and r_num = 1 ]';

source/core/ut_suite_cache_manager.pks

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ create or replace package ut_suite_cache_manager authid definer is
9494
a_package_name varchar2,
9595
a_procedure_name varchar2
9696
) return boolean;
97-
98-
99-
function create_where_filter(a_tags varchar2
100-
) return varchar2;
97+
10198
end ut_suite_cache_manager;
10299
/

0 commit comments

Comments
 (0)