From 16d47bd31be1811026a0fc585e56e6ca0769a5ac Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Wed, 12 Sep 2007 21:43:48 +0000 Subject: [PATCH] test fixes --- lib/WebGUI/Asset/Wobject/DataForm.pm | 2 ++ t/Macro/Thumbnail.t | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index 28e1378a0..a38966f4d 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -149,6 +149,7 @@ sub defaultViewForm { } #------------------------------------------------------------------- + =head2 definition ( session, [definition] ) Returns an array reference of definitions. Adds tableName, className, properties to array definition. @@ -449,6 +450,7 @@ sub getFormUrl { } #------------------------------------------------------------------- + =head2 getListUrl( params ) Get url of list of entries diff --git a/t/Macro/Thumbnail.t b/t/Macro/Thumbnail.t index 233dd9ef3..0d5938600 100644 --- a/t/Macro/Thumbnail.t +++ b/t/Macro/Thumbnail.t @@ -18,22 +18,21 @@ use WebGUI::Session; use WebGUI::Image; use WebGUI::Storage::Image; -my $graphicsPackage; -BEGIN { - if (eval { require Graphics::Magick; 1 }) { - $graphicsPackage = 'Graphics::Magick'; - } - elsif (eval { require Image::Magick; 1 }) { - $graphicsPackage = 'Image::Magick'; - } - else { - croak "You must have either Graphics::Magick or Image::Magick installed to run WebGUI.\n"; - } -} - use Test::More; # increment this value for each test you create use Test::Deep; -plan tests => 8; +plan tests => 9; + +my $graphicsPackage; +if (eval { require Graphics::Magick; 1 }) { + $graphicsPackage = 'Graphics::Magick'; +} +elsif (eval { require Image::Magick; 1 }) { + $graphicsPackage = 'Image::Magick'; +} +else { + die "Unable to load Graphics::Magick or Image::Magick!\n"; +} +pass "Load $graphicsPackage"; my $session = WebGUI::Test->session;