From cfae9b7f6d36bb95532015545c194574c3ba43e2 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Tue, 15 Jun 2010 05:49:38 -0500 Subject: [PATCH] fix test --- t/Macro/PageTitle.t | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/t/Macro/PageTitle.t b/t/Macro/PageTitle.t index 846968494..0c9f7ebca 100644 --- a/t/Macro/PageTitle.t +++ b/t/Macro/PageTitle.t @@ -60,23 +60,8 @@ $session->asset($snippet); my $macroOutput = WebGUI::Macro::PageTitle::process($session); is($macroOutput, $snippet->get('title'), "testing title returned from localy created asset with known title"); -my $origSessionRequest = $session->{_request}; - -my ($operation, $function) = (0,0); - -my $request = Test::MockObject->new; -$request->mock('body', - sub { - my ($self, $value) = @_; - return 1 if $operation and ($value eq "op"); - return 1 if $function and ($value eq "func"); - return 0; - } -); -$request->mock('param', sub {shift->body(@_)}); - -$session->{_request} = $request; - +my $request = $session->request; +$request->setup_param({op => 0, func => 0}); $output = WebGUI::Macro::PageTitle::process($session); is($output, $session->asset->get('title'), 'fetching title for session asset, no func or op'); @@ -84,17 +69,14 @@ my $urlizedTitle = sprintf q!%s!, $session->asset->getUrl, $session->asset->get('title'); -$operation = 1; -$function = 0; +$request->setup_param({op => 1, func => 0}); $output = WebGUI::Macro::PageTitle::process($session); is($output, $urlizedTitle, 'fetching urlized title via an operation'); -$operation = 0; -$function = 1; +$request->setup_param({op => 0, func => 1}); $output = WebGUI::Macro::PageTitle::process($session); is($output, $urlizedTitle, 'fetching urlized title via a function'); -$operation = 1; -$function = 1; +$request->setup_param({op => 1, func => 1}); $output = WebGUI::Macro::PageTitle::process($session); is($output, $urlizedTitle, 'fetching urlized title via an operation and function');