From 8ec8da0491ad89604700b3e29a227966f6d84ba1 Mon Sep 17 00:00:00 2001 From: Perl Tidy Date: Wed, 5 Dec 2018 15:38:52 -0500 Subject: no bug - reformat all the code using the new perltidy rules --- qa/t/webservice_bug_add_comment.t | 301 +++++++++++++++++++++----------------- 1 file changed, 165 insertions(+), 136 deletions(-) (limited to 'qa/t/webservice_bug_add_comment.t') diff --git a/qa/t/webservice_bug_add_comment.t b/qa/t/webservice_bug_add_comment.t index dafd088fb..a7b95caeb 100644 --- a/qa/t/webservice_bug_add_comment.t +++ b/qa/t/webservice_bug_add_comment.t @@ -16,153 +16,182 @@ use QA::Util; use Test::More tests => 141; my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients(); -use constant INVALID_BUG_ID => -1; +use constant INVALID_BUG_ID => -1; use constant INVALID_BUG_ALIAS => 'aaaaaaa12345'; -use constant PRIVS_USER => 'QA_Selenium_TEST'; +use constant PRIVS_USER => 'QA_Selenium_TEST'; use constant TIMETRACKING_USER => 'admin'; -use constant TEST_COMMENT => '--- Test Comment From QA Tests ---'; +use constant TEST_COMMENT => '--- Test Comment From QA Tests ---'; use constant TOO_LONG_COMMENT => 'a' x 100000; my @tests = ( - # Permissions - { args => { id => 'public_bug', comment => TEST_COMMENT }, - error => 'You must log in', - test => 'Logged-out user cannot comment on a public bug', - }, - { args => { id => 'private_bug', comment => TEST_COMMENT }, - error => "You must log in", - test => 'Logged-out user cannot comment on a private bug', - }, - { user => 'unprivileged', - args => { id => 'private_bug', comment => TEST_COMMENT }, - error => "not authorized to access", - test => "Unprivileged user can't comment on a private bug", - }, - - # Test ID parameter - { user => 'unprivileged', - args => { comment => TEST_COMMENT }, - error => 'a id argument', - test => 'Failing to pass the "id" param fails', - }, - { user => 'unprivileged', - args => { id => INVALID_BUG_ID, comment => TEST_COMMENT }, - error => "It does not seem like bug number", - test => 'Passing invalid bug id returns error "Invalid Bug ID"', - }, - { user => 'unprivileged', - args => { id => '', comment => TEST_COMMENT }, - error => "You must enter a valid bug number", - test => 'Passing empty bug id param returns error "Invalid Bug ID"', - }, - { user => 'unprivileged', - args => { id => INVALID_BUG_ALIAS, comment => TEST_COMMENT }, - error => "nor an alias to a bug", - test => 'Passing invalid bug alias returns error "Invalid Bug Alias"', - }, - - # Test Comment parameter - { user => 'unprivileged', - args => { id => 'public_bug' }, - error => 'a comment argument', - test => 'Failing to pass the "comment" parameter fails', - }, - { user => 'unprivileged', - args => { id => 'public_bug', comment => '' }, - error => "a comment argument", - test => 'Passing an empty comment fails', - }, - { user => 'unprivileged', - args => { id => 'public_bug', comment => ' ' }, - error => 'a comment argument', - test => 'Passing only a space for comment fails', - }, - { user => 'unprivileged', - args => { id => 'public_bug', comment => " \t\n\n\r\n\r\n\r " }, - error => 'a comment argument', - test => 'Passing only whitespace (including newlines) fails', - }, - { user => 'unprivileged', - args => { id => 'public_bug', comment => TOO_LONG_COMMENT }, - error => "cannot be longer than", - test => "Passing a comment that's too long fails", - }, - - # Testing the "private" parameter happens in the tests for Bug.comments - - # Test work_time parameter - # FIXME: Should be testing permissions on the work_time parameter, - # but we currently have no way to verify whether or not time was - # added to the bug, and there's no error thrown if you lack perms. - { user => 'admin', - args => { id => 'public_bug', comment => TEST_COMMENT, - work_time => 'aaa' }, - error => "is not a numeric value", - test => "Passing a non-numeric work_time fails", - }, - { user => 'admin', - args => { id => 'public_bug', comment => TEST_COMMENT, - work_time => '1234567890' }, - error => 'more than the maximum', - test => 'Passing too large of a work_time fails', - }, - { user => 'admin', - args => { id => 'public_bug', comment => '', - work_time => '1.0' }, - error => 'a comment argument', - test => 'Passing a work_time with an empty comment fails', - }, - - # Success tests - { user => 'unprivileged', - args => { id => 'public_bug', comment => TEST_COMMENT }, - test => 'Unprivileged user can add a comment to a public bug', - }, - { user => 'unprivileged', - args => { id => 'public_bug', comment => " \n" . TEST_COMMENT }, - test => 'Can add a comment to a bug where the first line is whitespace', - }, - { user => 'QA_Selenium_TEST', - args => { id => 'private_bug', comment => TEST_COMMENT }, - test => 'Privileged user can add a comment to a private bug', - check_privacy => 1, - }, - { user => 'QA_Selenium_TEST', - args => { id => 'public_bug', comment => TEST_COMMENT, - is_private => 1 }, - test => 'Insidergroup user can add a private comment', - check_privacy => 1, - }, - { user => 'admin', - args => { id => 'public_bug', comment => TEST_COMMENT, - work_time => '1.5' }, - test => 'Timetracking user can add work_time to a bug', - }, - # FIXME: Need to verify that the comment added actually has work_time. + + # Permissions + { + args => {id => 'public_bug', comment => TEST_COMMENT}, + error => 'You must log in', + test => 'Logged-out user cannot comment on a public bug', + }, + { + args => {id => 'private_bug', comment => TEST_COMMENT}, + error => "You must log in", + test => 'Logged-out user cannot comment on a private bug', + }, + { + user => 'unprivileged', + args => {id => 'private_bug', comment => TEST_COMMENT}, + error => "not authorized to access", + test => "Unprivileged user can't comment on a private bug", + }, + + # Test ID parameter + { + user => 'unprivileged', + args => {comment => TEST_COMMENT}, + error => 'a id argument', + test => 'Failing to pass the "id" param fails', + }, + { + user => 'unprivileged', + args => {id => INVALID_BUG_ID, comment => TEST_COMMENT}, + error => "It does not seem like bug number", + test => 'Passing invalid bug id returns error "Invalid Bug ID"', + }, + { + user => 'unprivileged', + args => {id => '', comment => TEST_COMMENT}, + error => "You must enter a valid bug number", + test => 'Passing empty bug id param returns error "Invalid Bug ID"', + }, + { + user => 'unprivileged', + args => {id => INVALID_BUG_ALIAS, comment => TEST_COMMENT}, + error => "nor an alias to a bug", + test => 'Passing invalid bug alias returns error "Invalid Bug Alias"', + }, + + # Test Comment parameter + { + user => 'unprivileged', + args => {id => 'public_bug'}, + error => 'a comment argument', + test => 'Failing to pass the "comment" parameter fails', + }, + { + user => 'unprivileged', + args => {id => 'public_bug', comment => ''}, + error => "a comment argument", + test => 'Passing an empty comment fails', + }, + { + user => 'unprivileged', + args => {id => 'public_bug', comment => ' '}, + error => 'a comment argument', + test => 'Passing only a space for comment fails', + }, + { + user => 'unprivileged', + args => {id => 'public_bug', comment => " \t\n\n\r\n\r\n\r "}, + error => 'a comment argument', + test => 'Passing only whitespace (including newlines) fails', + }, + { + user => 'unprivileged', + args => {id => 'public_bug', comment => TOO_LONG_COMMENT}, + error => "cannot be longer than", + test => "Passing a comment that's too long fails", + }, + + # Testing the "private" parameter happens in the tests for Bug.comments + + # Test work_time parameter + # FIXME: Should be testing permissions on the work_time parameter, + # but we currently have no way to verify whether or not time was + # added to the bug, and there's no error thrown if you lack perms. + { + user => 'admin', + args => {id => 'public_bug', comment => TEST_COMMENT, work_time => 'aaa'}, + error => "is not a numeric value", + test => "Passing a non-numeric work_time fails", + }, + { + user => 'admin', + args => + {id => 'public_bug', comment => TEST_COMMENT, work_time => '1234567890'}, + error => 'more than the maximum', + test => 'Passing too large of a work_time fails', + }, + { + user => 'admin', + args => {id => 'public_bug', comment => '', work_time => '1.0'}, + error => 'a comment argument', + test => 'Passing a work_time with an empty comment fails', + }, + + # Success tests + { + user => 'unprivileged', + args => {id => 'public_bug', comment => TEST_COMMENT}, + test => 'Unprivileged user can add a comment to a public bug', + }, + { + user => 'unprivileged', + args => {id => 'public_bug', comment => " \n" . TEST_COMMENT}, + test => 'Can add a comment to a bug where the first line is whitespace', + }, + { + user => 'QA_Selenium_TEST', + args => {id => 'private_bug', comment => TEST_COMMENT}, + test => 'Privileged user can add a comment to a private bug', + check_privacy => 1, + }, + { + user => 'QA_Selenium_TEST', + args => {id => 'public_bug', comment => TEST_COMMENT, is_private => 1}, + test => 'Insidergroup user can add a private comment', + check_privacy => 1, + }, + { + user => 'admin', + args => {id => 'public_bug', comment => TEST_COMMENT, work_time => '1.5'}, + test => 'Timetracking user can add work_time to a bug', + }, + + # FIXME: Need to verify that the comment added actually has work_time. ); -$jsonrpc_get->bz_call_fail('Bug.add_comment', - { id => 'public_bug', comment => TEST_COMMENT }, - 'must use HTTP POST', 'add_comment fails over GET'); +$jsonrpc_get->bz_call_fail( + 'Bug.add_comment', + {id => 'public_bug', comment => TEST_COMMENT}, + 'must use HTTP POST', + 'add_comment fails over GET' +); foreach my $rpc ($jsonrpc, $xmlrpc) { - $rpc->bz_run_tests(tests => \@tests, method => 'Bug.add_comment', - post_success => \&post_success); + $rpc->bz_run_tests( + tests => \@tests, + method => 'Bug.add_comment', + post_success => \&post_success + ); } sub post_success { - my ($call, $t, $rpc) = @_; - return unless $t->{check_privacy}; - - my $comment_id = $call->result->{id}; - my $result = $rpc->bz_call_success('Bug.comments', {comment_ids => [$comment_id]}); - if ($t->{args}->{is_private}) { - ok($result->result->{comments}->{$comment_id}->{is_private}, - $rpc->TYPE . ": Comment $comment_id is private"); - } - else { - ok(!$result->result->{comments}->{$comment_id}->{is_private}, - $rpc->TYPE . ": Comment $comment_id is NOT private"); - } + my ($call, $t, $rpc) = @_; + return unless $t->{check_privacy}; + + my $comment_id = $call->result->{id}; + my $result + = $rpc->bz_call_success('Bug.comments', {comment_ids => [$comment_id]}); + if ($t->{args}->{is_private}) { + ok( + $result->result->{comments}->{$comment_id}->{is_private}, + $rpc->TYPE . ": Comment $comment_id is private" + ); + } + else { + ok( + !$result->result->{comments}->{$comment_id}->{is_private}, + $rpc->TYPE . ": Comment $comment_id is NOT private" + ); + } } -- cgit v1.2.3-24-g4f1b