Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix error with space before annotation params #375

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
jgebal merged 9 commits into from
Jul 4, 2017
Merged

Fix error with space before annotation params #375

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
64cab8e
fix error with space before annotation params
Pazus Jun 28, 2017
eb0a999
Merge branch 'develop' into issue-357
jgebal Jun 29, 2017
f2ca323
addressed comments
Pazus Jul 1, 2017
e1893ae
Merge branch 'develop' into issue-357
Pazus Jul 2, 2017
4d9f9ae
Merge branch 'develop' into issue-357
Pazus Jul 2, 2017
413e63f
added trailing spaces processing
Pazus Jul 3, 2017
f1e22e4
Merge branch 'develop' into issue-357
Pazus Jul 3, 2017
2c4ffde
Merge branch 'develop' into issue-357
Pazus Jul 4, 2017
76b2df3
Merge branch 'develop' into issue-357
jgebal Jul 4, 2017
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
2 changes: 1 addition & 1 deletion source/core/ut_annotations.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ create or replace package body ut_annotations as
c_rgexp_identifier constant varchar2(50) := '[a-z][a-z0-9#_$]*';
c_annotation_block_pattern constant varchar2(200) := '(({COMMENT#.+}'||chr(10)||')+)( |'||chr(09)||')*(procedure|function)\s+(' ||
c_rgexp_identifier || ')';
c_annotation_pattern constant varchar2(50) := gc_annotation_qualifier || c_rgexp_identifier || '(\(.*?\)$)?';
c_annotation_pattern constant varchar2(50) := gc_annotation_qualifier || c_rgexp_identifier || '[ '||chr(9)||']*(\(.*?\)$)?';
Copy link
Copy Markdown
Member

@jgebal jgebal Jun 29, 2017

Choose a reason for hiding this comment

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

Shouldn't we use \s* rather than chr(9)?
We should also enhance the pattern to allow \s at the end I think.
So how about:

gc_annotation_qualifier || c_rgexp_identifier || '\s*(\(.*?\)\s*$)?';

Copy link
Copy Markdown
Member Author

@Pazus Pazus Jun 30, 2017

Choose a reason for hiding this comment

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

\s contains new line character which is not allowed

Copy link
Copy Markdown
Member

@jgebal jgebal Jun 30, 2017

Choose a reason for hiding this comment

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

Ok

Copy link
Copy Markdown
Member

@jgebal jgebal Jul 2, 2017

Choose a reason for hiding this comment

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

Can you make the regexp work with trailing spaces?
'[ '||chr(9)||]((.?)[ '||chr(9)||']*$)?'



function delete_multiline_comments(a_source in clob) return clob is
Expand Down
2 changes: 1 addition & 1 deletion source/core/ut_suite_manager.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ create or replace package body ut_suite_manager is
l_suite_name := l_annotation_data.package_annotations('suite').text;
end if;

if l_annotation_data.package_annotations.exists('suitepath') then
if l_annotation_data.package_annotations.exists('suitepath') and l_annotation_data.package_annotations('suitepath').text is not null then
l_suite_path := l_annotation_data.package_annotations('suitepath').text || '.' || lower(l_object_name);
end if;

Expand Down
2 changes: 2 additions & 0 deletions tests/RunAll.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ exec ut_coverage.coverage_start_develop();
@@lib/RunTest.sql ut_annotations/ut_annotations.parse_package_annotations.ParsePackageLevelAnnotationMultilineDeclare.sql
@@lib/RunTest.sql ut_annotations/ut_annotations.parse_package_annotations.ParsePackageLevelAnnotationWithKeyValue.sql
@@lib/RunTest.sql ut_annotations/ut_annotations.parse_package_annotations.ParsePackageLevelAnnotationWithMultilineComment.sql
@@lib/RunTest.sql ut_annotations/ut_annotations.parse_package_annotations.spaceBeforeAnnotationParams.sql
@@ut_expectations/ut.expect.not_to_be_null.sql
@@lib/RunTest.sql ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNotBoolean.sql
@@lib/RunTest.sql ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNull.sql
Expand Down Expand Up @@ -183,6 +184,7 @@ exec ut_coverage.coverage_start_develop();
@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql
@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.PackageWithHash.sql
@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.TestWithHashSign.sql
@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.emptySuitePath.sql


@@lib/RunTest.sql ut_test/ut_test.DisabledFlagSkipTest.sql
Expand Down
37 changes: 37 additions & 0 deletions ...s/ut_annotations/ut_annotations.parse_package_annotations.spaceBeforeAnnotationParams.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--Arrange
declare
l_source clob;
l_parsing_result ut_annotations.typ_annotated_package;
l_expected ut_annotations.typ_annotated_package;
l_ann_param ut_annotations.typ_annotation_param;

begin
l_source := 'PACKAGE test_tt AS
/*
Some comment
-- inlined
*/
-- %suite
-- %suitepath (all.globaltests)

procedure foo;
END;';

--Act
l_parsing_result := ut_annotations.parse_package_annotations(l_source);

--Assert
l_expected.package_annotations('suite').params := cast( null as ut_annotations.tt_annotation_params);

l_ann_param := null;
l_ann_param.val := 'all.globaltests';
l_expected.package_annotations('suitepath').params(1) := l_ann_param;

check_annotation_parsing(l_expected, l_parsing_result);

if ut_expectation_processor.get_status = ut_utils.tr_success then
:test_result := ut_utils.tr_success;
end if;

end;
/
7 changes: 7 additions & 0 deletions tests/ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,16 @@ set termout on

declare
l_objects_to_run ut_suite_items;
l_suite ut_suite;
begin
--act
l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with$dollar'));

--Assert
ut.expect(l_objects_to_run.count).to_equal(1);

l_suite := treat(l_objects_to_run(1) as ut_suite);
ut.expect(l_suite.name).to_equal('tst_package_with$dollar');

if ut_expectation_processor.get_status = ut_utils.tr_success then
:test_result := ut_utils.tr_success;
Expand Down
7 changes: 7 additions & 0 deletions tests/ut_suite_manager/ut_suite_manager.PackageWithHash.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,18 @@ set termout on

declare
l_objects_to_run ut_suite_items;
l_suite ut_suite;
begin

--act
l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with#hash'));

--Assert
ut.expect(l_objects_to_run.count).to_equal(1);

l_suite := treat(l_objects_to_run(1) as ut_suite);
ut.expect(l_suite.name).to_equal('tst_package_with#hash');

if ut_expectation_processor.get_status = ut_utils.tr_success then
:test_result := ut_utils.tr_success;
end if;
Expand Down
15 changes: 14 additions & 1 deletion tests/ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,30 @@ end;

create or replace package body tst_package_with_dollar_test as
procedure test$1 is begin ut.expect(1).to_equal(1); end;
procedure test$2 is begin ut.expect(1).to_equal(1); end;
end;
/

set termout on

declare
l_objects_to_run ut_suite_items;
l_suite ut_suite;
l_test ut_test;
begin
--act
l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with_dollar_test.test$1'));

--Assert
ut.expect(l_objects_to_run.count).to_equal(1);

l_suite := treat(l_objects_to_run(1) as ut_suite);

ut.expect(l_suite.name).to_equal('tst_package_with_dollar_test');
ut.expect(l_suite.items.count).to_equal(1);

l_test := treat(l_suite.items(1) as ut_test);

ut.expect(l_test.name).to_equal('test$1');

if ut_expectation_processor.get_status = ut_utils.tr_success then
:test_result := ut_utils.tr_success;
Expand Down
15 changes: 14 additions & 1 deletion tests/ut_suite_manager/ut_suite_manager.TestWithHashSign.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,31 @@ end;

create or replace package body tst_package_with_hash_test as
procedure test#1 is begin ut.expect(1).to_equal(1); end;
procedure test#2 is begin ut.expect(1).to_equal(1); end;
end;
/

set termout on

declare
l_objects_to_run ut_suite_items;
l_suite ut_suite;
l_test ut_test;
begin

--act
l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with_hash_test.test#1'));

--Assert
ut.expect(l_objects_to_run.count).to_equal(1);

l_suite := treat(l_objects_to_run(1) as ut_suite);

ut.expect(l_suite.name).to_equal('tst_package_with_hash_test');
ut.expect(l_suite.items.count).to_equal(1);

l_test := treat(l_suite.items(1) as ut_test);

ut.expect(l_test.name).to_equal('test#1');

if ut_expectation_processor.get_status = ut_utils.tr_success then
:test_result := ut_utils.tr_success;
Expand Down
41 changes: 41 additions & 0 deletions tests/ut_suite_manager/ut_suite_manager.emptySuitePath.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
set termout off
create or replace package tst_empty_suite_path as
--%suite
--%suitepath

--%test
procedure test1;
end;
/

create or replace package body tst_empty_suite_path as
procedure test1 is begin ut.expect(1).to_equal(1); end;
end;
/

set termout on

declare
l_objects_to_run ut_suite_items;
l_suite ut_suite;
begin

--act
l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_empty_suite_path'));

--Assert
ut.expect(l_objects_to_run.count).to_equal(1);

l_suite := treat(l_objects_to_run(1) as ut_suite);

ut.expect(l_suite.name).to_equal('tst_empty_suite_path');

if ut_expectation_processor.get_status = ut_utils.tr_success then
Copy link
Copy Markdown
Member

@jgebal jgebal Jun 29, 2017

Choose a reason for hiding this comment

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

I don't understand how will this test ever fail, as there is no expectation executed before status is checked.

:test_result := ut_utils.tr_success;
end if;

end;
/

drop package tst_empty_suite_path
/